diff --git a/.classpath b/.classpath
deleted file mode 100644
index d57ec025..00000000
--- a/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
-	<classpathentry kind="output" path="bin/classes"/>
-</classpath>
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 00000000..51f1a321
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+
+patreon: riverfor
+custom: ["https://paypal.me/qpyriver"]
diff --git a/.gitignore b/.gitignore
index fb990bfd..1c454d72 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,29 @@
-bin/
-gen/
-obj/
-.classpath
-.project
-.settings/
-examples/widget/assets/
-
-# Generated by tools/update.sh
-build.xml
+*.iml
+.gradle
+build
+__MACOSX
+.idea
+keystore
+.DS_Store
 local.properties
+*.apk
+qbaselib.iml
+.*
+!/.gitignore
+gradle-wrapper.properties
+Android.mk
+qpython/src/main/jni/python/libpython2.7.b
+qpysdk/src/main/obj
+values-fr
+values-tr
+build.gradle.new
+captures
+old.git
+qpython/qpython.key
+qpython/cn/release/output.json
+qpython/od/release/*
+qpython/cn
+qpython/google
+qpython/os
+qpython/ol
+qpython/op
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..441d4c0b
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,12 @@
+[submodule "qbaselib"]
+	path = qbaselib
+	url = git@github.com:qpython-android/qbaselib.git
+[submodule "qftplib"]
+	path = qftplib
+	url = git@github.com:qpython-android/qftplib.git
+[submodule "qpysdk/src/main/jni"]
+	path = qpysdk/src/main/jni
+	url = git@github.com:qpython-android/pygamesdl2-jni.git
+[submodule "qpysl4a"]
+	path = qpysl4a
+	url = git@github.com:qpython-android/qpysl4a.git
diff --git a/.project b/.project
deleted file mode 100644
index 0e1a2ab2..00000000
--- a/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>QSL4Alib</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
deleted file mode 100644
index 2b59faa3..00000000
--- a/AndroidManifest.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	android:installLocation="auto"
-	package="com.hipipal.sl4alib"
-	android:versionCode="2"
-	android:versionName="2.0">
-
-    <uses-sdk android:minSdkVersion="7" />
-</manifest>
diff --git a/README.md b/README.md
index d84071e0..9912213e 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,79 @@
-QSL4A
-=====
+# About
 
-SL4A Library in QPython
+
+<p align="center"><a href="https://play.google.com/store/apps/details?id=org.qpython.qpy" target="_blank"><img src="https://lh3.googleusercontent.com/E2sU2Mca-geyscWogW2ZsQC3dY1Y46a3HU35NoHv0AIBvCgQn_ZRZ2MOeA5tg3YkWg=s360-rw"></a></p>
+
+Welcome to the QPython project!
+
+QPython is the Python engine for android. It contains some amazing features such as Python interpreter, runtime environment, editor and QPYI and integrated SL4A. It makes it easy for you to use Python on Android. And it's FREE.
+
+Compared with other Python apps, QPython mainly solves how to use Python to drive your Android device work. Good SL4A support is our main goal, such as android's camera, sensor, sms media APIs etc.
+
+QPython already has millions of users worldwide and it is also an open source project.
+
+For different usage scenarios, QPython has two branches, namely QPython Ox and 3x.
+
+QPython Ox is mainly aimed at programming learners, and it provides more friendly features for beginners.
+QPython 3x is mainly for experienced Python users, and it provides some advanced technical features.
+
+## Quick start
+
+This repository is the QPython Ox project repository, you can follow the below steps to run it.
+
+- Macos + Android studio, (Ubuntu may work too)
+- git clone git@github.com:qpython-android/qpython.git
+- git submodule init
+- git submodule sync
+- git submodule update
+- build it...
+
+Get more information from [wiki](https://github.com/qpython-android/qpython/wiki) for developing QPython
+
+## Related 
+
+- [QPython 3x features](https://github.com/qpython-android/qpython.org/blob/master/qpython-docs/source/en/qpython_3x_featues.rst), [QPython Ox features](https://github.com/qpython-android/qpython.org/blob/master/qpython-docs/source/en/qpython_ox_featues.rst)
+- [QPySL4A APIs](https://github.com/qpython-android/qpysl4a/blob/master/doc/en/APIs.rst) and [test scripts](https://github.com/qpython-android/qpysl4a/issues/1)
+- QPYPI Packages
+
+## How to ask QPython related questions
+In order to benefit those guys who have the same issue with QPython, we suggest that you should ask the issue which is related with QPython within public techical communities.
+
+
+### English QPythonista Community
+
+- [Ask in stackoverflow](https://stackoverflow.com/questions/tagged/qpython)
+- [Discuss QPython Programming in QPython Group](https://www.facebook.com/groups/qpython/)
+
+### Chinese QPythonista Community
+
+- [在segmentfault提问 - Chinese](https://segmentfault.com/t/qpython)
+- [在贴吧讨论 - Chinese](https://tieba.baidu.com/f?ie=utf-8&kw=qpython)
+
+### Report issues
+
+Please tell us your phone's informatioin, android os information, QPython branch, and your code, where did you install it and the detailed stituation you have encountered.
+
+- [Report an app's issue](https://github.com/qpython-android/qpython/issues)
+- [Report an non-app's issue](https://github.com/qpython-android/qpython.org/issues)
+- [Request to support a package](https://github.com/qpython-android/qpypi/issues)
+
+## Donation
+
+- harford (Wechat)
+- 晨晖 (Wechat)
+
+THANK YOU VERY MUCH FOR DONATION!
+
+
+## How to contribute
+WE NEED YOUR HELP AND CONTRIBUTE, WE WILL BE VERY GRATEFUL IF YOU CAN TELL US YOUR IDEA OR SUGGESTION.
+
+IF YOU WANT TO PARTICIPATE THIS PROJECT, PLEASE SEND YOUR EMAIL TO US, WE WILL INVITE YOU INTO QPYTHON SLACK GROUP WHERE WE WILL DISCUSS HOW TO PUSH ON QPYTHON.
+
+- Email: support@qpython.org
+- Twitter: @qpython
+- Facebook: https://www.facebook.com/qpython
+
+Or you can join [qpython slack](https://join.slack.com/t/qpython/shared_invite/enQtOTI1MDY1NzM4NjU2LTljZDI3MjI0ZmZmNzIwNzAwMTU2ZDIyNGRjMTJiOTQ4MzgzY2Y3NDU5YzJjNTQ5MmM4Nzk2MGI4YWZmY2VhOTU)
+
+THANK YOU.
diff --git a/assets/need_network.html b/assets/need_network.html
deleted file mode 100644
index d4a83b5d..00000000
--- a/assets/need_network.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<html>
-<head>
-</head>
-<body>
-<div style="margin:0 auto;padding:20px 20px 20px;font-size:15px;text-align:center;color:grey">Network is unavailable!</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/assets/splash.html b/assets/splash.html
deleted file mode 100644
index 6bfc7988..00000000
--- a/assets/splash.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<html>
-<body>
-</body>
-</html>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 00000000..d576ffd4
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,118 @@
+def supportVersion = "28.0.0" // equals to line60
+def retrofitVersion = "2.1.0"
+def rxVersion = "1.2.1"
+
+def okhttpVersion = '3.10.0'
+
+def butterknifeVersion = '9.0.0' //eqals to line 26
+
+buildscript {
+    repositories {
+        jcenter()
+        google()
+        mavenCentral()
+
+        maven { url "https://plugins.gradle.org/m2/" }
+        maven { url "https://maven.google.com" }
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.5.3'
+
+        // A gradle plugin for getting java lambda support in java 6, 7 and android
+        // https://github.com/evant/gradle-retrolambda
+        classpath 'me.tatarka:gradle-retrolambda:3.7.0'
+
+        // Gradle plugin which downloads and manages your Android SDK.
+        //classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.0'
+
+        // Field and method binding for Android views which uses annotation processing to generate boilerplate code for you.
+        // https://github.com/JakeWharton/butterknife
+        classpath "com.jakewharton:butterknife-gradle-plugin:9.0.0-rc2"
+
+        // Realm is a mobile database: a replacement for SQLite & ORMs
+        // https://github.com/realm/realm-java
+        classpath "io.realm:realm-gradle-plugin:3.5.0"
+
+        classpath 'com.google.gms:google-services:4.0.2'
+    }
+}
+
+allprojects {
+    repositories {
+        jcenter()
+        google()
+
+        mavenCentral()
+        maven { url "https://jitpack.io" }
+        maven { url 'https://dl.bintray.com/azeesoft/maven' }
+        //maven { url "http://mvn.leancloud.cn/nexus/content/repositories/public" }
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}
+
+subprojects {
+    def androidHome
+    if ((androidHome = System.env.'ANDROID_HOME')
+            && (androidHome = androidHome as File).exists()
+            && androidHome.canWrite()) {
+        //apply plugin: 'android-sdk-manager'
+    }
+
+    project.configurations.all {
+        resolutionStrategy.eachDependency { details ->
+            if (details.requested.group == 'com.android.support'
+                    && !details.requested.name.contains('multidex')) {
+                details.useVersion "${supportVersion}"
+            }
+        }
+
+    }
+}
+
+ext {
+    libOkHttp3 = "com.squareup.okhttp3:okhttp:${okhttpVersion}"
+
+    libRxJava = "io.reactivex:rxandroid:${rxVersion}"
+    libRxAndroid = "io.reactivex:rxjava:${rxVersion}"
+    libFileDownloaderLib = 'com.liulishuo.filedownloader:library:0.3.5'
+
+    libSupportV4 = "com.android.support:support-v4:${supportVersion}"
+    libSupportV4Design = 'com.android.support:design:${supportVersion}'
+
+    libSupportV7 = "com.android.support:appcompat-v7:${supportVersion}"
+    libSupportCardView = "com.android.support:cardview-v7:${supportVersion}"
+
+    libSupportPreference = "com.android.support:preference-v14:${supportVersion}"
+    libSupportAnnotation = "com.android.support:support-annotations:${supportVersion}"
+    libSupportDesign = "com.android.support:design:${supportVersion}"
+    libOkHttp3Log = "com.squareup.okhttp3:logging-interceptor:${okhttpVersion}"
+
+    minSdkVersion = 14
+    targetSdkVersion = 28
+    compileSdkVersion = 28
+    buildToolsVersion = '28.0.3'
+
+    // firebase related https://firebase.google.com/docs/android/setup
+    firebaseCore = "com.google.firebase:firebase-core:16.0.6"
+    firebaseMsg = "com.google.firebase:firebase-messaging:17.3.4"
+    firebaseAuth = "com.google.firebase:firebase-auth:16.1.0"
+    firebaseDatabase = "com.google.firebase:firebase-database:16.0.5"
+
+    // https://developers.google.com/android/guides/setup
+    googlePlayServiceAuth = "com.google.android.gms:play-services-auth:16.0.1"
+
+    leakcanaryDebug = 'com.squareup.leakcanary:leakcanary-android:1.5.4'
+    leakcanaryRelease = 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'
+    libGoogleGuava = 'com.google.guava:guava:18.0'
+
+    retrofit = "com.squareup.retrofit2:retrofit:${retrofitVersion}"
+    retrofitCoverterGson = "com.squareup.retrofit2:converter-gson:${retrofitVersion}"
+    retrofitAdapterRxjava = "com.squareup.retrofit2:adapter-rxjava:${retrofitVersion}"
+
+    libButterknife = "com.jakewharton:butterknife:${butterknifeVersion}"
+    libButterknifeCompiler ="com.jakewharton:butterknife-compiler:${butterknifeVersion}"
+}
\ No newline at end of file
diff --git a/debug.keystore b/debug.keystore
new file mode 100644
index 00000000..70dc936c
Binary files /dev/null and b/debug.keystore differ
diff --git a/doc/com/android/python27/config/GlobalConstants.html b/doc/com/android/python27/config/GlobalConstants.html
deleted file mode 100644
index 6641a874..00000000
--- a/doc/com/android/python27/config/GlobalConstants.html
+++ /dev/null
@@ -1,330 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-GlobalConstants
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="GlobalConstants";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/GlobalConstants.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/android/python27/config/GlobalConstants.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="GlobalConstants.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;METHOD</FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;METHOD</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.android.python27.config</FONT>
-<BR>
-Interface GlobalConstants</H2>
-<HR>
-<DL>
-<DT><PRE>public interface <B>GlobalConstants</B></DL>
-</PRE>
-
-<P>
-<HR>
-
-<P>
-<!-- =========== FIELD SUMMARY =========== -->
-
-<A NAME="field_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Field Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/android/python27/config/GlobalConstants.html#LOCAL_ZIP_NAME">LOCAL_ZIP_NAME</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/android/python27/config/GlobalConstants.html#LOG_TAG">LOG_TAG</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/android/python27/config/GlobalConstants.html#PACKAGE_NAME">PACKAGE_NAME</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/android/python27/config/GlobalConstants.html#PYTHON_EXTRAS_ZIP_NAME">PYTHON_EXTRAS_ZIP_NAME</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/android/python27/config/GlobalConstants.html#PYTHON_MAIN_SCRIPT_NAME">PYTHON_MAIN_SCRIPT_NAME</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/android/python27/config/GlobalConstants.html#PYTHON_NICE_NAME">PYTHON_NICE_NAME</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/android/python27/config/GlobalConstants.html#PYTHON_PROJECT_ZIP_NAME">PYTHON_PROJECT_ZIP_NAME</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/android/python27/config/GlobalConstants.html#PYTHON_ZIP_NAME">PYTHON_ZIP_NAME</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-<A NAME="field_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Field Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="PACKAGE_NAME"><!-- --></A><H3>
-PACKAGE_NAME</H3>
-<PRE>
-static final java.lang.String <B>PACKAGE_NAME</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../constant-values.html#com.android.python27.config.GlobalConstants.PACKAGE_NAME">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="PYTHON_MAIN_SCRIPT_NAME"><!-- --></A><H3>
-PYTHON_MAIN_SCRIPT_NAME</H3>
-<PRE>
-static final java.lang.String <B>PYTHON_MAIN_SCRIPT_NAME</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../constant-values.html#com.android.python27.config.GlobalConstants.PYTHON_MAIN_SCRIPT_NAME">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="PYTHON_PROJECT_ZIP_NAME"><!-- --></A><H3>
-PYTHON_PROJECT_ZIP_NAME</H3>
-<PRE>
-static final java.lang.String <B>PYTHON_PROJECT_ZIP_NAME</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../constant-values.html#com.android.python27.config.GlobalConstants.PYTHON_PROJECT_ZIP_NAME">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="LOCAL_ZIP_NAME"><!-- --></A><H3>
-LOCAL_ZIP_NAME</H3>
-<PRE>
-static final java.lang.String <B>LOCAL_ZIP_NAME</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../constant-values.html#com.android.python27.config.GlobalConstants.LOCAL_ZIP_NAME">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="PYTHON_NICE_NAME"><!-- --></A><H3>
-PYTHON_NICE_NAME</H3>
-<PRE>
-static final java.lang.String <B>PYTHON_NICE_NAME</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../constant-values.html#com.android.python27.config.GlobalConstants.PYTHON_NICE_NAME">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="PYTHON_ZIP_NAME"><!-- --></A><H3>
-PYTHON_ZIP_NAME</H3>
-<PRE>
-static final java.lang.String <B>PYTHON_ZIP_NAME</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../constant-values.html#com.android.python27.config.GlobalConstants.PYTHON_ZIP_NAME">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="PYTHON_EXTRAS_ZIP_NAME"><!-- --></A><H3>
-PYTHON_EXTRAS_ZIP_NAME</H3>
-<PRE>
-static final java.lang.String <B>PYTHON_EXTRAS_ZIP_NAME</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../constant-values.html#com.android.python27.config.GlobalConstants.PYTHON_EXTRAS_ZIP_NAME">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="LOG_TAG"><!-- --></A><H3>
-LOG_TAG</H3>
-<PRE>
-static final java.lang.String <B>LOG_TAG</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../constant-values.html#com.android.python27.config.GlobalConstants.LOG_TAG">Constant Field Values</A></DL>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/GlobalConstants.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/android/python27/config/GlobalConstants.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="GlobalConstants.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;METHOD</FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;METHOD</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/android/python27/config/package-frame.html b/doc/com/android/python27/config/package-frame.html
deleted file mode 100644
index 0454c366..00000000
--- a/doc/com/android/python27/config/package-frame.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-com.android.python27.config
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-
-</HEAD>
-
-<BODY BGCOLOR="white">
-<FONT size="+1" CLASS="FrameTitleFont">
-<A HREF="../../../../com/android/python27/config/package-summary.html" target="classFrame">com.android.python27.config</A></FONT>
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
-Interfaces</FONT>&nbsp;
-<FONT CLASS="FrameItemFont">
-<BR>
-<A HREF="GlobalConstants.html" title="interface in com.android.python27.config" target="classFrame"><I>GlobalConstants</I></A></FONT></TD>
-</TR>
-</TABLE>
-
-
-</BODY>
-</HTML>
diff --git a/doc/com/android/python27/config/package-summary.html b/doc/com/android/python27/config/package-summary.html
deleted file mode 100644
index d7ccbfde..00000000
--- a/doc/com/android/python27/config/package-summary.html
+++ /dev/null
@@ -1,157 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-com.android.python27.config
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="com.android.python27.config";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV PACKAGE&nbsp;
-&nbsp;<A HREF="../../../../com/android/python27/process/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/android/python27/config/package-summary.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<H2>
-Package com.android.python27.config
-</H2>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Interface Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/android/python27/config/GlobalConstants.html" title="interface in com.android.python27.config">GlobalConstants</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-
-<P>
-<DL>
-</DL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV PACKAGE&nbsp;
-&nbsp;<A HREF="../../../../com/android/python27/process/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/android/python27/config/package-summary.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/android/python27/config/package-tree.html b/doc/com/android/python27/config/package-tree.html
deleted file mode 100644
index 238ba295..00000000
--- a/doc/com/android/python27/config/package-tree.html
+++ /dev/null
@@ -1,151 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-com.android.python27.config Class Hierarchy
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="com.android.python27.config Class Hierarchy";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;<A HREF="../../../../com/android/python27/process/package-tree.html"><B>NEXT</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/android/python27/config/package-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-Hierarchy For Package com.android.python27.config
-</H2>
-</CENTER>
-<DL>
-<DT><B>Package Hierarchies:</B><DD><A HREF="../../../../overview-tree.html">All Packages</A></DL>
-<HR>
-<H2>
-Interface Hierarchy
-</H2>
-<UL>
-<LI TYPE="circle">com.android.python27.config.<A HREF="../../../../com/android/python27/config/GlobalConstants.html" title="interface in com.android.python27.config"><B>GlobalConstants</B></A></UL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;<A HREF="../../../../com/android/python27/process/package-tree.html"><B>NEXT</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/android/python27/config/package-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/android/python27/process/InterpreterProcess.html b/doc/com/android/python27/process/InterpreterProcess.html
deleted file mode 100644
index 34a75e05..00000000
--- a/doc/com/android/python27/process/InterpreterProcess.html
+++ /dev/null
@@ -1,454 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:05 PDT 2014 -->
-<TITLE>
-InterpreterProcess
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="InterpreterProcess";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/InterpreterProcess.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;<A HREF="../../../../com/android/python27/process/MyScriptProcess.html" title="class in com.android.python27.process"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/android/python27/process/InterpreterProcess.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="InterpreterProcess.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#fields_inherited_from_class_com.android.python27.process.Process">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.android.python27.process</FONT>
-<BR>
-Class InterpreterProcess</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../com/android/python27/process/Process.html" title="class in com.android.python27.process">com.android.python27.process.Process</A>
-      <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.android.python27.process.InterpreterProcess</B>
-</PRE>
-<DL>
-<DT><B>Direct Known Subclasses:</B> <DD><A HREF="../../../../com/android/python27/process/PythonScriptProcess.html" title="class in com.android.python27.process">PythonScriptProcess</A></DD>
-</DL>
-<HR>
-<DL>
-<DT><PRE>public class <B>InterpreterProcess</B><DT>extends <A HREF="../../../../com/android/python27/process/Process.html" title="class in com.android.python27.process">Process</A></DL>
-</PRE>
-
-<P>
-<HR>
-
-<P>
-<!-- =========== FIELD SUMMARY =========== -->
-
-<A NAME="field_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Field Summary</B></FONT></TH>
-</TR>
-</TABLE>
-&nbsp;<A NAME="fields_inherited_from_class_com.android.python27.process.Process"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Fields inherited from class com.android.python27.process.<A HREF="../../../../com/android/python27/process/Process.html" title="class in com.android.python27.process">Process</A></B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../com/android/python27/process/Process.html#context">context</A></CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/android/python27/process/InterpreterProcess.html#InterpreterProcess(com.hipipal.sl4alib.PyScriptService, com.googlecode.android_scripting.interpreter.MyInterpreter, com.googlecode.android_scripting.AndroidProxy)">InterpreterProcess</A></B>(<A HREF="../../../../com/hipipal/sl4alib/PyScriptService.html" title="class in com.hipipal.sl4alib">PyScriptService</A>&nbsp;context,
-                   <A HREF="../../../../com/googlecode/android_scripting/interpreter/MyInterpreter.html" title="class in com.googlecode.android_scripting.interpreter">MyInterpreter</A>&nbsp;myInterpreter,
-                   <A HREF="../../../../com/googlecode/android_scripting/AndroidProxy.html" title="class in com.googlecode.android_scripting">AndroidProxy</A>&nbsp;paramAndroidProxy)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Creates a new <A HREF="../../../../com/android/python27/process/InterpreterProcess.html" title="class in com.android.python27.process"><CODE>InterpreterProcess</CODE></A>.</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/android/python27/process/InterpreterProcess.html#getHost()">getHost</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/Interpreter.html" title="class in com.googlecode.android_scripting.interpreter">Interpreter</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/android/python27/process/InterpreterProcess.html#getInterpreter()">getInterpreter</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/android/python27/process/InterpreterProcess.html#getPort()">getPort</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManagerFactory.html" title="interface in com.googlecode.android_scripting.jsonrpc">RpcReceiverManagerFactory</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/android/python27/process/InterpreterProcess.html#getRpcReceiverManagerFactory()">getRpcReceiverManagerFactory</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/android/python27/process/InterpreterProcess.html#getSdcardPackageDirectory()">getSdcardPackageDirectory</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/android/python27/process/InterpreterProcess.html#getSecret()">getSecret</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/android/python27/process/InterpreterProcess.html#getWorkingDirectory()">getWorkingDirectory</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/android/python27/process/InterpreterProcess.html#kill()">kill</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/android/python27/process/InterpreterProcess.html#start(java.lang.Runnable, java.util.List)">start</A></B>(java.lang.Runnable&nbsp;paramRunnable,
-      java.util.List&lt;java.lang.String&gt;&nbsp;paramList)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_com.android.python27.process.Process"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class com.android.python27.process.<A HREF="../../../../com/android/python27/process/Process.html" title="class in com.android.python27.process">Process</A></B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../com/android/python27/process/Process.html#addAllArguments(java.util.List)">addAllArguments</A>, <A HREF="../../../../com/android/python27/process/Process.html#addArgument(java.lang.String)">addArgument</A>, <A HREF="../../../../com/android/python27/process/Process.html#getErr()">getErr</A>, <A HREF="../../../../com/android/python27/process/Process.html#getFd()">getFd</A>, <A HREF="../../../../com/android/python27/process/Process.html#getIn()">getIn</A>, <A HREF="../../../../com/android/python27/process/Process.html#getLogFile()">getLogFile</A>, <A HREF="../../../../com/android/python27/process/Process.html#getName()">getName</A>, <A HREF="../../../../com/android/python27/process/Process.html#getOut()">getOut</A>, <A HREF="../../../../com/android/python27/process/Process.html#getPid()">getPid</A>, <A HREF="../../../../com/android/python27/process/Process.html#getReturnValue()">getReturnValue</A>, <A HREF="../../../../com/android/python27/process/Process.html#getUptime()">getUptime</A>, <A HREF="../../../../com/android/python27/process/Process.html#isAlive()">isAlive</A>, <A HREF="../../../../com/android/python27/process/Process.html#putAllEnvironmentVariables(java.util.Map)">putAllEnvironmentVariables</A>, <A HREF="../../../../com/android/python27/process/Process.html#putEnvironmentVariable(java.lang.String, java.lang.String)">putEnvironmentVariable</A>, <A HREF="../../../../com/android/python27/process/Process.html#setBinary(java.io.File)">setBinary</A>, <A HREF="../../../../com/android/python27/process/Process.html#setName(java.lang.String)">setName</A></CODE></TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="InterpreterProcess(com.hipipal.sl4alib.PyScriptService, com.googlecode.android_scripting.interpreter.MyInterpreter, com.googlecode.android_scripting.AndroidProxy)"><!-- --></A><H3>
-InterpreterProcess</H3>
-<PRE>
-public <B>InterpreterProcess</B>(<A HREF="../../../../com/hipipal/sl4alib/PyScriptService.html" title="class in com.hipipal.sl4alib">PyScriptService</A>&nbsp;context,
-                          <A HREF="../../../../com/googlecode/android_scripting/interpreter/MyInterpreter.html" title="class in com.googlecode.android_scripting.interpreter">MyInterpreter</A>&nbsp;myInterpreter,
-                          <A HREF="../../../../com/googlecode/android_scripting/AndroidProxy.html" title="class in com.googlecode.android_scripting">AndroidProxy</A>&nbsp;paramAndroidProxy)</PRE>
-<DL>
-<DD>Creates a new <A HREF="../../../../com/android/python27/process/InterpreterProcess.html" title="class in com.android.python27.process"><CODE>InterpreterProcess</CODE></A>.
-<P>
-<DL>
-<DT><B>Parameters:</B><DD><CODE>launchScript</CODE> - the absolute path to a script that should be launched with the interpreter<DD><CODE>port</CODE> - the port that the AndroidProxy is listening on</DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="getInterpreter()"><!-- --></A><H3>
-getInterpreter</H3>
-<PRE>
-public <A HREF="../../../../com/googlecode/android_scripting/interpreter/Interpreter.html" title="class in com.googlecode.android_scripting.interpreter">Interpreter</A> <B>getInterpreter</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getHost()"><!-- --></A><H3>
-getHost</H3>
-<PRE>
-public java.lang.String <B>getHost</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getPort()"><!-- --></A><H3>
-getPort</H3>
-<PRE>
-public int <B>getPort</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getSecret()"><!-- --></A><H3>
-getSecret</H3>
-<PRE>
-public java.lang.String <B>getSecret</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getWorkingDirectory()"><!-- --></A><H3>
-getWorkingDirectory</H3>
-<PRE>
-public java.lang.String <B>getWorkingDirectory</B>()</PRE>
-<DL>
-<DD><DL>
-<DT><B>Overrides:</B><DD><CODE><A HREF="../../../../com/android/python27/process/Process.html#getWorkingDirectory()">getWorkingDirectory</A></CODE> in class <CODE><A HREF="../../../../com/android/python27/process/Process.html" title="class in com.android.python27.process">Process</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getSdcardPackageDirectory()"><!-- --></A><H3>
-getSdcardPackageDirectory</H3>
-<PRE>
-public java.lang.String <B>getSdcardPackageDirectory</B>()</PRE>
-<DL>
-<DD><DL>
-<DT><B>Overrides:</B><DD><CODE><A HREF="../../../../com/android/python27/process/Process.html#getSdcardPackageDirectory()">getSdcardPackageDirectory</A></CODE> in class <CODE><A HREF="../../../../com/android/python27/process/Process.html" title="class in com.android.python27.process">Process</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getRpcReceiverManagerFactory()"><!-- --></A><H3>
-getRpcReceiverManagerFactory</H3>
-<PRE>
-public <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManagerFactory.html" title="interface in com.googlecode.android_scripting.jsonrpc">RpcReceiverManagerFactory</A> <B>getRpcReceiverManagerFactory</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="start(java.lang.Runnable, java.util.List)"><!-- --></A><H3>
-start</H3>
-<PRE>
-public void <B>start</B>(java.lang.Runnable&nbsp;paramRunnable,
-                  java.util.List&lt;java.lang.String&gt;&nbsp;paramList)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="kill()"><!-- --></A><H3>
-kill</H3>
-<PRE>
-public void <B>kill</B>()</PRE>
-<DL>
-<DD><DL>
-<DT><B>Overrides:</B><DD><CODE><A HREF="../../../../com/android/python27/process/Process.html#kill()">kill</A></CODE> in class <CODE><A HREF="../../../../com/android/python27/process/Process.html" title="class in com.android.python27.process">Process</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/InterpreterProcess.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;<A HREF="../../../../com/android/python27/process/MyScriptProcess.html" title="class in com.android.python27.process"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/android/python27/process/InterpreterProcess.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="InterpreterProcess.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#fields_inherited_from_class_com.android.python27.process.Process">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/android/python27/process/MyScriptProcess.html b/doc/com/android/python27/process/MyScriptProcess.html
deleted file mode 100644
index 622d5649..00000000
--- a/doc/com/android/python27/process/MyScriptProcess.html
+++ /dev/null
@@ -1,329 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:05 PDT 2014 -->
-<TITLE>
-MyScriptProcess
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="MyScriptProcess";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/MyScriptProcess.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/android/python27/process/InterpreterProcess.html" title="class in com.android.python27.process"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/android/python27/process/Process.html" title="class in com.android.python27.process"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/android/python27/process/MyScriptProcess.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="MyScriptProcess.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#fields_inherited_from_class_com.android.python27.process.Process">FIELD</A>&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.android.python27.process</FONT>
-<BR>
-Class MyScriptProcess</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../com/android/python27/process/Process.html" title="class in com.android.python27.process">com.android.python27.process.Process</A>
-      <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../com/android/python27/process/InterpreterProcess.html" title="class in com.android.python27.process">com.android.python27.process.InterpreterProcess</A>
-          <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../com/android/python27/process/PythonScriptProcess.html" title="class in com.android.python27.process">com.android.python27.process.PythonScriptProcess</A>
-              <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.android.python27.process.MyScriptProcess</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>MyScriptProcess</B><DT>extends <A HREF="../../../../com/android/python27/process/PythonScriptProcess.html" title="class in com.android.python27.process">PythonScriptProcess</A></DL>
-</PRE>
-
-<P>
-<HR>
-
-<P>
-<!-- =========== FIELD SUMMARY =========== -->
-
-<A NAME="field_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Field Summary</B></FONT></TH>
-</TR>
-</TABLE>
-&nbsp;<A NAME="fields_inherited_from_class_com.android.python27.process.Process"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Fields inherited from class com.android.python27.process.<A HREF="../../../../com/android/python27/process/Process.html" title="class in com.android.python27.process">Process</A></B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../com/android/python27/process/Process.html#context">context</A></CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/android/python27/process/MyScriptProcess.html#getSdcardPackageDirectory()">getSdcardPackageDirectory</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/android/python27/process/MyScriptProcess.html#getWorkingDirectory()">getWorkingDirectory</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;<A HREF="../../../../com/android/python27/process/MyScriptProcess.html" title="class in com.android.python27.process">MyScriptProcess</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/android/python27/process/MyScriptProcess.html#launchScript(com.hipipal.sl4alib.PyScriptService, java.io.File, com.googlecode.android_scripting.interpreter.InterpreterConfiguration, com.googlecode.android_scripting.AndroidProxy, java.lang.Runnable, java.lang.String, java.lang.String, java.util.List, java.util.Map, java.io.File)">launchScript</A></B>(<A HREF="../../../../com/hipipal/sl4alib/PyScriptService.html" title="class in com.hipipal.sl4alib">PyScriptService</A>&nbsp;context,
-             java.io.File&nbsp;script,
-             <A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterConfiguration.html" title="class in com.googlecode.android_scripting.interpreter">InterpreterConfiguration</A>&nbsp;configuration,
-             <A HREF="../../../../com/googlecode/android_scripting/AndroidProxy.html" title="class in com.googlecode.android_scripting">AndroidProxy</A>&nbsp;proxy,
-             java.lang.Runnable&nbsp;shutdownHook,
-             java.lang.String&nbsp;workingDir,
-             java.lang.String&nbsp;sdcardPackageDirectory,
-             java.util.List&lt;java.lang.String&gt;&nbsp;args,
-             java.util.Map&lt;java.lang.String,java.lang.String&gt;&nbsp;envVars,
-             java.io.File&nbsp;binary)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_com.android.python27.process.PythonScriptProcess"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class com.android.python27.process.<A HREF="../../../../com/android/python27/process/PythonScriptProcess.html" title="class in com.android.python27.process">PythonScriptProcess</A></B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../com/android/python27/process/PythonScriptProcess.html#getPath()">getPath</A></CODE></TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_com.android.python27.process.InterpreterProcess"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class com.android.python27.process.<A HREF="../../../../com/android/python27/process/InterpreterProcess.html" title="class in com.android.python27.process">InterpreterProcess</A></B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../com/android/python27/process/InterpreterProcess.html#getHost()">getHost</A>, <A HREF="../../../../com/android/python27/process/InterpreterProcess.html#getInterpreter()">getInterpreter</A>, <A HREF="../../../../com/android/python27/process/InterpreterProcess.html#getPort()">getPort</A>, <A HREF="../../../../com/android/python27/process/InterpreterProcess.html#getRpcReceiverManagerFactory()">getRpcReceiverManagerFactory</A>, <A HREF="../../../../com/android/python27/process/InterpreterProcess.html#getSecret()">getSecret</A>, <A HREF="../../../../com/android/python27/process/InterpreterProcess.html#kill()">kill</A>, <A HREF="../../../../com/android/python27/process/InterpreterProcess.html#start(java.lang.Runnable, java.util.List)">start</A></CODE></TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_com.android.python27.process.Process"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class com.android.python27.process.<A HREF="../../../../com/android/python27/process/Process.html" title="class in com.android.python27.process">Process</A></B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../com/android/python27/process/Process.html#addAllArguments(java.util.List)">addAllArguments</A>, <A HREF="../../../../com/android/python27/process/Process.html#addArgument(java.lang.String)">addArgument</A>, <A HREF="../../../../com/android/python27/process/Process.html#getErr()">getErr</A>, <A HREF="../../../../com/android/python27/process/Process.html#getFd()">getFd</A>, <A HREF="../../../../com/android/python27/process/Process.html#getIn()">getIn</A>, <A HREF="../../../../com/android/python27/process/Process.html#getLogFile()">getLogFile</A>, <A HREF="../../../../com/android/python27/process/Process.html#getName()">getName</A>, <A HREF="../../../../com/android/python27/process/Process.html#getOut()">getOut</A>, <A HREF="../../../../com/android/python27/process/Process.html#getPid()">getPid</A>, <A HREF="../../../../com/android/python27/process/Process.html#getReturnValue()">getReturnValue</A>, <A HREF="../../../../com/android/python27/process/Process.html#getUptime()">getUptime</A>, <A HREF="../../../../com/android/python27/process/Process.html#isAlive()">isAlive</A>, <A HREF="../../../../com/android/python27/process/Process.html#putAllEnvironmentVariables(java.util.Map)">putAllEnvironmentVariables</A>, <A HREF="../../../../com/android/python27/process/Process.html#putEnvironmentVariable(java.lang.String, java.lang.String)">putEnvironmentVariable</A>, <A HREF="../../../../com/android/python27/process/Process.html#setBinary(java.io.File)">setBinary</A>, <A HREF="../../../../com/android/python27/process/Process.html#setName(java.lang.String)">setName</A></CODE></TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="launchScript(com.hipipal.sl4alib.PyScriptService, java.io.File, com.googlecode.android_scripting.interpreter.InterpreterConfiguration, com.googlecode.android_scripting.AndroidProxy, java.lang.Runnable, java.lang.String, java.lang.String, java.util.List, java.util.Map, java.io.File)"><!-- --></A><H3>
-launchScript</H3>
-<PRE>
-public static <A HREF="../../../../com/android/python27/process/MyScriptProcess.html" title="class in com.android.python27.process">MyScriptProcess</A> <B>launchScript</B>(<A HREF="../../../../com/hipipal/sl4alib/PyScriptService.html" title="class in com.hipipal.sl4alib">PyScriptService</A>&nbsp;context,
-                                           java.io.File&nbsp;script,
-                                           <A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterConfiguration.html" title="class in com.googlecode.android_scripting.interpreter">InterpreterConfiguration</A>&nbsp;configuration,
-                                           <A HREF="../../../../com/googlecode/android_scripting/AndroidProxy.html" title="class in com.googlecode.android_scripting">AndroidProxy</A>&nbsp;proxy,
-                                           java.lang.Runnable&nbsp;shutdownHook,
-                                           java.lang.String&nbsp;workingDir,
-                                           java.lang.String&nbsp;sdcardPackageDirectory,
-                                           java.util.List&lt;java.lang.String&gt;&nbsp;args,
-                                           java.util.Map&lt;java.lang.String,java.lang.String&gt;&nbsp;envVars,
-                                           java.io.File&nbsp;binary)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getWorkingDirectory()"><!-- --></A><H3>
-getWorkingDirectory</H3>
-<PRE>
-public java.lang.String <B>getWorkingDirectory</B>()</PRE>
-<DL>
-<DD><DL>
-<DT><B>Overrides:</B><DD><CODE><A HREF="../../../../com/android/python27/process/InterpreterProcess.html#getWorkingDirectory()">getWorkingDirectory</A></CODE> in class <CODE><A HREF="../../../../com/android/python27/process/InterpreterProcess.html" title="class in com.android.python27.process">InterpreterProcess</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getSdcardPackageDirectory()"><!-- --></A><H3>
-getSdcardPackageDirectory</H3>
-<PRE>
-public java.lang.String <B>getSdcardPackageDirectory</B>()</PRE>
-<DL>
-<DD><DL>
-<DT><B>Overrides:</B><DD><CODE><A HREF="../../../../com/android/python27/process/InterpreterProcess.html#getSdcardPackageDirectory()">getSdcardPackageDirectory</A></CODE> in class <CODE><A HREF="../../../../com/android/python27/process/InterpreterProcess.html" title="class in com.android.python27.process">InterpreterProcess</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/MyScriptProcess.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/android/python27/process/InterpreterProcess.html" title="class in com.android.python27.process"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/android/python27/process/Process.html" title="class in com.android.python27.process"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/android/python27/process/MyScriptProcess.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="MyScriptProcess.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#fields_inherited_from_class_com.android.python27.process.Process">FIELD</A>&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/android/python27/process/Process.html b/doc/com/android/python27/process/Process.html
deleted file mode 100644
index f5209122..00000000
--- a/doc/com/android/python27/process/Process.html
+++ /dev/null
@@ -1,635 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:05 PDT 2014 -->
-<TITLE>
-Process
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Process";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/Process.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/android/python27/process/MyScriptProcess.html" title="class in com.android.python27.process"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/android/python27/process/PythonScriptProcess.html" title="class in com.android.python27.process"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/android/python27/process/Process.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="Process.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.android.python27.process</FONT>
-<BR>
-Class Process</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.android.python27.process.Process</B>
-</PRE>
-<DL>
-<DT><B>Direct Known Subclasses:</B> <DD><A HREF="../../../../com/android/python27/process/InterpreterProcess.html" title="class in com.android.python27.process">InterpreterProcess</A></DD>
-</DL>
-<HR>
-<DL>
-<DT><PRE>public class <B>Process</B><DT>extends java.lang.Object</DL>
-</PRE>
-
-<P>
-<HR>
-
-<P>
-<!-- =========== FIELD SUMMARY =========== -->
-
-<A NAME="field_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Field Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../com/hipipal/sl4alib/PyScriptService.html" title="class in com.hipipal.sl4alib">PyScriptService</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/android/python27/process/Process.html#context">context</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/android/python27/process/Process.html#Process(com.hipipal.sl4alib.PyScriptService)">Process</A></B>(<A HREF="../../../../com/hipipal/sl4alib/PyScriptService.html" title="class in com.hipipal.sl4alib">PyScriptService</A>&nbsp;context)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/android/python27/process/Process.html#addAllArguments(java.util.List)">addAllArguments</A></B>(java.util.List&lt;java.lang.String&gt;&nbsp;arguments)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/android/python27/process/Process.html#addArgument(java.lang.String)">addArgument</A></B>(java.lang.String&nbsp;argument)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.io.OutputStream</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/android/python27/process/Process.html#getErr()">getErr</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.io.FileDescriptor</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/android/python27/process/Process.html#getFd()">getFd</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.io.InputStream</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/android/python27/process/Process.html#getIn()">getIn</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.io.File</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/android/python27/process/Process.html#getLogFile()">getLogFile</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/android/python27/process/Process.html#getName()">getName</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.io.OutputStream</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/android/python27/process/Process.html#getOut()">getOut</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.Integer</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/android/python27/process/Process.html#getPid()">getPid</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/android/python27/process/Process.html#getReturnValue()">getReturnValue</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/android/python27/process/Process.html#getSdcardPackageDirectory()">getSdcardPackageDirectory</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/android/python27/process/Process.html#getUptime()">getUptime</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/android/python27/process/Process.html#getWorkingDirectory()">getWorkingDirectory</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/android/python27/process/Process.html#isAlive()">isAlive</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/android/python27/process/Process.html#kill()">kill</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/android/python27/process/Process.html#putAllEnvironmentVariables(java.util.Map)">putAllEnvironmentVariables</A></B>(java.util.Map&lt;java.lang.String,java.lang.String&gt;&nbsp;environment)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/android/python27/process/Process.html#putEnvironmentVariable(java.lang.String, java.lang.String)">putEnvironmentVariable</A></B>(java.lang.String&nbsp;key,
-                       java.lang.String&nbsp;value)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/android/python27/process/Process.html#setBinary(java.io.File)">setBinary</A></B>(java.io.File&nbsp;binary)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/android/python27/process/Process.html#setName(java.lang.String)">setName</A></B>(java.lang.String&nbsp;name)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-<A NAME="field_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Field Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="context"><!-- --></A><H3>
-context</H3>
-<PRE>
-public <A HREF="../../../../com/hipipal/sl4alib/PyScriptService.html" title="class in com.hipipal.sl4alib">PyScriptService</A> <B>context</B></PRE>
-<DL>
-<DL>
-</DL>
-</DL>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="Process(com.hipipal.sl4alib.PyScriptService)"><!-- --></A><H3>
-Process</H3>
-<PRE>
-public <B>Process</B>(<A HREF="../../../../com/hipipal/sl4alib/PyScriptService.html" title="class in com.hipipal.sl4alib">PyScriptService</A>&nbsp;context)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="getReturnValue()"><!-- --></A><H3>
-getReturnValue</H3>
-<PRE>
-public int <B>getReturnValue</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="addArgument(java.lang.String)"><!-- --></A><H3>
-addArgument</H3>
-<PRE>
-public void <B>addArgument</B>(java.lang.String&nbsp;argument)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="addAllArguments(java.util.List)"><!-- --></A><H3>
-addAllArguments</H3>
-<PRE>
-public void <B>addAllArguments</B>(java.util.List&lt;java.lang.String&gt;&nbsp;arguments)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="putAllEnvironmentVariables(java.util.Map)"><!-- --></A><H3>
-putAllEnvironmentVariables</H3>
-<PRE>
-public void <B>putAllEnvironmentVariables</B>(java.util.Map&lt;java.lang.String,java.lang.String&gt;&nbsp;environment)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="putEnvironmentVariable(java.lang.String, java.lang.String)"><!-- --></A><H3>
-putEnvironmentVariable</H3>
-<PRE>
-public void <B>putEnvironmentVariable</B>(java.lang.String&nbsp;key,
-                                   java.lang.String&nbsp;value)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setBinary(java.io.File)"><!-- --></A><H3>
-setBinary</H3>
-<PRE>
-public void <B>setBinary</B>(java.io.File&nbsp;binary)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getPid()"><!-- --></A><H3>
-getPid</H3>
-<PRE>
-public java.lang.Integer <B>getPid</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getFd()"><!-- --></A><H3>
-getFd</H3>
-<PRE>
-public java.io.FileDescriptor <B>getFd</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getOut()"><!-- --></A><H3>
-getOut</H3>
-<PRE>
-public java.io.OutputStream <B>getOut</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getErr()"><!-- --></A><H3>
-getErr</H3>
-<PRE>
-public java.io.OutputStream <B>getErr</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getLogFile()"><!-- --></A><H3>
-getLogFile</H3>
-<PRE>
-public java.io.File <B>getLogFile</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getIn()"><!-- --></A><H3>
-getIn</H3>
-<PRE>
-public java.io.InputStream <B>getIn</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="kill()"><!-- --></A><H3>
-kill</H3>
-<PRE>
-public void <B>kill</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isAlive()"><!-- --></A><H3>
-isAlive</H3>
-<PRE>
-public boolean <B>isAlive</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getWorkingDirectory()"><!-- --></A><H3>
-getWorkingDirectory</H3>
-<PRE>
-public java.lang.String <B>getWorkingDirectory</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getSdcardPackageDirectory()"><!-- --></A><H3>
-getSdcardPackageDirectory</H3>
-<PRE>
-public java.lang.String <B>getSdcardPackageDirectory</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getUptime()"><!-- --></A><H3>
-getUptime</H3>
-<PRE>
-public java.lang.String <B>getUptime</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getName()"><!-- --></A><H3>
-getName</H3>
-<PRE>
-public java.lang.String <B>getName</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setName(java.lang.String)"><!-- --></A><H3>
-setName</H3>
-<PRE>
-public void <B>setName</B>(java.lang.String&nbsp;name)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/Process.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/android/python27/process/MyScriptProcess.html" title="class in com.android.python27.process"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/android/python27/process/PythonScriptProcess.html" title="class in com.android.python27.process"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/android/python27/process/Process.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="Process.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/android/python27/process/PythonScriptProcess.html b/doc/com/android/python27/process/PythonScriptProcess.html
deleted file mode 100644
index 732ea6bf..00000000
--- a/doc/com/android/python27/process/PythonScriptProcess.html
+++ /dev/null
@@ -1,299 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-PythonScriptProcess
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="PythonScriptProcess";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/PythonScriptProcess.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/android/python27/process/Process.html" title="class in com.android.python27.process"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/android/python27/process/PythonScriptProcess.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="PythonScriptProcess.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#fields_inherited_from_class_com.android.python27.process.Process">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.android.python27.process</FONT>
-<BR>
-Class PythonScriptProcess</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../com/android/python27/process/Process.html" title="class in com.android.python27.process">com.android.python27.process.Process</A>
-      <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../com/android/python27/process/InterpreterProcess.html" title="class in com.android.python27.process">com.android.python27.process.InterpreterProcess</A>
-          <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.android.python27.process.PythonScriptProcess</B>
-</PRE>
-<DL>
-<DT><B>Direct Known Subclasses:</B> <DD><A HREF="../../../../com/android/python27/process/MyScriptProcess.html" title="class in com.android.python27.process">MyScriptProcess</A></DD>
-</DL>
-<HR>
-<DL>
-<DT><PRE>public class <B>PythonScriptProcess</B><DT>extends <A HREF="../../../../com/android/python27/process/InterpreterProcess.html" title="class in com.android.python27.process">InterpreterProcess</A></DL>
-</PRE>
-
-<P>
-<HR>
-
-<P>
-<!-- =========== FIELD SUMMARY =========== -->
-
-<A NAME="field_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Field Summary</B></FONT></TH>
-</TR>
-</TABLE>
-&nbsp;<A NAME="fields_inherited_from_class_com.android.python27.process.Process"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Fields inherited from class com.android.python27.process.<A HREF="../../../../com/android/python27/process/Process.html" title="class in com.android.python27.process">Process</A></B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../com/android/python27/process/Process.html#context">context</A></CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/android/python27/process/PythonScriptProcess.html#PythonScriptProcess(com.hipipal.sl4alib.PyScriptService, java.io.File, com.googlecode.android_scripting.interpreter.InterpreterConfiguration, com.googlecode.android_scripting.AndroidProxy)">PythonScriptProcess</A></B>(<A HREF="../../../../com/hipipal/sl4alib/PyScriptService.html" title="class in com.hipipal.sl4alib">PyScriptService</A>&nbsp;context,
-                    java.io.File&nbsp;paramFile,
-                    <A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterConfiguration.html" title="class in com.googlecode.android_scripting.interpreter">InterpreterConfiguration</A>&nbsp;paramInterpreterConfiguration,
-                    <A HREF="../../../../com/googlecode/android_scripting/AndroidProxy.html" title="class in com.googlecode.android_scripting">AndroidProxy</A>&nbsp;paramAndroidProxy)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/android/python27/process/PythonScriptProcess.html#getPath()">getPath</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_com.android.python27.process.InterpreterProcess"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class com.android.python27.process.<A HREF="../../../../com/android/python27/process/InterpreterProcess.html" title="class in com.android.python27.process">InterpreterProcess</A></B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../com/android/python27/process/InterpreterProcess.html#getHost()">getHost</A>, <A HREF="../../../../com/android/python27/process/InterpreterProcess.html#getInterpreter()">getInterpreter</A>, <A HREF="../../../../com/android/python27/process/InterpreterProcess.html#getPort()">getPort</A>, <A HREF="../../../../com/android/python27/process/InterpreterProcess.html#getRpcReceiverManagerFactory()">getRpcReceiverManagerFactory</A>, <A HREF="../../../../com/android/python27/process/InterpreterProcess.html#getSdcardPackageDirectory()">getSdcardPackageDirectory</A>, <A HREF="../../../../com/android/python27/process/InterpreterProcess.html#getSecret()">getSecret</A>, <A HREF="../../../../com/android/python27/process/InterpreterProcess.html#getWorkingDirectory()">getWorkingDirectory</A>, <A HREF="../../../../com/android/python27/process/InterpreterProcess.html#kill()">kill</A>, <A HREF="../../../../com/android/python27/process/InterpreterProcess.html#start(java.lang.Runnable, java.util.List)">start</A></CODE></TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_com.android.python27.process.Process"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class com.android.python27.process.<A HREF="../../../../com/android/python27/process/Process.html" title="class in com.android.python27.process">Process</A></B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../com/android/python27/process/Process.html#addAllArguments(java.util.List)">addAllArguments</A>, <A HREF="../../../../com/android/python27/process/Process.html#addArgument(java.lang.String)">addArgument</A>, <A HREF="../../../../com/android/python27/process/Process.html#getErr()">getErr</A>, <A HREF="../../../../com/android/python27/process/Process.html#getFd()">getFd</A>, <A HREF="../../../../com/android/python27/process/Process.html#getIn()">getIn</A>, <A HREF="../../../../com/android/python27/process/Process.html#getLogFile()">getLogFile</A>, <A HREF="../../../../com/android/python27/process/Process.html#getName()">getName</A>, <A HREF="../../../../com/android/python27/process/Process.html#getOut()">getOut</A>, <A HREF="../../../../com/android/python27/process/Process.html#getPid()">getPid</A>, <A HREF="../../../../com/android/python27/process/Process.html#getReturnValue()">getReturnValue</A>, <A HREF="../../../../com/android/python27/process/Process.html#getUptime()">getUptime</A>, <A HREF="../../../../com/android/python27/process/Process.html#isAlive()">isAlive</A>, <A HREF="../../../../com/android/python27/process/Process.html#putAllEnvironmentVariables(java.util.Map)">putAllEnvironmentVariables</A>, <A HREF="../../../../com/android/python27/process/Process.html#putEnvironmentVariable(java.lang.String, java.lang.String)">putEnvironmentVariable</A>, <A HREF="../../../../com/android/python27/process/Process.html#setBinary(java.io.File)">setBinary</A>, <A HREF="../../../../com/android/python27/process/Process.html#setName(java.lang.String)">setName</A></CODE></TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="PythonScriptProcess(com.hipipal.sl4alib.PyScriptService, java.io.File, com.googlecode.android_scripting.interpreter.InterpreterConfiguration, com.googlecode.android_scripting.AndroidProxy)"><!-- --></A><H3>
-PythonScriptProcess</H3>
-<PRE>
-public <B>PythonScriptProcess</B>(<A HREF="../../../../com/hipipal/sl4alib/PyScriptService.html" title="class in com.hipipal.sl4alib">PyScriptService</A>&nbsp;context,
-                           java.io.File&nbsp;paramFile,
-                           <A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterConfiguration.html" title="class in com.googlecode.android_scripting.interpreter">InterpreterConfiguration</A>&nbsp;paramInterpreterConfiguration,
-                           <A HREF="../../../../com/googlecode/android_scripting/AndroidProxy.html" title="class in com.googlecode.android_scripting">AndroidProxy</A>&nbsp;paramAndroidProxy)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="getPath()"><!-- --></A><H3>
-getPath</H3>
-<PRE>
-public java.lang.String <B>getPath</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/PythonScriptProcess.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/android/python27/process/Process.html" title="class in com.android.python27.process"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/android/python27/process/PythonScriptProcess.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="PythonScriptProcess.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#fields_inherited_from_class_com.android.python27.process.Process">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/android/python27/process/package-frame.html b/doc/com/android/python27/process/package-frame.html
deleted file mode 100644
index 3104ce69..00000000
--- a/doc/com/android/python27/process/package-frame.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-com.android.python27.process
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-
-</HEAD>
-
-<BODY BGCOLOR="white">
-<FONT size="+1" CLASS="FrameTitleFont">
-<A HREF="../../../../com/android/python27/process/package-summary.html" target="classFrame">com.android.python27.process</A></FONT>
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
-Classes</FONT>&nbsp;
-<FONT CLASS="FrameItemFont">
-<BR>
-<A HREF="InterpreterProcess.html" title="class in com.android.python27.process" target="classFrame">InterpreterProcess</A>
-<BR>
-<A HREF="MyScriptProcess.html" title="class in com.android.python27.process" target="classFrame">MyScriptProcess</A>
-<BR>
-<A HREF="Process.html" title="class in com.android.python27.process" target="classFrame">Process</A>
-<BR>
-<A HREF="PythonScriptProcess.html" title="class in com.android.python27.process" target="classFrame">PythonScriptProcess</A></FONT></TD>
-</TR>
-</TABLE>
-
-
-</BODY>
-</HTML>
diff --git a/doc/com/android/python27/process/package-summary.html b/doc/com/android/python27/process/package-summary.html
deleted file mode 100644
index 6b45b30e..00000000
--- a/doc/com/android/python27/process/package-summary.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-com.android.python27.process
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="com.android.python27.process";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/android/python27/config/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/android/python27/support/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/android/python27/process/package-summary.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<H2>
-Package com.android.python27.process
-</H2>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Class Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/android/python27/process/InterpreterProcess.html" title="class in com.android.python27.process">InterpreterProcess</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/android/python27/process/MyScriptProcess.html" title="class in com.android.python27.process">MyScriptProcess</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/android/python27/process/Process.html" title="class in com.android.python27.process">Process</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/android/python27/process/PythonScriptProcess.html" title="class in com.android.python27.process">PythonScriptProcess</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-
-<P>
-<DL>
-</DL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/android/python27/config/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/android/python27/support/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/android/python27/process/package-summary.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/android/python27/process/package-tree.html b/doc/com/android/python27/process/package-tree.html
deleted file mode 100644
index 1fb32c4d..00000000
--- a/doc/com/android/python27/process/package-tree.html
+++ /dev/null
@@ -1,159 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-com.android.python27.process Class Hierarchy
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="com.android.python27.process Class Hierarchy";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/android/python27/config/package-tree.html"><B>PREV</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/android/python27/support/package-tree.html"><B>NEXT</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/android/python27/process/package-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-Hierarchy For Package com.android.python27.process
-</H2>
-</CENTER>
-<DL>
-<DT><B>Package Hierarchies:</B><DD><A HREF="../../../../overview-tree.html">All Packages</A></DL>
-<HR>
-<H2>
-Class Hierarchy
-</H2>
-<UL>
-<LI TYPE="circle">java.lang.Object<UL>
-<LI TYPE="circle">com.android.python27.process.<A HREF="../../../../com/android/python27/process/Process.html" title="class in com.android.python27.process"><B>Process</B></A><UL>
-<LI TYPE="circle">com.android.python27.process.<A HREF="../../../../com/android/python27/process/InterpreterProcess.html" title="class in com.android.python27.process"><B>InterpreterProcess</B></A><UL>
-<LI TYPE="circle">com.android.python27.process.<A HREF="../../../../com/android/python27/process/PythonScriptProcess.html" title="class in com.android.python27.process"><B>PythonScriptProcess</B></A><UL>
-<LI TYPE="circle">com.android.python27.process.<A HREF="../../../../com/android/python27/process/MyScriptProcess.html" title="class in com.android.python27.process"><B>MyScriptProcess</B></A></UL>
-</UL>
-</UL>
-</UL>
-</UL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/android/python27/config/package-tree.html"><B>PREV</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/android/python27/support/package-tree.html"><B>NEXT</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/android/python27/process/package-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/android/python27/support/Utils.html b/doc/com/android/python27/support/Utils.html
deleted file mode 100644
index 484ee1ea..00000000
--- a/doc/com/android/python27/support/Utils.html
+++ /dev/null
@@ -1,313 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:04 PDT 2014 -->
-<TITLE>
-Utils
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Utils";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/Utils.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/android/python27/support/Utils.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="Utils.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.android.python27.support</FONT>
-<BR>
-Class Utils</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.android.python27.support.Utils</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>Utils</B><DT>extends java.lang.Object</DL>
-</PRE>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/android/python27/support/Utils.html#Utils()">Utils</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/android/python27/support/Utils.html#createDirectoryOnExternalStorage(java.lang.String)">createDirectoryOnExternalStorage</A></B>(java.lang.String&nbsp;path)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/android/python27/support/Utils.html#deleteDir(java.io.File)">deleteDir</A></B>(java.io.File&nbsp;dir)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/android/python27/support/Utils.html#getFileExtension(java.lang.String)">getFileExtension</A></B>(java.lang.String&nbsp;sFileName)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/android/python27/support/Utils.html#unzip(java.io.InputStream, java.lang.String, boolean)">unzip</A></B>(java.io.InputStream&nbsp;inputStream,
-      java.lang.String&nbsp;dest,
-      boolean&nbsp;replaceIfExists)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="Utils()"><!-- --></A><H3>
-Utils</H3>
-<PRE>
-public <B>Utils</B>()</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="getFileExtension(java.lang.String)"><!-- --></A><H3>
-getFileExtension</H3>
-<PRE>
-public static java.lang.String <B>getFileExtension</B>(java.lang.String&nbsp;sFileName)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="unzip(java.io.InputStream, java.lang.String, boolean)"><!-- --></A><H3>
-unzip</H3>
-<PRE>
-public static boolean <B>unzip</B>(java.io.InputStream&nbsp;inputStream,
-                            java.lang.String&nbsp;dest,
-                            boolean&nbsp;replaceIfExists)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="deleteDir(java.io.File)"><!-- --></A><H3>
-deleteDir</H3>
-<PRE>
-public static boolean <B>deleteDir</B>(java.io.File&nbsp;dir)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="createDirectoryOnExternalStorage(java.lang.String)"><!-- --></A><H3>
-createDirectoryOnExternalStorage</H3>
-<PRE>
-public static void <B>createDirectoryOnExternalStorage</B>(java.lang.String&nbsp;path)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/Utils.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/android/python27/support/Utils.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="Utils.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/android/python27/support/package-frame.html b/doc/com/android/python27/support/package-frame.html
deleted file mode 100644
index ce6e24a3..00000000
--- a/doc/com/android/python27/support/package-frame.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-com.android.python27.support
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-
-</HEAD>
-
-<BODY BGCOLOR="white">
-<FONT size="+1" CLASS="FrameTitleFont">
-<A HREF="../../../../com/android/python27/support/package-summary.html" target="classFrame">com.android.python27.support</A></FONT>
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
-Classes</FONT>&nbsp;
-<FONT CLASS="FrameItemFont">
-<BR>
-<A HREF="Utils.html" title="class in com.android.python27.support" target="classFrame">Utils</A></FONT></TD>
-</TR>
-</TABLE>
-
-
-</BODY>
-</HTML>
diff --git a/doc/com/android/python27/support/package-summary.html b/doc/com/android/python27/support/package-summary.html
deleted file mode 100644
index 78a31816..00000000
--- a/doc/com/android/python27/support/package-summary.html
+++ /dev/null
@@ -1,157 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-com.android.python27.support
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="com.android.python27.support";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/android/python27/process/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/android/python27/support/package-summary.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<H2>
-Package com.android.python27.support
-</H2>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Class Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/android/python27/support/Utils.html" title="class in com.android.python27.support">Utils</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-
-<P>
-<DL>
-</DL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/android/python27/process/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/android/python27/support/package-summary.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/android/python27/support/package-tree.html b/doc/com/android/python27/support/package-tree.html
deleted file mode 100644
index db0673d9..00000000
--- a/doc/com/android/python27/support/package-tree.html
+++ /dev/null
@@ -1,153 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-com.android.python27.support Class Hierarchy
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="com.android.python27.support Class Hierarchy";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/android/python27/process/package-tree.html"><B>PREV</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/package-tree.html"><B>NEXT</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/android/python27/support/package-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-Hierarchy For Package com.android.python27.support
-</H2>
-</CENTER>
-<DL>
-<DT><B>Package Hierarchies:</B><DD><A HREF="../../../../overview-tree.html">All Packages</A></DL>
-<HR>
-<H2>
-Class Hierarchy
-</H2>
-<UL>
-<LI TYPE="circle">java.lang.Object<UL>
-<LI TYPE="circle">com.android.python27.support.<A HREF="../../../../com/android/python27/support/Utils.html" title="class in com.android.python27.support"><B>Utils</B></A></UL>
-</UL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/android/python27/process/package-tree.html"><B>PREV</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/package-tree.html"><B>NEXT</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/android/python27/support/package-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/Analytics.html b/doc/com/googlecode/android_scripting/Analytics.html
deleted file mode 100644
index 346da390..00000000
--- a/doc/com/googlecode/android_scripting/Analytics.html
+++ /dev/null
@@ -1,278 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:00:56 PDT 2014 -->
-<TITLE>
-Analytics
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Analytics";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/Analytics.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/AndroidProxy.html" title="class in com.googlecode.android_scripting"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/googlecode/android_scripting/Analytics.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="Analytics.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting</FONT>
-<BR>
-Class Analytics</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.Analytics</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>Analytics</B><DT>extends java.lang.Object</DL>
-</PRE>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Analytics.html#start(Context, java.lang.String)">start</A></B>(Context&nbsp;context,
-      java.lang.String&nbsp;analyticsAccountId)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Analytics.html#stop()">stop</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Analytics.html#track(java.lang.String...)">track</A></B>(java.lang.String...&nbsp;nameParts)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Analytics.html#trackActivity(Activity)">trackActivity</A></B>(Activity&nbsp;activity)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="start(Context, java.lang.String)"><!-- --></A><H3>
-start</H3>
-<PRE>
-public static void <B>start</B>(Context&nbsp;context,
-                         java.lang.String&nbsp;analyticsAccountId)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="track(java.lang.String...)"><!-- --></A><H3>
-track</H3>
-<PRE>
-public static void <B>track</B>(java.lang.String...&nbsp;nameParts)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="trackActivity(Activity)"><!-- --></A><H3>
-trackActivity</H3>
-<PRE>
-public static void <B>trackActivity</B>(Activity&nbsp;activity)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="stop()"><!-- --></A><H3>
-stop</H3>
-<PRE>
-public static void <B>stop</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/Analytics.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/AndroidProxy.html" title="class in com.googlecode.android_scripting"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/googlecode/android_scripting/Analytics.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="Analytics.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/AndroidProxy.html b/doc/com/googlecode/android_scripting/AndroidProxy.html
deleted file mode 100644
index 31d21435..00000000
--- a/doc/com/googlecode/android_scripting/AndroidProxy.html
+++ /dev/null
@@ -1,391 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:00:56 PDT 2014 -->
-<TITLE>
-AndroidProxy
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="AndroidProxy";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/AndroidProxy.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/Analytics.html" title="class in com.googlecode.android_scripting"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/BaseApplication.html" title="class in com.googlecode.android_scripting"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/googlecode/android_scripting/AndroidProxy.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="AndroidProxy.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting</FONT>
-<BR>
-Class AndroidProxy</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.AndroidProxy</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>AndroidProxy</B><DT>extends java.lang.Object</DL>
-</PRE>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/AndroidProxy.html#AndroidProxy(Service, Intent, boolean)">AndroidProxy</A></B>(Service&nbsp;service,
-             Intent&nbsp;intent,
-             boolean&nbsp;requiresHandshake)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.net.InetSocketAddress</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/AndroidProxy.html#getAddress()">getAddress</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManagerFactory.html" title="interface in com.googlecode.android_scripting.jsonrpc">RpcReceiverManagerFactory</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/AndroidProxy.html#getRpcReceiverManagerFactory()">getRpcReceiverManagerFactory</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/AndroidProxy.html#getSecret()">getSecret</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/AndroidProxy.html#shutdown()">shutdown</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.net.InetSocketAddress</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/AndroidProxy.html#startLocal()">startLocal</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.net.InetSocketAddress</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/AndroidProxy.html#startLocal(int)">startLocal</A></B>(int&nbsp;port)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.net.InetSocketAddress</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/AndroidProxy.html#startPublic()">startPublic</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.net.InetSocketAddress</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/AndroidProxy.html#startPublic(int)">startPublic</A></B>(int&nbsp;port)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="AndroidProxy(Service, Intent, boolean)"><!-- --></A><H3>
-AndroidProxy</H3>
-<PRE>
-public <B>AndroidProxy</B>(Service&nbsp;service,
-                    Intent&nbsp;intent,
-                    boolean&nbsp;requiresHandshake)</PRE>
-<DL>
-<DL>
-<DT><B>Parameters:</B><DD><CODE>service</CODE> - Android service (required to build facades).<DD><CODE>intent</CODE> - the intent that launched the proxy/script.<DD><CODE>requiresHandshake</CODE> - indicates whether RPC security protocol should be enabled.</DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="getAddress()"><!-- --></A><H3>
-getAddress</H3>
-<PRE>
-public java.net.InetSocketAddress <B>getAddress</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="startLocal()"><!-- --></A><H3>
-startLocal</H3>
-<PRE>
-public java.net.InetSocketAddress <B>startLocal</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="startLocal(int)"><!-- --></A><H3>
-startLocal</H3>
-<PRE>
-public java.net.InetSocketAddress <B>startLocal</B>(int&nbsp;port)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="startPublic()"><!-- --></A><H3>
-startPublic</H3>
-<PRE>
-public java.net.InetSocketAddress <B>startPublic</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="startPublic(int)"><!-- --></A><H3>
-startPublic</H3>
-<PRE>
-public java.net.InetSocketAddress <B>startPublic</B>(int&nbsp;port)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="shutdown()"><!-- --></A><H3>
-shutdown</H3>
-<PRE>
-public void <B>shutdown</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getSecret()"><!-- --></A><H3>
-getSecret</H3>
-<PRE>
-public java.lang.String <B>getSecret</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getRpcReceiverManagerFactory()"><!-- --></A><H3>
-getRpcReceiverManagerFactory</H3>
-<PRE>
-public <A HREF="../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManagerFactory.html" title="interface in com.googlecode.android_scripting.jsonrpc">RpcReceiverManagerFactory</A> <B>getRpcReceiverManagerFactory</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/AndroidProxy.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/Analytics.html" title="class in com.googlecode.android_scripting"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/BaseApplication.html" title="class in com.googlecode.android_scripting"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/googlecode/android_scripting/AndroidProxy.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="AndroidProxy.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/BaseApplication.html b/doc/com/googlecode/android_scripting/BaseApplication.html
deleted file mode 100644
index 18865601..00000000
--- a/doc/com/googlecode/android_scripting/BaseApplication.html
+++ /dev/null
@@ -1,310 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:00:57 PDT 2014 -->
-<TITLE>
-BaseApplication
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="BaseApplication";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/BaseApplication.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/AndroidProxy.html" title="class in com.googlecode.android_scripting"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/Constants.html" title="interface in com.googlecode.android_scripting"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/googlecode/android_scripting/BaseApplication.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="BaseApplication.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting</FONT>
-<BR>
-Class BaseApplication</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../resources/inherit.gif" ALT="extended by ">Application
-      <IMG SRC="../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.BaseApplication</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>BaseApplication</B><DT>extends Application</DL>
-</PRE>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/BaseApplication.html#BaseApplication()">BaseApplication</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../com/googlecode/android_scripting/interpreter/InterpreterConfiguration.html" title="class in com.googlecode.android_scripting.interpreter">InterpreterConfiguration</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/BaseApplication.html#getInterpreterConfiguration()">getInterpreterConfiguration</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../com/googlecode/android_scripting/FutureActivityTaskExecutor.html" title="class in com.googlecode.android_scripting">FutureActivityTaskExecutor</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/BaseApplication.html#getTaskExecutor()">getTaskExecutor</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../com/googlecode/android_scripting/trigger/TriggerRepository.html" title="class in com.googlecode.android_scripting.trigger">TriggerRepository</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/BaseApplication.html#getTriggerRepository()">getTriggerRepository</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/BaseApplication.html#onCreate()">onCreate</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="BaseApplication()"><!-- --></A><H3>
-BaseApplication</H3>
-<PRE>
-public <B>BaseApplication</B>()</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="getTaskExecutor()"><!-- --></A><H3>
-getTaskExecutor</H3>
-<PRE>
-public <A HREF="../../../com/googlecode/android_scripting/FutureActivityTaskExecutor.html" title="class in com.googlecode.android_scripting">FutureActivityTaskExecutor</A> <B>getTaskExecutor</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="onCreate()"><!-- --></A><H3>
-onCreate</H3>
-<PRE>
-public void <B>onCreate</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getInterpreterConfiguration()"><!-- --></A><H3>
-getInterpreterConfiguration</H3>
-<PRE>
-public <A HREF="../../../com/googlecode/android_scripting/interpreter/InterpreterConfiguration.html" title="class in com.googlecode.android_scripting.interpreter">InterpreterConfiguration</A> <B>getInterpreterConfiguration</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getTriggerRepository()"><!-- --></A><H3>
-getTriggerRepository</H3>
-<PRE>
-public <A HREF="../../../com/googlecode/android_scripting/trigger/TriggerRepository.html" title="class in com.googlecode.android_scripting.trigger">TriggerRepository</A> <B>getTriggerRepository</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/BaseApplication.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/AndroidProxy.html" title="class in com.googlecode.android_scripting"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/Constants.html" title="interface in com.googlecode.android_scripting"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/googlecode/android_scripting/BaseApplication.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="BaseApplication.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/Constants.html b/doc/com/googlecode/android_scripting/Constants.html
deleted file mode 100644
index 6af3f697..00000000
--- a/doc/com/googlecode/android_scripting/Constants.html
+++ /dev/null
@@ -1,834 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:00:57 PDT 2014 -->
-<TITLE>
-Constants
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Constants";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/Constants.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/BaseApplication.html" title="class in com.googlecode.android_scripting"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/Exec.html" title="class in com.googlecode.android_scripting"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/googlecode/android_scripting/Constants.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="Constants.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;METHOD</FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;METHOD</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting</FONT>
-<BR>
-Interface Constants</H2>
-<HR>
-<DL>
-<DT><PRE>public interface <B>Constants</B></DL>
-</PRE>
-
-<P>
-<HR>
-
-<P>
-<!-- =========== FIELD SUMMARY =========== -->
-
-<A NAME="field_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Field Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Constants.html#ACTION_ACTIVITY_RESULT">ACTION_ACTIVITY_RESULT</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Constants.html#ACTION_CANCEL_NOTIFICATION">ACTION_CANCEL_NOTIFICATION</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Constants.html#ACTION_EDIT_SCRIPT">ACTION_EDIT_SCRIPT</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Constants.html#ACTION_KILL_ALL">ACTION_KILL_ALL</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Constants.html#ACTION_KILL_PROCESS">ACTION_KILL_PROCESS</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Constants.html#ACTION_LAUNCH_BACKGROUND_SCRIPT">ACTION_LAUNCH_BACKGROUND_SCRIPT</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Constants.html#ACTION_LAUNCH_FOREGROUND_SCRIPT">ACTION_LAUNCH_FOREGROUND_SCRIPT</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Constants.html#ACTION_LAUNCH_INTERPRETER">ACTION_LAUNCH_INTERPRETER</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Constants.html#ACTION_LAUNCH_SCRIPT_FOR_RESULT">ACTION_LAUNCH_SCRIPT_FOR_RESULT</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Constants.html#ACTION_LAUNCH_SERVER">ACTION_LAUNCH_SERVER</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Constants.html#ACTION_SAVE_AND_RUN_SCRIPT">ACTION_SAVE_AND_RUN_SCRIPT</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Constants.html#ACTION_SAVE_SCRIPT">ACTION_SAVE_SCRIPT</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Constants.html#ACTION_SHOW_RUNNING_SCRIPTS">ACTION_SHOW_RUNNING_SCRIPTS</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;ComponentName</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Constants.html#BLUETOOTH_DEVICE_LIST_COMPONENT_NAME">BLUETOOTH_DEVICE_LIST_COMPONENT_NAME</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Constants.html#EXTRA_API_PROMPT_RPC_NAME">EXTRA_API_PROMPT_RPC_NAME</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Constants.html#EXTRA_API_PROMPT_VALUES">EXTRA_API_PROMPT_VALUES</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Constants.html#EXTRA_DEVICE_ADDRESS">EXTRA_DEVICE_ADDRESS</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Constants.html#EXTRA_INTERPRETER_NAME">EXTRA_INTERPRETER_NAME</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Constants.html#EXTRA_IS_NEW_SCRIPT">EXTRA_IS_NEW_SCRIPT</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Constants.html#EXTRA_LAUNCH_IN_BACKGROUND">EXTRA_LAUNCH_IN_BACKGROUND</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Constants.html#EXTRA_PROCESS_ID">EXTRA_PROCESS_ID</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Constants.html#EXTRA_PROXY_PORT">EXTRA_PROXY_PORT</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Constants.html#EXTRA_RESULT">EXTRA_RESULT</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Constants.html#EXTRA_RPC_HELP_TEXT">EXTRA_RPC_HELP_TEXT</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Constants.html#EXTRA_SCRIPT_CONTENT">EXTRA_SCRIPT_CONTENT</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Constants.html#EXTRA_SCRIPT_PATH">EXTRA_SCRIPT_PATH</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Constants.html#EXTRA_SCRIPT_TEXT">EXTRA_SCRIPT_TEXT</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Constants.html#EXTRA_TASK_ID">EXTRA_TASK_ID</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Constants.html#EXTRA_TRIGGER_ID">EXTRA_TRIGGER_ID</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Constants.html#EXTRA_USE_EXTERNAL_IP">EXTRA_USE_EXTERNAL_IP</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Constants.html#EXTRA_USE_SERVICE_PORT">EXTRA_USE_SERVICE_PORT</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Constants.html#FORCE_BROWSER">FORCE_BROWSER</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Constants.html#HIDE_NOTIFY">HIDE_NOTIFY</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;ComponentName</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Constants.html#SL4A_SERVICE_COMPONENT_NAME">SL4A_SERVICE_COMPONENT_NAME</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;ComponentName</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Constants.html#SL4A_SERVICE_LAUNCHER_COMPONENT_NAME">SL4A_SERVICE_LAUNCHER_COMPONENT_NAME</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;ComponentName</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Constants.html#TRIGGER_SERVICE_COMPONENT_NAME">TRIGGER_SERVICE_COMPONENT_NAME</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-<A NAME="field_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Field Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="ACTION_LAUNCH_FOREGROUND_SCRIPT"><!-- --></A><H3>
-ACTION_LAUNCH_FOREGROUND_SCRIPT</H3>
-<PRE>
-static final java.lang.String <B>ACTION_LAUNCH_FOREGROUND_SCRIPT</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#com.googlecode.android_scripting.Constants.ACTION_LAUNCH_FOREGROUND_SCRIPT">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="ACTION_LAUNCH_BACKGROUND_SCRIPT"><!-- --></A><H3>
-ACTION_LAUNCH_BACKGROUND_SCRIPT</H3>
-<PRE>
-static final java.lang.String <B>ACTION_LAUNCH_BACKGROUND_SCRIPT</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#com.googlecode.android_scripting.Constants.ACTION_LAUNCH_BACKGROUND_SCRIPT">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="ACTION_LAUNCH_SCRIPT_FOR_RESULT"><!-- --></A><H3>
-ACTION_LAUNCH_SCRIPT_FOR_RESULT</H3>
-<PRE>
-static final java.lang.String <B>ACTION_LAUNCH_SCRIPT_FOR_RESULT</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#com.googlecode.android_scripting.Constants.ACTION_LAUNCH_SCRIPT_FOR_RESULT">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="ACTION_LAUNCH_INTERPRETER"><!-- --></A><H3>
-ACTION_LAUNCH_INTERPRETER</H3>
-<PRE>
-static final java.lang.String <B>ACTION_LAUNCH_INTERPRETER</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#com.googlecode.android_scripting.Constants.ACTION_LAUNCH_INTERPRETER">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="ACTION_EDIT_SCRIPT"><!-- --></A><H3>
-ACTION_EDIT_SCRIPT</H3>
-<PRE>
-static final java.lang.String <B>ACTION_EDIT_SCRIPT</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#com.googlecode.android_scripting.Constants.ACTION_EDIT_SCRIPT">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="ACTION_SAVE_SCRIPT"><!-- --></A><H3>
-ACTION_SAVE_SCRIPT</H3>
-<PRE>
-static final java.lang.String <B>ACTION_SAVE_SCRIPT</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#com.googlecode.android_scripting.Constants.ACTION_SAVE_SCRIPT">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="ACTION_SAVE_AND_RUN_SCRIPT"><!-- --></A><H3>
-ACTION_SAVE_AND_RUN_SCRIPT</H3>
-<PRE>
-static final java.lang.String <B>ACTION_SAVE_AND_RUN_SCRIPT</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#com.googlecode.android_scripting.Constants.ACTION_SAVE_AND_RUN_SCRIPT">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="ACTION_KILL_PROCESS"><!-- --></A><H3>
-ACTION_KILL_PROCESS</H3>
-<PRE>
-static final java.lang.String <B>ACTION_KILL_PROCESS</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#com.googlecode.android_scripting.Constants.ACTION_KILL_PROCESS">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="ACTION_KILL_ALL"><!-- --></A><H3>
-ACTION_KILL_ALL</H3>
-<PRE>
-static final java.lang.String <B>ACTION_KILL_ALL</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#com.googlecode.android_scripting.Constants.ACTION_KILL_ALL">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="ACTION_SHOW_RUNNING_SCRIPTS"><!-- --></A><H3>
-ACTION_SHOW_RUNNING_SCRIPTS</H3>
-<PRE>
-static final java.lang.String <B>ACTION_SHOW_RUNNING_SCRIPTS</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#com.googlecode.android_scripting.Constants.ACTION_SHOW_RUNNING_SCRIPTS">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="ACTION_CANCEL_NOTIFICATION"><!-- --></A><H3>
-ACTION_CANCEL_NOTIFICATION</H3>
-<PRE>
-static final java.lang.String <B>ACTION_CANCEL_NOTIFICATION</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#com.googlecode.android_scripting.Constants.ACTION_CANCEL_NOTIFICATION">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="ACTION_ACTIVITY_RESULT"><!-- --></A><H3>
-ACTION_ACTIVITY_RESULT</H3>
-<PRE>
-static final java.lang.String <B>ACTION_ACTIVITY_RESULT</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#com.googlecode.android_scripting.Constants.ACTION_ACTIVITY_RESULT">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="ACTION_LAUNCH_SERVER"><!-- --></A><H3>
-ACTION_LAUNCH_SERVER</H3>
-<PRE>
-static final java.lang.String <B>ACTION_LAUNCH_SERVER</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#com.googlecode.android_scripting.Constants.ACTION_LAUNCH_SERVER">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="EXTRA_RESULT"><!-- --></A><H3>
-EXTRA_RESULT</H3>
-<PRE>
-static final java.lang.String <B>EXTRA_RESULT</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#com.googlecode.android_scripting.Constants.EXTRA_RESULT">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="EXTRA_SCRIPT_PATH"><!-- --></A><H3>
-EXTRA_SCRIPT_PATH</H3>
-<PRE>
-static final java.lang.String <B>EXTRA_SCRIPT_PATH</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#com.googlecode.android_scripting.Constants.EXTRA_SCRIPT_PATH">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="EXTRA_SCRIPT_CONTENT"><!-- --></A><H3>
-EXTRA_SCRIPT_CONTENT</H3>
-<PRE>
-static final java.lang.String <B>EXTRA_SCRIPT_CONTENT</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#com.googlecode.android_scripting.Constants.EXTRA_SCRIPT_CONTENT">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="EXTRA_INTERPRETER_NAME"><!-- --></A><H3>
-EXTRA_INTERPRETER_NAME</H3>
-<PRE>
-static final java.lang.String <B>EXTRA_INTERPRETER_NAME</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#com.googlecode.android_scripting.Constants.EXTRA_INTERPRETER_NAME">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="EXTRA_USE_EXTERNAL_IP"><!-- --></A><H3>
-EXTRA_USE_EXTERNAL_IP</H3>
-<PRE>
-static final java.lang.String <B>EXTRA_USE_EXTERNAL_IP</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#com.googlecode.android_scripting.Constants.EXTRA_USE_EXTERNAL_IP">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="EXTRA_USE_SERVICE_PORT"><!-- --></A><H3>
-EXTRA_USE_SERVICE_PORT</H3>
-<PRE>
-static final java.lang.String <B>EXTRA_USE_SERVICE_PORT</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#com.googlecode.android_scripting.Constants.EXTRA_USE_SERVICE_PORT">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="EXTRA_SCRIPT_TEXT"><!-- --></A><H3>
-EXTRA_SCRIPT_TEXT</H3>
-<PRE>
-static final java.lang.String <B>EXTRA_SCRIPT_TEXT</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#com.googlecode.android_scripting.Constants.EXTRA_SCRIPT_TEXT">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="EXTRA_RPC_HELP_TEXT"><!-- --></A><H3>
-EXTRA_RPC_HELP_TEXT</H3>
-<PRE>
-static final java.lang.String <B>EXTRA_RPC_HELP_TEXT</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#com.googlecode.android_scripting.Constants.EXTRA_RPC_HELP_TEXT">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="EXTRA_API_PROMPT_RPC_NAME"><!-- --></A><H3>
-EXTRA_API_PROMPT_RPC_NAME</H3>
-<PRE>
-static final java.lang.String <B>EXTRA_API_PROMPT_RPC_NAME</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#com.googlecode.android_scripting.Constants.EXTRA_API_PROMPT_RPC_NAME">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="EXTRA_API_PROMPT_VALUES"><!-- --></A><H3>
-EXTRA_API_PROMPT_VALUES</H3>
-<PRE>
-static final java.lang.String <B>EXTRA_API_PROMPT_VALUES</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#com.googlecode.android_scripting.Constants.EXTRA_API_PROMPT_VALUES">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="EXTRA_PROXY_PORT"><!-- --></A><H3>
-EXTRA_PROXY_PORT</H3>
-<PRE>
-static final java.lang.String <B>EXTRA_PROXY_PORT</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#com.googlecode.android_scripting.Constants.EXTRA_PROXY_PORT">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="EXTRA_PROCESS_ID"><!-- --></A><H3>
-EXTRA_PROCESS_ID</H3>
-<PRE>
-static final java.lang.String <B>EXTRA_PROCESS_ID</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#com.googlecode.android_scripting.Constants.EXTRA_PROCESS_ID">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="EXTRA_IS_NEW_SCRIPT"><!-- --></A><H3>
-EXTRA_IS_NEW_SCRIPT</H3>
-<PRE>
-static final java.lang.String <B>EXTRA_IS_NEW_SCRIPT</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#com.googlecode.android_scripting.Constants.EXTRA_IS_NEW_SCRIPT">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="EXTRA_TRIGGER_ID"><!-- --></A><H3>
-EXTRA_TRIGGER_ID</H3>
-<PRE>
-static final java.lang.String <B>EXTRA_TRIGGER_ID</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#com.googlecode.android_scripting.Constants.EXTRA_TRIGGER_ID">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="EXTRA_LAUNCH_IN_BACKGROUND"><!-- --></A><H3>
-EXTRA_LAUNCH_IN_BACKGROUND</H3>
-<PRE>
-static final java.lang.String <B>EXTRA_LAUNCH_IN_BACKGROUND</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#com.googlecode.android_scripting.Constants.EXTRA_LAUNCH_IN_BACKGROUND">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="EXTRA_TASK_ID"><!-- --></A><H3>
-EXTRA_TASK_ID</H3>
-<PRE>
-static final java.lang.String <B>EXTRA_TASK_ID</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#com.googlecode.android_scripting.Constants.EXTRA_TASK_ID">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="EXTRA_DEVICE_ADDRESS"><!-- --></A><H3>
-EXTRA_DEVICE_ADDRESS</H3>
-<PRE>
-static final java.lang.String <B>EXTRA_DEVICE_ADDRESS</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#com.googlecode.android_scripting.Constants.EXTRA_DEVICE_ADDRESS">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="SL4A_SERVICE_COMPONENT_NAME"><!-- --></A><H3>
-SL4A_SERVICE_COMPONENT_NAME</H3>
-<PRE>
-static final ComponentName <B>SL4A_SERVICE_COMPONENT_NAME</B></PRE>
-<DL>
-<DL>
-</DL>
-</DL>
-<HR>
-
-<A NAME="SL4A_SERVICE_LAUNCHER_COMPONENT_NAME"><!-- --></A><H3>
-SL4A_SERVICE_LAUNCHER_COMPONENT_NAME</H3>
-<PRE>
-static final ComponentName <B>SL4A_SERVICE_LAUNCHER_COMPONENT_NAME</B></PRE>
-<DL>
-<DL>
-</DL>
-</DL>
-<HR>
-
-<A NAME="BLUETOOTH_DEVICE_LIST_COMPONENT_NAME"><!-- --></A><H3>
-BLUETOOTH_DEVICE_LIST_COMPONENT_NAME</H3>
-<PRE>
-static final ComponentName <B>BLUETOOTH_DEVICE_LIST_COMPONENT_NAME</B></PRE>
-<DL>
-<DL>
-</DL>
-</DL>
-<HR>
-
-<A NAME="TRIGGER_SERVICE_COMPONENT_NAME"><!-- --></A><H3>
-TRIGGER_SERVICE_COMPONENT_NAME</H3>
-<PRE>
-static final ComponentName <B>TRIGGER_SERVICE_COMPONENT_NAME</B></PRE>
-<DL>
-<DL>
-</DL>
-</DL>
-<HR>
-
-<A NAME="FORCE_BROWSER"><!-- --></A><H3>
-FORCE_BROWSER</H3>
-<PRE>
-static final java.lang.String <B>FORCE_BROWSER</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#com.googlecode.android_scripting.Constants.FORCE_BROWSER">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="HIDE_NOTIFY"><!-- --></A><H3>
-HIDE_NOTIFY</H3>
-<PRE>
-static final java.lang.String <B>HIDE_NOTIFY</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#com.googlecode.android_scripting.Constants.HIDE_NOTIFY">Constant Field Values</A></DL>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/Constants.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/BaseApplication.html" title="class in com.googlecode.android_scripting"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/Exec.html" title="class in com.googlecode.android_scripting"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/googlecode/android_scripting/Constants.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="Constants.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;METHOD</FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;METHOD</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/Exec.html b/doc/com/googlecode/android_scripting/Exec.html
deleted file mode 100644
index ccf01070..00000000
--- a/doc/com/googlecode/android_scripting/Exec.html
+++ /dev/null
@@ -1,342 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:00:57 PDT 2014 -->
-<TITLE>
-Exec
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Exec";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/Exec.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/Constants.html" title="interface in com.googlecode.android_scripting"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/FeaturedInterpreters.html" title="class in com.googlecode.android_scripting"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/googlecode/android_scripting/Exec.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="Exec.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting</FONT>
-<BR>
-Class Exec</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.Exec</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>Exec</B><DT>extends java.lang.Object</DL>
-</PRE>
-
-<P>
-Tools for executing commands.
-<P>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Exec.html#Exec()">Exec</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.io.FileDescriptor</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Exec.html#createSubprocess(java.lang.String, java.lang.String[], java.lang.String[], java.lang.String)">createSubprocess</A></B>(java.lang.String&nbsp;command,
-                 java.lang.String[]&nbsp;arguments,
-                 java.lang.String[]&nbsp;environmentVariables,
-                 java.lang.String&nbsp;workingDirectory)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.io.FileDescriptor</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Exec.html#createSubprocess(java.lang.String, java.lang.String[], java.lang.String[], java.lang.String, int[])">createSubprocess</A></B>(java.lang.String&nbsp;command,
-                 java.lang.String[]&nbsp;arguments,
-                 java.lang.String[]&nbsp;environmentVariables,
-                 java.lang.String&nbsp;workingDirectory,
-                 int[]&nbsp;processId)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Exec.html#setPtyWindowSize(java.io.FileDescriptor, int, int, int, int)">setPtyWindowSize</A></B>(java.io.FileDescriptor&nbsp;fd,
-                 int&nbsp;row,
-                 int&nbsp;col,
-                 int&nbsp;xpixel,
-                 int&nbsp;ypixel)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Exec.html#waitFor(int)">waitFor</A></B>(int&nbsp;processId)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Causes the calling thread to wait for the process associated with the receiver to finish
- executing.</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="Exec()"><!-- --></A><H3>
-Exec</H3>
-<PRE>
-public <B>Exec</B>()</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="createSubprocess(java.lang.String, java.lang.String[], java.lang.String[], java.lang.String)"><!-- --></A><H3>
-createSubprocess</H3>
-<PRE>
-public static java.io.FileDescriptor <B>createSubprocess</B>(java.lang.String&nbsp;command,
-                                                      java.lang.String[]&nbsp;arguments,
-                                                      java.lang.String[]&nbsp;environmentVariables,
-                                                      java.lang.String&nbsp;workingDirectory)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>cmd</CODE> - The command to execute<DD><CODE>arg0</CODE> - The first argument to the command, may be null<DD><CODE>arg1</CODE> - the second argument to the command, may be null
-<DT><B>Returns:</B><DD>the file descriptor of the started process.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="createSubprocess(java.lang.String, java.lang.String[], java.lang.String[], java.lang.String, int[])"><!-- --></A><H3>
-createSubprocess</H3>
-<PRE>
-public static java.io.FileDescriptor <B>createSubprocess</B>(java.lang.String&nbsp;command,
-                                                      java.lang.String[]&nbsp;arguments,
-                                                      java.lang.String[]&nbsp;environmentVariables,
-                                                      java.lang.String&nbsp;workingDirectory,
-                                                      int[]&nbsp;processId)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>cmd</CODE> - The command to execute<DD><CODE>arguments</CODE> - Array of arguments, may be null<DD><CODE>environmentVariables</CODE> - Array of environment variables, may be null<DD><CODE>processId</CODE> - A one-element array to which the process ID of the started process will be written.
-<DT><B>Returns:</B><DD>the file descriptor of the opened process's psuedo-terminal.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setPtyWindowSize(java.io.FileDescriptor, int, int, int, int)"><!-- --></A><H3>
-setPtyWindowSize</H3>
-<PRE>
-public static void <B>setPtyWindowSize</B>(java.io.FileDescriptor&nbsp;fd,
-                                    int&nbsp;row,
-                                    int&nbsp;col,
-                                    int&nbsp;xpixel,
-                                    int&nbsp;ypixel)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="waitFor(int)"><!-- --></A><H3>
-waitFor</H3>
-<PRE>
-public static int <B>waitFor</B>(int&nbsp;processId)</PRE>
-<DL>
-<DD>Causes the calling thread to wait for the process associated with the receiver to finish
- executing.
-<P>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>The exit value of the Process being waited on</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/Exec.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/Constants.html" title="interface in com.googlecode.android_scripting"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/FeaturedInterpreters.html" title="class in com.googlecode.android_scripting"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/googlecode/android_scripting/Exec.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="Exec.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/FeaturedInterpreters.html b/doc/com/googlecode/android_scripting/FeaturedInterpreters.html
deleted file mode 100644
index 3921f44a..00000000
--- a/doc/com/googlecode/android_scripting/FeaturedInterpreters.html
+++ /dev/null
@@ -1,330 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:00:57 PDT 2014 -->
-<TITLE>
-FeaturedInterpreters
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="FeaturedInterpreters";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/FeaturedInterpreters.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/Exec.html" title="class in com.googlecode.android_scripting"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/FileUtils.html" title="class in com.googlecode.android_scripting"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/googlecode/android_scripting/FeaturedInterpreters.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="FeaturedInterpreters.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting</FONT>
-<BR>
-Class FeaturedInterpreters</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.FeaturedInterpreters</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>FeaturedInterpreters</B><DT>extends java.lang.Object</DL>
-</PRE>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/FeaturedInterpreters.html#FeaturedInterpreters()">FeaturedInterpreters</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/FeaturedInterpreters.html#getInterpreterIcon(Context, java.lang.String)">getInterpreterIcon</A></B>(Context&nbsp;context,
-                   java.lang.String&nbsp;key)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/FeaturedInterpreters.html#getInterpreterNameForScript(java.lang.String)">getInterpreterNameForScript</A></B>(java.lang.String&nbsp;fileName)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.util.List&lt;java.lang.String&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/FeaturedInterpreters.html#getList()">getList</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.net.URL</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/FeaturedInterpreters.html#getUrlForName(java.lang.String)">getUrlForName</A></B>(java.lang.String&nbsp;name)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/FeaturedInterpreters.html#isSupported(java.lang.String)">isSupported</A></B>(java.lang.String&nbsp;fileName)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="FeaturedInterpreters()"><!-- --></A><H3>
-FeaturedInterpreters</H3>
-<PRE>
-public <B>FeaturedInterpreters</B>()</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="getList()"><!-- --></A><H3>
-getList</H3>
-<PRE>
-public static java.util.List&lt;java.lang.String&gt; <B>getList</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getUrlForName(java.lang.String)"><!-- --></A><H3>
-getUrlForName</H3>
-<PRE>
-public static java.net.URL <B>getUrlForName</B>(java.lang.String&nbsp;name)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getInterpreterNameForScript(java.lang.String)"><!-- --></A><H3>
-getInterpreterNameForScript</H3>
-<PRE>
-public static java.lang.String <B>getInterpreterNameForScript</B>(java.lang.String&nbsp;fileName)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isSupported(java.lang.String)"><!-- --></A><H3>
-isSupported</H3>
-<PRE>
-public static boolean <B>isSupported</B>(java.lang.String&nbsp;fileName)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getInterpreterIcon(Context, java.lang.String)"><!-- --></A><H3>
-getInterpreterIcon</H3>
-<PRE>
-public static int <B>getInterpreterIcon</B>(Context&nbsp;context,
-                                     java.lang.String&nbsp;key)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/FeaturedInterpreters.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/Exec.html" title="class in com.googlecode.android_scripting"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/FileUtils.html" title="class in com.googlecode.android_scripting"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/googlecode/android_scripting/FeaturedInterpreters.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="FeaturedInterpreters.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/FileUtils.html b/doc/com/googlecode/android_scripting/FileUtils.html
deleted file mode 100644
index db31f669..00000000
--- a/doc/com/googlecode/android_scripting/FileUtils.html
+++ /dev/null
@@ -1,422 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:00:57 PDT 2014 -->
-<TITLE>
-FileUtils
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="FileUtils";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/FileUtils.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/FeaturedInterpreters.html" title="class in com.googlecode.android_scripting"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/ForegroundService.html" title="class in com.googlecode.android_scripting"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/googlecode/android_scripting/FileUtils.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="FileUtils.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting</FONT>
-<BR>
-Class FileUtils</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.FileUtils</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>FileUtils</B><DT>extends java.lang.Object</DL>
-</PRE>
-
-<P>
-Utility functions for handling files.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Damon Kohler (damonkohler@gmail.com)</DD>
-</DL>
-<HR>
-
-<P>
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/FileUtils.html#chmod(java.io.File, int)">chmod</A></B>(java.io.File&nbsp;path,
-      int&nbsp;mode)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.io.File</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/FileUtils.html#copyFromStream(java.lang.String, java.io.InputStream)">copyFromStream</A></B>(java.lang.String&nbsp;name,
-               java.io.InputStream&nbsp;input)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/FileUtils.html#delete(java.io.File)">delete</A></B>(java.io.File&nbsp;path)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/FileUtils.html#externalStorageMounted()">externalStorageMounted</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.io.File</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/FileUtils.html#getExternalDownload()">getExternalDownload</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/FileUtils.html#makeDirectories(java.io.File, int)">makeDirectories</A></B>(java.io.File&nbsp;directory,
-                int&nbsp;mode)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/FileUtils.html#readFromAssetsFile(Context, java.lang.String)">readFromAssetsFile</A></B>(Context&nbsp;context,
-                   java.lang.String&nbsp;name)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/FileUtils.html#readToString(java.io.File)">readToString</A></B>(java.io.File&nbsp;file)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/FileUtils.html#recursiveChmod(java.io.File, int)">recursiveChmod</A></B>(java.io.File&nbsp;root,
-               int&nbsp;mode)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/FileUtils.html#rename(java.io.File, java.lang.String)">rename</A></B>(java.io.File&nbsp;file,
-       java.lang.String&nbsp;name)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="externalStorageMounted()"><!-- --></A><H3>
-externalStorageMounted</H3>
-<PRE>
-public static boolean <B>externalStorageMounted</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="chmod(java.io.File, int)"><!-- --></A><H3>
-chmod</H3>
-<PRE>
-public static int <B>chmod</B>(java.io.File&nbsp;path,
-                        int&nbsp;mode)
-                 throws java.lang.Exception</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.lang.Exception</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="recursiveChmod(java.io.File, int)"><!-- --></A><H3>
-recursiveChmod</H3>
-<PRE>
-public static boolean <B>recursiveChmod</B>(java.io.File&nbsp;root,
-                                     int&nbsp;mode)
-                              throws java.lang.Exception</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.lang.Exception</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="delete(java.io.File)"><!-- --></A><H3>
-delete</H3>
-<PRE>
-public static boolean <B>delete</B>(java.io.File&nbsp;path)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="copyFromStream(java.lang.String, java.io.InputStream)"><!-- --></A><H3>
-copyFromStream</H3>
-<PRE>
-public static java.io.File <B>copyFromStream</B>(java.lang.String&nbsp;name,
-                                          java.io.InputStream&nbsp;input)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="makeDirectories(java.io.File, int)"><!-- --></A><H3>
-makeDirectories</H3>
-<PRE>
-public static boolean <B>makeDirectories</B>(java.io.File&nbsp;directory,
-                                      int&nbsp;mode)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getExternalDownload()"><!-- --></A><H3>
-getExternalDownload</H3>
-<PRE>
-public static java.io.File <B>getExternalDownload</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="rename(java.io.File, java.lang.String)"><!-- --></A><H3>
-rename</H3>
-<PRE>
-public static boolean <B>rename</B>(java.io.File&nbsp;file,
-                             java.lang.String&nbsp;name)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="readToString(java.io.File)"><!-- --></A><H3>
-readToString</H3>
-<PRE>
-public static java.lang.String <B>readToString</B>(java.io.File&nbsp;file)
-                                     throws java.io.IOException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.io.IOException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="readFromAssetsFile(Context, java.lang.String)"><!-- --></A><H3>
-readFromAssetsFile</H3>
-<PRE>
-public static java.lang.String <B>readFromAssetsFile</B>(Context&nbsp;context,
-                                                  java.lang.String&nbsp;name)
-                                           throws java.io.IOException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.io.IOException</CODE></DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/FileUtils.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/FeaturedInterpreters.html" title="class in com.googlecode.android_scripting"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/ForegroundService.html" title="class in com.googlecode.android_scripting"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/googlecode/android_scripting/FileUtils.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="FileUtils.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/ForegroundService.html b/doc/com/googlecode/android_scripting/ForegroundService.html
deleted file mode 100644
index b31bd6d3..00000000
--- a/doc/com/googlecode/android_scripting/ForegroundService.html
+++ /dev/null
@@ -1,275 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:00:57 PDT 2014 -->
-<TITLE>
-ForegroundService
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="ForegroundService";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ForegroundService.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/FileUtils.html" title="class in com.googlecode.android_scripting"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/FutureActivityTaskExecutor.html" title="class in com.googlecode.android_scripting"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/googlecode/android_scripting/ForegroundService.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ForegroundService.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting</FONT>
-<BR>
-Class ForegroundService</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../resources/inherit.gif" ALT="extended by ">Service
-      <IMG SRC="../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.ForegroundService</B>
-</PRE>
-<DL>
-<DT><B>Direct Known Subclasses:</B> <DD><A HREF="../../../com/hipipal/sl4alib/SL4AScriptService.html" title="class in com.hipipal.sl4alib">SL4AScriptService</A></DD>
-</DL>
-<HR>
-<DL>
-<DT><PRE>public abstract class <B>ForegroundService</B><DT>extends Service</DL>
-</PRE>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/ForegroundService.html#ForegroundService(int)">ForegroundService</A></B>(int&nbsp;id)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/ForegroundService.html#onCreate()">onCreate</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/ForegroundService.html#onDestroy()">onDestroy</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="ForegroundService(int)"><!-- --></A><H3>
-ForegroundService</H3>
-<PRE>
-public <B>ForegroundService</B>(int&nbsp;id)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="onCreate()"><!-- --></A><H3>
-onCreate</H3>
-<PRE>
-public void <B>onCreate</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="onDestroy()"><!-- --></A><H3>
-onDestroy</H3>
-<PRE>
-public void <B>onDestroy</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ForegroundService.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/FileUtils.html" title="class in com.googlecode.android_scripting"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/FutureActivityTaskExecutor.html" title="class in com.googlecode.android_scripting"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/googlecode/android_scripting/ForegroundService.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ForegroundService.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/FutureActivityTaskExecutor.html b/doc/com/googlecode/android_scripting/FutureActivityTaskExecutor.html
deleted file mode 100644
index 8483735a..00000000
--- a/doc/com/googlecode/android_scripting/FutureActivityTaskExecutor.html
+++ /dev/null
@@ -1,271 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:00:57 PDT 2014 -->
-<TITLE>
-FutureActivityTaskExecutor
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="FutureActivityTaskExecutor";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/FutureActivityTaskExecutor.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/ForegroundService.html" title="class in com.googlecode.android_scripting"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/IntentBuilders.html" title="class in com.googlecode.android_scripting"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/googlecode/android_scripting/FutureActivityTaskExecutor.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="FutureActivityTaskExecutor.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting</FONT>
-<BR>
-Class FutureActivityTaskExecutor</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.FutureActivityTaskExecutor</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>FutureActivityTaskExecutor</B><DT>extends java.lang.Object</DL>
-</PRE>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/FutureActivityTaskExecutor.html#FutureActivityTaskExecutor(Context)">FutureActivityTaskExecutor</A></B>(Context&nbsp;context)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/FutureActivityTaskExecutor.html#execute(com.googlecode.android_scripting.future.FutureActivityTask)">execute</A></B>(<A HREF="../../../com/googlecode/android_scripting/future/FutureActivityTask.html" title="class in com.googlecode.android_scripting.future">FutureActivityTask</A>&lt;?&gt;&nbsp;task)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../com/googlecode/android_scripting/future/FutureActivityTask.html" title="class in com.googlecode.android_scripting.future">FutureActivityTask</A>&lt;?&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/FutureActivityTaskExecutor.html#getTask(int)">getTask</A></B>(int&nbsp;id)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="FutureActivityTaskExecutor(Context)"><!-- --></A><H3>
-FutureActivityTaskExecutor</H3>
-<PRE>
-public <B>FutureActivityTaskExecutor</B>(Context&nbsp;context)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="execute(com.googlecode.android_scripting.future.FutureActivityTask)"><!-- --></A><H3>
-execute</H3>
-<PRE>
-public void <B>execute</B>(<A HREF="../../../com/googlecode/android_scripting/future/FutureActivityTask.html" title="class in com.googlecode.android_scripting.future">FutureActivityTask</A>&lt;?&gt;&nbsp;task)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getTask(int)"><!-- --></A><H3>
-getTask</H3>
-<PRE>
-public <A HREF="../../../com/googlecode/android_scripting/future/FutureActivityTask.html" title="class in com.googlecode.android_scripting.future">FutureActivityTask</A>&lt;?&gt; <B>getTask</B>(int&nbsp;id)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/FutureActivityTaskExecutor.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/ForegroundService.html" title="class in com.googlecode.android_scripting"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/IntentBuilders.html" title="class in com.googlecode.android_scripting"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/googlecode/android_scripting/FutureActivityTaskExecutor.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="FutureActivityTaskExecutor.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/IntentBuilders.html b/doc/com/googlecode/android_scripting/IntentBuilders.html
deleted file mode 100644
index 9e943db6..00000000
--- a/doc/com/googlecode/android_scripting/IntentBuilders.html
+++ /dev/null
@@ -1,379 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:00:57 PDT 2014 -->
-<TITLE>
-IntentBuilders
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="IntentBuilders";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/IntentBuilders.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/FutureActivityTaskExecutor.html" title="class in com.googlecode.android_scripting"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/IoUtils.html" title="class in com.googlecode.android_scripting"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/googlecode/android_scripting/IntentBuilders.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="IntentBuilders.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting</FONT>
-<BR>
-Class IntentBuilders</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.IntentBuilders</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>IntentBuilders</B><DT>extends java.lang.Object</DL>
-</PRE>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;Intent</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/IntentBuilders.html#buildBackgroundShortcutIntent(java.io.File, Parcelable)">buildBackgroundShortcutIntent</A></B>(java.io.File&nbsp;script,
-                              Parcelable&nbsp;iconResource)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Builds an intent that creates a shortcut to launch the provided script in the background.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;Intent</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/IntentBuilders.html#buildInterpreterShortcutIntent(com.googlecode.android_scripting.interpreter.Interpreter, Parcelable)">buildInterpreterShortcutIntent</A></B>(<A HREF="../../../com/googlecode/android_scripting/interpreter/Interpreter.html" title="class in com.googlecode.android_scripting.interpreter">Interpreter</A>&nbsp;interpreter,
-                               Parcelable&nbsp;iconResource)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Builds an intent that creates a shortcut to launch the provided interpreter.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;Intent</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/IntentBuilders.html#buildStartInBackgroundIntent(java.io.File)">buildStartInBackgroundIntent</A></B>(java.io.File&nbsp;script)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Builds an intent that will launch a script in the background.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;Intent</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/IntentBuilders.html#buildStartInTerminalIntent(java.io.File)">buildStartInTerminalIntent</A></B>(java.io.File&nbsp;script)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Builds an intent that launches a script in a terminal.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;Intent</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/IntentBuilders.html#buildStartInterpreterIntent(java.lang.String)">buildStartInterpreterIntent</A></B>(java.lang.String&nbsp;interpreterName)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Builds an intent that launches an interpreter.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;Intent</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/IntentBuilders.html#buildTerminalShortcutIntent(java.io.File, Parcelable)">buildTerminalShortcutIntent</A></B>(java.io.File&nbsp;script,
-                            Parcelable&nbsp;iconResource)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Builds an intent that creates a shortcut to launch the provided script in a terminal.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;Intent</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/IntentBuilders.html#buildTriggerServiceIntent()">buildTriggerServiceIntent</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;PendingIntent</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/IntentBuilders.html#buildTriggerServicePendingIntent(Context)">buildTriggerServicePendingIntent</A></B>(Context&nbsp;context)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Creates a pending intent that can be used to start the trigger service.</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="buildTriggerServiceIntent()"><!-- --></A><H3>
-buildTriggerServiceIntent</H3>
-<PRE>
-public static Intent <B>buildTriggerServiceIntent</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="buildStartInBackgroundIntent(java.io.File)"><!-- --></A><H3>
-buildStartInBackgroundIntent</H3>
-<PRE>
-public static Intent <B>buildStartInBackgroundIntent</B>(java.io.File&nbsp;script)</PRE>
-<DL>
-<DD>Builds an intent that will launch a script in the background.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>script</CODE> - the script to launch
-<DT><B>Returns:</B><DD>the intent that will launch the script</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="buildStartInTerminalIntent(java.io.File)"><!-- --></A><H3>
-buildStartInTerminalIntent</H3>
-<PRE>
-public static Intent <B>buildStartInTerminalIntent</B>(java.io.File&nbsp;script)</PRE>
-<DL>
-<DD>Builds an intent that launches a script in a terminal.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>script</CODE> - the script to launch
-<DT><B>Returns:</B><DD>the intent that will launch the script</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="buildStartInterpreterIntent(java.lang.String)"><!-- --></A><H3>
-buildStartInterpreterIntent</H3>
-<PRE>
-public static Intent <B>buildStartInterpreterIntent</B>(java.lang.String&nbsp;interpreterName)</PRE>
-<DL>
-<DD>Builds an intent that launches an interpreter.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>interpreterName</CODE> - the interpreter to launch
-<DT><B>Returns:</B><DD>the intent that will launch the interpreter</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="buildInterpreterShortcutIntent(com.googlecode.android_scripting.interpreter.Interpreter, Parcelable)"><!-- --></A><H3>
-buildInterpreterShortcutIntent</H3>
-<PRE>
-public static Intent <B>buildInterpreterShortcutIntent</B>(<A HREF="../../../com/googlecode/android_scripting/interpreter/Interpreter.html" title="class in com.googlecode.android_scripting.interpreter">Interpreter</A>&nbsp;interpreter,
-                                                    Parcelable&nbsp;iconResource)</PRE>
-<DL>
-<DD>Builds an intent that creates a shortcut to launch the provided interpreter.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>interpreter</CODE> - the interpreter to link to<DD><CODE>iconResource</CODE> - the icon resource to associate with the shortcut
-<DT><B>Returns:</B><DD>the intent that will create the shortcut</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="buildBackgroundShortcutIntent(java.io.File, Parcelable)"><!-- --></A><H3>
-buildBackgroundShortcutIntent</H3>
-<PRE>
-public static Intent <B>buildBackgroundShortcutIntent</B>(java.io.File&nbsp;script,
-                                                   Parcelable&nbsp;iconResource)</PRE>
-<DL>
-<DD>Builds an intent that creates a shortcut to launch the provided script in the background.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>script</CODE> - the script to link to<DD><CODE>iconResource</CODE> - the icon resource to associate with the shortcut
-<DT><B>Returns:</B><DD>the intent that will create the shortcut</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="buildTerminalShortcutIntent(java.io.File, Parcelable)"><!-- --></A><H3>
-buildTerminalShortcutIntent</H3>
-<PRE>
-public static Intent <B>buildTerminalShortcutIntent</B>(java.io.File&nbsp;script,
-                                                 Parcelable&nbsp;iconResource)</PRE>
-<DL>
-<DD>Builds an intent that creates a shortcut to launch the provided script in a terminal.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>script</CODE> - the script to link to<DD><CODE>iconResource</CODE> - the icon resource to associate with the shortcut
-<DT><B>Returns:</B><DD>the intent that will create the shortcut</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="buildTriggerServicePendingIntent(Context)"><!-- --></A><H3>
-buildTriggerServicePendingIntent</H3>
-<PRE>
-public static PendingIntent <B>buildTriggerServicePendingIntent</B>(Context&nbsp;context)</PRE>
-<DL>
-<DD>Creates a pending intent that can be used to start the trigger service.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>context</CODE> - the context under whose authority to launch the intent
-<DT><B>Returns:</B><DD><CODE>PendingIntent</CODE> object for running the trigger service</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/IntentBuilders.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/FutureActivityTaskExecutor.html" title="class in com.googlecode.android_scripting"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/IoUtils.html" title="class in com.googlecode.android_scripting"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/googlecode/android_scripting/IntentBuilders.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="IntentBuilders.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/IoUtils.html b/doc/com/googlecode/android_scripting/IoUtils.html
deleted file mode 100644
index d8f6eee2..00000000
--- a/doc/com/googlecode/android_scripting/IoUtils.html
+++ /dev/null
@@ -1,226 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:00:57 PDT 2014 -->
-<TITLE>
-IoUtils
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="IoUtils";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/IoUtils.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/IntentBuilders.html" title="class in com.googlecode.android_scripting"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/Log.html" title="class in com.googlecode.android_scripting"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/googlecode/android_scripting/IoUtils.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="IoUtils.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting</FONT>
-<BR>
-Class IoUtils</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.IoUtils</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>IoUtils</B><DT>extends java.lang.Object</DL>
-</PRE>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/IoUtils.html#copy(java.io.InputStream, java.io.OutputStream)">copy</A></B>(java.io.InputStream&nbsp;input,
-     java.io.OutputStream&nbsp;output)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="copy(java.io.InputStream, java.io.OutputStream)"><!-- --></A><H3>
-copy</H3>
-<PRE>
-public static int <B>copy</B>(java.io.InputStream&nbsp;input,
-                       java.io.OutputStream&nbsp;output)
-                throws java.lang.Exception,
-                       java.io.IOException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.lang.Exception</CODE>
-<DD><CODE>java.io.IOException</CODE></DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/IoUtils.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/IntentBuilders.html" title="class in com.googlecode.android_scripting"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/Log.html" title="class in com.googlecode.android_scripting"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/googlecode/android_scripting/IoUtils.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="IoUtils.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/Log.html b/doc/com/googlecode/android_scripting/Log.html
deleted file mode 100644
index fdf564ad..00000000
--- a/doc/com/googlecode/android_scripting/Log.html
+++ /dev/null
@@ -1,706 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:00:58 PDT 2014 -->
-<TITLE>
-Log
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Log";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/Log.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/IoUtils.html" title="class in com.googlecode.android_scripting"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/MainThread.html" title="class in com.googlecode.android_scripting"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/googlecode/android_scripting/Log.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="Log.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting</FONT>
-<BR>
-Class Log</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.Log</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>Log</B><DT>extends java.lang.Object</DL>
-</PRE>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Log.html#d(Context, java.lang.String)">d</A></B>(Context&nbsp;context,
-  java.lang.String&nbsp;message)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Log.html#d(Context, java.lang.String, java.lang.Throwable)">d</A></B>(Context&nbsp;context,
-  java.lang.String&nbsp;message,
-  java.lang.Throwable&nbsp;e)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Log.html#d(java.lang.String)">d</A></B>(java.lang.String&nbsp;message)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Log.html#d(java.lang.String, java.lang.Throwable)">d</A></B>(java.lang.String&nbsp;message,
-  java.lang.Throwable&nbsp;e)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Log.html#e(Context, java.lang.String)">e</A></B>(Context&nbsp;context,
-  java.lang.String&nbsp;message)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Log.html#e(Context, java.lang.String, java.lang.Throwable)">e</A></B>(Context&nbsp;context,
-  java.lang.String&nbsp;message,
-  java.lang.Throwable&nbsp;e)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Log.html#e(java.lang.String)">e</A></B>(java.lang.String&nbsp;message)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Log.html#e(java.lang.String, java.lang.Throwable)">e</A></B>(java.lang.String&nbsp;message,
-  java.lang.Throwable&nbsp;e)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Log.html#e(java.lang.Throwable)">e</A></B>(java.lang.Throwable&nbsp;e)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Log.html#i(Context, java.lang.String)">i</A></B>(Context&nbsp;context,
-  java.lang.String&nbsp;message)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Log.html#i(Context, java.lang.String, java.lang.Throwable)">i</A></B>(Context&nbsp;context,
-  java.lang.String&nbsp;message,
-  java.lang.Throwable&nbsp;e)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Log.html#i(java.lang.String)">i</A></B>(java.lang.String&nbsp;message)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Log.html#i(java.lang.String, java.lang.Throwable)">i</A></B>(java.lang.String&nbsp;message,
-  java.lang.Throwable&nbsp;e)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Log.html#notify(Context, java.lang.String, java.lang.String, java.lang.String)">notify</A></B>(Context&nbsp;context,
-       java.lang.String&nbsp;title,
-       java.lang.String&nbsp;contentTitle,
-       java.lang.String&nbsp;message)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Log.html#showDialog(Context, java.lang.String, java.lang.String)">showDialog</A></B>(Context&nbsp;context,
-           java.lang.String&nbsp;title,
-           java.lang.String&nbsp;message)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Log.html#v(Context, java.lang.String)">v</A></B>(Context&nbsp;context,
-  java.lang.String&nbsp;message)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Log.html#v(Context, java.lang.String, java.lang.Throwable)">v</A></B>(Context&nbsp;context,
-  java.lang.String&nbsp;message,
-  java.lang.Throwable&nbsp;e)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Log.html#v(java.lang.String)">v</A></B>(java.lang.String&nbsp;message)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Log.html#v(java.lang.String, java.lang.Throwable)">v</A></B>(java.lang.String&nbsp;message,
-  java.lang.Throwable&nbsp;e)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Log.html#w(Context, java.lang.String)">w</A></B>(Context&nbsp;context,
-  java.lang.String&nbsp;message)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Log.html#w(Context, java.lang.String, java.lang.Throwable)">w</A></B>(Context&nbsp;context,
-  java.lang.String&nbsp;message,
-  java.lang.Throwable&nbsp;e)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Log.html#w(java.lang.String)">w</A></B>(java.lang.String&nbsp;message)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Log.html#w(java.lang.String, java.lang.Throwable)">w</A></B>(java.lang.String&nbsp;message,
-  java.lang.Throwable&nbsp;e)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Log.html#w(java.lang.Throwable)">w</A></B>(java.lang.Throwable&nbsp;e)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="notify(Context, java.lang.String, java.lang.String, java.lang.String)"><!-- --></A><H3>
-notify</H3>
-<PRE>
-public static void <B>notify</B>(Context&nbsp;context,
-                          java.lang.String&nbsp;title,
-                          java.lang.String&nbsp;contentTitle,
-                          java.lang.String&nbsp;message)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="showDialog(Context, java.lang.String, java.lang.String)"><!-- --></A><H3>
-showDialog</H3>
-<PRE>
-public static void <B>showDialog</B>(Context&nbsp;context,
-                              java.lang.String&nbsp;title,
-                              java.lang.String&nbsp;message)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="v(java.lang.String)"><!-- --></A><H3>
-v</H3>
-<PRE>
-public static void <B>v</B>(java.lang.String&nbsp;message)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="v(java.lang.String, java.lang.Throwable)"><!-- --></A><H3>
-v</H3>
-<PRE>
-public static void <B>v</B>(java.lang.String&nbsp;message,
-                     java.lang.Throwable&nbsp;e)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="v(Context, java.lang.String)"><!-- --></A><H3>
-v</H3>
-<PRE>
-public static void <B>v</B>(Context&nbsp;context,
-                     java.lang.String&nbsp;message)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="v(Context, java.lang.String, java.lang.Throwable)"><!-- --></A><H3>
-v</H3>
-<PRE>
-public static void <B>v</B>(Context&nbsp;context,
-                     java.lang.String&nbsp;message,
-                     java.lang.Throwable&nbsp;e)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="e(java.lang.Throwable)"><!-- --></A><H3>
-e</H3>
-<PRE>
-public static void <B>e</B>(java.lang.Throwable&nbsp;e)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="e(java.lang.String)"><!-- --></A><H3>
-e</H3>
-<PRE>
-public static void <B>e</B>(java.lang.String&nbsp;message)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="e(java.lang.String, java.lang.Throwable)"><!-- --></A><H3>
-e</H3>
-<PRE>
-public static void <B>e</B>(java.lang.String&nbsp;message,
-                     java.lang.Throwable&nbsp;e)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="e(Context, java.lang.String)"><!-- --></A><H3>
-e</H3>
-<PRE>
-public static void <B>e</B>(Context&nbsp;context,
-                     java.lang.String&nbsp;message)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="e(Context, java.lang.String, java.lang.Throwable)"><!-- --></A><H3>
-e</H3>
-<PRE>
-public static void <B>e</B>(Context&nbsp;context,
-                     java.lang.String&nbsp;message,
-                     java.lang.Throwable&nbsp;e)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="w(java.lang.Throwable)"><!-- --></A><H3>
-w</H3>
-<PRE>
-public static void <B>w</B>(java.lang.Throwable&nbsp;e)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="w(java.lang.String)"><!-- --></A><H3>
-w</H3>
-<PRE>
-public static void <B>w</B>(java.lang.String&nbsp;message)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="w(java.lang.String, java.lang.Throwable)"><!-- --></A><H3>
-w</H3>
-<PRE>
-public static void <B>w</B>(java.lang.String&nbsp;message,
-                     java.lang.Throwable&nbsp;e)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="w(Context, java.lang.String)"><!-- --></A><H3>
-w</H3>
-<PRE>
-public static void <B>w</B>(Context&nbsp;context,
-                     java.lang.String&nbsp;message)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="w(Context, java.lang.String, java.lang.Throwable)"><!-- --></A><H3>
-w</H3>
-<PRE>
-public static void <B>w</B>(Context&nbsp;context,
-                     java.lang.String&nbsp;message,
-                     java.lang.Throwable&nbsp;e)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="d(java.lang.String)"><!-- --></A><H3>
-d</H3>
-<PRE>
-public static void <B>d</B>(java.lang.String&nbsp;message)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="d(java.lang.String, java.lang.Throwable)"><!-- --></A><H3>
-d</H3>
-<PRE>
-public static void <B>d</B>(java.lang.String&nbsp;message,
-                     java.lang.Throwable&nbsp;e)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="d(Context, java.lang.String)"><!-- --></A><H3>
-d</H3>
-<PRE>
-public static void <B>d</B>(Context&nbsp;context,
-                     java.lang.String&nbsp;message)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="d(Context, java.lang.String, java.lang.Throwable)"><!-- --></A><H3>
-d</H3>
-<PRE>
-public static void <B>d</B>(Context&nbsp;context,
-                     java.lang.String&nbsp;message,
-                     java.lang.Throwable&nbsp;e)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="i(java.lang.String)"><!-- --></A><H3>
-i</H3>
-<PRE>
-public static void <B>i</B>(java.lang.String&nbsp;message)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="i(java.lang.String, java.lang.Throwable)"><!-- --></A><H3>
-i</H3>
-<PRE>
-public static void <B>i</B>(java.lang.String&nbsp;message,
-                     java.lang.Throwable&nbsp;e)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="i(Context, java.lang.String)"><!-- --></A><H3>
-i</H3>
-<PRE>
-public static void <B>i</B>(Context&nbsp;context,
-                     java.lang.String&nbsp;message)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="i(Context, java.lang.String, java.lang.Throwable)"><!-- --></A><H3>
-i</H3>
-<PRE>
-public static void <B>i</B>(Context&nbsp;context,
-                     java.lang.String&nbsp;message,
-                     java.lang.Throwable&nbsp;e)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/Log.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/IoUtils.html" title="class in com.googlecode.android_scripting"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/MainThread.html" title="class in com.googlecode.android_scripting"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/googlecode/android_scripting/Log.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="Log.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/MainThread.html b/doc/com/googlecode/android_scripting/MainThread.html
deleted file mode 100644
index cafff4c5..00000000
--- a/doc/com/googlecode/android_scripting/MainThread.html
+++ /dev/null
@@ -1,252 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:00:58 PDT 2014 -->
-<TITLE>
-MainThread
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="MainThread";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/MainThread.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/Log.html" title="class in com.googlecode.android_scripting"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/NotificationIdFactory.html" title="class in com.googlecode.android_scripting"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/googlecode/android_scripting/MainThread.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="MainThread.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting</FONT>
-<BR>
-Class MainThread</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.MainThread</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>MainThread</B><DT>extends java.lang.Object</DL>
-</PRE>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0" SUMMARY="">
-<TR ALIGN="right" VALIGN="">
-<TD NOWRAP><FONT SIZE="-1">
-<CODE>&lt;T&gt; T</CODE></FONT></TD>
-</TR>
-</TABLE>
-</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/MainThread.html#run(Context, java.util.concurrent.Callable)">run</A></B>(Context&nbsp;context,
-    java.util.concurrent.Callable&lt;T&gt;&nbsp;task)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Executed in the main thread, returns the result of an execution.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/MainThread.html#run(Context, java.lang.Runnable)">run</A></B>(Context&nbsp;context,
-    java.lang.Runnable&nbsp;task)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="run(Context, java.util.concurrent.Callable)"><!-- --></A><H3>
-run</H3>
-<PRE>
-public static &lt;T&gt; T <B>run</B>(Context&nbsp;context,
-                        java.util.concurrent.Callable&lt;T&gt;&nbsp;task)</PRE>
-<DL>
-<DD>Executed in the main thread, returns the result of an execution. Anything that runs here should
- finish quickly to avoid hanging the UI thread.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="run(Context, java.lang.Runnable)"><!-- --></A><H3>
-run</H3>
-<PRE>
-public static void <B>run</B>(Context&nbsp;context,
-                       java.lang.Runnable&nbsp;task)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/MainThread.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/Log.html" title="class in com.googlecode.android_scripting"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/NotificationIdFactory.html" title="class in com.googlecode.android_scripting"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/googlecode/android_scripting/MainThread.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="MainThread.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/NotificationIdFactory.html b/doc/com/googlecode/android_scripting/NotificationIdFactory.html
deleted file mode 100644
index e73c42d5..00000000
--- a/doc/com/googlecode/android_scripting/NotificationIdFactory.html
+++ /dev/null
@@ -1,228 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:00:58 PDT 2014 -->
-<TITLE>
-NotificationIdFactory
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="NotificationIdFactory";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/NotificationIdFactory.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/MainThread.html" title="class in com.googlecode.android_scripting"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/Process.html" title="class in com.googlecode.android_scripting"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/googlecode/android_scripting/NotificationIdFactory.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="NotificationIdFactory.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting</FONT>
-<BR>
-Class NotificationIdFactory</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.NotificationIdFactory</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public final class <B>NotificationIdFactory</B><DT>extends java.lang.Object</DL>
-</PRE>
-
-<P>
-Creates unique ids to identify the notifications created by the android scripting service and the
- trigger service.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Felix Arends (felix.arends@gmail.com)</DD>
-</DL>
-<HR>
-
-<P>
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/NotificationIdFactory.html#create()">create</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="create()"><!-- --></A><H3>
-create</H3>
-<PRE>
-public static int <B>create</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/NotificationIdFactory.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/MainThread.html" title="class in com.googlecode.android_scripting"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/Process.html" title="class in com.googlecode.android_scripting"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/googlecode/android_scripting/NotificationIdFactory.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="NotificationIdFactory.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/Process.html b/doc/com/googlecode/android_scripting/Process.html
deleted file mode 100644
index 34fc3450..00000000
--- a/doc/com/googlecode/android_scripting/Process.html
+++ /dev/null
@@ -1,580 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:00:58 PDT 2014 -->
-<TITLE>
-Process
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Process";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/Process.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/NotificationIdFactory.html" title="class in com.googlecode.android_scripting"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/ScriptLauncher.html" title="class in com.googlecode.android_scripting"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/googlecode/android_scripting/Process.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="Process.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting</FONT>
-<BR>
-Class Process</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.Process</B>
-</PRE>
-<DL>
-<DT><B>Direct Known Subclasses:</B> <DD><A HREF="../../../com/googlecode/android_scripting/interpreter/InterpreterProcess.html" title="class in com.googlecode.android_scripting.interpreter">InterpreterProcess</A></DD>
-</DL>
-<HR>
-<DL>
-<DT><PRE>public class <B>Process</B><DT>extends java.lang.Object</DL>
-</PRE>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Process.html#Process()">Process</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Process.html#addAllArguments(java.util.List)">addAllArguments</A></B>(java.util.List&lt;java.lang.String&gt;&nbsp;arguments)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Process.html#addArgument(java.lang.String)">addArgument</A></B>(java.lang.String&nbsp;argument)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.io.OutputStream</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Process.html#getErr()">getErr</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.io.FileDescriptor</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Process.html#getFd()">getFd</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.io.InputStream</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Process.html#getIn()">getIn</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.io.File</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Process.html#getLogFile()">getLogFile</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Process.html#getName()">getName</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.io.OutputStream</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Process.html#getOut()">getOut</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.Integer</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Process.html#getPid()">getPid</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Process.html#getUptime()">getUptime</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Process.html#getWorkingDirectory()">getWorkingDirectory</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Process.html#isAlive()">isAlive</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Process.html#kill()">kill</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Process.html#putAllEnvironmentVariables(java.util.Map)">putAllEnvironmentVariables</A></B>(java.util.Map&lt;java.lang.String,java.lang.String&gt;&nbsp;environment)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Process.html#putEnvironmentVariable(java.lang.String, java.lang.String)">putEnvironmentVariable</A></B>(java.lang.String&nbsp;key,
-                       java.lang.String&nbsp;value)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Process.html#setBinary(java.io.File)">setBinary</A></B>(java.io.File&nbsp;binary)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Process.html#setName(java.lang.String)">setName</A></B>(java.lang.String&nbsp;name)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Process.html#start(java.lang.Runnable)">start</A></B>(java.lang.Runnable&nbsp;shutdownHook)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="Process()"><!-- --></A><H3>
-Process</H3>
-<PRE>
-public <B>Process</B>()</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="addArgument(java.lang.String)"><!-- --></A><H3>
-addArgument</H3>
-<PRE>
-public void <B>addArgument</B>(java.lang.String&nbsp;argument)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="addAllArguments(java.util.List)"><!-- --></A><H3>
-addAllArguments</H3>
-<PRE>
-public void <B>addAllArguments</B>(java.util.List&lt;java.lang.String&gt;&nbsp;arguments)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="putAllEnvironmentVariables(java.util.Map)"><!-- --></A><H3>
-putAllEnvironmentVariables</H3>
-<PRE>
-public void <B>putAllEnvironmentVariables</B>(java.util.Map&lt;java.lang.String,java.lang.String&gt;&nbsp;environment)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="putEnvironmentVariable(java.lang.String, java.lang.String)"><!-- --></A><H3>
-putEnvironmentVariable</H3>
-<PRE>
-public void <B>putEnvironmentVariable</B>(java.lang.String&nbsp;key,
-                                   java.lang.String&nbsp;value)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setBinary(java.io.File)"><!-- --></A><H3>
-setBinary</H3>
-<PRE>
-public void <B>setBinary</B>(java.io.File&nbsp;binary)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getPid()"><!-- --></A><H3>
-getPid</H3>
-<PRE>
-public java.lang.Integer <B>getPid</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getFd()"><!-- --></A><H3>
-getFd</H3>
-<PRE>
-public java.io.FileDescriptor <B>getFd</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getOut()"><!-- --></A><H3>
-getOut</H3>
-<PRE>
-public java.io.OutputStream <B>getOut</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getErr()"><!-- --></A><H3>
-getErr</H3>
-<PRE>
-public java.io.OutputStream <B>getErr</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getLogFile()"><!-- --></A><H3>
-getLogFile</H3>
-<PRE>
-public java.io.File <B>getLogFile</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getIn()"><!-- --></A><H3>
-getIn</H3>
-<PRE>
-public java.io.InputStream <B>getIn</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="start(java.lang.Runnable)"><!-- --></A><H3>
-start</H3>
-<PRE>
-public void <B>start</B>(java.lang.Runnable&nbsp;shutdownHook)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="kill()"><!-- --></A><H3>
-kill</H3>
-<PRE>
-public void <B>kill</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isAlive()"><!-- --></A><H3>
-isAlive</H3>
-<PRE>
-public boolean <B>isAlive</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getUptime()"><!-- --></A><H3>
-getUptime</H3>
-<PRE>
-public java.lang.String <B>getUptime</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getName()"><!-- --></A><H3>
-getName</H3>
-<PRE>
-public java.lang.String <B>getName</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setName(java.lang.String)"><!-- --></A><H3>
-setName</H3>
-<PRE>
-public void <B>setName</B>(java.lang.String&nbsp;name)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getWorkingDirectory()"><!-- --></A><H3>
-getWorkingDirectory</H3>
-<PRE>
-public java.lang.String <B>getWorkingDirectory</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/Process.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/NotificationIdFactory.html" title="class in com.googlecode.android_scripting"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/ScriptLauncher.html" title="class in com.googlecode.android_scripting"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/googlecode/android_scripting/Process.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="Process.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/ScriptLauncher.html b/doc/com/googlecode/android_scripting/ScriptLauncher.html
deleted file mode 100644
index 303f2292..00000000
--- a/doc/com/googlecode/android_scripting/ScriptLauncher.html
+++ /dev/null
@@ -1,275 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:00:58 PDT 2014 -->
-<TITLE>
-ScriptLauncher
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="ScriptLauncher";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ScriptLauncher.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/Process.html" title="class in com.googlecode.android_scripting"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/ScriptProcess.html" title="class in com.googlecode.android_scripting"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/googlecode/android_scripting/ScriptLauncher.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ScriptLauncher.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting</FONT>
-<BR>
-Class ScriptLauncher</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.ScriptLauncher</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>ScriptLauncher</B><DT>extends java.lang.Object</DL>
-</PRE>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;<A HREF="../../../com/googlecode/android_scripting/interpreter/html/HtmlActivityTask.html" title="class in com.googlecode.android_scripting.interpreter.html">HtmlActivityTask</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/ScriptLauncher.html#launchHtmlScript(java.io.File, Service, Intent, com.googlecode.android_scripting.interpreter.InterpreterConfiguration)">launchHtmlScript</A></B>(java.io.File&nbsp;script,
-                 Service&nbsp;service,
-                 Intent&nbsp;intent,
-                 <A HREF="../../../com/googlecode/android_scripting/interpreter/InterpreterConfiguration.html" title="class in com.googlecode.android_scripting.interpreter">InterpreterConfiguration</A>&nbsp;config)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;<A HREF="../../../com/googlecode/android_scripting/interpreter/InterpreterProcess.html" title="class in com.googlecode.android_scripting.interpreter">InterpreterProcess</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/ScriptLauncher.html#launchInterpreter(com.googlecode.android_scripting.AndroidProxy, Intent, com.googlecode.android_scripting.interpreter.InterpreterConfiguration, java.lang.Runnable)">launchInterpreter</A></B>(<A HREF="../../../com/googlecode/android_scripting/AndroidProxy.html" title="class in com.googlecode.android_scripting">AndroidProxy</A>&nbsp;proxy,
-                  Intent&nbsp;intent,
-                  <A HREF="../../../com/googlecode/android_scripting/interpreter/InterpreterConfiguration.html" title="class in com.googlecode.android_scripting.interpreter">InterpreterConfiguration</A>&nbsp;config,
-                  java.lang.Runnable&nbsp;shutdownHook)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;<A HREF="../../../com/googlecode/android_scripting/ScriptProcess.html" title="class in com.googlecode.android_scripting">ScriptProcess</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/ScriptLauncher.html#launchScript(java.io.File, com.googlecode.android_scripting.interpreter.InterpreterConfiguration, com.googlecode.android_scripting.AndroidProxy, java.lang.Runnable)">launchScript</A></B>(java.io.File&nbsp;script,
-             <A HREF="../../../com/googlecode/android_scripting/interpreter/InterpreterConfiguration.html" title="class in com.googlecode.android_scripting.interpreter">InterpreterConfiguration</A>&nbsp;configuration,
-             <A HREF="../../../com/googlecode/android_scripting/AndroidProxy.html" title="class in com.googlecode.android_scripting">AndroidProxy</A>&nbsp;proxy,
-             java.lang.Runnable&nbsp;shutdownHook)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="launchHtmlScript(java.io.File, Service, Intent, com.googlecode.android_scripting.interpreter.InterpreterConfiguration)"><!-- --></A><H3>
-launchHtmlScript</H3>
-<PRE>
-public static <A HREF="../../../com/googlecode/android_scripting/interpreter/html/HtmlActivityTask.html" title="class in com.googlecode.android_scripting.interpreter.html">HtmlActivityTask</A> <B>launchHtmlScript</B>(java.io.File&nbsp;script,
-                                                Service&nbsp;service,
-                                                Intent&nbsp;intent,
-                                                <A HREF="../../../com/googlecode/android_scripting/interpreter/InterpreterConfiguration.html" title="class in com.googlecode.android_scripting.interpreter">InterpreterConfiguration</A>&nbsp;config)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="launchInterpreter(com.googlecode.android_scripting.AndroidProxy, Intent, com.googlecode.android_scripting.interpreter.InterpreterConfiguration, java.lang.Runnable)"><!-- --></A><H3>
-launchInterpreter</H3>
-<PRE>
-public static <A HREF="../../../com/googlecode/android_scripting/interpreter/InterpreterProcess.html" title="class in com.googlecode.android_scripting.interpreter">InterpreterProcess</A> <B>launchInterpreter</B>(<A HREF="../../../com/googlecode/android_scripting/AndroidProxy.html" title="class in com.googlecode.android_scripting">AndroidProxy</A>&nbsp;proxy,
-                                                   Intent&nbsp;intent,
-                                                   <A HREF="../../../com/googlecode/android_scripting/interpreter/InterpreterConfiguration.html" title="class in com.googlecode.android_scripting.interpreter">InterpreterConfiguration</A>&nbsp;config,
-                                                   java.lang.Runnable&nbsp;shutdownHook)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="launchScript(java.io.File, com.googlecode.android_scripting.interpreter.InterpreterConfiguration, com.googlecode.android_scripting.AndroidProxy, java.lang.Runnable)"><!-- --></A><H3>
-launchScript</H3>
-<PRE>
-public static <A HREF="../../../com/googlecode/android_scripting/ScriptProcess.html" title="class in com.googlecode.android_scripting">ScriptProcess</A> <B>launchScript</B>(java.io.File&nbsp;script,
-                                         <A HREF="../../../com/googlecode/android_scripting/interpreter/InterpreterConfiguration.html" title="class in com.googlecode.android_scripting.interpreter">InterpreterConfiguration</A>&nbsp;configuration,
-                                         <A HREF="../../../com/googlecode/android_scripting/AndroidProxy.html" title="class in com.googlecode.android_scripting">AndroidProxy</A>&nbsp;proxy,
-                                         java.lang.Runnable&nbsp;shutdownHook)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ScriptLauncher.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/Process.html" title="class in com.googlecode.android_scripting"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/ScriptProcess.html" title="class in com.googlecode.android_scripting"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/googlecode/android_scripting/ScriptLauncher.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ScriptLauncher.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/ScriptProcess.html b/doc/com/googlecode/android_scripting/ScriptProcess.html
deleted file mode 100644
index 582128e2..00000000
--- a/doc/com/googlecode/android_scripting/ScriptProcess.html
+++ /dev/null
@@ -1,276 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:00:58 PDT 2014 -->
-<TITLE>
-ScriptProcess
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="ScriptProcess";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ScriptProcess.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/ScriptLauncher.html" title="class in com.googlecode.android_scripting"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/ScriptStorageAdapter.html" title="class in com.googlecode.android_scripting"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/googlecode/android_scripting/ScriptProcess.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ScriptProcess.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting</FONT>
-<BR>
-Class ScriptProcess</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../com/googlecode/android_scripting/Process.html" title="class in com.googlecode.android_scripting">com.googlecode.android_scripting.Process</A>
-      <IMG SRC="../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../com/googlecode/android_scripting/interpreter/InterpreterProcess.html" title="class in com.googlecode.android_scripting.interpreter">com.googlecode.android_scripting.interpreter.InterpreterProcess</A>
-          <IMG SRC="../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.ScriptProcess</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>ScriptProcess</B><DT>extends <A HREF="../../../com/googlecode/android_scripting/interpreter/InterpreterProcess.html" title="class in com.googlecode.android_scripting.interpreter">InterpreterProcess</A></DL>
-</PRE>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/ScriptProcess.html#ScriptProcess(java.io.File, com.googlecode.android_scripting.interpreter.InterpreterConfiguration, com.googlecode.android_scripting.AndroidProxy)">ScriptProcess</A></B>(java.io.File&nbsp;script,
-              <A HREF="../../../com/googlecode/android_scripting/interpreter/InterpreterConfiguration.html" title="class in com.googlecode.android_scripting.interpreter">InterpreterConfiguration</A>&nbsp;configuration,
-              <A HREF="../../../com/googlecode/android_scripting/AndroidProxy.html" title="class in com.googlecode.android_scripting">AndroidProxy</A>&nbsp;proxy)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/ScriptProcess.html#getPath()">getPath</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_com.googlecode.android_scripting.interpreter.InterpreterProcess"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class com.googlecode.android_scripting.interpreter.<A HREF="../../../com/googlecode/android_scripting/interpreter/InterpreterProcess.html" title="class in com.googlecode.android_scripting.interpreter">InterpreterProcess</A></B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../com/googlecode/android_scripting/interpreter/InterpreterProcess.html#getAddress()">getAddress</A>, <A HREF="../../../com/googlecode/android_scripting/interpreter/InterpreterProcess.html#getHost()">getHost</A>, <A HREF="../../../com/googlecode/android_scripting/interpreter/InterpreterProcess.html#getInterpreter()">getInterpreter</A>, <A HREF="../../../com/googlecode/android_scripting/interpreter/InterpreterProcess.html#getPort()">getPort</A>, <A HREF="../../../com/googlecode/android_scripting/interpreter/InterpreterProcess.html#getRpcReceiverManagerFactory()">getRpcReceiverManagerFactory</A>, <A HREF="../../../com/googlecode/android_scripting/interpreter/InterpreterProcess.html#getSecret()">getSecret</A>, <A HREF="../../../com/googlecode/android_scripting/interpreter/InterpreterProcess.html#getWorkingDirectory()">getWorkingDirectory</A>, <A HREF="../../../com/googlecode/android_scripting/interpreter/InterpreterProcess.html#kill()">kill</A>, <A HREF="../../../com/googlecode/android_scripting/interpreter/InterpreterProcess.html#start(java.lang.Runnable)">start</A></CODE></TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_com.googlecode.android_scripting.Process"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class com.googlecode.android_scripting.<A HREF="../../../com/googlecode/android_scripting/Process.html" title="class in com.googlecode.android_scripting">Process</A></B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../com/googlecode/android_scripting/Process.html#addAllArguments(java.util.List)">addAllArguments</A>, <A HREF="../../../com/googlecode/android_scripting/Process.html#addArgument(java.lang.String)">addArgument</A>, <A HREF="../../../com/googlecode/android_scripting/Process.html#getErr()">getErr</A>, <A HREF="../../../com/googlecode/android_scripting/Process.html#getFd()">getFd</A>, <A HREF="../../../com/googlecode/android_scripting/Process.html#getIn()">getIn</A>, <A HREF="../../../com/googlecode/android_scripting/Process.html#getLogFile()">getLogFile</A>, <A HREF="../../../com/googlecode/android_scripting/Process.html#getName()">getName</A>, <A HREF="../../../com/googlecode/android_scripting/Process.html#getOut()">getOut</A>, <A HREF="../../../com/googlecode/android_scripting/Process.html#getPid()">getPid</A>, <A HREF="../../../com/googlecode/android_scripting/Process.html#getUptime()">getUptime</A>, <A HREF="../../../com/googlecode/android_scripting/Process.html#isAlive()">isAlive</A>, <A HREF="../../../com/googlecode/android_scripting/Process.html#putAllEnvironmentVariables(java.util.Map)">putAllEnvironmentVariables</A>, <A HREF="../../../com/googlecode/android_scripting/Process.html#putEnvironmentVariable(java.lang.String, java.lang.String)">putEnvironmentVariable</A>, <A HREF="../../../com/googlecode/android_scripting/Process.html#setBinary(java.io.File)">setBinary</A>, <A HREF="../../../com/googlecode/android_scripting/Process.html#setName(java.lang.String)">setName</A></CODE></TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="ScriptProcess(java.io.File, com.googlecode.android_scripting.interpreter.InterpreterConfiguration, com.googlecode.android_scripting.AndroidProxy)"><!-- --></A><H3>
-ScriptProcess</H3>
-<PRE>
-public <B>ScriptProcess</B>(java.io.File&nbsp;script,
-                     <A HREF="../../../com/googlecode/android_scripting/interpreter/InterpreterConfiguration.html" title="class in com.googlecode.android_scripting.interpreter">InterpreterConfiguration</A>&nbsp;configuration,
-                     <A HREF="../../../com/googlecode/android_scripting/AndroidProxy.html" title="class in com.googlecode.android_scripting">AndroidProxy</A>&nbsp;proxy)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="getPath()"><!-- --></A><H3>
-getPath</H3>
-<PRE>
-public java.lang.String <B>getPath</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ScriptProcess.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/ScriptLauncher.html" title="class in com.googlecode.android_scripting"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/ScriptStorageAdapter.html" title="class in com.googlecode.android_scripting"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/googlecode/android_scripting/ScriptProcess.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ScriptProcess.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/ScriptStorageAdapter.html b/doc/com/googlecode/android_scripting/ScriptStorageAdapter.html
deleted file mode 100644
index 23704e5f..00000000
--- a/doc/com/googlecode/android_scripting/ScriptStorageAdapter.html
+++ /dev/null
@@ -1,302 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:00:58 PDT 2014 -->
-<TITLE>
-ScriptStorageAdapter
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="ScriptStorageAdapter";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ScriptStorageAdapter.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/ScriptProcess.html" title="class in com.googlecode.android_scripting"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/SimpleServer.html" title="class in com.googlecode.android_scripting"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/googlecode/android_scripting/ScriptStorageAdapter.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ScriptStorageAdapter.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting</FONT>
-<BR>
-Class ScriptStorageAdapter</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.ScriptStorageAdapter</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>ScriptStorageAdapter</B><DT>extends java.lang.Object</DL>
-</PRE>
-
-<P>
-Manages storage and retrieval of scripts on the file system.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Damon Kohler (damonkohler@gmail.com)</DD>
-</DL>
-<HR>
-
-<P>
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.util.List&lt;java.io.File&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/ScriptStorageAdapter.html#listAllScripts(java.io.File)">listAllScripts</A></B>(java.io.File&nbsp;dir)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns a list of all available script <CODE>File</CODE>s.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.util.List&lt;java.io.File&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/ScriptStorageAdapter.html#listExecutableScripts(java.io.File, com.googlecode.android_scripting.interpreter.InterpreterConfiguration)">listExecutableScripts</A></B>(java.io.File&nbsp;directory,
-                      <A HREF="../../../com/googlecode/android_scripting/interpreter/InterpreterConfiguration.html" title="class in com.googlecode.android_scripting.interpreter">InterpreterConfiguration</A>&nbsp;config)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns a list of script <CODE>File</CODE>s from the given folder for which there is an interpreter
- installed.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.util.List&lt;java.io.File&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/ScriptStorageAdapter.html#listExecutableScriptsRecursively(java.io.File, com.googlecode.android_scripting.interpreter.InterpreterConfiguration)">listExecutableScriptsRecursively</A></B>(java.io.File&nbsp;directory,
-                                 <A HREF="../../../com/googlecode/android_scripting/interpreter/InterpreterConfiguration.html" title="class in com.googlecode.android_scripting.interpreter">InterpreterConfiguration</A>&nbsp;config)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns a list of all (including subfolders) script <CODE>File</CODE>s for which there is an
- interpreter installed.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/ScriptStorageAdapter.html#writeScript(java.io.File, java.lang.String)">writeScript</A></B>(java.io.File&nbsp;script,
-            java.lang.String&nbsp;data)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Writes data to the script by name and overwrites any existing data.</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="writeScript(java.io.File, java.lang.String)"><!-- --></A><H3>
-writeScript</H3>
-<PRE>
-public static void <B>writeScript</B>(java.io.File&nbsp;script,
-                               java.lang.String&nbsp;data)</PRE>
-<DL>
-<DD>Writes data to the script by name and overwrites any existing data.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="listAllScripts(java.io.File)"><!-- --></A><H3>
-listAllScripts</H3>
-<PRE>
-public static java.util.List&lt;java.io.File&gt; <B>listAllScripts</B>(java.io.File&nbsp;dir)</PRE>
-<DL>
-<DD>Returns a list of all available script <CODE>File</CODE>s.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="listExecutableScripts(java.io.File, com.googlecode.android_scripting.interpreter.InterpreterConfiguration)"><!-- --></A><H3>
-listExecutableScripts</H3>
-<PRE>
-public static java.util.List&lt;java.io.File&gt; <B>listExecutableScripts</B>(java.io.File&nbsp;directory,
-                                                                 <A HREF="../../../com/googlecode/android_scripting/interpreter/InterpreterConfiguration.html" title="class in com.googlecode.android_scripting.interpreter">InterpreterConfiguration</A>&nbsp;config)</PRE>
-<DL>
-<DD>Returns a list of script <CODE>File</CODE>s from the given folder for which there is an interpreter
- installed.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="listExecutableScriptsRecursively(java.io.File, com.googlecode.android_scripting.interpreter.InterpreterConfiguration)"><!-- --></A><H3>
-listExecutableScriptsRecursively</H3>
-<PRE>
-public static java.util.List&lt;java.io.File&gt; <B>listExecutableScriptsRecursively</B>(java.io.File&nbsp;directory,
-                                                                            <A HREF="../../../com/googlecode/android_scripting/interpreter/InterpreterConfiguration.html" title="class in com.googlecode.android_scripting.interpreter">InterpreterConfiguration</A>&nbsp;config)</PRE>
-<DL>
-<DD>Returns a list of all (including subfolders) script <CODE>File</CODE>s for which there is an
- interpreter installed.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ScriptStorageAdapter.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/ScriptProcess.html" title="class in com.googlecode.android_scripting"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/SimpleServer.html" title="class in com.googlecode.android_scripting"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/googlecode/android_scripting/ScriptStorageAdapter.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ScriptStorageAdapter.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/SimpleServer.SimpleServerObserver.html b/doc/com/googlecode/android_scripting/SimpleServer.SimpleServerObserver.html
deleted file mode 100644
index 372e5857..00000000
--- a/doc/com/googlecode/android_scripting/SimpleServer.SimpleServerObserver.html
+++ /dev/null
@@ -1,228 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:00:58 PDT 2014 -->
-<TITLE>
-SimpleServer.SimpleServerObserver
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="SimpleServer.SimpleServerObserver";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/SimpleServer.SimpleServerObserver.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/SimpleServer.html" title="class in com.googlecode.android_scripting"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/SingleThreadExecutor.html" title="class in com.googlecode.android_scripting"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/googlecode/android_scripting/SimpleServer.SimpleServerObserver.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="SimpleServer.SimpleServerObserver.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting</FONT>
-<BR>
-Interface SimpleServer.SimpleServerObserver</H2>
-<DL>
-<DT><B>Enclosing class:</B><DD><A HREF="../../../com/googlecode/android_scripting/SimpleServer.html" title="class in com.googlecode.android_scripting">SimpleServer</A></DD>
-</DL>
-<HR>
-<DL>
-<DT><PRE>public static interface <B>SimpleServer.SimpleServerObserver</B></DL>
-</PRE>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/SimpleServer.SimpleServerObserver.html#onConnect()">onConnect</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/SimpleServer.SimpleServerObserver.html#onDisconnect()">onDisconnect</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="onConnect()"><!-- --></A><H3>
-onConnect</H3>
-<PRE>
-void <B>onConnect</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="onDisconnect()"><!-- --></A><H3>
-onDisconnect</H3>
-<PRE>
-void <B>onDisconnect</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/SimpleServer.SimpleServerObserver.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/SimpleServer.html" title="class in com.googlecode.android_scripting"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/SingleThreadExecutor.html" title="class in com.googlecode.android_scripting"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/googlecode/android_scripting/SimpleServer.SimpleServerObserver.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="SimpleServer.SimpleServerObserver.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/SimpleServer.html b/doc/com/googlecode/android_scripting/SimpleServer.html
deleted file mode 100644
index 18c6d60a..00000000
--- a/doc/com/googlecode/android_scripting/SimpleServer.html
+++ /dev/null
@@ -1,433 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:00:58 PDT 2014 -->
-<TITLE>
-SimpleServer
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="SimpleServer";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/SimpleServer.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/ScriptStorageAdapter.html" title="class in com.googlecode.android_scripting"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/SimpleServer.SimpleServerObserver.html" title="interface in com.googlecode.android_scripting"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/googlecode/android_scripting/SimpleServer.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="SimpleServer.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#nested_class_summary">NESTED</A>&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting</FONT>
-<BR>
-Class SimpleServer</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.SimpleServer</B>
-</PRE>
-<DL>
-<DT><B>Direct Known Subclasses:</B> <DD><A HREF="../../../com/googlecode/android_scripting/facade/EventServer.html" title="class in com.googlecode.android_scripting.facade">EventServer</A>, <A HREF="../../../com/googlecode/android_scripting/jsonrpc/JsonRpcServer.html" title="class in com.googlecode.android_scripting.jsonrpc">JsonRpcServer</A></DD>
-</DL>
-<HR>
-<DL>
-<DT><PRE>public abstract class <B>SimpleServer</B><DT>extends java.lang.Object</DL>
-</PRE>
-
-<P>
-A simple server.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Damon Kohler (damonkohler@gmail.com)</DD>
-</DL>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-<A NAME="nested_class_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Nested Class Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;interface</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/SimpleServer.SimpleServerObserver.html" title="interface in com.googlecode.android_scripting">SimpleServer.SimpleServerObserver</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/SimpleServer.html#SimpleServer()">SimpleServer</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/SimpleServer.html#addObserver(com.googlecode.android_scripting.SimpleServer.SimpleServerObserver)">addObserver</A></B>(<A HREF="../../../com/googlecode/android_scripting/SimpleServer.SimpleServerObserver.html" title="interface in com.googlecode.android_scripting">SimpleServer.SimpleServerObserver</A>&nbsp;observer)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Adds an observer.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/SimpleServer.html#getNumberOfConnections()">getNumberOfConnections</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the number of active connections to this server.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.net.InetAddress</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/SimpleServer.html#getPublicInetAddress()">getPublicInetAddress</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/SimpleServer.html#removeObserver(com.googlecode.android_scripting.SimpleServer.SimpleServerObserver)">removeObserver</A></B>(<A HREF="../../../com/googlecode/android_scripting/SimpleServer.SimpleServerObserver.html" title="interface in com.googlecode.android_scripting">SimpleServer.SimpleServerObserver</A>&nbsp;observer)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Removes an observer.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/SimpleServer.html#shutdown()">shutdown</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.net.InetSocketAddress</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/SimpleServer.html#startAllInterfaces(int)">startAllInterfaces</A></B>(int&nbsp;port)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;data Starts the RPC server bound to all interfaces</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.net.InetSocketAddress</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/SimpleServer.html#startLocal(int)">startLocal</A></B>(int&nbsp;port)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Starts the RPC server bound to the localhost address.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.net.InetSocketAddress</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/SimpleServer.html#startPublic(int)">startPublic</A></B>(int&nbsp;port)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;data Starts the RPC server bound to the public facing address.</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="SimpleServer()"><!-- --></A><H3>
-SimpleServer</H3>
-<PRE>
-public <B>SimpleServer</B>()</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="addObserver(com.googlecode.android_scripting.SimpleServer.SimpleServerObserver)"><!-- --></A><H3>
-addObserver</H3>
-<PRE>
-public void <B>addObserver</B>(<A HREF="../../../com/googlecode/android_scripting/SimpleServer.SimpleServerObserver.html" title="interface in com.googlecode.android_scripting">SimpleServer.SimpleServerObserver</A>&nbsp;observer)</PRE>
-<DL>
-<DD>Adds an observer.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="removeObserver(com.googlecode.android_scripting.SimpleServer.SimpleServerObserver)"><!-- --></A><H3>
-removeObserver</H3>
-<PRE>
-public void <B>removeObserver</B>(<A HREF="../../../com/googlecode/android_scripting/SimpleServer.SimpleServerObserver.html" title="interface in com.googlecode.android_scripting">SimpleServer.SimpleServerObserver</A>&nbsp;observer)</PRE>
-<DL>
-<DD>Removes an observer.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getNumberOfConnections()"><!-- --></A><H3>
-getNumberOfConnections</H3>
-<PRE>
-public int <B>getNumberOfConnections</B>()</PRE>
-<DL>
-<DD>Returns the number of active connections to this server.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getPublicInetAddress()"><!-- --></A><H3>
-getPublicInetAddress</H3>
-<PRE>
-public static java.net.InetAddress <B>getPublicInetAddress</B>()
-                                                 throws java.net.UnknownHostException,
-                                                        java.net.SocketException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.net.UnknownHostException</CODE>
-<DD><CODE>java.net.SocketException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="startLocal(int)"><!-- --></A><H3>
-startLocal</H3>
-<PRE>
-public java.net.InetSocketAddress <B>startLocal</B>(int&nbsp;port)</PRE>
-<DL>
-<DD>Starts the RPC server bound to the localhost address.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>port</CODE> - the port to bind to or 0 to pick any unused port
-<DT><B>Returns:</B><DD>the port that the server is bound to</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="startPublic(int)"><!-- --></A><H3>
-startPublic</H3>
-<PRE>
-public java.net.InetSocketAddress <B>startPublic</B>(int&nbsp;port)</PRE>
-<DL>
-<DD>data Starts the RPC server bound to the public facing address.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>port</CODE> - the port to bind to or 0 to pick any unused port
-<DT><B>Returns:</B><DD>the port that the server is bound to</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="startAllInterfaces(int)"><!-- --></A><H3>
-startAllInterfaces</H3>
-<PRE>
-public java.net.InetSocketAddress <B>startAllInterfaces</B>(int&nbsp;port)</PRE>
-<DL>
-<DD>data Starts the RPC server bound to all interfaces
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>port</CODE> - the port to bind to or 0 to pick any unused port
-<DT><B>Returns:</B><DD>the port that the server is bound to</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="shutdown()"><!-- --></A><H3>
-shutdown</H3>
-<PRE>
-public void <B>shutdown</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/SimpleServer.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/ScriptStorageAdapter.html" title="class in com.googlecode.android_scripting"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/SimpleServer.SimpleServerObserver.html" title="interface in com.googlecode.android_scripting"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/googlecode/android_scripting/SimpleServer.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="SimpleServer.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#nested_class_summary">NESTED</A>&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/SingleThreadExecutor.html b/doc/com/googlecode/android_scripting/SingleThreadExecutor.html
deleted file mode 100644
index 9f2096f9..00000000
--- a/doc/com/googlecode/android_scripting/SingleThreadExecutor.html
+++ /dev/null
@@ -1,266 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:00:58 PDT 2014 -->
-<TITLE>
-SingleThreadExecutor
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="SingleThreadExecutor";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/SingleThreadExecutor.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/SimpleServer.SimpleServerObserver.html" title="interface in com.googlecode.android_scripting"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/StringUtils.html" title="class in com.googlecode.android_scripting"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/googlecode/android_scripting/SingleThreadExecutor.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="SingleThreadExecutor.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#nested_classes_inherited_from_class_java.util.concurrent.ThreadPoolExecutor">NESTED</A>&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#methods_inherited_from_class_java.util.concurrent.ThreadPoolExecutor">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting</FONT>
-<BR>
-Class SingleThreadExecutor</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../resources/inherit.gif" ALT="extended by ">java.util.concurrent.AbstractExecutorService
-      <IMG SRC="../../../resources/inherit.gif" ALT="extended by ">java.util.concurrent.ThreadPoolExecutor
-          <IMG SRC="../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.SingleThreadExecutor</B>
-</PRE>
-<DL>
-<DT><B>All Implemented Interfaces:</B> <DD>java.util.concurrent.Executor, java.util.concurrent.ExecutorService</DD>
-</DL>
-<HR>
-<DL>
-<DT><PRE>public class <B>SingleThreadExecutor</B><DT>extends java.util.concurrent.ThreadPoolExecutor</DL>
-</PRE>
-
-<P>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-<A NAME="nested_class_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Nested Class Summary</B></FONT></TH>
-</TR>
-</TABLE>
-&nbsp;<A NAME="nested_classes_inherited_from_class_java.util.concurrent.ThreadPoolExecutor"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Nested classes/interfaces inherited from class java.util.concurrent.ThreadPoolExecutor</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>java.util.concurrent.ThreadPoolExecutor.AbortPolicy, java.util.concurrent.ThreadPoolExecutor.CallerRunsPolicy, java.util.concurrent.ThreadPoolExecutor.DiscardOldestPolicy, java.util.concurrent.ThreadPoolExecutor.DiscardPolicy</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/SingleThreadExecutor.html#SingleThreadExecutor()">SingleThreadExecutor</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.util.concurrent.ThreadPoolExecutor"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.util.concurrent.ThreadPoolExecutor</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>allowCoreThreadTimeOut, allowsCoreThreadTimeOut, awaitTermination, execute, getActiveCount, getCompletedTaskCount, getCorePoolSize, getKeepAliveTime, getLargestPoolSize, getMaximumPoolSize, getPoolSize, getQueue, getRejectedExecutionHandler, getTaskCount, getThreadFactory, isShutdown, isTerminated, isTerminating, prestartAllCoreThreads, prestartCoreThread, purge, remove, setCorePoolSize, setKeepAliveTime, setMaximumPoolSize, setRejectedExecutionHandler, setThreadFactory, shutdown, shutdownNow</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.util.concurrent.AbstractExecutorService"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.util.concurrent.AbstractExecutorService</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>invokeAll, invokeAll, invokeAny, invokeAny, submit, submit, submit</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="SingleThreadExecutor()"><!-- --></A><H3>
-SingleThreadExecutor</H3>
-<PRE>
-public <B>SingleThreadExecutor</B>()</PRE>
-<DL>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/SingleThreadExecutor.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/SimpleServer.SimpleServerObserver.html" title="interface in com.googlecode.android_scripting"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/StringUtils.html" title="class in com.googlecode.android_scripting"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/googlecode/android_scripting/SingleThreadExecutor.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="SingleThreadExecutor.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#nested_classes_inherited_from_class_java.util.concurrent.ThreadPoolExecutor">NESTED</A>&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#methods_inherited_from_class_java.util.concurrent.ThreadPoolExecutor">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/StringUtils.html b/doc/com/googlecode/android_scripting/StringUtils.html
deleted file mode 100644
index e7d63e52..00000000
--- a/doc/com/googlecode/android_scripting/StringUtils.html
+++ /dev/null
@@ -1,221 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:00:58 PDT 2014 -->
-<TITLE>
-StringUtils
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="StringUtils";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/StringUtils.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/SingleThreadExecutor.html" title="class in com.googlecode.android_scripting"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/Version.html" title="class in com.googlecode.android_scripting"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/googlecode/android_scripting/StringUtils.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="StringUtils.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting</FONT>
-<BR>
-Class StringUtils</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.StringUtils</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>StringUtils</B><DT>extends java.lang.Object</DL>
-</PRE>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/StringUtils.html#join(java.util.Collection, java.lang.String)">join</A></B>(java.util.Collection&lt;java.lang.String&gt;&nbsp;collection,
-     java.lang.String&nbsp;delimiter)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="join(java.util.Collection, java.lang.String)"><!-- --></A><H3>
-join</H3>
-<PRE>
-public static java.lang.String <B>join</B>(java.util.Collection&lt;java.lang.String&gt;&nbsp;collection,
-                                    java.lang.String&nbsp;delimiter)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/StringUtils.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/SingleThreadExecutor.html" title="class in com.googlecode.android_scripting"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/Version.html" title="class in com.googlecode.android_scripting"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/googlecode/android_scripting/StringUtils.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="StringUtils.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/Version.html b/doc/com/googlecode/android_scripting/Version.html
deleted file mode 100644
index f3a01b16..00000000
--- a/doc/com/googlecode/android_scripting/Version.html
+++ /dev/null
@@ -1,219 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:00:58 PDT 2014 -->
-<TITLE>
-Version
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Version";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/Version.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/StringUtils.html" title="class in com.googlecode.android_scripting"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/googlecode/android_scripting/Version.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="Version.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting</FONT>
-<BR>
-Class Version</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.Version</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>Version</B><DT>extends java.lang.Object</DL>
-</PRE>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/googlecode/android_scripting/Version.html#getVersion(Context)">getVersion</A></B>(Context&nbsp;context)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="getVersion(Context)"><!-- --></A><H3>
-getVersion</H3>
-<PRE>
-public static java.lang.String <B>getVersion</B>(Context&nbsp;context)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/Version.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/StringUtils.html" title="class in com.googlecode.android_scripting"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/googlecode/android_scripting/Version.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="Version.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/activity/FutureActivity.html b/doc/com/googlecode/android_scripting/activity/FutureActivity.html
deleted file mode 100644
index 219123a8..00000000
--- a/doc/com/googlecode/android_scripting/activity/FutureActivity.html
+++ /dev/null
@@ -1,330 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:03 PDT 2014 -->
-<TITLE>
-FutureActivity
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="FutureActivity";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/FutureActivity.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/activity/FutureActivity.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="FutureActivity.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.activity</FONT>
-<BR>
-Class FutureActivity</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by ">Activity
-      <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.activity.FutureActivity</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>FutureActivity</B><DT>extends Activity</DL>
-</PRE>
-
-<P>
-This <CODE>Activity</CODE> is launched by <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc"><CODE>RpcReceiver</CODE></A>s in order to perform operations that a
- <CODE>Service</CODE> is unable to do. For example: start another activity for result, show dialogs,
- etc.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Damon Kohler (damonkohler@gmail.com)</DD>
-</DL>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/activity/FutureActivity.html#FutureActivity()">FutureActivity</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/activity/FutureActivity.html#onActivityResult(int, int, Intent)">onActivityResult</A></B>(int&nbsp;requestCode,
-                 int&nbsp;resultCode,
-                 Intent&nbsp;data)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/activity/FutureActivity.html#onCreateContextMenu(ContextMenu, View, ContextMenuInfo)">onCreateContextMenu</A></B>(ContextMenu&nbsp;menu,
-                    View&nbsp;v,
-                    ContextMenuInfo&nbsp;menuInfo)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/activity/FutureActivity.html#onKeyDown(int, KeyEvent)">onKeyDown</A></B>(int&nbsp;keyCode,
-          KeyEvent&nbsp;event)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/activity/FutureActivity.html#onPrepareOptionsMenu(Menu)">onPrepareOptionsMenu</A></B>(Menu&nbsp;menu)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="FutureActivity()"><!-- --></A><H3>
-FutureActivity</H3>
-<PRE>
-public <B>FutureActivity</B>()</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="onCreateContextMenu(ContextMenu, View, ContextMenuInfo)"><!-- --></A><H3>
-onCreateContextMenu</H3>
-<PRE>
-public void <B>onCreateContextMenu</B>(ContextMenu&nbsp;menu,
-                                View&nbsp;v,
-                                ContextMenuInfo&nbsp;menuInfo)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="onPrepareOptionsMenu(Menu)"><!-- --></A><H3>
-onPrepareOptionsMenu</H3>
-<PRE>
-public boolean <B>onPrepareOptionsMenu</B>(Menu&nbsp;menu)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="onActivityResult(int, int, Intent)"><!-- --></A><H3>
-onActivityResult</H3>
-<PRE>
-public void <B>onActivityResult</B>(int&nbsp;requestCode,
-                             int&nbsp;resultCode,
-                             Intent&nbsp;data)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="onKeyDown(int, KeyEvent)"><!-- --></A><H3>
-onKeyDown</H3>
-<PRE>
-public boolean <B>onKeyDown</B>(int&nbsp;keyCode,
-                         KeyEvent&nbsp;event)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/FutureActivity.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/activity/FutureActivity.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="FutureActivity.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/activity/package-frame.html b/doc/com/googlecode/android_scripting/activity/package-frame.html
deleted file mode 100644
index bfc13280..00000000
--- a/doc/com/googlecode/android_scripting/activity/package-frame.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-com.googlecode.android_scripting.activity
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-
-</HEAD>
-
-<BODY BGCOLOR="white">
-<FONT size="+1" CLASS="FrameTitleFont">
-<A HREF="../../../../com/googlecode/android_scripting/activity/package-summary.html" target="classFrame">com.googlecode.android_scripting.activity</A></FONT>
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
-Classes</FONT>&nbsp;
-<FONT CLASS="FrameItemFont">
-<BR>
-<A HREF="FutureActivity.html" title="class in com.googlecode.android_scripting.activity" target="classFrame">FutureActivity</A></FONT></TD>
-</TR>
-</TABLE>
-
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/activity/package-summary.html b/doc/com/googlecode/android_scripting/activity/package-summary.html
deleted file mode 100644
index bc7e15d6..00000000
--- a/doc/com/googlecode/android_scripting/activity/package-summary.html
+++ /dev/null
@@ -1,158 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-com.googlecode.android_scripting.activity
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="com.googlecode.android_scripting.activity";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/bluetooth/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/activity/package-summary.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<H2>
-Package com.googlecode.android_scripting.activity
-</H2>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Class Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/activity/FutureActivity.html" title="class in com.googlecode.android_scripting.activity">FutureActivity</A></B></TD>
-<TD>This <CODE>Activity</CODE> is launched by <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc"><CODE>RpcReceiver</CODE></A>s in order to perform operations that a
- <CODE>Service</CODE> is unable to do.</TD>
-</TR>
-</TABLE>
-&nbsp;
-
-<P>
-<DL>
-</DL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/bluetooth/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/activity/package-summary.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/activity/package-tree.html b/doc/com/googlecode/android_scripting/activity/package-tree.html
deleted file mode 100644
index 0fa3a349..00000000
--- a/doc/com/googlecode/android_scripting/activity/package-tree.html
+++ /dev/null
@@ -1,155 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-com.googlecode.android_scripting.activity Class Hierarchy
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="com.googlecode.android_scripting.activity Class Hierarchy";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/package-tree.html"><B>PREV</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/bluetooth/package-tree.html"><B>NEXT</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/activity/package-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-Hierarchy For Package com.googlecode.android_scripting.activity
-</H2>
-</CENTER>
-<DL>
-<DT><B>Package Hierarchies:</B><DD><A HREF="../../../../overview-tree.html">All Packages</A></DL>
-<HR>
-<H2>
-Class Hierarchy
-</H2>
-<UL>
-<LI TYPE="circle">java.lang.Object<UL>
-<LI TYPE="circle">Activity<UL>
-<LI TYPE="circle">com.googlecode.android_scripting.activity.<A HREF="../../../../com/googlecode/android_scripting/activity/FutureActivity.html" title="class in com.googlecode.android_scripting.activity"><B>FutureActivity</B></A></UL>
-</UL>
-</UL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/package-tree.html"><B>PREV</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/bluetooth/package-tree.html"><B>NEXT</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/activity/package-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/bluetooth/BluetoothDiscoveryHelper.BluetoothDiscoveryListener.html b/doc/com/googlecode/android_scripting/bluetooth/BluetoothDiscoveryHelper.BluetoothDiscoveryListener.html
deleted file mode 100644
index c1886890..00000000
--- a/doc/com/googlecode/android_scripting/bluetooth/BluetoothDiscoveryHelper.BluetoothDiscoveryListener.html
+++ /dev/null
@@ -1,251 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:05 PDT 2014 -->
-<TITLE>
-BluetoothDiscoveryHelper.BluetoothDiscoveryListener
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="BluetoothDiscoveryHelper.BluetoothDiscoveryListener";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/BluetoothDiscoveryHelper.BluetoothDiscoveryListener.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/bluetooth/BluetoothDiscoveryHelper.html" title="class in com.googlecode.android_scripting.bluetooth"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/bluetooth/BluetoothDiscoveryHelper.BluetoothDiscoveryListener.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="BluetoothDiscoveryHelper.BluetoothDiscoveryListener.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.bluetooth</FONT>
-<BR>
-Interface BluetoothDiscoveryHelper.BluetoothDiscoveryListener</H2>
-<DL>
-<DT><B>Enclosing class:</B><DD><A HREF="../../../../com/googlecode/android_scripting/bluetooth/BluetoothDiscoveryHelper.html" title="class in com.googlecode.android_scripting.bluetooth">BluetoothDiscoveryHelper</A></DD>
-</DL>
-<HR>
-<DL>
-<DT><PRE>public static interface <B>BluetoothDiscoveryHelper.BluetoothDiscoveryListener</B></DL>
-</PRE>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/bluetooth/BluetoothDiscoveryHelper.BluetoothDiscoveryListener.html#addBondedDevice(java.lang.String, java.lang.String)">addBondedDevice</A></B>(java.lang.String&nbsp;name,
-                java.lang.String&nbsp;address)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/bluetooth/BluetoothDiscoveryHelper.BluetoothDiscoveryListener.html#addDevice(java.lang.String, java.lang.String)">addDevice</A></B>(java.lang.String&nbsp;name,
-          java.lang.String&nbsp;address)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/bluetooth/BluetoothDiscoveryHelper.BluetoothDiscoveryListener.html#scanDone()">scanDone</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="addBondedDevice(java.lang.String, java.lang.String)"><!-- --></A><H3>
-addBondedDevice</H3>
-<PRE>
-void <B>addBondedDevice</B>(java.lang.String&nbsp;name,
-                     java.lang.String&nbsp;address)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="addDevice(java.lang.String, java.lang.String)"><!-- --></A><H3>
-addDevice</H3>
-<PRE>
-void <B>addDevice</B>(java.lang.String&nbsp;name,
-               java.lang.String&nbsp;address)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="scanDone()"><!-- --></A><H3>
-scanDone</H3>
-<PRE>
-void <B>scanDone</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/BluetoothDiscoveryHelper.BluetoothDiscoveryListener.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/bluetooth/BluetoothDiscoveryHelper.html" title="class in com.googlecode.android_scripting.bluetooth"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/bluetooth/BluetoothDiscoveryHelper.BluetoothDiscoveryListener.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="BluetoothDiscoveryHelper.BluetoothDiscoveryListener.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/bluetooth/BluetoothDiscoveryHelper.html b/doc/com/googlecode/android_scripting/bluetooth/BluetoothDiscoveryHelper.html
deleted file mode 100644
index fd87b13a..00000000
--- a/doc/com/googlecode/android_scripting/bluetooth/BluetoothDiscoveryHelper.html
+++ /dev/null
@@ -1,290 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:05 PDT 2014 -->
-<TITLE>
-BluetoothDiscoveryHelper
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="BluetoothDiscoveryHelper";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/BluetoothDiscoveryHelper.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/bluetooth/BluetoothDiscoveryHelper.BluetoothDiscoveryListener.html" title="interface in com.googlecode.android_scripting.bluetooth"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/bluetooth/BluetoothDiscoveryHelper.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="BluetoothDiscoveryHelper.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#nested_class_summary">NESTED</A>&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.bluetooth</FONT>
-<BR>
-Class BluetoothDiscoveryHelper</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.bluetooth.BluetoothDiscoveryHelper</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>BluetoothDiscoveryHelper</B><DT>extends java.lang.Object</DL>
-</PRE>
-
-<P>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-<A NAME="nested_class_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Nested Class Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;interface</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/bluetooth/BluetoothDiscoveryHelper.BluetoothDiscoveryListener.html" title="interface in com.googlecode.android_scripting.bluetooth">BluetoothDiscoveryHelper.BluetoothDiscoveryListener</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/bluetooth/BluetoothDiscoveryHelper.html#BluetoothDiscoveryHelper(Context, com.googlecode.android_scripting.bluetooth.BluetoothDiscoveryHelper.BluetoothDiscoveryListener)">BluetoothDiscoveryHelper</A></B>(Context&nbsp;context,
-                         <A HREF="../../../../com/googlecode/android_scripting/bluetooth/BluetoothDiscoveryHelper.BluetoothDiscoveryListener.html" title="interface in com.googlecode.android_scripting.bluetooth">BluetoothDiscoveryHelper.BluetoothDiscoveryListener</A>&nbsp;listener)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/bluetooth/BluetoothDiscoveryHelper.html#cancel()">cancel</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/bluetooth/BluetoothDiscoveryHelper.html#startDiscovery()">startDiscovery</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="BluetoothDiscoveryHelper(Context, com.googlecode.android_scripting.bluetooth.BluetoothDiscoveryHelper.BluetoothDiscoveryListener)"><!-- --></A><H3>
-BluetoothDiscoveryHelper</H3>
-<PRE>
-public <B>BluetoothDiscoveryHelper</B>(Context&nbsp;context,
-                                <A HREF="../../../../com/googlecode/android_scripting/bluetooth/BluetoothDiscoveryHelper.BluetoothDiscoveryListener.html" title="interface in com.googlecode.android_scripting.bluetooth">BluetoothDiscoveryHelper.BluetoothDiscoveryListener</A>&nbsp;listener)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="startDiscovery()"><!-- --></A><H3>
-startDiscovery</H3>
-<PRE>
-public void <B>startDiscovery</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="cancel()"><!-- --></A><H3>
-cancel</H3>
-<PRE>
-public void <B>cancel</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/BluetoothDiscoveryHelper.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/bluetooth/BluetoothDiscoveryHelper.BluetoothDiscoveryListener.html" title="interface in com.googlecode.android_scripting.bluetooth"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/bluetooth/BluetoothDiscoveryHelper.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="BluetoothDiscoveryHelper.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#nested_class_summary">NESTED</A>&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/bluetooth/package-frame.html b/doc/com/googlecode/android_scripting/bluetooth/package-frame.html
deleted file mode 100644
index ba75acf8..00000000
--- a/doc/com/googlecode/android_scripting/bluetooth/package-frame.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-com.googlecode.android_scripting.bluetooth
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-
-</HEAD>
-
-<BODY BGCOLOR="white">
-<FONT size="+1" CLASS="FrameTitleFont">
-<A HREF="../../../../com/googlecode/android_scripting/bluetooth/package-summary.html" target="classFrame">com.googlecode.android_scripting.bluetooth</A></FONT>
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
-Interfaces</FONT>&nbsp;
-<FONT CLASS="FrameItemFont">
-<BR>
-<A HREF="BluetoothDiscoveryHelper.BluetoothDiscoveryListener.html" title="interface in com.googlecode.android_scripting.bluetooth" target="classFrame"><I>BluetoothDiscoveryHelper.BluetoothDiscoveryListener</I></A></FONT></TD>
-</TR>
-</TABLE>
-
-
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
-Classes</FONT>&nbsp;
-<FONT CLASS="FrameItemFont">
-<BR>
-<A HREF="BluetoothDiscoveryHelper.html" title="class in com.googlecode.android_scripting.bluetooth" target="classFrame">BluetoothDiscoveryHelper</A></FONT></TD>
-</TR>
-</TABLE>
-
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/bluetooth/package-summary.html b/doc/com/googlecode/android_scripting/bluetooth/package-summary.html
deleted file mode 100644
index 19325a56..00000000
--- a/doc/com/googlecode/android_scripting/bluetooth/package-summary.html
+++ /dev/null
@@ -1,171 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-com.googlecode.android_scripting.bluetooth
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="com.googlecode.android_scripting.bluetooth";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/activity/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/event/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/bluetooth/package-summary.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<H2>
-Package com.googlecode.android_scripting.bluetooth
-</H2>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Interface Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/bluetooth/BluetoothDiscoveryHelper.BluetoothDiscoveryListener.html" title="interface in com.googlecode.android_scripting.bluetooth">BluetoothDiscoveryHelper.BluetoothDiscoveryListener</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Class Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/bluetooth/BluetoothDiscoveryHelper.html" title="class in com.googlecode.android_scripting.bluetooth">BluetoothDiscoveryHelper</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-
-<P>
-<DL>
-</DL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/activity/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/event/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/bluetooth/package-summary.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/bluetooth/package-tree.html b/doc/com/googlecode/android_scripting/bluetooth/package-tree.html
deleted file mode 100644
index c1b7d903..00000000
--- a/doc/com/googlecode/android_scripting/bluetooth/package-tree.html
+++ /dev/null
@@ -1,158 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-com.googlecode.android_scripting.bluetooth Class Hierarchy
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="com.googlecode.android_scripting.bluetooth Class Hierarchy";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/activity/package-tree.html"><B>PREV</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/event/package-tree.html"><B>NEXT</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/bluetooth/package-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-Hierarchy For Package com.googlecode.android_scripting.bluetooth
-</H2>
-</CENTER>
-<DL>
-<DT><B>Package Hierarchies:</B><DD><A HREF="../../../../overview-tree.html">All Packages</A></DL>
-<HR>
-<H2>
-Class Hierarchy
-</H2>
-<UL>
-<LI TYPE="circle">java.lang.Object<UL>
-<LI TYPE="circle">com.googlecode.android_scripting.bluetooth.<A HREF="../../../../com/googlecode/android_scripting/bluetooth/BluetoothDiscoveryHelper.html" title="class in com.googlecode.android_scripting.bluetooth"><B>BluetoothDiscoveryHelper</B></A></UL>
-</UL>
-<H2>
-Interface Hierarchy
-</H2>
-<UL>
-<LI TYPE="circle">com.googlecode.android_scripting.bluetooth.<A HREF="../../../../com/googlecode/android_scripting/bluetooth/BluetoothDiscoveryHelper.BluetoothDiscoveryListener.html" title="interface in com.googlecode.android_scripting.bluetooth"><B>BluetoothDiscoveryHelper.BluetoothDiscoveryListener</B></A></UL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/activity/package-tree.html"><B>PREV</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/event/package-tree.html"><B>NEXT</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/bluetooth/package-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/event/Event.html b/doc/com/googlecode/android_scripting/event/Event.html
deleted file mode 100644
index 66067eb5..00000000
--- a/doc/com/googlecode/android_scripting/event/Event.html
+++ /dev/null
@@ -1,349 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-Event
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Event";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/Event.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/event/Event.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="Event.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.event</FONT>
-<BR>
-Class Event</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.event.Event</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>Event</B><DT>extends java.lang.Object</DL>
-</PRE>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/event/Event.html#Event(java.lang.String, java.lang.Object)">Event</A></B>(java.lang.String&nbsp;name,
-      java.lang.Object&nbsp;data)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;double</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/event/Event.html#getCreationTime()">getCreationTime</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.Object</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/event/Event.html#getData()">getData</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/event/Event.html#getName()">getName</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/event/Event.html#nameEquals(java.lang.String)">nameEquals</A></B>(java.lang.String&nbsp;name)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/event/Event.html#setData(java.lang.Object)">setData</A></B>(java.lang.Object&nbsp;data)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/event/Event.html#setName(java.lang.String)">setName</A></B>(java.lang.String&nbsp;name)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="Event(java.lang.String, java.lang.Object)"><!-- --></A><H3>
-Event</H3>
-<PRE>
-public <B>Event</B>(java.lang.String&nbsp;name,
-             java.lang.Object&nbsp;data)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="setName(java.lang.String)"><!-- --></A><H3>
-setName</H3>
-<PRE>
-public void <B>setName</B>(java.lang.String&nbsp;name)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getName()"><!-- --></A><H3>
-getName</H3>
-<PRE>
-public java.lang.String <B>getName</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setData(java.lang.Object)"><!-- --></A><H3>
-setData</H3>
-<PRE>
-public void <B>setData</B>(java.lang.Object&nbsp;data)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getData()"><!-- --></A><H3>
-getData</H3>
-<PRE>
-public java.lang.Object <B>getData</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getCreationTime()"><!-- --></A><H3>
-getCreationTime</H3>
-<PRE>
-public double <B>getCreationTime</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="nameEquals(java.lang.String)"><!-- --></A><H3>
-nameEquals</H3>
-<PRE>
-public boolean <B>nameEquals</B>(java.lang.String&nbsp;name)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/Event.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/event/Event.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="Event.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/event/package-frame.html b/doc/com/googlecode/android_scripting/event/package-frame.html
deleted file mode 100644
index faa7679b..00000000
--- a/doc/com/googlecode/android_scripting/event/package-frame.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-com.googlecode.android_scripting.event
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-
-</HEAD>
-
-<BODY BGCOLOR="white">
-<FONT size="+1" CLASS="FrameTitleFont">
-<A HREF="../../../../com/googlecode/android_scripting/event/package-summary.html" target="classFrame">com.googlecode.android_scripting.event</A></FONT>
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
-Classes</FONT>&nbsp;
-<FONT CLASS="FrameItemFont">
-<BR>
-<A HREF="Event.html" title="class in com.googlecode.android_scripting.event" target="classFrame">Event</A></FONT></TD>
-</TR>
-</TABLE>
-
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/event/package-summary.html b/doc/com/googlecode/android_scripting/event/package-summary.html
deleted file mode 100644
index 51655d2c..00000000
--- a/doc/com/googlecode/android_scripting/event/package-summary.html
+++ /dev/null
@@ -1,157 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-com.googlecode.android_scripting.event
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="com.googlecode.android_scripting.event";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/bluetooth/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/exception/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/event/package-summary.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<H2>
-Package com.googlecode.android_scripting.event
-</H2>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Class Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/event/Event.html" title="class in com.googlecode.android_scripting.event">Event</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-
-<P>
-<DL>
-</DL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/bluetooth/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/exception/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/event/package-summary.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/event/package-tree.html b/doc/com/googlecode/android_scripting/event/package-tree.html
deleted file mode 100644
index 00c2113a..00000000
--- a/doc/com/googlecode/android_scripting/event/package-tree.html
+++ /dev/null
@@ -1,153 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-com.googlecode.android_scripting.event Class Hierarchy
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="com.googlecode.android_scripting.event Class Hierarchy";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/bluetooth/package-tree.html"><B>PREV</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/exception/package-tree.html"><B>NEXT</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/event/package-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-Hierarchy For Package com.googlecode.android_scripting.event
-</H2>
-</CENTER>
-<DL>
-<DT><B>Package Hierarchies:</B><DD><A HREF="../../../../overview-tree.html">All Packages</A></DL>
-<HR>
-<H2>
-Class Hierarchy
-</H2>
-<UL>
-<LI TYPE="circle">java.lang.Object<UL>
-<LI TYPE="circle">com.googlecode.android_scripting.event.<A HREF="../../../../com/googlecode/android_scripting/event/Event.html" title="class in com.googlecode.android_scripting.event"><B>Event</B></A></UL>
-</UL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/bluetooth/package-tree.html"><B>PREV</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/exception/package-tree.html"><B>NEXT</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/event/package-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/exception/Sl4aException.html b/doc/com/googlecode/android_scripting/exception/Sl4aException.html
deleted file mode 100644
index 1b86a9ee..00000000
--- a/doc/com/googlecode/android_scripting/exception/Sl4aException.html
+++ /dev/null
@@ -1,270 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:00:56 PDT 2014 -->
-<TITLE>
-Sl4aException
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Sl4aException";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/Sl4aException.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/exception/Sl4aException.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="Sl4aException.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#methods_inherited_from_class_java.lang.Throwable">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.exception</FONT>
-<BR>
-Class Sl4aException</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by ">java.lang.Throwable
-      <IMG SRC="../../../../resources/inherit.gif" ALT="extended by ">java.lang.Exception
-          <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.exception.Sl4aException</B>
-</PRE>
-<DL>
-<DT><B>All Implemented Interfaces:</B> <DD>java.io.Serializable</DD>
-</DL>
-<HR>
-<DL>
-<DT><PRE>public class <B>Sl4aException</B><DT>extends java.lang.Exception</DL>
-</PRE>
-
-<P>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../serialized-form.html#com.googlecode.android_scripting.exception.Sl4aException">Serialized Form</A></DL>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/exception/Sl4aException.html#Sl4aException(java.lang.Exception)">Sl4aException</A></B>(java.lang.Exception&nbsp;e)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/exception/Sl4aException.html#Sl4aException(java.lang.String)">Sl4aException</A></B>(java.lang.String&nbsp;message)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/exception/Sl4aException.html#Sl4aException(java.lang.String, java.lang.Exception)">Sl4aException</A></B>(java.lang.String&nbsp;message,
-              java.lang.Exception&nbsp;e)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Throwable"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Throwable</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>fillInStackTrace, getCause, getLocalizedMessage, getMessage, getStackTrace, initCause, printStackTrace, printStackTrace, printStackTrace, setStackTrace, toString</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="Sl4aException(java.lang.Exception)"><!-- --></A><H3>
-Sl4aException</H3>
-<PRE>
-public <B>Sl4aException</B>(java.lang.Exception&nbsp;e)</PRE>
-<DL>
-</DL>
-<HR>
-
-<A NAME="Sl4aException(java.lang.String)"><!-- --></A><H3>
-Sl4aException</H3>
-<PRE>
-public <B>Sl4aException</B>(java.lang.String&nbsp;message)</PRE>
-<DL>
-</DL>
-<HR>
-
-<A NAME="Sl4aException(java.lang.String, java.lang.Exception)"><!-- --></A><H3>
-Sl4aException</H3>
-<PRE>
-public <B>Sl4aException</B>(java.lang.String&nbsp;message,
-                     java.lang.Exception&nbsp;e)</PRE>
-<DL>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/Sl4aException.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/exception/Sl4aException.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="Sl4aException.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#methods_inherited_from_class_java.lang.Throwable">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/exception/package-frame.html b/doc/com/googlecode/android_scripting/exception/package-frame.html
deleted file mode 100644
index 227db841..00000000
--- a/doc/com/googlecode/android_scripting/exception/package-frame.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-com.googlecode.android_scripting.exception
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-
-</HEAD>
-
-<BODY BGCOLOR="white">
-<FONT size="+1" CLASS="FrameTitleFont">
-<A HREF="../../../../com/googlecode/android_scripting/exception/package-summary.html" target="classFrame">com.googlecode.android_scripting.exception</A></FONT>
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
-Exceptions</FONT>&nbsp;
-<FONT CLASS="FrameItemFont">
-<BR>
-<A HREF="Sl4aException.html" title="class in com.googlecode.android_scripting.exception" target="classFrame">Sl4aException</A></FONT></TD>
-</TR>
-</TABLE>
-
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/exception/package-summary.html b/doc/com/googlecode/android_scripting/exception/package-summary.html
deleted file mode 100644
index affde56d..00000000
--- a/doc/com/googlecode/android_scripting/exception/package-summary.html
+++ /dev/null
@@ -1,157 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-com.googlecode.android_scripting.exception
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="com.googlecode.android_scripting.exception";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/event/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/exception/package-summary.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<H2>
-Package com.googlecode.android_scripting.exception
-</H2>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Exception Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/exception/Sl4aException.html" title="class in com.googlecode.android_scripting.exception">Sl4aException</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-
-<P>
-<DL>
-</DL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/event/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/exception/package-summary.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/exception/package-tree.html b/doc/com/googlecode/android_scripting/exception/package-tree.html
deleted file mode 100644
index cb74a932..00000000
--- a/doc/com/googlecode/android_scripting/exception/package-tree.html
+++ /dev/null
@@ -1,158 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-com.googlecode.android_scripting.exception Class Hierarchy
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="com.googlecode.android_scripting.exception Class Hierarchy";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/event/package-tree.html"><B>PREV</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/package-tree.html"><B>NEXT</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/exception/package-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-Hierarchy For Package com.googlecode.android_scripting.exception
-</H2>
-</CENTER>
-<DL>
-<DT><B>Package Hierarchies:</B><DD><A HREF="../../../../overview-tree.html">All Packages</A></DL>
-<HR>
-<H2>
-Class Hierarchy
-</H2>
-<UL>
-<LI TYPE="circle">java.lang.Object<UL>
-<LI TYPE="circle">java.lang.Throwable (implements java.io.Serializable)
-<UL>
-<LI TYPE="circle">java.lang.Exception<UL>
-<LI TYPE="circle">com.googlecode.android_scripting.exception.<A HREF="../../../../com/googlecode/android_scripting/exception/Sl4aException.html" title="class in com.googlecode.android_scripting.exception"><B>Sl4aException</B></A></UL>
-</UL>
-</UL>
-</UL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/event/package-tree.html"><B>PREV</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/package-tree.html"><B>NEXT</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/exception/package-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/facade/ActivityResultFacade.html b/doc/com/googlecode/android_scripting/facade/ActivityResultFacade.html
deleted file mode 100644
index 4326ea4d..00000000
--- a/doc/com/googlecode/android_scripting/facade/ActivityResultFacade.html
+++ /dev/null
@@ -1,742 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:00:59 PDT 2014 -->
-<TITLE>
-ActivityResultFacade
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="ActivityResultFacade";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ActivityResultFacade.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/AndroidFacade.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/ActivityResultFacade.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ActivityResultFacade.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.facade</FONT>
-<BR>
-Class ActivityResultFacade</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">com.googlecode.android_scripting.jsonrpc.RpcReceiver</A>
-      <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.facade.ActivityResultFacade</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>ActivityResultFacade</B><DT>extends <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A></DL>
-</PRE>
-
-<P>
-Allows you to return results to a startActivityForResult call.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Alexey Reznichenko (alexey.reznichenko@gmail.com)</DD>
-</DL>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/ActivityResultFacade.html#ActivityResultFacade(com.googlecode.android_scripting.facade.FacadeManager)">ActivityResultFacade</A></B>(<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A>&nbsp;manager)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/ActivityResultFacade.html#setActivity(Activity)">setActivity</A></B>(Activity&nbsp;activity)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/ActivityResultFacade.html#setResultBoolean(java.lang.Integer, java.lang.Boolean)">setResultBoolean</A></B>(java.lang.Integer&nbsp;resultCode,
-                 java.lang.Boolean&nbsp;resultValue)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/ActivityResultFacade.html#setResultBooleanArray(java.lang.Integer, java.lang.Boolean[])">setResultBooleanArray</A></B>(java.lang.Integer&nbsp;resultCode,
-                      java.lang.Boolean[]&nbsp;resultValue)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/ActivityResultFacade.html#setResultByte(java.lang.Integer, java.lang.Byte)">setResultByte</A></B>(java.lang.Integer&nbsp;resultCode,
-              java.lang.Byte&nbsp;resultValue)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/ActivityResultFacade.html#setResultByteArray(java.lang.Integer, java.lang.Byte[])">setResultByteArray</A></B>(java.lang.Integer&nbsp;resultCode,
-                   java.lang.Byte[]&nbsp;resultValue)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/ActivityResultFacade.html#setResultChar(java.lang.Integer, java.lang.Character)">setResultChar</A></B>(java.lang.Integer&nbsp;resultCode,
-              java.lang.Character&nbsp;resultValue)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/ActivityResultFacade.html#setResultCharArray(java.lang.Integer, java.lang.Character[])">setResultCharArray</A></B>(java.lang.Integer&nbsp;resultCode,
-                   java.lang.Character[]&nbsp;resultValue)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/ActivityResultFacade.html#setResultDouble(java.lang.Integer, java.lang.Double)">setResultDouble</A></B>(java.lang.Integer&nbsp;resultCode,
-                java.lang.Double&nbsp;resultValue)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/ActivityResultFacade.html#setResultDoubleArray(java.lang.Integer, java.lang.Double[])">setResultDoubleArray</A></B>(java.lang.Integer&nbsp;resultCode,
-                     java.lang.Double[]&nbsp;resultValue)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/ActivityResultFacade.html#setResultFloat(java.lang.Integer, java.lang.Float)">setResultFloat</A></B>(java.lang.Integer&nbsp;resultCode,
-               java.lang.Float&nbsp;resultValue)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/ActivityResultFacade.html#setResultFloatArray(java.lang.Integer, java.lang.Float[])">setResultFloatArray</A></B>(java.lang.Integer&nbsp;resultCode,
-                    java.lang.Float[]&nbsp;resultValue)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/ActivityResultFacade.html#setResultInteger(java.lang.Integer, java.lang.Integer)">setResultInteger</A></B>(java.lang.Integer&nbsp;resultCode,
-                 java.lang.Integer&nbsp;resultValue)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/ActivityResultFacade.html#setResultIntegerArray(java.lang.Integer, java.lang.Integer[])">setResultIntegerArray</A></B>(java.lang.Integer&nbsp;resultCode,
-                      java.lang.Integer[]&nbsp;resultValue)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/ActivityResultFacade.html#setResultLong(java.lang.Integer, java.lang.Long)">setResultLong</A></B>(java.lang.Integer&nbsp;resultCode,
-              java.lang.Long&nbsp;resultValue)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/ActivityResultFacade.html#setResultLongArray(java.lang.Integer, java.lang.Long[])">setResultLongArray</A></B>(java.lang.Integer&nbsp;resultCode,
-                   java.lang.Long[]&nbsp;resultValue)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/ActivityResultFacade.html#setResultSerializable(java.lang.Integer, java.io.Serializable)">setResultSerializable</A></B>(java.lang.Integer&nbsp;resultCode,
-                      java.io.Serializable&nbsp;resultValue)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/ActivityResultFacade.html#setResultShort(java.lang.Integer, java.lang.Short)">setResultShort</A></B>(java.lang.Integer&nbsp;resultCode,
-               java.lang.Short&nbsp;resultValue)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/ActivityResultFacade.html#setResultShortArray(java.lang.Integer, java.lang.Short[])">setResultShortArray</A></B>(java.lang.Integer&nbsp;resultCode,
-                    java.lang.Short[]&nbsp;resultValue)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/ActivityResultFacade.html#setResultString(java.lang.Integer, java.lang.String)">setResultString</A></B>(java.lang.Integer&nbsp;resultCode,
-                java.lang.String&nbsp;resultValue)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/ActivityResultFacade.html#setResultStringArray(java.lang.Integer, java.lang.String[])">setResultStringArray</A></B>(java.lang.Integer&nbsp;resultCode,
-                     java.lang.String[]&nbsp;resultValue)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/ActivityResultFacade.html#shutdown()">shutdown</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Invoked when the receiver is shut down.</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="ActivityResultFacade(com.googlecode.android_scripting.facade.FacadeManager)"><!-- --></A><H3>
-ActivityResultFacade</H3>
-<PRE>
-public <B>ActivityResultFacade</B>(<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A>&nbsp;manager)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="setResultBoolean(java.lang.Integer, java.lang.Boolean)"><!-- --></A><H3>
-setResultBoolean</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(), the resulting intent will contain SCRIPT_RESULT extra with the given value.")
-</FONT>public void <B>setResultBoolean</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="resultCode",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="The result code to propagate back to the originating activity, often RESULT_CANCELED (0) or RESULT_OK (-1)")</FONT>
-                                            java.lang.Integer&nbsp;resultCode,
-                                            <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="resultValue")</FONT>
-                                            java.lang.Boolean&nbsp;resultValue)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setResultByte(java.lang.Integer, java.lang.Byte)"><!-- --></A><H3>
-setResultByte</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(), the resulting intent will contain SCRIPT_RESULT extra with the given value.")
-</FONT>public void <B>setResultByte</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="resultCode",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="The result code to propagate back to the originating activity, often RESULT_CANCELED (0) or RESULT_OK (-1)")</FONT>
-                                         java.lang.Integer&nbsp;resultCode,
-                                         <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="resultValue")</FONT>
-                                         java.lang.Byte&nbsp;resultValue)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setResultShort(java.lang.Integer, java.lang.Short)"><!-- --></A><H3>
-setResultShort</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(), the resulting intent will contain SCRIPT_RESULT extra with the given value.")
-</FONT>public void <B>setResultShort</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="resultCode",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="The result code to propagate back to the originating activity, often RESULT_CANCELED (0) or RESULT_OK (-1)")</FONT>
-                                          java.lang.Integer&nbsp;resultCode,
-                                          <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="resultValue")</FONT>
-                                          java.lang.Short&nbsp;resultValue)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setResultChar(java.lang.Integer, java.lang.Character)"><!-- --></A><H3>
-setResultChar</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(), the resulting intent will contain SCRIPT_RESULT extra with the given value.")
-</FONT>public void <B>setResultChar</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="resultCode",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="The result code to propagate back to the originating activity, often RESULT_CANCELED (0) or RESULT_OK (-1)")</FONT>
-                                         java.lang.Integer&nbsp;resultCode,
-                                         <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="resultValue")</FONT>
-                                         java.lang.Character&nbsp;resultValue)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setResultInteger(java.lang.Integer, java.lang.Integer)"><!-- --></A><H3>
-setResultInteger</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(), the resulting intent will contain SCRIPT_RESULT extra with the given value.")
-</FONT>public void <B>setResultInteger</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="resultCode",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="The result code to propagate back to the originating activity, often RESULT_CANCELED (0) or RESULT_OK (-1)")</FONT>
-                                            java.lang.Integer&nbsp;resultCode,
-                                            <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="resultValue")</FONT>
-                                            java.lang.Integer&nbsp;resultValue)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setResultLong(java.lang.Integer, java.lang.Long)"><!-- --></A><H3>
-setResultLong</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(), the resulting intent will contain SCRIPT_RESULT extra with the given value.")
-</FONT>public void <B>setResultLong</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="resultCode",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="The result code to propagate back to the originating activity, often RESULT_CANCELED (0) or RESULT_OK (-1)")</FONT>
-                                         java.lang.Integer&nbsp;resultCode,
-                                         <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="resultValue")</FONT>
-                                         java.lang.Long&nbsp;resultValue)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setResultFloat(java.lang.Integer, java.lang.Float)"><!-- --></A><H3>
-setResultFloat</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(), the resulting intent will contain SCRIPT_RESULT extra with the given value.")
-</FONT>public void <B>setResultFloat</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="resultCode",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="The result code to propagate back to the originating activity, often RESULT_CANCELED (0) or RESULT_OK (-1)")</FONT>
-                                          java.lang.Integer&nbsp;resultCode,
-                                          <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="resultValue")</FONT>
-                                          java.lang.Float&nbsp;resultValue)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setResultDouble(java.lang.Integer, java.lang.Double)"><!-- --></A><H3>
-setResultDouble</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(), the resulting intent will contain SCRIPT_RESULT extra with the given value.")
-</FONT>public void <B>setResultDouble</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="resultCode",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="The result code to propagate back to the originating activity, often RESULT_CANCELED (0) or RESULT_OK (-1)")</FONT>
-                                           java.lang.Integer&nbsp;resultCode,
-                                           <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="resultValue")</FONT>
-                                           java.lang.Double&nbsp;resultValue)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setResultString(java.lang.Integer, java.lang.String)"><!-- --></A><H3>
-setResultString</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(), the resulting intent will contain SCRIPT_RESULT extra with the given value.")
-</FONT>public void <B>setResultString</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="resultCode",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="The result code to propagate back to the originating activity, often RESULT_CANCELED (0) or RESULT_OK (-1)")</FONT>
-                                           java.lang.Integer&nbsp;resultCode,
-                                           <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="resultValue")</FONT>
-                                           java.lang.String&nbsp;resultValue)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setResultBooleanArray(java.lang.Integer, java.lang.Boolean[])"><!-- --></A><H3>
-setResultBooleanArray</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(), the resulting intent will contain SCRIPT_RESULT extra with the given value.")
-</FONT>public void <B>setResultBooleanArray</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="resultCode",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="The result code to propagate back to the originating activity, often RESULT_CANCELED (0) or RESULT_OK (-1)")</FONT>
-                                                 java.lang.Integer&nbsp;resultCode,
-                                                 <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="resultValue")</FONT>
-                                                 java.lang.Boolean[]&nbsp;resultValue)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setResultByteArray(java.lang.Integer, java.lang.Byte[])"><!-- --></A><H3>
-setResultByteArray</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(), the resulting intent will contain SCRIPT_RESULT extra with the given value.")
-</FONT>public void <B>setResultByteArray</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="resultCode",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="The result code to propagate back to the originating activity, often RESULT_CANCELED (0) or RESULT_OK (-1)")</FONT>
-                                              java.lang.Integer&nbsp;resultCode,
-                                              <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="resultValue")</FONT>
-                                              java.lang.Byte[]&nbsp;resultValue)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setResultShortArray(java.lang.Integer, java.lang.Short[])"><!-- --></A><H3>
-setResultShortArray</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(), the resulting intent will contain SCRIPT_RESULT extra with the given value.")
-</FONT>public void <B>setResultShortArray</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="resultCode",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="The result code to propagate back to the originating activity, often RESULT_CANCELED (0) or RESULT_OK (-1)")</FONT>
-                                               java.lang.Integer&nbsp;resultCode,
-                                               <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="resultValue")</FONT>
-                                               java.lang.Short[]&nbsp;resultValue)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setResultCharArray(java.lang.Integer, java.lang.Character[])"><!-- --></A><H3>
-setResultCharArray</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(), the resulting intent will contain SCRIPT_RESULT extra with the given value.")
-</FONT>public void <B>setResultCharArray</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="resultCode",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="The result code to propagate back to the originating activity, often RESULT_CANCELED (0) or RESULT_OK (-1)")</FONT>
-                                              java.lang.Integer&nbsp;resultCode,
-                                              <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="resultValue")</FONT>
-                                              java.lang.Character[]&nbsp;resultValue)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setResultIntegerArray(java.lang.Integer, java.lang.Integer[])"><!-- --></A><H3>
-setResultIntegerArray</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(), the resulting intent will contain SCRIPT_RESULT extra with the given value.")
-</FONT>public void <B>setResultIntegerArray</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="resultCode",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="The result code to propagate back to the originating activity, often RESULT_CANCELED (0) or RESULT_OK (-1)")</FONT>
-                                                 java.lang.Integer&nbsp;resultCode,
-                                                 <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="resultValue")</FONT>
-                                                 java.lang.Integer[]&nbsp;resultValue)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setResultLongArray(java.lang.Integer, java.lang.Long[])"><!-- --></A><H3>
-setResultLongArray</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(), the resulting intent will contain SCRIPT_RESULT extra with the given value.")
-</FONT>public void <B>setResultLongArray</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="resultCode",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="The result code to propagate back to the originating activity, often RESULT_CANCELED (0) or RESULT_OK (-1)")</FONT>
-                                              java.lang.Integer&nbsp;resultCode,
-                                              <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="resultValue")</FONT>
-                                              java.lang.Long[]&nbsp;resultValue)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setResultFloatArray(java.lang.Integer, java.lang.Float[])"><!-- --></A><H3>
-setResultFloatArray</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(), the resulting intent will contain SCRIPT_RESULT extra with the given value.")
-</FONT>public void <B>setResultFloatArray</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="resultCode",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="The result code to propagate back to the originating activity, often RESULT_CANCELED (0) or RESULT_OK (-1)")</FONT>
-                                               java.lang.Integer&nbsp;resultCode,
-                                               <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="resultValue")</FONT>
-                                               java.lang.Float[]&nbsp;resultValue)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setResultDoubleArray(java.lang.Integer, java.lang.Double[])"><!-- --></A><H3>
-setResultDoubleArray</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(), the resulting intent will contain SCRIPT_RESULT extra with the given value.")
-</FONT>public void <B>setResultDoubleArray</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="resultCode",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="The result code to propagate back to the originating activity, often RESULT_CANCELED (0) or RESULT_OK (-1)")</FONT>
-                                                java.lang.Integer&nbsp;resultCode,
-                                                <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="resultValue")</FONT>
-                                                java.lang.Double[]&nbsp;resultValue)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setResultStringArray(java.lang.Integer, java.lang.String[])"><!-- --></A><H3>
-setResultStringArray</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(), the resulting intent will contain SCRIPT_RESULT extra with the given value.")
-</FONT>public void <B>setResultStringArray</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="resultCode",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="The result code to propagate back to the originating activity, often RESULT_CANCELED (0) or RESULT_OK (-1)")</FONT>
-                                                java.lang.Integer&nbsp;resultCode,
-                                                <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="resultValue")</FONT>
-                                                java.lang.String[]&nbsp;resultValue)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setResultSerializable(java.lang.Integer, java.io.Serializable)"><!-- --></A><H3>
-setResultSerializable</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(), the resulting intent will contain SCRIPT_RESULT extra with the given value.")
-</FONT>public void <B>setResultSerializable</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="resultCode",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="The result code to propagate back to the originating activity, often RESULT_CANCELED (0) or RESULT_OK (-1)")</FONT>
-                                                 java.lang.Integer&nbsp;resultCode,
-                                                 <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="resultValue")</FONT>
-                                                 java.io.Serializable&nbsp;resultValue)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setActivity(Activity)"><!-- --></A><H3>
-setActivity</H3>
-<PRE>
-public void <B>setActivity</B>(Activity&nbsp;activity)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="shutdown()"><!-- --></A><H3>
-shutdown</H3>
-<PRE>
-public void <B>shutdown</B>()</PRE>
-<DL>
-<DD><B>Description copied from class: <CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html#shutdown()">RpcReceiver</A></CODE></B></DD>
-<DD>Invoked when the receiver is shut down.
-<P>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html#shutdown()">shutdown</A></CODE> in class <CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ActivityResultFacade.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/AndroidFacade.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/ActivityResultFacade.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ActivityResultFacade.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/facade/AndroidFacade.Resources.html b/doc/com/googlecode/android_scripting/facade/AndroidFacade.Resources.html
deleted file mode 100644
index 1c4f2c6f..00000000
--- a/doc/com/googlecode/android_scripting/facade/AndroidFacade.Resources.html
+++ /dev/null
@@ -1,214 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:00:59 PDT 2014 -->
-<TITLE>
-AndroidFacade.Resources
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="AndroidFacade.Resources";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/AndroidFacade.Resources.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/AndroidFacade.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/ApplicationManagerFacade.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/AndroidFacade.Resources.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="AndroidFacade.Resources.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.facade</FONT>
-<BR>
-Interface AndroidFacade.Resources</H2>
-<DL>
-<DT><B>Enclosing class:</B><DD><A HREF="../../../../com/googlecode/android_scripting/facade/AndroidFacade.html" title="class in com.googlecode.android_scripting.facade">AndroidFacade</A></DD>
-</DL>
-<HR>
-<DL>
-<DT><PRE>public static interface <B>AndroidFacade.Resources</B></DL>
-</PRE>
-
-<P>
-An instance of this interface is passed to the facade. From this object, the resource IDs can
- be obtained.
-<P>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/AndroidFacade.Resources.html#getLogo48()">getLogo48</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="getLogo48()"><!-- --></A><H3>
-getLogo48</H3>
-<PRE>
-int <B>getLogo48</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/AndroidFacade.Resources.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/AndroidFacade.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/ApplicationManagerFacade.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/AndroidFacade.Resources.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="AndroidFacade.Resources.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/facade/AndroidFacade.html b/doc/com/googlecode/android_scripting/facade/AndroidFacade.html
deleted file mode 100644
index d91e2c31..00000000
--- a/doc/com/googlecode/android_scripting/facade/AndroidFacade.html
+++ /dev/null
@@ -1,694 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:00:59 PDT 2014 -->
-<TITLE>
-AndroidFacade
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="AndroidFacade";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/AndroidFacade.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/ActivityResultFacade.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/AndroidFacade.Resources.html" title="interface in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/AndroidFacade.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="AndroidFacade.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#nested_class_summary">NESTED</A>&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.facade</FONT>
-<BR>
-Class AndroidFacade</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">com.googlecode.android_scripting.jsonrpc.RpcReceiver</A>
-      <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.facade.AndroidFacade</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>AndroidFacade</B><DT>extends <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A></DL>
-</PRE>
-
-<P>
-Some general purpose Android routines.<br>
- <h2>Intents</h2> Intents are returned as a map, in the following form:<br>
- <ul>
- <li><b>action</b> - action.
- <li><b>data</b> - url
- <li><b>type</b> - mime type
- <li><b>packagename</b> - name of package. If used, requires classname to be useful (optional)
- <li><b>classname</b> - name of class. If used, requires packagename to be useful (optional)
- <li><b>categories</b> - list of categories
- <li><b>extras</b> - map of extras
- <li><b>flags</b> - integer flags.
- </ul>
- <br>
- An intent can be built using the <A HREF="../../../../com/googlecode/android_scripting/facade/AndroidFacade.html#makeIntent(java.lang.String, java.lang.String, java.lang.String, JSONObject, JSONArray, java.lang.String, java.lang.String, java.lang.Integer)"><CODE>makeIntent(java.lang.String, java.lang.String, java.lang.String, JSONObject, JSONArray, java.lang.String, java.lang.String, java.lang.Integer)</CODE></A> call, but can also be constructed exterally.
-<P>
-
-<P>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-<A NAME="nested_class_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Nested Class Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;interface</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/AndroidFacade.Resources.html" title="interface in com.googlecode.android_scripting.facade">AndroidFacade.Resources</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;An instance of this interface is passed to the facade.</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/AndroidFacade.html#AndroidFacade(com.googlecode.android_scripting.facade.FacadeManager)">AndroidFacade</A></B>(<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A>&nbsp;manager)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.util.Map&lt;java.lang.String,java.lang.Object&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/AndroidFacade.html#environment()">environment</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="AndroidFacade(com.googlecode.android_scripting.facade.FacadeManager)"><!-- --></A><H3>
-AndroidFacade</H3>
-<PRE>
-public <B>AndroidFacade</B>(<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A>&nbsp;manager)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="shutdown()"><!-- --></A><H3>
-shutdown</H3>
-<PRE>
-public void <B>shutdown</B>()</PRE>
-<DL>
-<DD><B>Description copied from class: <CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html#shutdown()">RpcReceiver</A></CODE></B></DD>
-<DD>Invoked when the receiver is shut down.
-<P>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html#shutdown()">shutdown</A></CODE> in class <CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setClipboard(java.lang.String)"><!-- --></A><H3>
-setClipboard</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Put text in the clipboard.")
-</FONT>public void <B>setClipboard</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="text")</FONT>
-                                        java.lang.String&nbsp;text)</PRE>
-<DL>
-<DD>Creates a new AndroidFacade that simplifies the interface to various Android APIs.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>service</CODE> - is the <CODE>Context</CODE> the APIs will run under</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getClipboard()"><!-- --></A><H3>
-getClipboard</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Read text from the clipboard.",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="The text in the clipboard.")
-</FONT>public java.lang.String <B>getClipboard</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="putExtrasFromJsonObject(JSONObject, Intent)"><!-- --></A><H3>
-putExtrasFromJsonObject</H3>
-<PRE>
-public static void <B>putExtrasFromJsonObject</B>(JSONObject&nbsp;extras,
-                                           Intent&nbsp;intent)
-                                    throws JSONException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>JSONException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="startActivityForResult(java.lang.String, java.lang.String, java.lang.String, JSONObject, java.lang.String, java.lang.String)"><!-- --></A><H3>
-startActivityForResult</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Starts an activity and returns the result.",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="A Map representation of the result Intent.")
-</FONT>public Intent <B>startActivityForResult</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="action")</FONT>
-                                                           java.lang.String&nbsp;action,
-                                                           <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="uri")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                                           java.lang.String&nbsp;uri,
-                                                           <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="type",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="MIME type/subtype of the URI")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                                           java.lang.String&nbsp;type,
-                                                           <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="extras",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="a Map of extras to add to the Intent")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                                           JSONObject&nbsp;extras,
-                                                           <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="packagename",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="name of package. If used, requires classname to be useful")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                                           java.lang.String&nbsp;packagename,
-                                                           <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="classname",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="name of class. If used, requires packagename to be useful")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                                           java.lang.String&nbsp;classname)
-                              throws JSONException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>JSONException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="startActivityForResultIntent(Intent)"><!-- --></A><H3>
-startActivityForResultIntent</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Starts an activity and returns the result.",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="A Map representation of the result Intent.")
-</FONT>public Intent <B>startActivityForResultIntent</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="intent",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="Intent in the format as returned from makeIntent")</FONT>
-                                                                 Intent&nbsp;intent)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="startActivity(java.lang.String, java.lang.String, java.lang.String, JSONObject, java.lang.Boolean, java.lang.String, java.lang.String)"><!-- --></A><H3>
-startActivity</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Starts an activity.")
-</FONT>public void <B>startActivity</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="action")</FONT>
-                                         java.lang.String&nbsp;action,
-                                         <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="uri")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                         java.lang.String&nbsp;uri,
-                                         <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="type",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="MIME type/subtype of the URI")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                         java.lang.String&nbsp;type,
-                                         <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="extras",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="a Map of extras to add to the Intent")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                         JSONObject&nbsp;extras,
-                                         <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="wait",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="block until the user exits the started activity")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                         java.lang.Boolean&nbsp;wait,
-                                         <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="packagename",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="name of package. If used, requires classname to be useful")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                         java.lang.String&nbsp;packagename,
-                                         <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="classname",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="name of class. If used, requires packagename to be useful")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                         java.lang.String&nbsp;classname)
-                   throws java.lang.Exception</PRE>
-<DL>
-<DD>packagename and classname, if provided, are used in a 'setComponent' call.
-<P>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.lang.Exception</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="sendBroadcast(java.lang.String, java.lang.String, java.lang.String, JSONObject, java.lang.String, java.lang.String)"><!-- --></A><H3>
-sendBroadcast</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Send a broadcast.")
-</FONT>public void <B>sendBroadcast</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="action")</FONT>
-                                         java.lang.String&nbsp;action,
-                                         <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="uri")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                         java.lang.String&nbsp;uri,
-                                         <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="type",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="MIME type/subtype of the URI")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                         java.lang.String&nbsp;type,
-                                         <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="extras",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="a Map of extras to add to the Intent")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                         JSONObject&nbsp;extras,
-                                         <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="packagename",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="name of package. If used, requires classname to be useful")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                         java.lang.String&nbsp;packagename,
-                                         <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="classname",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="name of class. If used, requires packagename to be useful")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                         java.lang.String&nbsp;classname)
-                   throws JSONException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>JSONException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="makeIntent(java.lang.String, java.lang.String, java.lang.String, JSONObject, JSONArray, java.lang.String, java.lang.String, java.lang.Integer)"><!-- --></A><H3>
-makeIntent</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Create an Intent.",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="An object representing an Intent")
-</FONT>public Intent <B>makeIntent</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="action")</FONT>
-                                               java.lang.String&nbsp;action,
-                                               <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="uri")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                               java.lang.String&nbsp;uri,
-                                               <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="type",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="MIME type/subtype of the URI")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                               java.lang.String&nbsp;type,
-                                               <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="extras",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="a Map of extras to add to the Intent")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                               JSONObject&nbsp;extras,
-                                               <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="categories",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="a List of categories to add to the Intent")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                               JSONArray&nbsp;categories,
-                                               <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="packagename",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="name of package. If used, requires classname to be useful")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                               java.lang.String&nbsp;packagename,
-                                               <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="classname",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="name of class. If used, requires packagename to be useful")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                               java.lang.String&nbsp;classname,
-                                               <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="flags",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="Intent flags")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                               java.lang.Integer&nbsp;flags)
-                  throws JSONException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>JSONException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="startActivityIntent(Intent, java.lang.Boolean)"><!-- --></A><H3>
-startActivityIntent</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Start Activity using Intent")
-</FONT>public void <B>startActivityIntent</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="intent",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="Intent in the format as returned from makeIntent")</FONT>
-                                               Intent&nbsp;intent,
-                                               <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="wait",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="block until the user exits the started activity")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                               java.lang.Boolean&nbsp;wait)
-                         throws java.lang.Exception</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.lang.Exception</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="sendBroadcastIntent(Intent)"><!-- --></A><H3>
-sendBroadcastIntent</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Send Broadcast Intent")
-</FONT>public void <B>sendBroadcastIntent</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="intent",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="Intent in the format as returned from makeIntent")</FONT>
-                                               Intent&nbsp;intent)
-                         throws java.lang.Exception</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.lang.Exception</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="vibrate(java.lang.Integer)"><!-- --></A><H3>
-vibrate</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Vibrates the phone or a specified duration in milliseconds.")
-</FONT>public void <B>vibrate</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="duration",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="duration in milliseconds")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="300")</FONT>
-                                   java.lang.Integer&nbsp;duration)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="makeToast(java.lang.String)"><!-- --></A><H3>
-makeToast</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Displays a short-duration Toast notification.")
-</FONT>public void <B>makeToast</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="message")</FONT>
-                                     java.lang.String&nbsp;message)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getInput(java.lang.String, java.lang.String)"><!-- --></A><H3>
-getInput</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Queries the user for a text input.")
-<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDeprecated.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDeprecated</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDeprecated.html#value()">value</A>="dialogGetInput",
-               <A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDeprecated.html#release()">release</A>="r3")
-</FONT>public java.lang.String <B>getInput</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="title",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="title of the input box")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="SL4A Input")</FONT>
-                                                                          java.lang.String&nbsp;title,
-                                                                          <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="message",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="message to display above the input box")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="Please enter value:")</FONT>
-                                                                          java.lang.String&nbsp;message)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getPassword(java.lang.String, java.lang.String)"><!-- --></A><H3>
-getPassword</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Queries the user for a password.")
-<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDeprecated.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDeprecated</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDeprecated.html#value()">value</A>="dialogGetPassword",
-               <A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDeprecated.html#release()">release</A>="r3")
-</FONT>public java.lang.String <B>getPassword</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="title",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="title of the input box")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="SL4A Password Input")</FONT>
-                                                                             java.lang.String&nbsp;title,
-                                                                             <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="message",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="message to display above the input box")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="Please enter password:")</FONT>
-                                                                             java.lang.String&nbsp;message)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="notify(java.lang.String, java.lang.String)"><!-- --></A><H3>
-notify</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Displays a notification that will be canceled when the user clicks on it.")
-</FONT>public void <B>notify</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="title",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="title")</FONT>
-                                  java.lang.String&nbsp;title,
-                                  <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="message")</FONT>
-                                  java.lang.String&nbsp;message)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getIntent()"><!-- --></A><H3>
-getIntent</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns the intent that launched the script.")
-</FONT>public java.lang.Object <B>getIntent</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="sendEmail(java.lang.String, java.lang.String, java.lang.String, java.lang.String)"><!-- --></A><H3>
-sendEmail</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Launches an activity that sends an e-mail message to a given recipient.")
-</FONT>public void <B>sendEmail</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="to",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="A comma separated list of recipients.")</FONT>
-                                     java.lang.String&nbsp;to,
-                                     <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="subject")</FONT>
-                                     java.lang.String&nbsp;subject,
-                                     <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="body")</FONT>
-                                     java.lang.String&nbsp;body,
-                                     <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="attachmentUri")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                     java.lang.String&nbsp;attachmentUri)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getPackageVersionCode(java.lang.String)"><!-- --></A><H3>
-getPackageVersionCode</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns package version code.")
-</FONT>public int <B>getPackageVersionCode</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="packageName")</FONT>
-                                                java.lang.String&nbsp;packageName)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getPackageVersion(java.lang.String)"><!-- --></A><H3>
-getPackageVersion</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns package version name.")
-</FONT>public java.lang.String <B>getPackageVersion</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="packageName")</FONT>
-                                                         java.lang.String&nbsp;packageName)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="requiredVersion(java.lang.Integer)"><!-- --></A><H3>
-requiredVersion</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Checks if version of SL4A is greater than or equal to the specified version.")
-</FONT>public boolean <B>requiredVersion</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="requiredVersion")</FONT>
-                                              java.lang.Integer&nbsp;version)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="log(java.lang.String)"><!-- --></A><H3>
-log</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Writes message to logcat.")
-</FONT>public void <B>log</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="message")</FONT>
-                               java.lang.String&nbsp;message)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="environment()"><!-- --></A><H3>
-environment</H3>
-<PRE>
-<DD>Map returned:
- 
- <pre>
-   TZ = Timezone
-     id = Timezone ID
-     display = Timezone display name
-     offset = Offset from UTC (in ms)
-   SDK = SDK Version
-   download = default download path
-   appcache = Location of application cache 
-   sdcard = Space on sdcard
-     availblocks = Available blocks
-     blockcount = Total Blocks
-     blocksize = size of block.
- </pre>
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getConstants(java.lang.String)"><!-- --></A><H3>
-getConstants</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Get list of constants (static final fields) for a class")
-</FONT>public Bundle <B>getConstants</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="classname",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="Class to get constants from")</FONT>
-                                          java.lang.String&nbsp;classname)
-                    throws java.lang.Exception</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.lang.Exception</CODE></DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/AndroidFacade.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/ActivityResultFacade.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/AndroidFacade.Resources.html" title="interface in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/AndroidFacade.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="AndroidFacade.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#nested_class_summary">NESTED</A>&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/facade/ApplicationManagerFacade.html b/doc/com/googlecode/android_scripting/facade/ApplicationManagerFacade.html
deleted file mode 100644
index 941aed3b..00000000
--- a/doc/com/googlecode/android_scripting/facade/ApplicationManagerFacade.html
+++ /dev/null
@@ -1,346 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:00:59 PDT 2014 -->
-<TITLE>
-ApplicationManagerFacade
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="ApplicationManagerFacade";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ApplicationManagerFacade.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/AndroidFacade.Resources.html" title="interface in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/BatteryManagerFacade.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/ApplicationManagerFacade.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ApplicationManagerFacade.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.facade</FONT>
-<BR>
-Class ApplicationManagerFacade</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">com.googlecode.android_scripting.jsonrpc.RpcReceiver</A>
-      <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.facade.ApplicationManagerFacade</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>ApplicationManagerFacade</B><DT>extends <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A></DL>
-</PRE>
-
-<P>
-Facade for managing Applications.
-<P>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/ApplicationManagerFacade.html#ApplicationManagerFacade(com.googlecode.android_scripting.facade.FacadeManager)">ApplicationManagerFacade</A></B>(<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A>&nbsp;manager)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/ApplicationManagerFacade.html#forceStopPackage(java.lang.String)">forceStopPackage</A></B>(java.lang.String&nbsp;packageName)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.util.Map&lt;java.lang.String,java.lang.String&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/ApplicationManagerFacade.html#getLaunchableApplications()">getLaunchableApplications</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.util.List&lt;java.lang.String&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/ApplicationManagerFacade.html#getRunningPackages()">getRunningPackages</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/ApplicationManagerFacade.html#launch(java.lang.String)">launch</A></B>(java.lang.String&nbsp;className)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/ApplicationManagerFacade.html#shutdown()">shutdown</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Invoked when the receiver is shut down.</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="ApplicationManagerFacade(com.googlecode.android_scripting.facade.FacadeManager)"><!-- --></A><H3>
-ApplicationManagerFacade</H3>
-<PRE>
-public <B>ApplicationManagerFacade</B>(<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A>&nbsp;manager)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="getLaunchableApplications()"><!-- --></A><H3>
-getLaunchableApplications</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns a list of all launchable application class names.")
-</FONT>public java.util.Map&lt;java.lang.String,java.lang.String&gt; <B>getLaunchableApplications</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="launch(java.lang.String)"><!-- --></A><H3>
-launch</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Start activity with the given class name.")
-</FONT>public void <B>launch</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="className")</FONT>
-                                  java.lang.String&nbsp;className)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getRunningPackages()"><!-- --></A><H3>
-getRunningPackages</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns a list of packages running activities or services.",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="List of packages running activities.")
-</FONT>public java.util.List&lt;java.lang.String&gt; <B>getRunningPackages</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="forceStopPackage(java.lang.String)"><!-- --></A><H3>
-forceStopPackage</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Force stops a package.")
-</FONT>public void <B>forceStopPackage</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="packageName",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="name of package")</FONT>
-                                            java.lang.String&nbsp;packageName)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="shutdown()"><!-- --></A><H3>
-shutdown</H3>
-<PRE>
-public void <B>shutdown</B>()</PRE>
-<DL>
-<DD><B>Description copied from class: <CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html#shutdown()">RpcReceiver</A></CODE></B></DD>
-<DD>Invoked when the receiver is shut down.
-<P>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html#shutdown()">shutdown</A></CODE> in class <CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ApplicationManagerFacade.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/AndroidFacade.Resources.html" title="interface in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/BatteryManagerFacade.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/ApplicationManagerFacade.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ApplicationManagerFacade.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/facade/BatteryManagerFacade.html b/doc/com/googlecode/android_scripting/facade/BatteryManagerFacade.html
deleted file mode 100644
index dee36f87..00000000
--- a/doc/com/googlecode/android_scripting/facade/BatteryManagerFacade.html
+++ /dev/null
@@ -1,556 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:00:59 PDT 2014 -->
-<TITLE>
-BatteryManagerFacade
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="BatteryManagerFacade";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/BatteryManagerFacade.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/ApplicationManagerFacade.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/BluetoothFacade.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/BatteryManagerFacade.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="BatteryManagerFacade.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.facade</FONT>
-<BR>
-Class BatteryManagerFacade</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">com.googlecode.android_scripting.jsonrpc.RpcReceiver</A>
-      <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.facade.BatteryManagerFacade</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>BatteryManagerFacade</B><DT>extends <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A></DL>
-</PRE>
-
-<P>
-Exposes Batterymanager API. Note that in order to use any of the batteryGet* functions, you need
- to batteryStartMonitoring, and then wait for a "battery" event. Sleeping for a second will
- usually work just as well.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Alexey Reznichenko (alexey.reznichenko@gmail.com), Robbie Matthews (rjmatthews62@gmail.com)</DD>
-</DL>
-<HR>
-
-<P>
-<!-- =========== FIELD SUMMARY =========== -->
-
-<A NAME="field_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Field Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/BatteryManagerFacade.html#BATTERY_PLUGGED_AC">BATTERY_PLUGGED_AC</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Power source is an AC charger.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/BatteryManagerFacade.html#BATTERY_PLUGGED_USB">BATTERY_PLUGGED_USB</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Power source is a USB port.</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/BatteryManagerFacade.html#BatteryManagerFacade(com.googlecode.android_scripting.facade.FacadeManager)">BatteryManagerFacade</A></B>(<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A>&nbsp;manager)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.Boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/BatteryManagerFacade.html#batteryCheckPresent()">batteryCheckPresent</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.Integer</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/BatteryManagerFacade.html#batteryGetHealth()">batteryGetHealth</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.Integer</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/BatteryManagerFacade.html#batteryGetLevel()">batteryGetLevel</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.Integer</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/BatteryManagerFacade.html#batteryGetPlugType()">batteryGetPlugType</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.Integer</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/BatteryManagerFacade.html#batteryGetStatus()">batteryGetStatus</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/BatteryManagerFacade.html#batteryGetTechnology()">batteryGetTechnology</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.Integer</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/BatteryManagerFacade.html#batteryGetTemperature()">batteryGetTemperature</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.Integer</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/BatteryManagerFacade.html#batteryGetVoltage()">batteryGetVoltage</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/BatteryManagerFacade.html#batteryStartMonitoring()">batteryStartMonitoring</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;throws "battery" events</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/BatteryManagerFacade.html#batteryStopMonitoring()">batteryStopMonitoring</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;Bundle</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/BatteryManagerFacade.html#readBatteryData()">readBatteryData</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/BatteryManagerFacade.html#shutdown()">shutdown</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Invoked when the receiver is shut down.</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-<A NAME="field_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Field Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="BATTERY_PLUGGED_AC"><!-- --></A><H3>
-BATTERY_PLUGGED_AC</H3>
-<PRE>
-public static final int <B>BATTERY_PLUGGED_AC</B></PRE>
-<DL>
-<DD>Power source is an AC charger.
-<P>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../constant-values.html#com.googlecode.android_scripting.facade.BatteryManagerFacade.BATTERY_PLUGGED_AC">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="BATTERY_PLUGGED_USB"><!-- --></A><H3>
-BATTERY_PLUGGED_USB</H3>
-<PRE>
-public static final int <B>BATTERY_PLUGGED_USB</B></PRE>
-<DL>
-<DD>Power source is a USB port.
-<P>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../constant-values.html#com.googlecode.android_scripting.facade.BatteryManagerFacade.BATTERY_PLUGGED_USB">Constant Field Values</A></DL>
-</DL>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="BatteryManagerFacade(com.googlecode.android_scripting.facade.FacadeManager)"><!-- --></A><H3>
-BatteryManagerFacade</H3>
-<PRE>
-public <B>BatteryManagerFacade</B>(<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A>&nbsp;manager)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="readBatteryData()"><!-- --></A><H3>
-readBatteryData</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns the most recently recorded battery data.")
-</FONT>public Bundle <B>readBatteryData</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="batteryStartMonitoring()"><!-- --></A><H3>
-batteryStartMonitoring</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Starts tracking battery state.")
-<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcStartEvent.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcStartEvent</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcStartEvent.html#value()">value</A>="battery")
-</FONT>public void <B>batteryStartMonitoring</B>()</PRE>
-<DL>
-<DD>throws "battery" events
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="batteryStopMonitoring()"><!-- --></A><H3>
-batteryStopMonitoring</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Stops tracking battery state.")
-<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcStopEvent.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcStopEvent</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcStopEvent.html#value()">value</A>="battery")
-</FONT>public void <B>batteryStopMonitoring</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="shutdown()"><!-- --></A><H3>
-shutdown</H3>
-<PRE>
-public void <B>shutdown</B>()</PRE>
-<DL>
-<DD><B>Description copied from class: <CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html#shutdown()">RpcReceiver</A></CODE></B></DD>
-<DD>Invoked when the receiver is shut down.
-<P>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html#shutdown()">shutdown</A></CODE> in class <CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="batteryGetStatus()"><!-- --></A><H3>
-batteryGetStatus</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns  the most recently received battery status data:\n1 - unknown;\n2 - charging;\n3 - discharging;\n4 - not charging;\n5 - full;")
-</FONT>public java.lang.Integer <B>batteryGetStatus</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="batteryGetHealth()"><!-- --></A><H3>
-batteryGetHealth</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns the most recently received battery health data:\n1 - unknown;\n2 - good;\n3 - overheat;\n4 - dead;\n5 - over voltage;\n6 - unspecified failure;")
-</FONT>public java.lang.Integer <B>batteryGetHealth</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="batteryGetPlugType()"><!-- --></A><H3>
-batteryGetPlugType</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns the most recently received plug type data:\n-1 - unknown\n0 - unplugged;\n1 - power source is an AC charger\n2 - power source is a USB port")
-</FONT>public java.lang.Integer <B>batteryGetPlugType</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="batteryCheckPresent()"><!-- --></A><H3>
-batteryCheckPresent</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns the most recently received battery presence data.")
-<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcMinSdk.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcMinSdk</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcMinSdk.html#value()">value</A>=5)
-</FONT>public java.lang.Boolean <B>batteryCheckPresent</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="batteryGetLevel()"><!-- --></A><H3>
-batteryGetLevel</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns the most recently received battery level (percentage).")
-<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcMinSdk.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcMinSdk</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcMinSdk.html#value()">value</A>=5)
-</FONT>public java.lang.Integer <B>batteryGetLevel</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="batteryGetVoltage()"><!-- --></A><H3>
-batteryGetVoltage</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns the most recently received battery voltage.")
-<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcMinSdk.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcMinSdk</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcMinSdk.html#value()">value</A>=5)
-</FONT>public java.lang.Integer <B>batteryGetVoltage</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="batteryGetTemperature()"><!-- --></A><H3>
-batteryGetTemperature</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns the most recently received battery temperature.")
-<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcMinSdk.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcMinSdk</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcMinSdk.html#value()">value</A>=5)
-</FONT>public java.lang.Integer <B>batteryGetTemperature</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="batteryGetTechnology()"><!-- --></A><H3>
-batteryGetTechnology</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns the most recently received battery technology data.")
-<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcMinSdk.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcMinSdk</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcMinSdk.html#value()">value</A>=5)
-</FONT>public java.lang.String <B>batteryGetTechnology</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/BatteryManagerFacade.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/ApplicationManagerFacade.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/BluetoothFacade.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/BatteryManagerFacade.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="BatteryManagerFacade.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/facade/BluetoothFacade.html b/doc/com/googlecode/android_scripting/facade/BluetoothFacade.html
deleted file mode 100644
index 24430ba1..00000000
--- a/doc/com/googlecode/android_scripting/facade/BluetoothFacade.html
+++ /dev/null
@@ -1,771 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:00:59 PDT 2014 -->
-<TITLE>
-BluetoothFacade
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="BluetoothFacade";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/BluetoothFacade.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/BatteryManagerFacade.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/CameraFacade.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/BluetoothFacade.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="BluetoothFacade.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.facade</FONT>
-<BR>
-Class BluetoothFacade</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">com.googlecode.android_scripting.jsonrpc.RpcReceiver</A>
-      <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.facade.BluetoothFacade</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE><FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcMinSdk.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcMinSdk</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcMinSdk.html#value()">value</A>=5)
-</FONT>public class <B>BluetoothFacade</B><DT>extends <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A></DL>
-</PRE>
-
-<P>
-Bluetooth functions.
-<P>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/BluetoothFacade.html#BluetoothFacade(com.googlecode.android_scripting.facade.FacadeManager)">BluetoothFacade</A></B>(<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A>&nbsp;manager)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/BluetoothFacade.html#bluetoothAccept(java.lang.String, java.lang.Integer)">bluetoothAccept</A></B>(java.lang.String&nbsp;uuid,
-                java.lang.Integer&nbsp;timeout)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.util.Map&lt;java.lang.String,java.lang.String&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/BluetoothFacade.html#bluetoothActiveConnections()">bluetoothActiveConnections</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/BluetoothFacade.html#bluetoothConnect(java.lang.String, java.lang.String)">bluetoothConnect</A></B>(java.lang.String&nbsp;uuid,
-                 java.lang.String&nbsp;address)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.Boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/BluetoothFacade.html#bluetoothDiscoveryCancel()">bluetoothDiscoveryCancel</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.Boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/BluetoothFacade.html#bluetoothDiscoveryStart()">bluetoothDiscoveryStart</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/BluetoothFacade.html#bluetoothGetConnectedDeviceName(java.lang.String)">bluetoothGetConnectedDeviceName</A></B>(java.lang.String&nbsp;connID)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/BluetoothFacade.html#bluetoothGetLocalAddress()">bluetoothGetLocalAddress</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/BluetoothFacade.html#bluetoothGetLocalName()">bluetoothGetLocalName</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/BluetoothFacade.html#bluetoothGetRemoteDeviceName(java.lang.String)">bluetoothGetRemoteDeviceName</A></B>(java.lang.String&nbsp;address)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/BluetoothFacade.html#bluetoothGetScanMode()">bluetoothGetScanMode</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.Boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/BluetoothFacade.html#bluetoothIsDiscovering()">bluetoothIsDiscovering</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/BluetoothFacade.html#bluetoothMakeDiscoverable(java.lang.Integer)">bluetoothMakeDiscoverable</A></B>(java.lang.Integer&nbsp;duration)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/BluetoothFacade.html#bluetoothRead(java.lang.Integer, java.lang.String)">bluetoothRead</A></B>(java.lang.Integer&nbsp;bufferSize,
-              java.lang.String&nbsp;connID)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/BluetoothFacade.html#bluetoothReadBinary(java.lang.Integer, java.lang.String)">bluetoothReadBinary</A></B>(java.lang.Integer&nbsp;bufferSize,
-                    java.lang.String&nbsp;connID)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/BluetoothFacade.html#bluetoothReadLine(java.lang.String)">bluetoothReadLine</A></B>(java.lang.String&nbsp;connID)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.Boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/BluetoothFacade.html#bluetoothReadReady(java.lang.String)">bluetoothReadReady</A></B>(java.lang.String&nbsp;connID)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/BluetoothFacade.html#bluetoothSetLocalName(java.lang.String)">bluetoothSetLocalName</A></B>(java.lang.String&nbsp;name)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/BluetoothFacade.html#bluetoothStop(java.lang.String)">bluetoothStop</A></B>(java.lang.String&nbsp;connID)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/BluetoothFacade.html#bluetoothWrite(java.lang.String, java.lang.String)">bluetoothWrite</A></B>(java.lang.String&nbsp;ascii,
-               java.lang.String&nbsp;connID)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/BluetoothFacade.html#bluetoothWriteBinary(java.lang.String, java.lang.String)">bluetoothWriteBinary</A></B>(java.lang.String&nbsp;base64,
-                     java.lang.String&nbsp;connID)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.Boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/BluetoothFacade.html#checkBluetoothState()">checkBluetoothState</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/BluetoothFacade.html#shutdown()">shutdown</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Invoked when the receiver is shut down.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.Boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/BluetoothFacade.html#toggleBluetoothState(java.lang.Boolean, java.lang.Boolean)">toggleBluetoothState</A></B>(java.lang.Boolean&nbsp;enabled,
-                     java.lang.Boolean&nbsp;prompt)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="BluetoothFacade(com.googlecode.android_scripting.facade.FacadeManager)"><!-- --></A><H3>
-BluetoothFacade</H3>
-<PRE>
-public <B>BluetoothFacade</B>(<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A>&nbsp;manager)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="bluetoothActiveConnections()"><!-- --></A><H3>
-bluetoothActiveConnections</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns active Bluetooth connections.")
-</FONT>public java.util.Map&lt;java.lang.String,java.lang.String&gt; <B>bluetoothActiveConnections</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="bluetoothWriteBinary(java.lang.String, java.lang.String)"><!-- --></A><H3>
-bluetoothWriteBinary</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Send bytes over the currently open Bluetooth connection.")
-</FONT>public void <B>bluetoothWriteBinary</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="base64",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="A base64 encoded String of the bytes to be sent.")</FONT>
-                                                java.lang.String&nbsp;base64,
-                                                <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="connID",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="Connection id")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                                java.lang.String&nbsp;connID)
-                          throws java.io.IOException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.io.IOException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="bluetoothReadBinary(java.lang.Integer, java.lang.String)"><!-- --></A><H3>
-bluetoothReadBinary</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Read up to bufferSize bytes and return a chunked, base64 encoded string.")
-</FONT>public java.lang.String <B>bluetoothReadBinary</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="bufferSize")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="4096")</FONT>
-                                                           java.lang.Integer&nbsp;bufferSize,
-                                                           <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="connID",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="Connection id")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                                           java.lang.String&nbsp;connID)
-                                     throws java.io.IOException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.io.IOException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="bluetoothConnect(java.lang.String, java.lang.String)"><!-- --></A><H3>
-bluetoothConnect</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Connect to a device over Bluetooth. Blocks until the connection is established or fails.",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="True if the connection was established successfully.")
-</FONT>public java.lang.String <B>bluetoothConnect</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="uuid",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="The UUID passed here must match the UUID used by the server device.")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="457807c0-4897-11df-9879-0800200c9a66")</FONT>
-                                                               java.lang.String&nbsp;uuid,
-                                                               <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="address",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="The user will be presented with a list of discovered devices to choose from if an address is not provided.")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                                               java.lang.String&nbsp;address)
-                                  throws java.io.IOException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.io.IOException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="bluetoothAccept(java.lang.String, java.lang.Integer)"><!-- --></A><H3>
-bluetoothAccept</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Listens for and accepts a Bluetooth connection. Blocks until the connection is established or fails.")
-</FONT>public java.lang.String <B>bluetoothAccept</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="uuid")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="457807c0-4897-11df-9879-0800200c9a66")</FONT>
-                                                       java.lang.String&nbsp;uuid,
-                                                       <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="timeout",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="How long to wait for a new connection, 0 is wait for ever")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="0")</FONT>
-                                                       java.lang.Integer&nbsp;timeout)
-                                 throws java.io.IOException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.io.IOException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="bluetoothMakeDiscoverable(java.lang.Integer)"><!-- --></A><H3>
-bluetoothMakeDiscoverable</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Requests that the device be discoverable for Bluetooth connections.")
-</FONT>public void <B>bluetoothMakeDiscoverable</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="duration",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="period of time, in seconds, during which the device should be discoverable")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="300")</FONT>
-                                                     java.lang.Integer&nbsp;duration)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="bluetoothWrite(java.lang.String, java.lang.String)"><!-- --></A><H3>
-bluetoothWrite</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Sends ASCII characters over the currently open Bluetooth connection.")
-</FONT>public void <B>bluetoothWrite</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="ascii")</FONT>
-                                          java.lang.String&nbsp;ascii,
-                                          <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="connID",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="Connection id")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="")</FONT>
-                                          java.lang.String&nbsp;connID)
-                    throws java.io.IOException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.io.IOException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="bluetoothReadReady(java.lang.String)"><!-- --></A><H3>
-bluetoothReadReady</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns True if the next read is guaranteed not to block.")
-</FONT>public java.lang.Boolean <B>bluetoothReadReady</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="connID",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="Connection id")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                                           java.lang.String&nbsp;connID)
-                                     throws java.io.IOException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.io.IOException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="bluetoothRead(java.lang.Integer, java.lang.String)"><!-- --></A><H3>
-bluetoothRead</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Read up to bufferSize ASCII characters.")
-</FONT>public java.lang.String <B>bluetoothRead</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="bufferSize")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="4096")</FONT>
-                                                     java.lang.Integer&nbsp;bufferSize,
-                                                     <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="connID",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="Connection id")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="")</FONT>
-                                                     java.lang.String&nbsp;connID)
-                               throws java.io.IOException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.io.IOException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="bluetoothReadLine(java.lang.String)"><!-- --></A><H3>
-bluetoothReadLine</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Read the next line.")
-</FONT>public java.lang.String <B>bluetoothReadLine</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="connID",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="Connection id")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="")</FONT>
-                                                         java.lang.String&nbsp;connID)
-                                   throws java.io.IOException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.io.IOException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="bluetoothGetRemoteDeviceName(java.lang.String)"><!-- --></A><H3>
-bluetoothGetRemoteDeviceName</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Queries a remote device for it\'s name or null if it can\'t be resolved")
-</FONT>public java.lang.String <B>bluetoothGetRemoteDeviceName</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="address",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="Bluetooth Address For Target Device")</FONT>
-                                                                    java.lang.String&nbsp;address)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="bluetoothGetLocalName()"><!-- --></A><H3>
-bluetoothGetLocalName</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Gets the Bluetooth Visible device name")
-</FONT>public java.lang.String <B>bluetoothGetLocalName</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="bluetoothSetLocalName(java.lang.String)"><!-- --></A><H3>
-bluetoothSetLocalName</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Sets the Bluetooth Visible device name, returns True on success")
-</FONT>public boolean <B>bluetoothSetLocalName</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="name",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="New local name")</FONT>
-                                                    java.lang.String&nbsp;name)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="bluetoothGetScanMode()"><!-- --></A><H3>
-bluetoothGetScanMode</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Gets the scan mode for the local dongle.\r\nReturn values:\r\n\t-1 when Bluetooth is disabled.\r\n\t0 if non discoverable and non connectable.\r\n\r1 connectable non discoverable.\r3 connectable and discoverable.")
-</FONT>public int <B>bluetoothGetScanMode</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="bluetoothGetConnectedDeviceName(java.lang.String)"><!-- --></A><H3>
-bluetoothGetConnectedDeviceName</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns the name of the connected device.")
-</FONT>public java.lang.String <B>bluetoothGetConnectedDeviceName</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="connID",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="Connection id")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="")</FONT>
-                                                                       java.lang.String&nbsp;connID)
-                                                 throws java.io.IOException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.io.IOException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="checkBluetoothState()"><!-- --></A><H3>
-checkBluetoothState</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Checks Bluetooth state.",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="True if Bluetooth is enabled.")
-</FONT>public java.lang.Boolean <B>checkBluetoothState</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="toggleBluetoothState(java.lang.Boolean, java.lang.Boolean)"><!-- --></A><H3>
-toggleBluetoothState</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Toggle Bluetooth on and off.",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="True if Bluetooth is enabled.")
-</FONT>public java.lang.Boolean <B>toggleBluetoothState</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="enabled")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                                                    java.lang.Boolean&nbsp;enabled,
-                                                                    <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="prompt",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="Prompt the user to confirm changing the Bluetooth state.")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="true")</FONT>
-                                                                    java.lang.Boolean&nbsp;prompt)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="bluetoothStop(java.lang.String)"><!-- --></A><H3>
-bluetoothStop</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Stops Bluetooth connection.")
-</FONT>public void <B>bluetoothStop</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="connID",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="Connection id")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="")</FONT>
-                                         java.lang.String&nbsp;connID)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="bluetoothGetLocalAddress()"><!-- --></A><H3>
-bluetoothGetLocalAddress</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns the hardware address of the local Bluetooth adapter. ")
-</FONT>public java.lang.String <B>bluetoothGetLocalAddress</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="bluetoothDiscoveryStart()"><!-- --></A><H3>
-bluetoothDiscoveryStart</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Start the remote device discovery process. ",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="true on success, false on error")
-</FONT>public java.lang.Boolean <B>bluetoothDiscoveryStart</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="bluetoothDiscoveryCancel()"><!-- --></A><H3>
-bluetoothDiscoveryCancel</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Cancel the current device discovery process.",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="true on success, false on error")
-</FONT>public java.lang.Boolean <B>bluetoothDiscoveryCancel</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="bluetoothIsDiscovering()"><!-- --></A><H3>
-bluetoothIsDiscovering</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Return true if the local Bluetooth adapter is currently in the device discovery process. ")
-</FONT>public java.lang.Boolean <B>bluetoothIsDiscovering</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="shutdown()"><!-- --></A><H3>
-shutdown</H3>
-<PRE>
-public void <B>shutdown</B>()</PRE>
-<DL>
-<DD><B>Description copied from class: <CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html#shutdown()">RpcReceiver</A></CODE></B></DD>
-<DD>Invoked when the receiver is shut down.
-<P>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html#shutdown()">shutdown</A></CODE> in class <CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/BluetoothFacade.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/BatteryManagerFacade.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/CameraFacade.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/BluetoothFacade.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="BluetoothFacade.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/facade/CameraFacade.html b/doc/com/googlecode/android_scripting/facade/CameraFacade.html
deleted file mode 100644
index 291e73c8..00000000
--- a/doc/com/googlecode/android_scripting/facade/CameraFacade.html
+++ /dev/null
@@ -1,312 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:00:59 PDT 2014 -->
-<TITLE>
-CameraFacade
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="CameraFacade";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/CameraFacade.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/BluetoothFacade.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/CommonIntentsFacade.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/CameraFacade.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="CameraFacade.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.facade</FONT>
-<BR>
-Class CameraFacade</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">com.googlecode.android_scripting.jsonrpc.RpcReceiver</A>
-      <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.facade.CameraFacade</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>CameraFacade</B><DT>extends <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A></DL>
-</PRE>
-
-<P>
-Access Camera functions.
-<P>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/CameraFacade.html#CameraFacade(com.googlecode.android_scripting.facade.FacadeManager)">CameraFacade</A></B>(<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A>&nbsp;manager)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;Bundle</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/CameraFacade.html#cameraCapturePicture(java.lang.String, java.lang.Boolean)">cameraCapturePicture</A></B>(java.lang.String&nbsp;targetPath,
-                     java.lang.Boolean&nbsp;useAutoFocus)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/CameraFacade.html#cameraInteractiveCapturePicture(java.lang.String)">cameraInteractiveCapturePicture</A></B>(java.lang.String&nbsp;targetPath)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/CameraFacade.html#shutdown()">shutdown</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Invoked when the receiver is shut down.</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="CameraFacade(com.googlecode.android_scripting.facade.FacadeManager)"><!-- --></A><H3>
-CameraFacade</H3>
-<PRE>
-public <B>CameraFacade</B>(<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A>&nbsp;manager)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="cameraCapturePicture(java.lang.String, java.lang.Boolean)"><!-- --></A><H3>
-cameraCapturePicture</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Take a picture and save it to the specified path.",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="A map of Booleans autoFocus and takePicture where True indicates success.")
-</FONT>public Bundle <B>cameraCapturePicture</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="targetPath")</FONT>
-                                                         java.lang.String&nbsp;targetPath,
-                                                         <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="useAutoFocus")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="true")</FONT>
-                                                         java.lang.Boolean&nbsp;useAutoFocus)
-                            throws java.lang.InterruptedException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.lang.InterruptedException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="shutdown()"><!-- --></A><H3>
-shutdown</H3>
-<PRE>
-public void <B>shutdown</B>()</PRE>
-<DL>
-<DD><B>Description copied from class: <CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html#shutdown()">RpcReceiver</A></CODE></B></DD>
-<DD>Invoked when the receiver is shut down.
-<P>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html#shutdown()">shutdown</A></CODE> in class <CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="cameraInteractiveCapturePicture(java.lang.String)"><!-- --></A><H3>
-cameraInteractiveCapturePicture</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Starts the image capture application to take a picture and saves it to the specified path.")
-</FONT>public void <B>cameraInteractiveCapturePicture</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="targetPath")</FONT>
-                                                           java.lang.String&nbsp;targetPath)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/CameraFacade.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/BluetoothFacade.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/CommonIntentsFacade.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/CameraFacade.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="CameraFacade.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/facade/CommonIntentsFacade.html b/doc/com/googlecode/android_scripting/facade/CommonIntentsFacade.html
deleted file mode 100644
index a7d4db97..00000000
--- a/doc/com/googlecode/android_scripting/facade/CommonIntentsFacade.html
+++ /dev/null
@@ -1,436 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:00 PDT 2014 -->
-<TITLE>
-CommonIntentsFacade
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="CommonIntentsFacade";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/CommonIntentsFacade.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/CameraFacade.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/ContactsFacade.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/CommonIntentsFacade.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="CommonIntentsFacade.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.facade</FONT>
-<BR>
-Class CommonIntentsFacade</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">com.googlecode.android_scripting.jsonrpc.RpcReceiver</A>
-      <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.facade.CommonIntentsFacade</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>CommonIntentsFacade</B><DT>extends <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A></DL>
-</PRE>
-
-<P>
-A selection of commonly used intents. <br>
- <br>
- These can be used to trigger some common tasks.
-<P>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/CommonIntentsFacade.html#CommonIntentsFacade(com.googlecode.android_scripting.facade.FacadeManager)">CommonIntentsFacade</A></B>(<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A>&nbsp;manager)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;Intent</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/CommonIntentsFacade.html#pick(java.lang.String)">pick</A></B>(java.lang.String&nbsp;uri)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;Intent</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/CommonIntentsFacade.html#scanBarcode()">scanBarcode</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/CommonIntentsFacade.html#search(java.lang.String)">search</A></B>(java.lang.String&nbsp;query)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/CommonIntentsFacade.html#shutdown()">shutdown</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Invoked when the receiver is shut down.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/CommonIntentsFacade.html#view(java.lang.String, java.lang.String, JSONObject)">view</A></B>(java.lang.String&nbsp;uri,
-     java.lang.String&nbsp;type,
-     JSONObject&nbsp;extras)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/CommonIntentsFacade.html#viewContacts()">viewContacts</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/CommonIntentsFacade.html#viewHtml(java.lang.String)">viewHtml</A></B>(java.lang.String&nbsp;path)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/CommonIntentsFacade.html#viewMap(java.lang.String)">viewMap</A></B>(java.lang.String&nbsp;query)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="CommonIntentsFacade(com.googlecode.android_scripting.facade.FacadeManager)"><!-- --></A><H3>
-CommonIntentsFacade</H3>
-<PRE>
-public <B>CommonIntentsFacade</B>(<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A>&nbsp;manager)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="shutdown()"><!-- --></A><H3>
-shutdown</H3>
-<PRE>
-public void <B>shutdown</B>()</PRE>
-<DL>
-<DD><B>Description copied from class: <CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html#shutdown()">RpcReceiver</A></CODE></B></DD>
-<DD>Invoked when the receiver is shut down.
-<P>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html#shutdown()">shutdown</A></CODE> in class <CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="pick(java.lang.String)"><!-- --></A><H3>
-pick</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Display content to be picked by URI (e.g. contacts)",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="A map of result values.")
-</FONT>public Intent <B>pick</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="uri")</FONT>
-                                         java.lang.String&nbsp;uri)
-            throws JSONException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>JSONException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="scanBarcode()"><!-- --></A><H3>
-scanBarcode</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Starts the barcode scanner.",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="A Map representation of the result Intent.")
-</FONT>public Intent <B>scanBarcode</B>()
-                   throws JSONException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>JSONException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="view(java.lang.String, java.lang.String, JSONObject)"><!-- --></A><H3>
-view</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Start activity with view action by URI (i.e. browser, contacts, etc.).")
-</FONT>public void <B>view</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="uri")</FONT>
-                                java.lang.String&nbsp;uri,
-                                <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="type",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="MIME type/subtype of the URI")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                java.lang.String&nbsp;type,
-                                <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="extras",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="a Map of extras to add to the Intent")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                JSONObject&nbsp;extras)
-          throws java.lang.Exception</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.lang.Exception</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="viewMap(java.lang.String)"><!-- --></A><H3>
-viewMap</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Opens a map search for query (e.g. pizza, 123 My Street).")
-</FONT>public void <B>viewMap</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="query, e.g. pizza, 123 My Street")</FONT>
-                                   java.lang.String&nbsp;query)
-             throws java.lang.Exception</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.lang.Exception</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="viewContacts()"><!-- --></A><H3>
-viewContacts</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Opens the list of contacts.")
-</FONT>public void <B>viewContacts</B>()
-                  throws JSONException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>JSONException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="viewHtml(java.lang.String)"><!-- --></A><H3>
-viewHtml</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Opens the browser to display a local HTML file.")
-</FONT>public void <B>viewHtml</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="path",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="the path to the HTML file")</FONT>
-                                    java.lang.String&nbsp;path)
-              throws JSONException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>JSONException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="search(java.lang.String)"><!-- --></A><H3>
-search</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Starts a search for the given query.")
-</FONT>public void <B>search</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="query")</FONT>
-                                  java.lang.String&nbsp;query)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/CommonIntentsFacade.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/CameraFacade.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/ContactsFacade.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/CommonIntentsFacade.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="CommonIntentsFacade.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/facade/ContactsFacade.html b/doc/com/googlecode/android_scripting/facade/ContactsFacade.html
deleted file mode 100644
index 7b118370..00000000
--- a/doc/com/googlecode/android_scripting/facade/ContactsFacade.html
+++ /dev/null
@@ -1,603 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:00 PDT 2014 -->
-<TITLE>
-ContactsFacade
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="ContactsFacade";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ContactsFacade.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/CommonIntentsFacade.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/ContactsFacade.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ContactsFacade.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.facade</FONT>
-<BR>
-Class ContactsFacade</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">com.googlecode.android_scripting.jsonrpc.RpcReceiver</A>
-      <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.facade.ContactsFacade</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>ContactsFacade</B><DT>extends <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A></DL>
-</PRE>
-
-<P>
-Provides access to contacts related functionality.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>MeanEYE.rcf (meaneye.rcf@gmail.com</DD>
-</DL>
-<HR>
-
-<P>
-<!-- =========== FIELD SUMMARY =========== -->
-
-<A NAME="field_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Field Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/ContactsFacade.html#mContactId">mContactId</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/ContactsFacade.html#mHasPhoneNumber">mHasPhoneNumber</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;Uri</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/ContactsFacade.html#mPhoneContent">mPhoneContent</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/ContactsFacade.html#mPhoneNumber">mPhoneNumber</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/ContactsFacade.html#mPrimary">mPrimary</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/ContactsFacade.html#ContactsFacade(com.googlecode.android_scripting.facade.FacadeManager)">ContactsFacade</A></B>(<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A>&nbsp;manager)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.util.List&lt;JSONObject&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/ContactsFacade.html#contactsGet(JSONArray)">contactsGet</A></B>(JSONArray&nbsp;attributes)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.util.List&lt;java.lang.String&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/ContactsFacade.html#contactsGetAttributes()">contactsGetAttributes</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;JSONObject</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/ContactsFacade.html#contactsGetById(java.lang.Integer, JSONArray)">contactsGetById</A></B>(java.lang.Integer&nbsp;id,
-                JSONArray&nbsp;attributes)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.Integer</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/ContactsFacade.html#contactsGetCount()">contactsGetCount</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.util.List&lt;java.lang.Integer&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/ContactsFacade.html#contactsGetIds()">contactsGetIds</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;Intent</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/ContactsFacade.html#pickContact()">pickContact</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/ContactsFacade.html#pickPhone()">pickPhone</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;JSONArray</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/ContactsFacade.html#queryAttributes(java.lang.String)">queryAttributes</A></B>(java.lang.String&nbsp;uri)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.util.List&lt;JSONObject&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/ContactsFacade.html#queryContent(java.lang.String, JSONArray, java.lang.String, JSONArray, java.lang.String)">queryContent</A></B>(java.lang.String&nbsp;uri,
-             JSONArray&nbsp;attributes,
-             java.lang.String&nbsp;selection,
-             JSONArray&nbsp;selectionArgs,
-             java.lang.String&nbsp;order)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Exactly as per <a href=
- "http://developer.android.com/reference/android/content/ContentResolver.html#query%28android.net.Uri,%20java.lang.String[],%20java.lang.String,%20java.lang.String[],%20java.lang.String%29"
- >ContentResolver.query</a></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/ContactsFacade.html#shutdown()">shutdown</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Invoked when the receiver is shut down.</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-<A NAME="field_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Field Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="mPhoneContent"><!-- --></A><H3>
-mPhoneContent</H3>
-<PRE>
-public Uri <B>mPhoneContent</B></PRE>
-<DL>
-<DL>
-</DL>
-</DL>
-<HR>
-
-<A NAME="mContactId"><!-- --></A><H3>
-mContactId</H3>
-<PRE>
-public java.lang.String <B>mContactId</B></PRE>
-<DL>
-<DL>
-</DL>
-</DL>
-<HR>
-
-<A NAME="mPrimary"><!-- --></A><H3>
-mPrimary</H3>
-<PRE>
-public java.lang.String <B>mPrimary</B></PRE>
-<DL>
-<DL>
-</DL>
-</DL>
-<HR>
-
-<A NAME="mPhoneNumber"><!-- --></A><H3>
-mPhoneNumber</H3>
-<PRE>
-public java.lang.String <B>mPhoneNumber</B></PRE>
-<DL>
-<DL>
-</DL>
-</DL>
-<HR>
-
-<A NAME="mHasPhoneNumber"><!-- --></A><H3>
-mHasPhoneNumber</H3>
-<PRE>
-public java.lang.String <B>mHasPhoneNumber</B></PRE>
-<DL>
-<DL>
-</DL>
-</DL>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="ContactsFacade(com.googlecode.android_scripting.facade.FacadeManager)"><!-- --></A><H3>
-ContactsFacade</H3>
-<PRE>
-public <B>ContactsFacade</B>(<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A>&nbsp;manager)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="pickContact()"><!-- --></A><H3>
-pickContact</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Displays a list of contacts to pick from.",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="A map of result values.")
-</FONT>public Intent <B>pickContact</B>()
-                   throws JSONException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>JSONException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="pickPhone()"><!-- --></A><H3>
-pickPhone</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Displays a list of phone numbers to pick from.",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="The selected phone number.")
-</FONT>public java.lang.String <B>pickPhone</B>()
-                           throws JSONException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>JSONException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="contactsGetAttributes()"><!-- --></A><H3>
-contactsGetAttributes</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns a List of all possible attributes for contacts.")
-</FONT>public java.util.List&lt;java.lang.String&gt; <B>contactsGetAttributes</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="contactsGetIds()"><!-- --></A><H3>
-contactsGetIds</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns a List of all contact IDs.")
-</FONT>public java.util.List&lt;java.lang.Integer&gt; <B>contactsGetIds</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="contactsGet(JSONArray)"><!-- --></A><H3>
-contactsGet</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns a List of all contacts.",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="a List of contacts as Maps")
-</FONT>public java.util.List&lt;JSONObject&gt; <B>contactsGet</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="attributes")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                                                    JSONArray&nbsp;attributes)
-                                       throws JSONException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>JSONException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="contactsGetById(java.lang.Integer, JSONArray)"><!-- --></A><H3>
-contactsGetById</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns contacts by ID.")
-</FONT>public JSONObject <B>contactsGetById</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="id")</FONT>
-                                                 java.lang.Integer&nbsp;id,
-                                                 <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="attributes")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                                 JSONArray&nbsp;attributes)
-                           throws JSONException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>JSONException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="contactsGetCount()"><!-- --></A><H3>
-contactsGetCount</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns the number of contacts.")
-</FONT>public java.lang.Integer <B>contactsGetCount</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="queryContent(java.lang.String, JSONArray, java.lang.String, JSONArray, java.lang.String)"><!-- --></A><H3>
-queryContent</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Content Resolver Query",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="result of query as Maps")
-</FONT>public java.util.List&lt;JSONObject&gt; <B>queryContent</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="uri",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="The URI, using the content:// scheme, for the content to retrieve.")</FONT>
-                                                                     java.lang.String&nbsp;uri,
-                                                                     <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="attributes",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="A list of which columns to return. Passing null will return all columns")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                                                     JSONArray&nbsp;attributes,
-                                                                     <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="selection",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="A filter declaring which rows to return")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                                                     java.lang.String&nbsp;selection,
-                                                                     <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="selectionArgs",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="You may include ?s in selection, which will be replaced by the values from selectionArgs")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                                                     JSONArray&nbsp;selectionArgs,
-                                                                     <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="order",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="How to order the rows")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                                                     java.lang.String&nbsp;order)
-                                        throws JSONException</PRE>
-<DL>
-<DD>Exactly as per <a href=
- "http://developer.android.com/reference/android/content/ContentResolver.html#query%28android.net.Uri,%20java.lang.String[],%20java.lang.String,%20java.lang.String[],%20java.lang.String%29"
- >ContentResolver.query</a>
-<P>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>JSONException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="queryAttributes(java.lang.String)"><!-- --></A><H3>
-queryAttributes</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Content Resolver Query Attributes",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="a list of available columns for a given content uri")
-</FONT>public JSONArray <B>queryAttributes</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="uri",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="The URI, using the content:// scheme, for the content to retrieve.")</FONT>
-                                                       java.lang.String&nbsp;uri)
-                          throws JSONException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>JSONException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="shutdown()"><!-- --></A><H3>
-shutdown</H3>
-<PRE>
-public void <B>shutdown</B>()</PRE>
-<DL>
-<DD><B>Description copied from class: <CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html#shutdown()">RpcReceiver</A></CODE></B></DD>
-<DD>Invoked when the receiver is shut down.
-<P>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html#shutdown()">shutdown</A></CODE> in class <CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ContactsFacade.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/CommonIntentsFacade.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/ContactsFacade.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ContactsFacade.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/facade/EventFacade.BroadcastListener.html b/doc/com/googlecode/android_scripting/facade/EventFacade.BroadcastListener.html
deleted file mode 100644
index 74d2566f..00000000
--- a/doc/com/googlecode/android_scripting/facade/EventFacade.BroadcastListener.html
+++ /dev/null
@@ -1,260 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:00 PDT 2014 -->
-<TITLE>
-EventFacade.BroadcastListener
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="EventFacade.BroadcastListener";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/EventFacade.BroadcastListener.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.EventObserver.html" title="interface in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/EventFacade.BroadcastListener.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="EventFacade.BroadcastListener.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.facade</FONT>
-<BR>
-Class EventFacade.BroadcastListener</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by ">android.content.BroadcastReceiver
-      <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.facade.EventFacade.BroadcastListener</B>
-</PRE>
-<DL>
-<DT><B>Enclosing class:</B><DD><A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.html" title="class in com.googlecode.android_scripting.facade">EventFacade</A></DD>
-</DL>
-<HR>
-<DL>
-<DT><PRE>public class <B>EventFacade.BroadcastListener</B><DT>extends android.content.BroadcastReceiver</DL>
-</PRE>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.BroadcastListener.html#EventFacade.BroadcastListener(com.googlecode.android_scripting.facade.EventFacade, boolean)">EventFacade.BroadcastListener</A></B>(<A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.html" title="class in com.googlecode.android_scripting.facade">EventFacade</A>&nbsp;parent,
-                              boolean&nbsp;enqueue)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.BroadcastListener.html#onReceive(Context, Intent)">onReceive</A></B>(Context&nbsp;context,
-          Intent&nbsp;intent)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="EventFacade.BroadcastListener(com.googlecode.android_scripting.facade.EventFacade, boolean)"><!-- --></A><H3>
-EventFacade.BroadcastListener</H3>
-<PRE>
-public <B>EventFacade.BroadcastListener</B>(<A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.html" title="class in com.googlecode.android_scripting.facade">EventFacade</A>&nbsp;parent,
-                                     boolean&nbsp;enqueue)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="onReceive(Context, Intent)"><!-- --></A><H3>
-onReceive</H3>
-<PRE>
-public void <B>onReceive</B>(Context&nbsp;context,
-                      Intent&nbsp;intent)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/EventFacade.BroadcastListener.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.EventObserver.html" title="interface in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/EventFacade.BroadcastListener.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="EventFacade.BroadcastListener.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/facade/EventFacade.EventObserver.html b/doc/com/googlecode/android_scripting/facade/EventFacade.EventObserver.html
deleted file mode 100644
index 306c6fe7..00000000
--- a/doc/com/googlecode/android_scripting/facade/EventFacade.EventObserver.html
+++ /dev/null
@@ -1,212 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:00 PDT 2014 -->
-<TITLE>
-EventFacade.EventObserver
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="EventFacade.EventObserver";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/EventFacade.EventObserver.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.BroadcastListener.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/EventServer.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/EventFacade.EventObserver.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="EventFacade.EventObserver.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.facade</FONT>
-<BR>
-Interface EventFacade.EventObserver</H2>
-<DL>
-<DT><B>All Known Implementing Classes:</B> <DD><A HREF="../../../../com/googlecode/android_scripting/facade/EventServer.html" title="class in com.googlecode.android_scripting.facade">EventServer</A></DD>
-</DL>
-<DL>
-<DT><B>Enclosing class:</B><DD><A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.html" title="class in com.googlecode.android_scripting.facade">EventFacade</A></DD>
-</DL>
-<HR>
-<DL>
-<DT><PRE>public static interface <B>EventFacade.EventObserver</B></DL>
-</PRE>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.EventObserver.html#onEventReceived(com.googlecode.android_scripting.event.Event)">onEventReceived</A></B>(<A HREF="../../../../com/googlecode/android_scripting/event/Event.html" title="class in com.googlecode.android_scripting.event">Event</A>&nbsp;event)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="onEventReceived(com.googlecode.android_scripting.event.Event)"><!-- --></A><H3>
-onEventReceived</H3>
-<PRE>
-void <B>onEventReceived</B>(<A HREF="../../../../com/googlecode/android_scripting/event/Event.html" title="class in com.googlecode.android_scripting.event">Event</A>&nbsp;event)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/EventFacade.EventObserver.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.BroadcastListener.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/EventServer.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/EventFacade.EventObserver.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="EventFacade.EventObserver.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/facade/EventFacade.html b/doc/com/googlecode/android_scripting/facade/EventFacade.html
deleted file mode 100644
index e8b9a495..00000000
--- a/doc/com/googlecode/android_scripting/facade/EventFacade.html
+++ /dev/null
@@ -1,762 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:00 PDT 2014 -->
-<TITLE>
-EventFacade
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="EventFacade";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/EventFacade.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/ContactsFacade.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.BroadcastListener.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/EventFacade.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="EventFacade.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#nested_class_summary">NESTED</A>&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.facade</FONT>
-<BR>
-Class EventFacade</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">com.googlecode.android_scripting.jsonrpc.RpcReceiver</A>
-      <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.facade.EventFacade</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>EventFacade</B><DT>extends <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A></DL>
-</PRE>
-
-<P>
-Manage the event queue. <br>
- <br>
- <b>Usage Notes:</b><br>
- EventFacade APIs interact with the Event Queue (a data buffer containing up to 1024 event
- entries).<br>
- Events are automatically entered into the Event Queue following API calls such as startSensing()
- and startLocating().<br>
- The Event Facade provides control over how events are entered into (and removed from) the Event
- Queue.<br>
- The Event Queue provides a useful means of recording background events (such as sensor data) when
- the phone is busy with foreground activities.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Felix Arends (felix.arends@gmail.com)</DD>
-</DL>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-<A NAME="nested_class_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Nested Class Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;class</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.BroadcastListener.html" title="class in com.googlecode.android_scripting.facade">EventFacade.BroadcastListener</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;interface</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.EventObserver.html" title="interface in com.googlecode.android_scripting.facade">EventFacade.EventObserver</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.html#EventFacade(com.googlecode.android_scripting.facade.FacadeManager)">EventFacade</A></B>(<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A>&nbsp;manager)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.html#addGlobalEventObserver(com.googlecode.android_scripting.facade.EventFacade.EventObserver)">addGlobalEventObserver</A></B>(<A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.EventObserver.html" title="interface in com.googlecode.android_scripting.facade">EventFacade.EventObserver</A>&nbsp;observer)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.html#addNamedEventObserver(java.lang.String, com.googlecode.android_scripting.facade.EventFacade.EventObserver)">addNamedEventObserver</A></B>(java.lang.String&nbsp;eventName,
-                      <A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.EventObserver.html" title="interface in com.googlecode.android_scripting.facade">EventFacade.EventObserver</A>&nbsp;observer)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.html#eventClearBuffer()">eventClearBuffer</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Example (python): droid.eventClearBuffer()</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.util.Set&lt;java.lang.String&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.html#eventGetBrodcastCategories()">eventGetBrodcastCategories</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.util.List&lt;<A HREF="../../../../com/googlecode/android_scripting/event/Event.html" title="class in com.googlecode.android_scripting.event">Event</A>&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.html#eventPoll(java.lang.Integer)">eventPoll</A></B>(java.lang.Integer&nbsp;number_of_events)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Actual data returned in the map will depend on the type of event.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.html#eventPost(java.lang.String, java.lang.String, java.lang.Boolean)">eventPost</A></B>(java.lang.String&nbsp;name,
-          java.lang.String&nbsp;data,
-          java.lang.Boolean&nbsp;enqueue)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
- Example:
-   import android
-   from datetime import datetime
-   droid = android.Android()
-   t = datetime.now()
-   droid.eventPost('Some Event', t)</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.html#eventRegisterForBroadcast(java.lang.String, java.lang.Boolean)">eventRegisterForBroadcast</A></B>(java.lang.String&nbsp;category,
-                          java.lang.Boolean&nbsp;enqueue)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Registers a listener for a new broadcast signal</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.html#eventUnregisterForBroadcast(java.lang.String)">eventUnregisterForBroadcast</A></B>(java.lang.String&nbsp;category)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../com/googlecode/android_scripting/event/Event.html" title="class in com.googlecode.android_scripting.event">Event</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.html#eventWait(java.lang.Integer)">eventWait</A></B>(java.lang.Integer&nbsp;timeout)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../com/googlecode/android_scripting/event/Event.html" title="class in com.googlecode.android_scripting.event">Event</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.html#eventWaitFor(java.lang.String, java.lang.Integer)">eventWaitFor</A></B>(java.lang.String&nbsp;eventName,
-             java.lang.Integer&nbsp;timeout)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.html#postEvent(java.lang.String, java.lang.Object)">postEvent</A></B>(java.lang.String&nbsp;name,
-          java.lang.Object&nbsp;data)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Post an event and queue it</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.html#postEvent(java.lang.String, java.lang.Object, boolean)">postEvent</A></B>(java.lang.String&nbsp;name,
-          java.lang.Object&nbsp;data,
-          boolean&nbsp;enqueue)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Posts an event with to the event queue.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../com/googlecode/android_scripting/event/Event.html" title="class in com.googlecode.android_scripting.event">Event</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.html#receiveEvent()">receiveEvent</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.html#removeEventObserver(com.googlecode.android_scripting.facade.EventFacade.EventObserver)">removeEventObserver</A></B>(<A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.EventObserver.html" title="interface in com.googlecode.android_scripting.facade">EventFacade.EventObserver</A>&nbsp;observer)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.html#rpcPostEvent(java.lang.String, java.lang.String)">rpcPostEvent</A></B>(java.lang.String&nbsp;name,
-             java.lang.String&nbsp;data)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.html#shutdown()">shutdown</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Invoked when the receiver is shut down.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.html#startEventDispatcher(java.lang.Integer)">startEventDispatcher</A></B>(java.lang.Integer&nbsp;port)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.html#stopEventDispatcher()">stopEventDispatcher</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../com/googlecode/android_scripting/event/Event.html" title="class in com.googlecode.android_scripting.event">Event</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.html#waitForEvent(java.lang.String, java.lang.Integer)">waitForEvent</A></B>(java.lang.String&nbsp;eventName,
-             java.lang.Integer&nbsp;timeout)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="EventFacade(com.googlecode.android_scripting.facade.FacadeManager)"><!-- --></A><H3>
-EventFacade</H3>
-<PRE>
-public <B>EventFacade</B>(<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A>&nbsp;manager)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="eventClearBuffer()"><!-- --></A><H3>
-eventClearBuffer</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Clears all events from the event buffer.")
-</FONT>public void <B>eventClearBuffer</B>()</PRE>
-<DL>
-<DD>Example (python): droid.eventClearBuffer()
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="eventRegisterForBroadcast(java.lang.String, java.lang.Boolean)"><!-- --></A><H3>
-eventRegisterForBroadcast</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Registers a listener for a new broadcast signal")
-</FONT>public boolean <B>eventRegisterForBroadcast</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="category")</FONT>
-                                                        java.lang.String&nbsp;category,
-                                                        <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="enqueue",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="Should this events be added to the event queue or only dispatched")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="true")</FONT>
-                                                        java.lang.Boolean&nbsp;enqueue)</PRE>
-<DL>
-<DD>Registers a listener for a new broadcast signal
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="eventUnregisterForBroadcast(java.lang.String)"><!-- --></A><H3>
-eventUnregisterForBroadcast</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Stop listening for a broadcast signal")
-</FONT>public void <B>eventUnregisterForBroadcast</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="category")</FONT>
-                                                       java.lang.String&nbsp;category)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="eventGetBrodcastCategories()"><!-- --></A><H3>
-eventGetBrodcastCategories</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Lists all the broadcast signals we are listening for")
-</FONT>public java.util.Set&lt;java.lang.String&gt; <B>eventGetBrodcastCategories</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="eventPoll(java.lang.Integer)"><!-- --></A><H3>
-eventPoll</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns and removes the oldest n events (i.e. location or sensor update, etc.) from the event buffer.",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="A List of Maps of event properties.")
-</FONT>public java.util.List&lt;<A HREF="../../../../com/googlecode/android_scripting/event/Event.html" title="class in com.googlecode.android_scripting.event">Event</A>&gt; <B>eventPoll</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="number_of_events")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="1")</FONT>
-                                                             java.lang.Integer&nbsp;number_of_events)</PRE>
-<DL>
-<DD>Actual data returned in the map will depend on the type of event.
- 
- <pre>
- Example (python):
-     import android, time
-     droid = android.Android()
-     droid.startSensing()
-     time.sleep(1)
-     droid.eventClearBuffer()
-     time.sleep(1)
-     e = eventPoll(1).result
-     event_entry_number = 0
-     x = e[event_entry_ number]['data']['xforce']
- </pre>
- 
- e has the format:<br>
- [{u'data': {u'accuracy': 0, u'pitch': -0.48766891956329345, u'xmag': -5.6875, u'azimuth':
- 0.3312483489513397, u'zforce': 8.3492730000000002, u'yforce': 4.5628165999999997, u'time':
- 1297072704.813, u'ymag': -11.125, u'zmag': -42.375, u'roll': -0.059393649548292161, u'xforce':
- 0.42223078000000003}, u'name': u'sensors', u'time': 1297072704813000L}]<br>
- x has the string value of the x force data (0.42223078000000003) at the time of the event
- entry. </pre>
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="eventWaitFor(java.lang.String, java.lang.Integer)"><!-- --></A><H3>
-eventWaitFor</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Blocks until an event with the supplied name occurs. The returned event is not removed from the buffer.",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="Map of event properties.")
-</FONT>public <A HREF="../../../../com/googlecode/android_scripting/event/Event.html" title="class in com.googlecode.android_scripting.event">Event</A> <B>eventWaitFor</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="eventName")</FONT>
-                                                java.lang.String&nbsp;eventName,
-                                                <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="timeout",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="the maximum time to wait (in ms)")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                                java.lang.Integer&nbsp;timeout)
-                   throws java.lang.InterruptedException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.lang.InterruptedException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="eventWait(java.lang.Integer)"><!-- --></A><H3>
-eventWait</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Blocks until an event occurs. The returned event is removed from the buffer.",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="Map of event properties.")
-</FONT>public <A HREF="../../../../com/googlecode/android_scripting/event/Event.html" title="class in com.googlecode.android_scripting.event">Event</A> <B>eventWait</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="timeout",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="the maximum time to wait")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                             java.lang.Integer&nbsp;timeout)
-                throws java.lang.InterruptedException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.lang.InterruptedException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="eventPost(java.lang.String, java.lang.String, java.lang.Boolean)"><!-- --></A><H3>
-eventPost</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Post an event to the event queue.")
-</FONT>public void <B>eventPost</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="name",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="Name of event")</FONT>
-                                     java.lang.String&nbsp;name,
-                                     <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="data",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="Data contained in event.")</FONT>
-                                     java.lang.String&nbsp;data,
-                                     <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="enqueue",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="Set to False if you don\'t want your events to be added to the event queue, just dispatched.")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="false")</FONT>
-                                     java.lang.Boolean&nbsp;enqueue)</PRE>
-<DL>
-<DD><pre>
- Example:
-   import android
-   from datetime import datetime
-   droid = android.Android()
-   t = datetime.now()
-   droid.eventPost('Some Event', t)
- </pre>
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="postEvent(java.lang.String, java.lang.Object)"><!-- --></A><H3>
-postEvent</H3>
-<PRE>
-public void <B>postEvent</B>(java.lang.String&nbsp;name,
-                      java.lang.Object&nbsp;data)</PRE>
-<DL>
-<DD>Post an event and queue it
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="postEvent(java.lang.String, java.lang.Object, boolean)"><!-- --></A><H3>
-postEvent</H3>
-<PRE>
-public void <B>postEvent</B>(java.lang.String&nbsp;name,
-                      java.lang.Object&nbsp;data,
-                      boolean&nbsp;enqueue)</PRE>
-<DL>
-<DD>Posts an event with to the event queue.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="rpcPostEvent(java.lang.String, java.lang.String)"><!-- --></A><H3>
-rpcPostEvent</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDeprecated.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDeprecated</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDeprecated.html#value()">value</A>="eventPost",
-               <A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDeprecated.html#release()">release</A>="r4")
-<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Post an event to the event queue.")
-<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcName.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcName</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcName.html#name()">name</A>="postEvent")
-</FONT>public void <B>rpcPostEvent</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="name")</FONT>
-                                                                              java.lang.String&nbsp;name,
-                                                                              <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="data")</FONT>
-                                                                              java.lang.String&nbsp;data)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="receiveEvent()"><!-- --></A><H3>
-receiveEvent</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDeprecated.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDeprecated</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDeprecated.html#value()">value</A>="eventPoll",
-               <A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDeprecated.html#release()">release</A>="r4")
-<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns and removes the oldest event (i.e. location or sensor update, etc.) from the event buffer.",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="Map of event properties.")
-</FONT>public <A HREF="../../../../com/googlecode/android_scripting/event/Event.html" title="class in com.googlecode.android_scripting.event">Event</A> <B>receiveEvent</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="waitForEvent(java.lang.String, java.lang.Integer)"><!-- --></A><H3>
-waitForEvent</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDeprecated.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDeprecated</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDeprecated.html#value()">value</A>="eventWaitFor",
-               <A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDeprecated.html#release()">release</A>="r4")
-<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Blocks until an event with the supplied name occurs. The returned event is not removed from the buffer.",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="Map of event properties.")
-</FONT>public <A HREF="../../../../com/googlecode/android_scripting/event/Event.html" title="class in com.googlecode.android_scripting.event">Event</A> <B>waitForEvent</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="eventName")</FONT>
-                                                                          java.lang.String&nbsp;eventName,
-                                                                          <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="timeout",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="the maximum time to wait")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                                                          java.lang.Integer&nbsp;timeout)
-                   throws java.lang.InterruptedException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.lang.InterruptedException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="startEventDispatcher(java.lang.Integer)"><!-- --></A><H3>
-startEventDispatcher</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Opens up a socket where you can read for events posted")
-</FONT>public int <B>startEventDispatcher</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="port",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="Port to use")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="0")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                               java.lang.Integer&nbsp;port)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="stopEventDispatcher()"><!-- --></A><H3>
-stopEventDispatcher</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Stops the event server, you can\'t read in the port anymore")
-</FONT>public void <B>stopEventDispatcher</B>()
-                         throws java.lang.RuntimeException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.lang.RuntimeException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="shutdown()"><!-- --></A><H3>
-shutdown</H3>
-<PRE>
-public void <B>shutdown</B>()</PRE>
-<DL>
-<DD><B>Description copied from class: <CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html#shutdown()">RpcReceiver</A></CODE></B></DD>
-<DD>Invoked when the receiver is shut down.
-<P>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html#shutdown()">shutdown</A></CODE> in class <CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="addNamedEventObserver(java.lang.String, com.googlecode.android_scripting.facade.EventFacade.EventObserver)"><!-- --></A><H3>
-addNamedEventObserver</H3>
-<PRE>
-public void <B>addNamedEventObserver</B>(java.lang.String&nbsp;eventName,
-                                  <A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.EventObserver.html" title="interface in com.googlecode.android_scripting.facade">EventFacade.EventObserver</A>&nbsp;observer)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="addGlobalEventObserver(com.googlecode.android_scripting.facade.EventFacade.EventObserver)"><!-- --></A><H3>
-addGlobalEventObserver</H3>
-<PRE>
-public void <B>addGlobalEventObserver</B>(<A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.EventObserver.html" title="interface in com.googlecode.android_scripting.facade">EventFacade.EventObserver</A>&nbsp;observer)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="removeEventObserver(com.googlecode.android_scripting.facade.EventFacade.EventObserver)"><!-- --></A><H3>
-removeEventObserver</H3>
-<PRE>
-public void <B>removeEventObserver</B>(<A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.EventObserver.html" title="interface in com.googlecode.android_scripting.facade">EventFacade.EventObserver</A>&nbsp;observer)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/EventFacade.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/ContactsFacade.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.BroadcastListener.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/EventFacade.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="EventFacade.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#nested_class_summary">NESTED</A>&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/facade/EventServer.html b/doc/com/googlecode/android_scripting/facade/EventServer.html
deleted file mode 100644
index aeb2d305..00000000
--- a/doc/com/googlecode/android_scripting/facade/EventServer.html
+++ /dev/null
@@ -1,354 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:00 PDT 2014 -->
-<TITLE>
-EventServer
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="EventServer";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/EventServer.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.EventObserver.html" title="interface in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/EyesFreeFacade.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/EventServer.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="EventServer.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#nested_classes_inherited_from_class_com.googlecode.android_scripting.SimpleServer">NESTED</A>&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.facade</FONT>
-<BR>
-Class EventServer</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../com/googlecode/android_scripting/SimpleServer.html" title="class in com.googlecode.android_scripting">com.googlecode.android_scripting.SimpleServer</A>
-      <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.facade.EventServer</B>
-</PRE>
-<DL>
-<DT><B>All Implemented Interfaces:</B> <DD><A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.EventObserver.html" title="interface in com.googlecode.android_scripting.facade">EventFacade.EventObserver</A></DD>
-</DL>
-<HR>
-<DL>
-<DT><PRE>public class <B>EventServer</B><DT>extends <A HREF="../../../../com/googlecode/android_scripting/SimpleServer.html" title="class in com.googlecode.android_scripting">SimpleServer</A><DT>implements <A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.EventObserver.html" title="interface in com.googlecode.android_scripting.facade">EventFacade.EventObserver</A></DL>
-</PRE>
-
-<P>
-An Event Forwarding server that forwards events from the rpc queue in realtime to listener
- clients.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Manuel Naranjo (manuel@aircable.net)</DD>
-<DT><B>See Also:</B><DD><A HREF="../../../../com/googlecode/android_scripting/SimpleServer.html" title="class in com.googlecode.android_scripting"><CODE>SimpleServer</CODE></A></DL>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-<A NAME="nested_class_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Nested Class Summary</B></FONT></TH>
-</TR>
-</TABLE>
-&nbsp;<A NAME="nested_classes_inherited_from_class_com.googlecode.android_scripting.SimpleServer"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Nested classes/interfaces inherited from class com.googlecode.android_scripting.<A HREF="../../../../com/googlecode/android_scripting/SimpleServer.html" title="class in com.googlecode.android_scripting">SimpleServer</A></B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../com/googlecode/android_scripting/SimpleServer.SimpleServerObserver.html" title="interface in com.googlecode.android_scripting">SimpleServer.SimpleServerObserver</A></CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/EventServer.html#EventServer()">EventServer</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/EventServer.html#EventServer(int)">EventServer</A></B>(int&nbsp;port)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.net.InetSocketAddress</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/EventServer.html#getAddress()">getAddress</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/EventServer.html#onEventReceived(com.googlecode.android_scripting.event.Event)">onEventReceived</A></B>(<A HREF="../../../../com/googlecode/android_scripting/event/Event.html" title="class in com.googlecode.android_scripting.event">Event</A>&nbsp;event)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/EventServer.html#shutdown()">shutdown</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_com.googlecode.android_scripting.SimpleServer"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class com.googlecode.android_scripting.<A HREF="../../../../com/googlecode/android_scripting/SimpleServer.html" title="class in com.googlecode.android_scripting">SimpleServer</A></B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../com/googlecode/android_scripting/SimpleServer.html#addObserver(com.googlecode.android_scripting.SimpleServer.SimpleServerObserver)">addObserver</A>, <A HREF="../../../../com/googlecode/android_scripting/SimpleServer.html#getNumberOfConnections()">getNumberOfConnections</A>, <A HREF="../../../../com/googlecode/android_scripting/SimpleServer.html#getPublicInetAddress()">getPublicInetAddress</A>, <A HREF="../../../../com/googlecode/android_scripting/SimpleServer.html#removeObserver(com.googlecode.android_scripting.SimpleServer.SimpleServerObserver)">removeObserver</A>, <A HREF="../../../../com/googlecode/android_scripting/SimpleServer.html#startAllInterfaces(int)">startAllInterfaces</A>, <A HREF="../../../../com/googlecode/android_scripting/SimpleServer.html#startLocal(int)">startLocal</A>, <A HREF="../../../../com/googlecode/android_scripting/SimpleServer.html#startPublic(int)">startPublic</A></CODE></TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="EventServer()"><!-- --></A><H3>
-EventServer</H3>
-<PRE>
-public <B>EventServer</B>()</PRE>
-<DL>
-</DL>
-<HR>
-
-<A NAME="EventServer(int)"><!-- --></A><H3>
-EventServer</H3>
-<PRE>
-public <B>EventServer</B>(int&nbsp;port)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="getAddress()"><!-- --></A><H3>
-getAddress</H3>
-<PRE>
-public java.net.InetSocketAddress <B>getAddress</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="shutdown()"><!-- --></A><H3>
-shutdown</H3>
-<PRE>
-public void <B>shutdown</B>()</PRE>
-<DL>
-<DD><DL>
-<DT><B>Overrides:</B><DD><CODE><A HREF="../../../../com/googlecode/android_scripting/SimpleServer.html#shutdown()">shutdown</A></CODE> in class <CODE><A HREF="../../../../com/googlecode/android_scripting/SimpleServer.html" title="class in com.googlecode.android_scripting">SimpleServer</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="onEventReceived(com.googlecode.android_scripting.event.Event)"><!-- --></A><H3>
-onEventReceived</H3>
-<PRE>
-public void <B>onEventReceived</B>(<A HREF="../../../../com/googlecode/android_scripting/event/Event.html" title="class in com.googlecode.android_scripting.event">Event</A>&nbsp;event)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.EventObserver.html#onEventReceived(com.googlecode.android_scripting.event.Event)">onEventReceived</A></CODE> in interface <CODE><A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.EventObserver.html" title="interface in com.googlecode.android_scripting.facade">EventFacade.EventObserver</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/EventServer.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.EventObserver.html" title="interface in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/EyesFreeFacade.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/EventServer.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="EventServer.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#nested_classes_inherited_from_class_com.googlecode.android_scripting.SimpleServer">NESTED</A>&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/facade/EyesFreeFacade.html b/doc/com/googlecode/android_scripting/facade/EyesFreeFacade.html
deleted file mode 100644
index d2b89f7e..00000000
--- a/doc/com/googlecode/android_scripting/facade/EyesFreeFacade.html
+++ /dev/null
@@ -1,284 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:00 PDT 2014 -->
-<TITLE>
-EyesFreeFacade
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="EyesFreeFacade";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/EyesFreeFacade.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/EventServer.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeConfiguration.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/EyesFreeFacade.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="EyesFreeFacade.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.facade</FONT>
-<BR>
-Class EyesFreeFacade</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">com.googlecode.android_scripting.jsonrpc.RpcReceiver</A>
-      <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.facade.EyesFreeFacade</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>EyesFreeFacade</B><DT>extends <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A></DL>
-</PRE>
-
-<P>
-Provides Text To Speech services for API 3 or less.
-<P>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/EyesFreeFacade.html#EyesFreeFacade(com.googlecode.android_scripting.facade.FacadeManager)">EyesFreeFacade</A></B>(<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A>&nbsp;manager)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/EyesFreeFacade.html#shutdown()">shutdown</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Invoked when the receiver is shut down.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/EyesFreeFacade.html#ttsSpeak(java.lang.String)">ttsSpeak</A></B>(java.lang.String&nbsp;message)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="EyesFreeFacade(com.googlecode.android_scripting.facade.FacadeManager)"><!-- --></A><H3>
-EyesFreeFacade</H3>
-<PRE>
-public <B>EyesFreeFacade</B>(<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A>&nbsp;manager)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="ttsSpeak(java.lang.String)"><!-- --></A><H3>
-ttsSpeak</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Speaks the provided message via TTS.")
-</FONT>public void <B>ttsSpeak</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="message")</FONT>
-                                    java.lang.String&nbsp;message)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="shutdown()"><!-- --></A><H3>
-shutdown</H3>
-<PRE>
-public void <B>shutdown</B>()</PRE>
-<DL>
-<DD><B>Description copied from class: <CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html#shutdown()">RpcReceiver</A></CODE></B></DD>
-<DD>Invoked when the receiver is shut down.
-<P>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html#shutdown()">shutdown</A></CODE> in class <CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/EyesFreeFacade.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/EventServer.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeConfiguration.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/EyesFreeFacade.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="EyesFreeFacade.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/facade/FacadeConfiguration.html b/doc/com/googlecode/android_scripting/facade/FacadeConfiguration.html
deleted file mode 100644
index 11dd4ba8..00000000
--- a/doc/com/googlecode/android_scripting/facade/FacadeConfiguration.html
+++ /dev/null
@@ -1,349 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:00 PDT 2014 -->
-<TITLE>
-FacadeConfiguration
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="FacadeConfiguration";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/FacadeConfiguration.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/EyesFreeFacade.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/FacadeConfiguration.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="FacadeConfiguration.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.facade</FONT>
-<BR>
-Class FacadeConfiguration</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.facade.FacadeConfiguration</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>FacadeConfiguration</B><DT>extends java.lang.Object</DL>
-</PRE>
-
-<P>
-Encapsulates the list of supported facades and their construction.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Damon Kohler (damonkohler@gmail.com), Igor Karp (igor.v.karp@gmail.com)</DD>
-</DL>
-<HR>
-
-<P>
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.util.List&lt;<A HREF="../../../../com/googlecode/android_scripting/rpc/MethodDescriptor.html" title="class in com.googlecode.android_scripting.rpc">MethodDescriptor</A>&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/FacadeConfiguration.html#collectMethodDescriptors()">collectMethodDescriptors</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns a list of <A HREF="../../../../com/googlecode/android_scripting/rpc/MethodDescriptor.html" title="class in com.googlecode.android_scripting.rpc"><CODE>MethodDescriptor</CODE></A> objects for all facades.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.util.Map&lt;java.lang.String,<A HREF="../../../../com/googlecode/android_scripting/rpc/MethodDescriptor.html" title="class in com.googlecode.android_scripting.rpc">MethodDescriptor</A>&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/FacadeConfiguration.html#collectStartEventMethodDescriptors()">collectStartEventMethodDescriptors</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.util.Map&lt;java.lang.String,<A HREF="../../../../com/googlecode/android_scripting/rpc/MethodDescriptor.html" title="class in com.googlecode.android_scripting.rpc">MethodDescriptor</A>&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/FacadeConfiguration.html#collectStopEventMethodDescriptors()">collectStopEventMethodDescriptors</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.util.List&lt;<A HREF="../../../../com/googlecode/android_scripting/rpc/MethodDescriptor.html" title="class in com.googlecode.android_scripting.rpc">MethodDescriptor</A>&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/FacadeConfiguration.html#collectSupportedMethodDescriptors()">collectSupportedMethodDescriptors</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns a list of not deprecated <A HREF="../../../../com/googlecode/android_scripting/rpc/MethodDescriptor.html" title="class in com.googlecode.android_scripting.rpc"><CODE>MethodDescriptor</CODE></A> objects for facades supported by the
- current SDK version.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.util.Collection&lt;java.lang.Class&lt;? extends <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A>&gt;&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/FacadeConfiguration.html#getFacadeClasses()">getFacadeClasses</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/MethodDescriptor.html" title="class in com.googlecode.android_scripting.rpc">MethodDescriptor</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/FacadeConfiguration.html#getMethodDescriptor(java.lang.String)">getMethodDescriptor</A></B>(java.lang.String&nbsp;name)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns a method by name.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/FacadeConfiguration.html#getSdkLevel()">getSdkLevel</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="getSdkLevel()"><!-- --></A><H3>
-getSdkLevel</H3>
-<PRE>
-public static int <B>getSdkLevel</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="collectMethodDescriptors()"><!-- --></A><H3>
-collectMethodDescriptors</H3>
-<PRE>
-public static java.util.List&lt;<A HREF="../../../../com/googlecode/android_scripting/rpc/MethodDescriptor.html" title="class in com.googlecode.android_scripting.rpc">MethodDescriptor</A>&gt; <B>collectMethodDescriptors</B>()</PRE>
-<DL>
-<DD>Returns a list of <A HREF="../../../../com/googlecode/android_scripting/rpc/MethodDescriptor.html" title="class in com.googlecode.android_scripting.rpc"><CODE>MethodDescriptor</CODE></A> objects for all facades.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="collectSupportedMethodDescriptors()"><!-- --></A><H3>
-collectSupportedMethodDescriptors</H3>
-<PRE>
-public static java.util.List&lt;<A HREF="../../../../com/googlecode/android_scripting/rpc/MethodDescriptor.html" title="class in com.googlecode.android_scripting.rpc">MethodDescriptor</A>&gt; <B>collectSupportedMethodDescriptors</B>()</PRE>
-<DL>
-<DD>Returns a list of not deprecated <A HREF="../../../../com/googlecode/android_scripting/rpc/MethodDescriptor.html" title="class in com.googlecode.android_scripting.rpc"><CODE>MethodDescriptor</CODE></A> objects for facades supported by the
- current SDK version.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="collectStartEventMethodDescriptors()"><!-- --></A><H3>
-collectStartEventMethodDescriptors</H3>
-<PRE>
-public static java.util.Map&lt;java.lang.String,<A HREF="../../../../com/googlecode/android_scripting/rpc/MethodDescriptor.html" title="class in com.googlecode.android_scripting.rpc">MethodDescriptor</A>&gt; <B>collectStartEventMethodDescriptors</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="collectStopEventMethodDescriptors()"><!-- --></A><H3>
-collectStopEventMethodDescriptors</H3>
-<PRE>
-public static java.util.Map&lt;java.lang.String,<A HREF="../../../../com/googlecode/android_scripting/rpc/MethodDescriptor.html" title="class in com.googlecode.android_scripting.rpc">MethodDescriptor</A>&gt; <B>collectStopEventMethodDescriptors</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getMethodDescriptor(java.lang.String)"><!-- --></A><H3>
-getMethodDescriptor</H3>
-<PRE>
-public static <A HREF="../../../../com/googlecode/android_scripting/rpc/MethodDescriptor.html" title="class in com.googlecode.android_scripting.rpc">MethodDescriptor</A> <B>getMethodDescriptor</B>(java.lang.String&nbsp;name)</PRE>
-<DL>
-<DD>Returns a method by name.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getFacadeClasses()"><!-- --></A><H3>
-getFacadeClasses</H3>
-<PRE>
-public static java.util.Collection&lt;java.lang.Class&lt;? extends <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A>&gt;&gt; <B>getFacadeClasses</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/FacadeConfiguration.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/EyesFreeFacade.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/FacadeConfiguration.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="FacadeConfiguration.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/facade/FacadeManager.html b/doc/com/googlecode/android_scripting/facade/FacadeManager.html
deleted file mode 100644
index 8e1d4a99..00000000
--- a/doc/com/googlecode/android_scripting/facade/FacadeManager.html
+++ /dev/null
@@ -1,354 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:00 PDT 2014 -->
-<TITLE>
-FacadeManager
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="FacadeManager";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/FacadeManager.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeConfiguration.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManagerFactory.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/FacadeManager.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="FacadeManager.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.facade</FONT>
-<BR>
-Class FacadeManager</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManager.html" title="class in com.googlecode.android_scripting.jsonrpc">com.googlecode.android_scripting.jsonrpc.RpcReceiverManager</A>
-      <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.facade.FacadeManager</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>FacadeManager</B><DT>extends <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManager.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiverManager</A></DL>
-</PRE>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html#FacadeManager(int, Service, Intent, java.util.Collection)">FacadeManager</A></B>(int&nbsp;sdkLevel,
-              Service&nbsp;service,
-              Intent&nbsp;intent,
-              java.util.Collection&lt;java.lang.Class&lt;? extends <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A>&gt;&gt;&nbsp;classList)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/AndroidFacade.Resources.html" title="interface in com.googlecode.android_scripting.facade">AndroidFacade.Resources</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html#getAndroidFacadeResources()">getAndroidFacadeResources</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;Intent</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html#getIntent()">getIntent</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html#getSdkLevel()">getSdkLevel</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;Service</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html#getService()">getService</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.Object</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html#invoke(java.lang.Class, java.lang.reflect.Method, java.lang.Object[])">invoke</A></B>(java.lang.Class&lt;? extends <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A>&gt;&nbsp;clazz,
-       java.lang.reflect.Method&nbsp;method,
-       java.lang.Object[]&nbsp;args)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_com.googlecode.android_scripting.jsonrpc.RpcReceiverManager"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class com.googlecode.android_scripting.jsonrpc.<A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManager.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiverManager</A></B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManager.html#getMethodDescriptor(java.lang.String)">getMethodDescriptor</A>, <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManager.html#getReceiver(java.lang.Class)">getReceiver</A>, <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManager.html#getRpcReceiverClasses()">getRpcReceiverClasses</A>, <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManager.html#shutdown()">shutdown</A></CODE></TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="FacadeManager(int, Service, Intent, java.util.Collection)"><!-- --></A><H3>
-FacadeManager</H3>
-<PRE>
-public <B>FacadeManager</B>(int&nbsp;sdkLevel,
-                     Service&nbsp;service,
-                     Intent&nbsp;intent,
-                     java.util.Collection&lt;java.lang.Class&lt;? extends <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A>&gt;&gt;&nbsp;classList)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="getSdkLevel()"><!-- --></A><H3>
-getSdkLevel</H3>
-<PRE>
-public int <B>getSdkLevel</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getService()"><!-- --></A><H3>
-getService</H3>
-<PRE>
-public Service <B>getService</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getIntent()"><!-- --></A><H3>
-getIntent</H3>
-<PRE>
-public Intent <B>getIntent</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="invoke(java.lang.Class, java.lang.reflect.Method, java.lang.Object[])"><!-- --></A><H3>
-invoke</H3>
-<PRE>
-public java.lang.Object <B>invoke</B>(java.lang.Class&lt;? extends <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A>&gt;&nbsp;clazz,
-                               java.lang.reflect.Method&nbsp;method,
-                               java.lang.Object[]&nbsp;args)
-                        throws java.lang.Exception</PRE>
-<DL>
-<DD><DL>
-<DT><B>Overrides:</B><DD><CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManager.html#invoke(java.lang.Class, java.lang.reflect.Method, java.lang.Object[])">invoke</A></CODE> in class <CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManager.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiverManager</A></CODE></DL>
-</DD>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.lang.Exception</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getAndroidFacadeResources()"><!-- --></A><H3>
-getAndroidFacadeResources</H3>
-<PRE>
-public <A HREF="../../../../com/googlecode/android_scripting/facade/AndroidFacade.Resources.html" title="interface in com.googlecode.android_scripting.facade">AndroidFacade.Resources</A> <B>getAndroidFacadeResources</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/FacadeManager.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeConfiguration.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManagerFactory.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/FacadeManager.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="FacadeManager.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/facade/FacadeManagerFactory.html b/doc/com/googlecode/android_scripting/facade/FacadeManagerFactory.html
deleted file mode 100644
index db2a5735..00000000
--- a/doc/com/googlecode/android_scripting/facade/FacadeManagerFactory.html
+++ /dev/null
@@ -1,286 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:00 PDT 2014 -->
-<TITLE>
-FacadeManagerFactory
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="FacadeManagerFactory";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/FacadeManagerFactory.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/LocationFacade.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/FacadeManagerFactory.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="FacadeManagerFactory.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.facade</FONT>
-<BR>
-Class FacadeManagerFactory</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.facade.FacadeManagerFactory</B>
-</PRE>
-<DL>
-<DT><B>All Implemented Interfaces:</B> <DD><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManagerFactory.html" title="interface in com.googlecode.android_scripting.jsonrpc">RpcReceiverManagerFactory</A></DD>
-</DL>
-<HR>
-<DL>
-<DT><PRE>public class <B>FacadeManagerFactory</B><DT>extends java.lang.Object<DT>implements <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManagerFactory.html" title="interface in com.googlecode.android_scripting.jsonrpc">RpcReceiverManagerFactory</A></DL>
-</PRE>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManagerFactory.html#FacadeManagerFactory(int, Service, Intent, java.util.Collection)">FacadeManagerFactory</A></B>(int&nbsp;sdkLevel,
-                     Service&nbsp;service,
-                     Intent&nbsp;intent,
-                     java.util.Collection&lt;java.lang.Class&lt;? extends <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A>&gt;&gt;&nbsp;classList)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManagerFactory.html#create()">create</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.util.List&lt;<A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManager.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiverManager</A>&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManagerFactory.html#getRpcReceiverManagers()">getRpcReceiverManagers</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="FacadeManagerFactory(int, Service, Intent, java.util.Collection)"><!-- --></A><H3>
-FacadeManagerFactory</H3>
-<PRE>
-public <B>FacadeManagerFactory</B>(int&nbsp;sdkLevel,
-                            Service&nbsp;service,
-                            Intent&nbsp;intent,
-                            java.util.Collection&lt;java.lang.Class&lt;? extends <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A>&gt;&gt;&nbsp;classList)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="create()"><!-- --></A><H3>
-create</H3>
-<PRE>
-public <A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A> <B>create</B>()</PRE>
-<DL>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManagerFactory.html#create()">create</A></CODE> in interface <CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManagerFactory.html" title="interface in com.googlecode.android_scripting.jsonrpc">RpcReceiverManagerFactory</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getRpcReceiverManagers()"><!-- --></A><H3>
-getRpcReceiverManagers</H3>
-<PRE>
-public java.util.List&lt;<A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManager.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiverManager</A>&gt; <B>getRpcReceiverManagers</B>()</PRE>
-<DL>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManagerFactory.html#getRpcReceiverManagers()">getRpcReceiverManagers</A></CODE> in interface <CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManagerFactory.html" title="interface in com.googlecode.android_scripting.jsonrpc">RpcReceiverManagerFactory</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/FacadeManagerFactory.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/LocationFacade.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/FacadeManagerFactory.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="FacadeManagerFactory.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/facade/LocationFacade.html b/doc/com/googlecode/android_scripting/facade/LocationFacade.html
deleted file mode 100644
index 70c71ff1..00000000
--- a/doc/com/googlecode/android_scripting/facade/LocationFacade.html
+++ /dev/null
@@ -1,462 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:00 PDT 2014 -->
-<TITLE>
-LocationFacade
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="LocationFacade";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/LocationFacade.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManagerFactory.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/MediaPlayerFacade.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/LocationFacade.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="LocationFacade.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.facade</FONT>
-<BR>
-Class LocationFacade</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">com.googlecode.android_scripting.jsonrpc.RpcReceiver</A>
-      <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.facade.LocationFacade</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>LocationFacade</B><DT>extends <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A></DL>
-</PRE>
-
-<P>
-This facade exposes the LocationManager related functionality.<br>
- <br>
- <b>Overview</b><br>
- Once activated by 'startLocating' the LocationFacade attempts to return location data collected
- via GPS or the cell network. If neither are available the last known location may be retrieved.
- If both are available the format of the returned data is:<br>
- {u'network': {u'altitude': 0, u'provider': u'network', u'longitude': -0.38509020000000002,
- u'time': 1297079691231L, u'latitude': 52.410557300000001, u'speed': 0, u'accuracy': 75}, u'gps':
- {u'altitude': 51, u'provider': u'gps', u'longitude': -0.38537094593048096, u'time':
- 1297079709000L, u'latitude': 52.41076922416687, u'speed': 0, u'accuracy': 24}}<br>
- If neither are available {} is returned. <br>
- Example (python):<br>
- 
- <pre>
- import android, time
- droid = android.Android()
- droid.startLocating()
- time.sleep(15)
- loc = droid.readLocation().result
- if loc = {}:
-   loc = getLastKnownLocation().result
- if loc != {}:
-   try:
-     n = loc['gps']
-   except KeyError:
-     n = loc['network'] 
-   la = n['latitude'] 
-   lo = n['longitude']
-   address = droid.geocode(la, lo).result
- droid.stopLocating()
- </pre>
- 
- The address format is:<br>
- [{u'thoroughfare': u'Some Street', u'locality': u'Some Town', u'sub_admin_area': u'Some Borough',
- u'admin_area': u'Some City', u'feature_name': u'House Numbers', u'country_code': u'GB',
- u'country_name': u'United Kingdom', u'postal_code': u'ST1 1'}]
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Damon Kohler (damonkohler@gmail.com), Felix Arends (felix.arends@gmail.com)</DD>
-</DL>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/LocationFacade.html#LocationFacade(com.googlecode.android_scripting.facade.FacadeManager)">LocationFacade</A></B>(<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A>&nbsp;manager)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.util.List&lt;Address&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/LocationFacade.html#geocode(java.lang.Double, java.lang.Double, java.lang.Integer)">geocode</A></B>(java.lang.Double&nbsp;latitude,
-        java.lang.Double&nbsp;longitude,
-        java.lang.Integer&nbsp;maxResults)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.util.Map&lt;java.lang.String,Location&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/LocationFacade.html#getLastKnownLocation()">getLastKnownLocation</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/LocationFacade.html#locationProviderEnabled(java.lang.String)">locationProviderEnabled</A></B>(java.lang.String&nbsp;provider)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.util.List&lt;java.lang.String&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/LocationFacade.html#locationProviders()">locationProviders</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.util.Map&lt;java.lang.String,Location&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/LocationFacade.html#readLocation()">readLocation</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/LocationFacade.html#shutdown()">shutdown</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Invoked when the receiver is shut down.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/LocationFacade.html#startLocating(java.lang.Integer, java.lang.Integer)">startLocating</A></B>(java.lang.Integer&nbsp;minUpdateTime,
-              java.lang.Integer&nbsp;minUpdateDistance)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/LocationFacade.html#stopLocating()">stopLocating</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="LocationFacade(com.googlecode.android_scripting.facade.FacadeManager)"><!-- --></A><H3>
-LocationFacade</H3>
-<PRE>
-public <B>LocationFacade</B>(<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A>&nbsp;manager)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="shutdown()"><!-- --></A><H3>
-shutdown</H3>
-<PRE>
-public void <B>shutdown</B>()</PRE>
-<DL>
-<DD><B>Description copied from class: <CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html#shutdown()">RpcReceiver</A></CODE></B></DD>
-<DD>Invoked when the receiver is shut down.
-<P>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html#shutdown()">shutdown</A></CODE> in class <CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="locationProviders()"><!-- --></A><H3>
-locationProviders</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns availables providers on the phone")
-</FONT>public java.util.List&lt;java.lang.String&gt; <B>locationProviders</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="locationProviderEnabled(java.lang.String)"><!-- --></A><H3>
-locationProviderEnabled</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Ask if provider is enabled")
-</FONT>public boolean <B>locationProviderEnabled</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="provider",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="Name of location provider")</FONT>
-                                                      java.lang.String&nbsp;provider)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="startLocating(java.lang.Integer, java.lang.Integer)"><!-- --></A><H3>
-startLocating</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Starts collecting location data.")
-<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcStartEvent.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcStartEvent</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcStartEvent.html#value()">value</A>="location")
-</FONT>public void <B>startLocating</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="minDistance",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="minimum time between updates in milliseconds")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="60000")</FONT>
-                                                            java.lang.Integer&nbsp;minUpdateTime,
-                                                            <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="minUpdateDistance",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="minimum distance between updates in meters")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="30")</FONT>
-                                                            java.lang.Integer&nbsp;minUpdateDistance)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="readLocation()"><!-- --></A><H3>
-readLocation</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns the current location as indicated by all available providers.",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="A map of location information by provider.")
-</FONT>public java.util.Map&lt;java.lang.String,Location&gt; <B>readLocation</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="stopLocating()"><!-- --></A><H3>
-stopLocating</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Stops collecting location data.")
-<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcStopEvent.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcStopEvent</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcStopEvent.html#value()">value</A>="location")
-</FONT>public void <B>stopLocating</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getLastKnownLocation()"><!-- --></A><H3>
-getLastKnownLocation</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns the last known location of the device.",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="A map of location information by provider.")
-</FONT>public java.util.Map&lt;java.lang.String,Location&gt; <B>getLastKnownLocation</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="geocode(java.lang.Double, java.lang.Double, java.lang.Integer)"><!-- --></A><H3>
-geocode</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns a list of addresses for the given latitude and longitude.",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="A list of addresses.")
-</FONT>public java.util.List&lt;Address&gt; <B>geocode</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="latitude")</FONT>
-                                                             java.lang.Double&nbsp;latitude,
-                                                             <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="longitude")</FONT>
-                                                             java.lang.Double&nbsp;longitude,
-                                                             <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="maxResults",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="maximum number of results")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="1")</FONT>
-                                                             java.lang.Integer&nbsp;maxResults)
-                                throws java.io.IOException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.io.IOException</CODE></DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/LocationFacade.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManagerFactory.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/MediaPlayerFacade.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/LocationFacade.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="LocationFacade.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/facade/MediaPlayerFacade.html b/doc/com/googlecode/android_scripting/facade/MediaPlayerFacade.html
deleted file mode 100644
index e7a0aa26..00000000
--- a/doc/com/googlecode/android_scripting/facade/MediaPlayerFacade.html
+++ /dev/null
@@ -1,534 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:00 PDT 2014 -->
-<TITLE>
-MediaPlayerFacade
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="MediaPlayerFacade";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/MediaPlayerFacade.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/LocationFacade.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/MediaRecorderFacade.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/MediaPlayerFacade.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="MediaPlayerFacade.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.facade</FONT>
-<BR>
-Class MediaPlayerFacade</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">com.googlecode.android_scripting.jsonrpc.RpcReceiver</A>
-      <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.facade.MediaPlayerFacade</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>MediaPlayerFacade</B><DT>extends <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A></DL>
-</PRE>
-
-<P>
-This facade exposes basic mediaPlayer functionality.
- 
- <br>
- <br>
- <b>Usage Notes:</b><br>
- mediaPlayerFacade maintains a list of media streams, identified by a user supplied tag. If the
- tag is null or blank, this tag defaults to "default"<br>
- Basic operation is: mediaPlayOpen("file:///sdcard/MP3/sample.mp3","mytag",true)<br>
- This will look for a media file at /sdcard/MP3/sample.mp3. Other urls should work. If the file
- exists and is playable, this will return a true otherwise it will return a false.
- 
- <br>
- If play=true, then the media file will play immediately, otherwise it will wait for a
- <A HREF="../../../../com/googlecode/android_scripting/facade/MediaPlayerFacade.html#mediaPlayStart(java.lang.String)"><CODE>mediaPlayerStart</CODE></A> command.
- 
- <br>
- When done with the resource, use <A HREF="../../../../com/googlecode/android_scripting/facade/MediaPlayerFacade.html#mediaPlayClose(java.lang.String)"><CODE>mediaPlayClose</CODE></A>
- 
- <br>
- You can get information about the loaded media with <A HREF="../../../../com/googlecode/android_scripting/facade/MediaPlayerFacade.html#mediaPlayInfo(java.lang.String)"><CODE>mediaPlayInfo</CODE></A> This
- returns a map with the following elements:
- <ul>
- <li>"tag" - user supplied tag identifying this mediaPlayer.
- <li>"loaded" - true if loaded, false if not. If false, no other elements are returned.
- <li>"duration" - length of the media in milliseconds.
- <li>"position" - current position of playback in milliseconds. Controlled by
- <A HREF="../../../../com/googlecode/android_scripting/facade/MediaPlayerFacade.html#mediaPlaySeek(java.lang.Integer, java.lang.String)"><CODE>mediaPlaySeek</CODE></A>
- <li>"isplaying" - shows whether media is playing. Controlled by <A HREF="../../../../com/googlecode/android_scripting/facade/MediaPlayerFacade.html#mediaPlayPause(java.lang.String)"><CODE>mediaPlayPause</CODE></A> and <A HREF="../../../../com/googlecode/android_scripting/facade/MediaPlayerFacade.html#mediaPlayStart(java.lang.String)"><CODE>mediaPlayStart</CODE></A>
- <li>"url" - the url used to open this media.
- <li>"looping" - whether media will loop. Controlled by <A HREF="../../../../com/googlecode/android_scripting/facade/MediaPlayerFacade.html#mediaPlaySetLooping(java.lang.Boolean, java.lang.String)"><CODE>mediaPlaySetLooping</CODE></A>
- </ul>
- <br>
- You can use <A HREF="../../../../com/googlecode/android_scripting/facade/MediaPlayerFacade.html#mediaPlayList()"><CODE>mediaPlayList</CODE></A> to get a list of the loaded tags. <br>
- <A HREF="../../../../com/googlecode/android_scripting/facade/MediaPlayerFacade.html#mediaIsPlaying(java.lang.String)"><CODE>mediaIsPlaying</CODE></A> will return true if the media is playing.<br>
- 
- <b>Events:</b><br>
- A playing media will throw a <b>"media"</b> event on completion.
- 
- NB: In remote mode, a media file will continue playing after the script has finished unless an
- explicit <A HREF="../../../../com/googlecode/android_scripting/facade/MediaPlayerFacade.html#mediaPlayClose(java.lang.String)"><CODE>mediaPlayClose</CODE></A> event is called.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Robbie Matthews (rjmatthews62@gmail.com)</DD>
-</DL>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/MediaPlayerFacade.html#MediaPlayerFacade(com.googlecode.android_scripting.facade.FacadeManager)">MediaPlayerFacade</A></B>(<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A>&nbsp;manager)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/MediaPlayerFacade.html#mediaIsPlaying(java.lang.String)">mediaIsPlaying</A></B>(java.lang.String&nbsp;tag)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/MediaPlayerFacade.html#mediaPlay(java.lang.String, java.lang.String, java.lang.Boolean)">mediaPlay</A></B>(java.lang.String&nbsp;url,
-          java.lang.String&nbsp;tag,
-          java.lang.Boolean&nbsp;play)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/MediaPlayerFacade.html#mediaPlayClose(java.lang.String)">mediaPlayClose</A></B>(java.lang.String&nbsp;tag)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.util.Map&lt;java.lang.String,java.lang.Object&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/MediaPlayerFacade.html#mediaPlayInfo(java.lang.String)">mediaPlayInfo</A></B>(java.lang.String&nbsp;tag)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.util.Set&lt;java.lang.String&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/MediaPlayerFacade.html#mediaPlayList()">mediaPlayList</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/MediaPlayerFacade.html#mediaPlayPause(java.lang.String)">mediaPlayPause</A></B>(java.lang.String&nbsp;tag)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/MediaPlayerFacade.html#mediaPlaySeek(java.lang.Integer, java.lang.String)">mediaPlaySeek</A></B>(java.lang.Integer&nbsp;msec,
-              java.lang.String&nbsp;tag)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/MediaPlayerFacade.html#mediaPlaySetLooping(java.lang.Boolean, java.lang.String)">mediaPlaySetLooping</A></B>(java.lang.Boolean&nbsp;enabled,
-                    java.lang.String&nbsp;tag)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/MediaPlayerFacade.html#mediaPlayStart(java.lang.String)">mediaPlayStart</A></B>(java.lang.String&nbsp;tag)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/MediaPlayerFacade.html#onCompletion(MediaPlayer)">onCompletion</A></B>(MediaPlayer&nbsp;player)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/MediaPlayerFacade.html#shutdown()">shutdown</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Invoked when the receiver is shut down.</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="MediaPlayerFacade(com.googlecode.android_scripting.facade.FacadeManager)"><!-- --></A><H3>
-MediaPlayerFacade</H3>
-<PRE>
-public <B>MediaPlayerFacade</B>(<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A>&nbsp;manager)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="mediaPlay(java.lang.String, java.lang.String, java.lang.Boolean)"><!-- --></A><H3>
-mediaPlay</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Open a media file",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="true if play successful")
-</FONT>public boolean <B>mediaPlay</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="url",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="url of media resource")</FONT>
-                                               java.lang.String&nbsp;url,
-                                               <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="tag",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="string identifying resource")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="default")</FONT>
-                                               java.lang.String&nbsp;tag,
-                                               <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="play",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="start playing immediately")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="true")</FONT>
-                                               java.lang.Boolean&nbsp;play)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="mediaPlayPause(java.lang.String)"><!-- --></A><H3>
-mediaPlayPause</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="pause playing media file",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="true if successful")
-</FONT>public boolean <B>mediaPlayPause</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="tag",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="string identifying resource")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="default")</FONT>
-                                                    java.lang.String&nbsp;tag)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="mediaPlayStart(java.lang.String)"><!-- --></A><H3>
-mediaPlayStart</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="start playing media file",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="true if successful")
-</FONT>public boolean <B>mediaPlayStart</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="tag",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="string identifying resource")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="default")</FONT>
-                                                    java.lang.String&nbsp;tag)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="mediaPlayClose(java.lang.String)"><!-- --></A><H3>
-mediaPlayClose</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Close media file",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="true if successful")
-</FONT>public boolean <B>mediaPlayClose</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="tag",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="string identifying resource")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="default")</FONT>
-                                                    java.lang.String&nbsp;tag)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="mediaIsPlaying(java.lang.String)"><!-- --></A><H3>
-mediaIsPlaying</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Checks if media file is playing.",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="true if playing")
-</FONT>public boolean <B>mediaIsPlaying</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="tag",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="string identifying resource")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="default")</FONT>
-                                                    java.lang.String&nbsp;tag)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="mediaPlayInfo(java.lang.String)"><!-- --></A><H3>
-mediaPlayInfo</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Information on current media",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="Media Information")
-</FONT>public java.util.Map&lt;java.lang.String,java.lang.Object&gt; <B>mediaPlayInfo</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="tag",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="string identifying resource")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="default")</FONT>
-                                                                                            java.lang.String&nbsp;tag)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="mediaPlayList()"><!-- --></A><H3>
-mediaPlayList</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Lists currently loaded media",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="List of Media Tags")
-</FONT>public java.util.Set&lt;java.lang.String&gt; <B>mediaPlayList</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="mediaPlaySetLooping(java.lang.Boolean, java.lang.String)"><!-- --></A><H3>
-mediaPlaySetLooping</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Set Looping",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="True if successful")
-</FONT>public boolean <B>mediaPlaySetLooping</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="enabled")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="true")</FONT>
-                                                         java.lang.Boolean&nbsp;enabled,
-                                                         <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="tag",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="string identifying resource")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="default")</FONT>
-                                                         java.lang.String&nbsp;tag)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="mediaPlaySeek(java.lang.Integer, java.lang.String)"><!-- --></A><H3>
-mediaPlaySeek</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Seek To Position",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="New Position (in ms)")
-</FONT>public int <B>mediaPlaySeek</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="msec",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="Position in millseconds")</FONT>
-                                               java.lang.Integer&nbsp;msec,
-                                               <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="tag",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="string identifying resource")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="default")</FONT>
-                                               java.lang.String&nbsp;tag)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="shutdown()"><!-- --></A><H3>
-shutdown</H3>
-<PRE>
-public void <B>shutdown</B>()</PRE>
-<DL>
-<DD><B>Description copied from class: <CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html#shutdown()">RpcReceiver</A></CODE></B></DD>
-<DD>Invoked when the receiver is shut down.
-<P>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html#shutdown()">shutdown</A></CODE> in class <CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="onCompletion(MediaPlayer)"><!-- --></A><H3>
-onCompletion</H3>
-<PRE>
-public void <B>onCompletion</B>(MediaPlayer&nbsp;player)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/MediaPlayerFacade.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/LocationFacade.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/MediaRecorderFacade.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/MediaPlayerFacade.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="MediaPlayerFacade.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/facade/MediaRecorderFacade.html b/doc/com/googlecode/android_scripting/facade/MediaRecorderFacade.html
deleted file mode 100644
index fda4c1fd..00000000
--- a/doc/com/googlecode/android_scripting/facade/MediaRecorderFacade.html
+++ /dev/null
@@ -1,399 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:00 PDT 2014 -->
-<TITLE>
-MediaRecorderFacade
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="MediaRecorderFacade";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/MediaRecorderFacade.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/MediaPlayerFacade.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/PhoneFacade.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/MediaRecorderFacade.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="MediaRecorderFacade.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.facade</FONT>
-<BR>
-Class MediaRecorderFacade</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">com.googlecode.android_scripting.jsonrpc.RpcReceiver</A>
-      <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.facade.MediaRecorderFacade</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>MediaRecorderFacade</B><DT>extends <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A></DL>
-</PRE>
-
-<P>
-A facade for recording media.
- 
- Guidance notes: Use e.g. '/sdcard/file.ext' for your media destination file. A file extension of
- mpg will use the default settings for format and codec (often h263 which won't work with common
- PC media players). A file extension of mp4 or 3gp will use the appropriate format with the (more
- common) h264 codec. A video player such as QQPlayer (from the android market) plays both codecs
- and uses the composition matrix (embedded in the video file) to correct for image rotation. Many
- PC based media players ignore this matrix. Standard video sizes may be specified.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Felix Arends (felix.arends@gmail.com), Damon Kohler (damonkohler@gmail.com), John Karwatzki (jokar49@gmail.com)</DD>
-</DL>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/MediaRecorderFacade.html#MediaRecorderFacade(com.googlecode.android_scripting.facade.FacadeManager)">MediaRecorderFacade</A></B>(<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A>&nbsp;manager)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/MediaRecorderFacade.html#recorderCaptureVideo(java.lang.String, java.lang.Integer, java.lang.Boolean)">recorderCaptureVideo</A></B>(java.lang.String&nbsp;targetPath,
-                     java.lang.Integer&nbsp;duration,
-                     java.lang.Boolean&nbsp;recordAudio)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/MediaRecorderFacade.html#recorderStartMicrophone(java.lang.String)">recorderStartMicrophone</A></B>(java.lang.String&nbsp;targetPath)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/MediaRecorderFacade.html#recorderStartVideo(java.lang.String, java.lang.Integer, java.lang.Integer)">recorderStartVideo</A></B>(java.lang.String&nbsp;targetPath,
-                   java.lang.Integer&nbsp;duration,
-                   java.lang.Integer&nbsp;videoSize)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/MediaRecorderFacade.html#recorderStop()">recorderStop</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/MediaRecorderFacade.html#shutdown()">shutdown</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Invoked when the receiver is shut down.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/MediaRecorderFacade.html#startInteractiveVideoRecording(java.lang.String)">startInteractiveVideoRecording</A></B>(java.lang.String&nbsp;path)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="MediaRecorderFacade(com.googlecode.android_scripting.facade.FacadeManager)"><!-- --></A><H3>
-MediaRecorderFacade</H3>
-<PRE>
-public <B>MediaRecorderFacade</B>(<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A>&nbsp;manager)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="recorderStartMicrophone(java.lang.String)"><!-- --></A><H3>
-recorderStartMicrophone</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Records audio from the microphone and saves it to the given location.")
-</FONT>public void <B>recorderStartMicrophone</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="targetPath")</FONT>
-                                                   java.lang.String&nbsp;targetPath)
-                             throws java.io.IOException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.io.IOException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="recorderStartVideo(java.lang.String, java.lang.Integer, java.lang.Integer)"><!-- --></A><H3>
-recorderStartVideo</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Records video from the camera and saves it to the given location. \nDuration specifies the maximum duration of the recording session. \nIf duration is 0 this method will return and the recording will only be stopped \nwhen recorderStop is called or when a scripts exits. \nOtherwise it will block for the time period equal to the duration argument.\nvideoSize: 0=160x120, 1=320x240, 2=352x288, 3=640x480, 4=800x480.")
-</FONT>public void <B>recorderStartVideo</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="targetPath")</FONT>
-                                              java.lang.String&nbsp;targetPath,
-                                              <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="duration")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="0")</FONT>
-                                              java.lang.Integer&nbsp;duration,
-                                              <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="videoSize")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="1")</FONT>
-                                              java.lang.Integer&nbsp;videoSize)
-                        throws java.lang.Exception</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.lang.Exception</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="recorderCaptureVideo(java.lang.String, java.lang.Integer, java.lang.Boolean)"><!-- --></A><H3>
-recorderCaptureVideo</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Records video (and optionally audio) from the camera and saves it to the given location. \nDuration specifies the maximum duration of the recording session. \nIf duration is not provided this method will return immediately and the recording will only be stopped \nwhen recorderStop is called or when a scripts exits. \nOtherwise it will block for the time period equal to the duration argument.")
-</FONT>public void <B>recorderCaptureVideo</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="targetPath")</FONT>
-                                                java.lang.String&nbsp;targetPath,
-                                                <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="duration")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                                java.lang.Integer&nbsp;duration,
-                                                <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="recordAudio")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="true")</FONT>
-                                                java.lang.Boolean&nbsp;recordAudio)
-                          throws java.lang.Exception</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.lang.Exception</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="recorderStop()"><!-- --></A><H3>
-recorderStop</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Stops a previously started recording.")
-</FONT>public void <B>recorderStop</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="startInteractiveVideoRecording(java.lang.String)"><!-- --></A><H3>
-startInteractiveVideoRecording</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Starts the video capture application to record a video and saves it to the specified path.")
-</FONT>public void <B>startInteractiveVideoRecording</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="path")</FONT>
-                                                          java.lang.String&nbsp;path)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="shutdown()"><!-- --></A><H3>
-shutdown</H3>
-<PRE>
-public void <B>shutdown</B>()</PRE>
-<DL>
-<DD><B>Description copied from class: <CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html#shutdown()">RpcReceiver</A></CODE></B></DD>
-<DD>Invoked when the receiver is shut down.
-<P>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html#shutdown()">shutdown</A></CODE> in class <CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/MediaRecorderFacade.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/MediaPlayerFacade.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/PhoneFacade.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/MediaRecorderFacade.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="MediaRecorderFacade.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/facade/PhoneFacade.html b/doc/com/googlecode/android_scripting/facade/PhoneFacade.html
deleted file mode 100644
index 14ad5ecf..00000000
--- a/doc/com/googlecode/android_scripting/facade/PhoneFacade.html
+++ /dev/null
@@ -1,788 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:00 PDT 2014 -->
-<TITLE>
-PhoneFacade
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="PhoneFacade";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/PhoneFacade.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/MediaRecorderFacade.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/PreferencesFacade.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/PhoneFacade.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="PhoneFacade.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.facade</FONT>
-<BR>
-Class PhoneFacade</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">com.googlecode.android_scripting.jsonrpc.RpcReceiver</A>
-      <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.facade.PhoneFacade</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>PhoneFacade</B><DT>extends <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A></DL>
-</PRE>
-
-<P>
-Exposes TelephonyManager functionality.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Damon Kohler (damonkohler@gmail.com), Felix Arends (felix.arends@gmail.com)</DD>
-</DL>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/PhoneFacade.html#PhoneFacade(com.googlecode.android_scripting.facade.FacadeManager)">PhoneFacade</A></B>(<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A>&nbsp;manager)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.Boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/PhoneFacade.html#checkNetworkRoaming()">checkNetworkRoaming</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;CellLocation</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/PhoneFacade.html#getCellLocation()">getCellLocation</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/PhoneFacade.html#getDeviceId()">getDeviceId</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/PhoneFacade.html#getDeviceSoftwareVersion()">getDeviceSoftwareVersion</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/PhoneFacade.html#getLine1Number()">getLine1Number</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.util.List&lt;NeighboringCellInfo&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/PhoneFacade.html#getNeighboringCellInfo()">getNeighboringCellInfo</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/PhoneFacade.html#getNetworkOperator()">getNetworkOperator</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/PhoneFacade.html#getNetworkOperatorName()">getNetworkOperatorName</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/PhoneFacade.html#getNetworkType()">getNetworkType</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/PhoneFacade.html#getPhoneType()">getPhoneType</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/PhoneFacade.html#getSimCountryIso()">getSimCountryIso</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/PhoneFacade.html#getSimOperator()">getSimOperator</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/PhoneFacade.html#getSimOperatorName()">getSimOperatorName</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/PhoneFacade.html#getSimSerialNumber()">getSimSerialNumber</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/PhoneFacade.html#getSimState()">getSimState</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/PhoneFacade.html#getSubscriberId()">getSubscriberId</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/PhoneFacade.html#getVoiceMailAlphaTag()">getVoiceMailAlphaTag</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/PhoneFacade.html#getVoiceMailNumber()">getVoiceMailNumber</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/PhoneFacade.html#phoneCall(java.lang.String)">phoneCall</A></B>(java.lang.String&nbsp;uriString)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/PhoneFacade.html#phoneCallNumber(java.lang.String)">phoneCallNumber</A></B>(java.lang.String&nbsp;number)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/PhoneFacade.html#phoneDial(java.lang.String)">phoneDial</A></B>(java.lang.String&nbsp;uri)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/PhoneFacade.html#phoneDialNumber(java.lang.String)">phoneDialNumber</A></B>(java.lang.String&nbsp;number)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;Bundle</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/PhoneFacade.html#readPhoneState()">readPhoneState</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/PhoneFacade.html#shutdown()">shutdown</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Invoked when the receiver is shut down.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/PhoneFacade.html#startTrackingPhoneState()">startTrackingPhoneState</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/PhoneFacade.html#stopTrackingPhoneState()">stopTrackingPhoneState</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="PhoneFacade(com.googlecode.android_scripting.facade.FacadeManager)"><!-- --></A><H3>
-PhoneFacade</H3>
-<PRE>
-public <B>PhoneFacade</B>(<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A>&nbsp;manager)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="shutdown()"><!-- --></A><H3>
-shutdown</H3>
-<PRE>
-public void <B>shutdown</B>()</PRE>
-<DL>
-<DD><B>Description copied from class: <CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html#shutdown()">RpcReceiver</A></CODE></B></DD>
-<DD>Invoked when the receiver is shut down.
-<P>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html#shutdown()">shutdown</A></CODE> in class <CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="startTrackingPhoneState()"><!-- --></A><H3>
-startTrackingPhoneState</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Starts tracking phone state.")
-<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcStartEvent.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcStartEvent</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcStartEvent.html#value()">value</A>="phone")
-</FONT>public void <B>startTrackingPhoneState</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="readPhoneState()"><!-- --></A><H3>
-readPhoneState</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns the current phone state and incoming number.",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="A Map of \"state\" and \"incomingNumber\"")
-</FONT>public Bundle <B>readPhoneState</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="stopTrackingPhoneState()"><!-- --></A><H3>
-stopTrackingPhoneState</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Stops tracking phone state.")
-<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcStopEvent.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcStopEvent</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcStopEvent.html#value()">value</A>="phone")
-</FONT>public void <B>stopTrackingPhoneState</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="phoneCall(java.lang.String)"><!-- --></A><H3>
-phoneCall</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Calls a contact/phone number by URI.")
-</FONT>public void <B>phoneCall</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="uri")</FONT>
-                                     java.lang.String&nbsp;uriString)
-               throws java.lang.Exception</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.lang.Exception</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="phoneCallNumber(java.lang.String)"><!-- --></A><H3>
-phoneCallNumber</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Calls a phone number.")
-</FONT>public void <B>phoneCallNumber</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="phone number")</FONT>
-                                           java.lang.String&nbsp;number)
-                     throws java.lang.Exception</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.lang.Exception</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="phoneDial(java.lang.String)"><!-- --></A><H3>
-phoneDial</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Dials a contact/phone number by URI.")
-</FONT>public void <B>phoneDial</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="uri")</FONT>
-                                     java.lang.String&nbsp;uri)
-               throws java.lang.Exception</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.lang.Exception</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="phoneDialNumber(java.lang.String)"><!-- --></A><H3>
-phoneDialNumber</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Dials a phone number.")
-</FONT>public void <B>phoneDialNumber</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="phone number")</FONT>
-                                           java.lang.String&nbsp;number)
-                     throws java.lang.Exception,
-                            java.io.UnsupportedEncodingException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.lang.Exception</CODE>
-<DD><CODE>java.io.UnsupportedEncodingException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getCellLocation()"><!-- --></A><H3>
-getCellLocation</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns the current cell location.")
-</FONT>public CellLocation <B>getCellLocation</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getNetworkOperator()"><!-- --></A><H3>
-getNetworkOperator</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns the numeric name (MCC+MNC) of current registered operator.")
-</FONT>public java.lang.String <B>getNetworkOperator</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getNetworkOperatorName()"><!-- --></A><H3>
-getNetworkOperatorName</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns the alphabetic name of current registered operator.")
-</FONT>public java.lang.String <B>getNetworkOperatorName</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getNetworkType()"><!-- --></A><H3>
-getNetworkType</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns a the radio technology (network type) currently in use on the device.")
-</FONT>public java.lang.String <B>getNetworkType</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getPhoneType()"><!-- --></A><H3>
-getPhoneType</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns the device phone type.")
-</FONT>public java.lang.String <B>getPhoneType</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getSimCountryIso()"><!-- --></A><H3>
-getSimCountryIso</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns the ISO country code equivalent for the SIM provider\'s country code.")
-</FONT>public java.lang.String <B>getSimCountryIso</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getSimOperator()"><!-- --></A><H3>
-getSimOperator</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns the MCC+MNC (mobile country code + mobile network code) of the provider of the SIM. 5 or 6 decimal digits.")
-</FONT>public java.lang.String <B>getSimOperator</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getSimOperatorName()"><!-- --></A><H3>
-getSimOperatorName</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns the Service Provider Name (SPN).")
-</FONT>public java.lang.String <B>getSimOperatorName</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getSimSerialNumber()"><!-- --></A><H3>
-getSimSerialNumber</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns the serial number of the SIM, if applicable. Return null if it is unavailable.")
-</FONT>public java.lang.String <B>getSimSerialNumber</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getSimState()"><!-- --></A><H3>
-getSimState</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns the state of the device SIM card.")
-</FONT>public java.lang.String <B>getSimState</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getSubscriberId()"><!-- --></A><H3>
-getSubscriberId</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns the unique subscriber ID, for example, the IMSI for a GSM phone. Return null if it is unavailable.")
-</FONT>public java.lang.String <B>getSubscriberId</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getVoiceMailAlphaTag()"><!-- --></A><H3>
-getVoiceMailAlphaTag</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Retrieves the alphabetic identifier associated with the voice mail number.")
-</FONT>public java.lang.String <B>getVoiceMailAlphaTag</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getVoiceMailNumber()"><!-- --></A><H3>
-getVoiceMailNumber</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns the voice mail number. Return null if it is unavailable.")
-</FONT>public java.lang.String <B>getVoiceMailNumber</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="checkNetworkRoaming()"><!-- --></A><H3>
-checkNetworkRoaming</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns true if the device is considered roaming on the current network, for GSM purposes.")
-</FONT>public java.lang.Boolean <B>checkNetworkRoaming</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getDeviceId()"><!-- --></A><H3>
-getDeviceId</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns the unique device ID, for example, the IMEI for GSM and the MEID for CDMA phones. Return null if device ID is not available.")
-</FONT>public java.lang.String <B>getDeviceId</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getDeviceSoftwareVersion()"><!-- --></A><H3>
-getDeviceSoftwareVersion</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns the software version number for the device, for example, the IMEI/SV for GSM phones. Return null if the software version is not available.")
-</FONT>public java.lang.String <B>getDeviceSoftwareVersion</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getLine1Number()"><!-- --></A><H3>
-getLine1Number</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns the phone number string for line 1, for example, the MSISDN for a GSM phone. Return null if it is unavailable.")
-</FONT>public java.lang.String <B>getLine1Number</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getNeighboringCellInfo()"><!-- --></A><H3>
-getNeighboringCellInfo</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns the neighboring cell information of the device.")
-</FONT>public java.util.List&lt;NeighboringCellInfo&gt; <B>getNeighboringCellInfo</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/PhoneFacade.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/MediaRecorderFacade.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/PreferencesFacade.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/PhoneFacade.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="PhoneFacade.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/facade/PreferencesFacade.html b/doc/com/googlecode/android_scripting/facade/PreferencesFacade.html
deleted file mode 100644
index f6bad9f4..00000000
--- a/doc/com/googlecode/android_scripting/facade/PreferencesFacade.html
+++ /dev/null
@@ -1,355 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:00 PDT 2014 -->
-<TITLE>
-PreferencesFacade
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="PreferencesFacade";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/PreferencesFacade.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/PhoneFacade.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/SensorManagerFacade.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/PreferencesFacade.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="PreferencesFacade.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.facade</FONT>
-<BR>
-Class PreferencesFacade</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">com.googlecode.android_scripting.jsonrpc.RpcReceiver</A>
-      <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.facade.PreferencesFacade</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>PreferencesFacade</B><DT>extends <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A></DL>
-</PRE>
-
-<P>
-This facade allows access to the Preferences interface.
- 
- <br>
- <b>Notes:</b> <br>
- <b>filename</b> - Filename indicates which preference file to refer to. If no filename is
- supplied (the default) then the SharedPreferences uses is the default for the SL4A application.<br>
- <b>prefPutValue</b> - uses "MODE_PRIVATE" when writing to preferences. Save values to the default
- shared preferences is explicitly disallowed.<br>
- <br>
- See <a
- href=http://developer.android.com/reference/java/util/prefs/Preferences.html>Preferences</a> and
- <a href=http://developer.android.com/guide/topics/data/data-storage.html#pref>Shared
- Preferences</a> in the android documentation on how preferences work.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Robbie Matthews (rjmatthews62@gmail.com)</DD>
-</DL>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/PreferencesFacade.html#PreferencesFacade(com.googlecode.android_scripting.facade.FacadeManager)">PreferencesFacade</A></B>(<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A>&nbsp;manager)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.util.Map&lt;java.lang.String,?&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/PreferencesFacade.html#prefGetAll(java.lang.String)">prefGetAll</A></B>(java.lang.String&nbsp;filename)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.Object</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/PreferencesFacade.html#prefGetValue(java.lang.String, java.lang.String)">prefGetValue</A></B>(java.lang.String&nbsp;key,
-             java.lang.String&nbsp;filename)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/PreferencesFacade.html#prefPutValue(java.lang.String, java.lang.Object, java.lang.String)">prefPutValue</A></B>(java.lang.String&nbsp;key,
-             java.lang.Object&nbsp;value,
-             java.lang.String&nbsp;filename)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/PreferencesFacade.html#shutdown()">shutdown</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Invoked when the receiver is shut down.</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="PreferencesFacade(com.googlecode.android_scripting.facade.FacadeManager)"><!-- --></A><H3>
-PreferencesFacade</H3>
-<PRE>
-public <B>PreferencesFacade</B>(<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A>&nbsp;manager)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="prefGetValue(java.lang.String, java.lang.String)"><!-- --></A><H3>
-prefGetValue</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Read a value from shared preferences")
-</FONT>public java.lang.Object <B>prefGetValue</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="key")</FONT>
-                                                    java.lang.String&nbsp;key,
-                                                    <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="filename",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="Desired preferences file. If not defined, uses the default Shared Preferences.")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                                    java.lang.String&nbsp;filename)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="prefPutValue(java.lang.String, java.lang.Object, java.lang.String)"><!-- --></A><H3>
-prefPutValue</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Write a value to shared preferences")
-</FONT>public void <B>prefPutValue</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="key")</FONT>
-                                        java.lang.String&nbsp;key,
-                                        <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="value")</FONT>
-                                        java.lang.Object&nbsp;value,
-                                        <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="filename",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="Desired preferences file. If not defined, uses the default Shared Preferences.")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                        java.lang.String&nbsp;filename)
-                  throws java.io.IOException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.io.IOException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="prefGetAll(java.lang.String)"><!-- --></A><H3>
-prefGetAll</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Get list of Shared Preference Values",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="Map of key,value")
-</FONT>public java.util.Map&lt;java.lang.String,?&gt; <B>prefGetAll</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="filename",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="Desired preferences file. If not defined, uses the default Shared Preferences.")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                                                          java.lang.String&nbsp;filename)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="shutdown()"><!-- --></A><H3>
-shutdown</H3>
-<PRE>
-public void <B>shutdown</B>()</PRE>
-<DL>
-<DD><B>Description copied from class: <CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html#shutdown()">RpcReceiver</A></CODE></B></DD>
-<DD>Invoked when the receiver is shut down.
-<P>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html#shutdown()">shutdown</A></CODE> in class <CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/PreferencesFacade.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/PhoneFacade.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/SensorManagerFacade.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/PreferencesFacade.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="PreferencesFacade.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/facade/SensorManagerFacade.html b/doc/com/googlecode/android_scripting/facade/SensorManagerFacade.html
deleted file mode 100644
index 6412352a..00000000
--- a/doc/com/googlecode/android_scripting/facade/SensorManagerFacade.html
+++ /dev/null
@@ -1,539 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:00 PDT 2014 -->
-<TITLE>
-SensorManagerFacade
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="SensorManagerFacade";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/SensorManagerFacade.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/PreferencesFacade.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/SettingsFacade.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/SensorManagerFacade.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="SensorManagerFacade.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.facade</FONT>
-<BR>
-Class SensorManagerFacade</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">com.googlecode.android_scripting.jsonrpc.RpcReceiver</A>
-      <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.facade.SensorManagerFacade</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>SensorManagerFacade</B><DT>extends <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A></DL>
-</PRE>
-
-<P>
-Exposes the SensorManager related functionality. <br>
- <br>
- <b>Guidance notes</b> <br>
- For reasons of economy the sensors on smart phones are usually low cost and, therefore, low
- accuracy (usually represented by 10 bit data). The floating point data values obtained from
- sensor readings have up to 16 decimal places, the majority of which are noise. On many phones the
- accelerometer is limited (by the phone manufacturer) to a maximum reading of 2g. The magnetometer
- (which also provides orientation readings) is strongly affected by the presence of ferrous metals
- and can give large errors in vehicles, on board ship etc.
- 
- Following a startSensingTimed(A,B) api call sensor events are entered into the Event Queue (see
- EventFacade). For the A parameter: 1 = All Sensors, 2 = Accelerometer, 3 = Magnetometer and 4 =
- Light. The B parameter is the minimum delay between recordings in milliseconds. To avoid
- duplicate readings the minimum delay should be 20 milliseconds. The light sensor will probably be
- much slower (taking about 1 second to register a change in light level). Note that if the light
- level is constant no sensor events will be registered by the light sensor.
- 
- Following a startSensingThreshold(A,B,C) api call sensor events greater than a given threshold
- are entered into the Event Queue. For the A parameter: 1 = Orientation, 2 = Accelerometer, 3 =
- Magnetometer and 4 = Light. The B parameter is the integer value of the required threshold level.
- For orientation sensing the integer threshold value is in milliradians. Since orientation events
- can exceed the threshold value for long periods only crossing and return events are recorded. The
- C parameter is the required axis (XYZ) of the sensor: 0 = No axis, 1 = X, 2 = Y, 3 = X+Y, 4 = Z,
- 5= X+Z, 6 = Y+Z, 7 = X+Y+Z. For orientation X = azimuth, Y = pitch and Z = roll. <br>
- 
- <br>
- <b>Example (python)</b>
- 
- <pre>
- import android, time
- droid = android.Android()
- droid.startSensingTimed(1, 250)
- time.sleep(1)
- s1 = droid.readSensors().result
- s2 = droid.sensorsGetAccuracy().result
- s3 = droid.sensorsGetLight().result
- s4 = droid.sensorsReadAccelerometer().result
- s5 = droid.sensorsReadMagnetometer().result
- s6 = droid.sensorsReadOrientation().result
- droid.stopSensing()
- </pre>
- 
- Returns:<br>
- s1 = {u'accuracy': 3, u'pitch': -0.47323511242866517, u'xmag': 1.75, u'azimuth':
- -0.26701245009899138, u'zforce': 8.4718560000000007, u'yforce': 4.2495484000000001, u'time':
- 1297160391.2820001, u'ymag': -8.9375, u'zmag': -41.0625, u'roll': -0.031366908922791481,
- u'xforce': 0.23154590999999999}<br>
- s2 = 3 (Highest accuracy)<br>
- s3 = None ---(not available on many phones)<br>
- s4 = [0.23154590999999999, 4.2495484000000001, 8.4718560000000007] ----(x, y, z accelerations)<br>
- s5 = [1.75, -8.9375, -41.0625] -----(x, y, z magnetic readings)<br>
- s6 = [-0.26701245009899138, -0.47323511242866517, -0.031366908922791481] ---(azimuth, pitch, roll
- in radians)<br>
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Damon Kohler (damonkohler@gmail.com), Felix Arends (felix.arends@gmail.com), Alexey Reznichenko (alexey.reznichenko@gmail.com), Robbie Mathews (rjmatthews62@gmail.com), John Karwatzki (jokar49@gmail.com)</DD>
-</DL>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/SensorManagerFacade.html#SensorManagerFacade(com.googlecode.android_scripting.facade.FacadeManager)">SensorManagerFacade</A></B>(<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A>&nbsp;manager)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;Bundle</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/SensorManagerFacade.html#readSensors()">readSensors</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.Integer</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/SensorManagerFacade.html#sensorsGetAccuracy()">sensorsGetAccuracy</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.Float</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/SensorManagerFacade.html#sensorsGetLight()">sensorsGetLight</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.util.List&lt;java.lang.Float&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/SensorManagerFacade.html#sensorsReadAccelerometer()">sensorsReadAccelerometer</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.util.List&lt;java.lang.Float&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/SensorManagerFacade.html#sensorsReadMagnetometer()">sensorsReadMagnetometer</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.util.List&lt;java.lang.Double&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/SensorManagerFacade.html#sensorsReadOrientation()">sensorsReadOrientation</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/SensorManagerFacade.html#shutdown()">shutdown</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Invoked when the receiver is shut down.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/SensorManagerFacade.html#startSensing(java.lang.Integer)">startSensing</A></B>(java.lang.Integer&nbsp;sampleSize)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/SensorManagerFacade.html#startSensingThreshold(java.lang.Integer, java.lang.Integer, java.lang.Integer)">startSensingThreshold</A></B>(java.lang.Integer&nbsp;sensorNumber,
-                      java.lang.Integer&nbsp;threshold,
-                      java.lang.Integer&nbsp;axis)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/SensorManagerFacade.html#startSensingTimed(java.lang.Integer, java.lang.Integer)">startSensingTimed</A></B>(java.lang.Integer&nbsp;sensorNumber,
-                  java.lang.Integer&nbsp;delayTime)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/SensorManagerFacade.html#stopSensing()">stopSensing</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="SensorManagerFacade(com.googlecode.android_scripting.facade.FacadeManager)"><!-- --></A><H3>
-SensorManagerFacade</H3>
-<PRE>
-public <B>SensorManagerFacade</B>(<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A>&nbsp;manager)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="startSensingTimed(java.lang.Integer, java.lang.Integer)"><!-- --></A><H3>
-startSensingTimed</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Starts recording sensor data to be available for polling.")
-<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcStartEvent.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcStartEvent</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcStartEvent.html#value()">value</A>="sensors")
-</FONT>public void <B>startSensingTimed</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="sensorNumber",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="1 = All, 2 = Accelerometer, 3 = Magnetometer and 4 = Light")</FONT>
-                                                                java.lang.Integer&nbsp;sensorNumber,
-                                                                <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="delayTime",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="Minimum time between readings in milliseconds")</FONT>
-                                                                java.lang.Integer&nbsp;delayTime)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="startSensingThreshold(java.lang.Integer, java.lang.Integer, java.lang.Integer)"><!-- --></A><H3>
-startSensingThreshold</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Records to the Event Queue sensor data exceeding a chosen threshold.")
-<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcStartEvent.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcStartEvent</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcStartEvent.html#value()">value</A>="threshold")
-</FONT>public void <B>startSensingThreshold</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="sensorNumber",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="1 = Orientation, 2 = Accelerometer, 3 = Magnetometer and 4 = Light")</FONT>
-                                                                    java.lang.Integer&nbsp;sensorNumber,
-                                                                    <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="threshold",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="Threshold level for chosen sensor (integer)")</FONT>
-                                                                    java.lang.Integer&nbsp;threshold,
-                                                                    <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="axis",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="0 = No axis, 1 = X, 2 = Y, 3 = X+Y, 4 = Z, 5= X+Z, 6 = Y+Z, 7 = X+Y+Z")</FONT>
-                                                                    java.lang.Integer&nbsp;axis)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="readSensors()"><!-- --></A><H3>
-readSensors</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns the most recently recorded sensor data.")
-</FONT>public Bundle <B>readSensors</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="stopSensing()"><!-- --></A><H3>
-stopSensing</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Stops collecting sensor data.")
-<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcStopEvent.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcStopEvent</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcStopEvent.html#value()">value</A>="sensors")
-</FONT>public void <B>stopSensing</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="sensorsGetAccuracy()"><!-- --></A><H3>
-sensorsGetAccuracy</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns the most recently received accuracy value.")
-</FONT>public java.lang.Integer <B>sensorsGetAccuracy</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="sensorsGetLight()"><!-- --></A><H3>
-sensorsGetLight</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns the most recently received light value.")
-</FONT>public java.lang.Float <B>sensorsGetLight</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="sensorsReadAccelerometer()"><!-- --></A><H3>
-sensorsReadAccelerometer</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns the most recently received accelerometer values.",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="a List of Floats [(acceleration on the) X axis, Y axis, Z axis].")
-</FONT>public java.util.List&lt;java.lang.Float&gt; <B>sensorsReadAccelerometer</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="sensorsReadMagnetometer()"><!-- --></A><H3>
-sensorsReadMagnetometer</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns the most recently received magnetic field values.",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="a List of Floats [(magnetic field value for) X axis, Y axis, Z axis].")
-</FONT>public java.util.List&lt;java.lang.Float&gt; <B>sensorsReadMagnetometer</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="sensorsReadOrientation()"><!-- --></A><H3>
-sensorsReadOrientation</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns the most recently received orientation values.",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="a List of Doubles [azimuth, pitch, roll].")
-</FONT>public java.util.List&lt;java.lang.Double&gt; <B>sensorsReadOrientation</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="startSensing(java.lang.Integer)"><!-- --></A><H3>
-startSensing</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Starts recording sensor data to be available for polling.")
-<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDeprecated.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDeprecated</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDeprecated.html#value()">value</A>="startSensingTimed or startSensingThreshhold",
-               <A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDeprecated.html#release()">release</A>="4")
-</FONT>public void <B>startSensing</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="sampleSize",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="number of samples for calculating average readings")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="5")</FONT>
-                                                                  java.lang.Integer&nbsp;sampleSize)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="shutdown()"><!-- --></A><H3>
-shutdown</H3>
-<PRE>
-public void <B>shutdown</B>()</PRE>
-<DL>
-<DD><B>Description copied from class: <CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html#shutdown()">RpcReceiver</A></CODE></B></DD>
-<DD>Invoked when the receiver is shut down.
-<P>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html#shutdown()">shutdown</A></CODE> in class <CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/SensorManagerFacade.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/PreferencesFacade.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/SettingsFacade.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/SensorManagerFacade.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="SensorManagerFacade.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/facade/SettingsFacade.html b/doc/com/googlecode/android_scripting/facade/SettingsFacade.html
deleted file mode 100644
index 0e4795f3..00000000
--- a/doc/com/googlecode/android_scripting/facade/SettingsFacade.html
+++ /dev/null
@@ -1,690 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:00 PDT 2014 -->
-<TITLE>
-SettingsFacade
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="SettingsFacade";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/SettingsFacade.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/SensorManagerFacade.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/SignalStrengthFacade.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/SettingsFacade.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="SettingsFacade.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.facade</FONT>
-<BR>
-Class SettingsFacade</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">com.googlecode.android_scripting.jsonrpc.RpcReceiver</A>
-      <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.facade.SettingsFacade</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>SettingsFacade</B><DT>extends <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A></DL>
-</PRE>
-
-<P>
-Exposes phone settings functionality.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Frank Spychalski (frank.spychalski@gmail.com)</DD>
-</DL>
-<HR>
-
-<P>
-<!-- =========== FIELD SUMMARY =========== -->
-
-<A NAME="field_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Field Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/SettingsFacade.html#AIRPLANE_MODE_OFF">AIRPLANE_MODE_OFF</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/SettingsFacade.html#AIRPLANE_MODE_ON">AIRPLANE_MODE_ON</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/SettingsFacade.html#SettingsFacade(com.googlecode.android_scripting.facade.FacadeManager)">SettingsFacade</A></B>(<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A>&nbsp;manager)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Creates a new SettingsFacade.</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.Boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/SettingsFacade.html#checkAirplaneMode()">checkAirplaneMode</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.Boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/SettingsFacade.html#checkRingerSilentMode()">checkRingerSilentMode</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.Boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/SettingsFacade.html#checkScreenOn()">checkScreenOn</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/SettingsFacade.html#getMaxMediaVolume()">getMaxMediaVolume</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/SettingsFacade.html#getMaxRingerVolume()">getMaxRingerVolume</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/SettingsFacade.html#getMediaVolume()">getMediaVolume</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/SettingsFacade.html#getRingerVolume()">getRingerVolume</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.Integer</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/SettingsFacade.html#getScreenBrightness()">getScreenBrightness</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.Integer</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/SettingsFacade.html#getScreenTimeout()">getScreenTimeout</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.Boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/SettingsFacade.html#getVibrateMode(java.lang.Boolean)">getVibrateMode</A></B>(java.lang.Boolean&nbsp;ringer)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/SettingsFacade.html#setMediaVolume(java.lang.Integer)">setMediaVolume</A></B>(java.lang.Integer&nbsp;volume)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/SettingsFacade.html#setRingerVolume(java.lang.Integer)">setRingerVolume</A></B>(java.lang.Integer&nbsp;volume)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.Integer</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/SettingsFacade.html#setScreenBrightness(java.lang.Integer)">setScreenBrightness</A></B>(java.lang.Integer&nbsp;value)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.Integer</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/SettingsFacade.html#setScreenTimeout(java.lang.Integer)">setScreenTimeout</A></B>(java.lang.Integer&nbsp;value)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/SettingsFacade.html#shutdown()">shutdown</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Invoked when the receiver is shut down.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.Boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/SettingsFacade.html#toggleAirplaneMode(java.lang.Boolean)">toggleAirplaneMode</A></B>(java.lang.Boolean&nbsp;enabled)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.Boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/SettingsFacade.html#toggleRingerSilentMode(java.lang.Boolean)">toggleRingerSilentMode</A></B>(java.lang.Boolean&nbsp;enabled)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.Boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/SettingsFacade.html#toggleVibrateMode(java.lang.Boolean, java.lang.Boolean)">toggleVibrateMode</A></B>(java.lang.Boolean&nbsp;enabled,
-                  java.lang.Boolean&nbsp;ringer)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-<A NAME="field_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Field Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="AIRPLANE_MODE_OFF"><!-- --></A><H3>
-AIRPLANE_MODE_OFF</H3>
-<PRE>
-public static int <B>AIRPLANE_MODE_OFF</B></PRE>
-<DL>
-<DL>
-</DL>
-</DL>
-<HR>
-
-<A NAME="AIRPLANE_MODE_ON"><!-- --></A><H3>
-AIRPLANE_MODE_ON</H3>
-<PRE>
-public static int <B>AIRPLANE_MODE_ON</B></PRE>
-<DL>
-<DL>
-</DL>
-</DL>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="SettingsFacade(com.googlecode.android_scripting.facade.FacadeManager)"><!-- --></A><H3>
-SettingsFacade</H3>
-<PRE>
-public <B>SettingsFacade</B>(<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A>&nbsp;manager)</PRE>
-<DL>
-<DD>Creates a new SettingsFacade.
-<P>
-<DL>
-<DT><B>Parameters:</B><DD><CODE>service</CODE> - is the <CODE>Context</CODE> the APIs will run under</DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="setScreenTimeout(java.lang.Integer)"><!-- --></A><H3>
-setScreenTimeout</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Sets the screen timeout to this number of seconds.",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="The original screen timeout.")
-</FONT>public java.lang.Integer <B>setScreenTimeout</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="value")</FONT>
-                                                                java.lang.Integer&nbsp;value)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getScreenTimeout()"><!-- --></A><H3>
-getScreenTimeout</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns the current screen timeout in seconds.",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="the current screen timeout in seconds.")
-</FONT>public java.lang.Integer <B>getScreenTimeout</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="checkAirplaneMode()"><!-- --></A><H3>
-checkAirplaneMode</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Checks the airplane mode setting.",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="True if airplane mode is enabled.")
-</FONT>public java.lang.Boolean <B>checkAirplaneMode</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="toggleAirplaneMode(java.lang.Boolean)"><!-- --></A><H3>
-toggleAirplaneMode</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Toggles airplane mode on and off.",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="True if airplane mode is enabled.")
-</FONT>public java.lang.Boolean <B>toggleAirplaneMode</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="enabled")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                                                  java.lang.Boolean&nbsp;enabled)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="checkRingerSilentMode()"><!-- --></A><H3>
-checkRingerSilentMode</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Checks the ringer silent mode setting.",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="True if ringer silent mode is enabled.")
-</FONT>public java.lang.Boolean <B>checkRingerSilentMode</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="toggleRingerSilentMode(java.lang.Boolean)"><!-- --></A><H3>
-toggleRingerSilentMode</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Toggles ringer silent mode on and off.",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="True if ringer silent mode is enabled.")
-</FONT>public java.lang.Boolean <B>toggleRingerSilentMode</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="enabled")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                                                      java.lang.Boolean&nbsp;enabled)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="toggleVibrateMode(java.lang.Boolean, java.lang.Boolean)"><!-- --></A><H3>
-toggleVibrateMode</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Toggles vibrate mode on and off. If ringer=true then set Ringer setting, else set Notification setting",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="True if vibrate mode is enabled.")
-</FONT>public java.lang.Boolean <B>toggleVibrateMode</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="enabled")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                                                 java.lang.Boolean&nbsp;enabled,
-                                                                 <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="ringer")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                                                 java.lang.Boolean&nbsp;ringer)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getVibrateMode(java.lang.Boolean)"><!-- --></A><H3>
-getVibrateMode</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Checks Vibration setting. If ringer=true then query Ringer setting, else query Notification setting",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="True if vibrate mode is enabled.")
-</FONT>public java.lang.Boolean <B>getVibrateMode</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="ringer")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                                              java.lang.Boolean&nbsp;ringer)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getMaxRingerVolume()"><!-- --></A><H3>
-getMaxRingerVolume</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns the maximum ringer volume.")
-</FONT>public int <B>getMaxRingerVolume</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getRingerVolume()"><!-- --></A><H3>
-getRingerVolume</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns the current ringer volume.")
-</FONT>public int <B>getRingerVolume</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setRingerVolume(java.lang.Integer)"><!-- --></A><H3>
-setRingerVolume</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Sets the ringer volume.")
-</FONT>public void <B>setRingerVolume</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="volume")</FONT>
-                                           java.lang.Integer&nbsp;volume)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getMaxMediaVolume()"><!-- --></A><H3>
-getMaxMediaVolume</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns the maximum media volume.")
-</FONT>public int <B>getMaxMediaVolume</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getMediaVolume()"><!-- --></A><H3>
-getMediaVolume</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns the current media volume.")
-</FONT>public int <B>getMediaVolume</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setMediaVolume(java.lang.Integer)"><!-- --></A><H3>
-setMediaVolume</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Sets the media volume.")
-</FONT>public void <B>setMediaVolume</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="volume")</FONT>
-                                          java.lang.Integer&nbsp;volume)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getScreenBrightness()"><!-- --></A><H3>
-getScreenBrightness</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns the screen backlight brightness.",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="the current screen brightness between 0 and 255")
-</FONT>public java.lang.Integer <B>getScreenBrightness</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setScreenBrightness(java.lang.Integer)"><!-- --></A><H3>
-setScreenBrightness</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Sets the the screen backlight brightness.",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="the original screen brightness.")
-</FONT>public java.lang.Integer <B>setScreenBrightness</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="value",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="brightness value between 0 and 255")</FONT>
-                                                                   java.lang.Integer&nbsp;value)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="checkScreenOn()"><!-- --></A><H3>
-checkScreenOn</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Checks if the screen is on or off (requires API level 7).",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="True if the screen is currently on.")
-</FONT>public java.lang.Boolean <B>checkScreenOn</B>()
-                                throws java.lang.Exception</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.lang.Exception</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="shutdown()"><!-- --></A><H3>
-shutdown</H3>
-<PRE>
-public void <B>shutdown</B>()</PRE>
-<DL>
-<DD><B>Description copied from class: <CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html#shutdown()">RpcReceiver</A></CODE></B></DD>
-<DD>Invoked when the receiver is shut down.
-<P>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html#shutdown()">shutdown</A></CODE> in class <CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/SettingsFacade.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/SensorManagerFacade.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/SignalStrengthFacade.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/SettingsFacade.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="SettingsFacade.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/facade/SignalStrengthFacade.html b/doc/com/googlecode/android_scripting/facade/SignalStrengthFacade.html
deleted file mode 100644
index f86faef0..00000000
--- a/doc/com/googlecode/android_scripting/facade/SignalStrengthFacade.html
+++ /dev/null
@@ -1,331 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:01 PDT 2014 -->
-<TITLE>
-SignalStrengthFacade
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="SignalStrengthFacade";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/SignalStrengthFacade.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/SettingsFacade.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/SmsFacade.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/SignalStrengthFacade.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="SignalStrengthFacade.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.facade</FONT>
-<BR>
-Class SignalStrengthFacade</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">com.googlecode.android_scripting.jsonrpc.RpcReceiver</A>
-      <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.facade.SignalStrengthFacade</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE><FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcMinSdk.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcMinSdk</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcMinSdk.html#value()">value</A>=7)
-</FONT>public class <B>SignalStrengthFacade</B><DT>extends <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A></DL>
-</PRE>
-
-<P>
-Exposes SignalStrength functionality.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Joerg Zieren (joerg.zieren@gmail.com)</DD>
-</DL>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/SignalStrengthFacade.html#SignalStrengthFacade(com.googlecode.android_scripting.facade.FacadeManager)">SignalStrengthFacade</A></B>(<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A>&nbsp;manager)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;Bundle</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/SignalStrengthFacade.html#readSignalStrengths()">readSignalStrengths</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/SignalStrengthFacade.html#shutdown()">shutdown</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Invoked when the receiver is shut down.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/SignalStrengthFacade.html#startTrackingSignalStrengths()">startTrackingSignalStrengths</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/SignalStrengthFacade.html#stopTrackingSignalStrengths()">stopTrackingSignalStrengths</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="SignalStrengthFacade(com.googlecode.android_scripting.facade.FacadeManager)"><!-- --></A><H3>
-SignalStrengthFacade</H3>
-<PRE>
-public <B>SignalStrengthFacade</B>(<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A>&nbsp;manager)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="startTrackingSignalStrengths()"><!-- --></A><H3>
-startTrackingSignalStrengths</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Starts tracking signal strengths.")
-<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcStartEvent.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcStartEvent</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcStartEvent.html#value()">value</A>="signal_strengths")
-</FONT>public void <B>startTrackingSignalStrengths</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="readSignalStrengths()"><!-- --></A><H3>
-readSignalStrengths</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns the current signal strengths.",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="A map of \"gsm_signal_strength\"")
-</FONT>public Bundle <B>readSignalStrengths</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="stopTrackingSignalStrengths()"><!-- --></A><H3>
-stopTrackingSignalStrengths</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Stops tracking signal strength.")
-<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcStopEvent.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcStopEvent</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcStopEvent.html#value()">value</A>="signal_strengths")
-</FONT>public void <B>stopTrackingSignalStrengths</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="shutdown()"><!-- --></A><H3>
-shutdown</H3>
-<PRE>
-public void <B>shutdown</B>()</PRE>
-<DL>
-<DD><B>Description copied from class: <CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html#shutdown()">RpcReceiver</A></CODE></B></DD>
-<DD>Invoked when the receiver is shut down.
-<P>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html#shutdown()">shutdown</A></CODE> in class <CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/SignalStrengthFacade.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/SettingsFacade.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/SmsFacade.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/SignalStrengthFacade.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="SignalStrengthFacade.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/facade/SmsFacade.html b/doc/com/googlecode/android_scripting/facade/SmsFacade.html
deleted file mode 100644
index 9a74514b..00000000
--- a/doc/com/googlecode/android_scripting/facade/SmsFacade.html
+++ /dev/null
@@ -1,467 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:01 PDT 2014 -->
-<TITLE>
-SmsFacade
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="SmsFacade";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/SmsFacade.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/SignalStrengthFacade.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/SpeechRecognitionFacade.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/SmsFacade.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="SmsFacade.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.facade</FONT>
-<BR>
-Class SmsFacade</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">com.googlecode.android_scripting.jsonrpc.RpcReceiver</A>
-      <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.facade.SmsFacade</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>SmsFacade</B><DT>extends <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A></DL>
-</PRE>
-
-<P>
-Provides access to SMS related functionality.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>MeanEYE.rcf (meaneye.rcf@gmail.com)</DD>
-</DL>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/SmsFacade.html#SmsFacade(com.googlecode.android_scripting.facade.FacadeManager)">SmsFacade</A></B>(<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A>&nbsp;manager)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/SmsFacade.html#shutdown()">shutdown</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Invoked when the receiver is shut down.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.Boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/SmsFacade.html#smsDeleteMessage(java.lang.Integer)">smsDeleteMessage</A></B>(java.lang.Integer&nbsp;id)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.util.List&lt;java.lang.String&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/SmsFacade.html#smsGetAttributes()">smsGetAttributes</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;JSONObject</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/SmsFacade.html#smsGetMessageById(java.lang.Integer, JSONArray)">smsGetMessageById</A></B>(java.lang.Integer&nbsp;id,
-                  JSONArray&nbsp;attributes)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.Integer</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/SmsFacade.html#smsGetMessageCount(java.lang.Boolean, java.lang.String)">smsGetMessageCount</A></B>(java.lang.Boolean&nbsp;unreadOnly,
-                   java.lang.String&nbsp;folder)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.util.List&lt;java.lang.Integer&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/SmsFacade.html#smsGetMessageIds(java.lang.Boolean, java.lang.String)">smsGetMessageIds</A></B>(java.lang.Boolean&nbsp;unreadOnly,
-                 java.lang.String&nbsp;folder)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.util.List&lt;JSONObject&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/SmsFacade.html#smsGetMessages(java.lang.Boolean, java.lang.String, JSONArray)">smsGetMessages</A></B>(java.lang.Boolean&nbsp;unreadOnly,
-               java.lang.String&nbsp;folder,
-               JSONArray&nbsp;attributes)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.Integer</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/SmsFacade.html#smsMarkMessageRead(JSONArray, java.lang.Boolean)">smsMarkMessageRead</A></B>(JSONArray&nbsp;ids,
-                   java.lang.Boolean&nbsp;read)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/SmsFacade.html#smsSend(java.lang.String, java.lang.String)">smsSend</A></B>(java.lang.String&nbsp;destinationAddress,
-        java.lang.String&nbsp;text)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="SmsFacade(com.googlecode.android_scripting.facade.FacadeManager)"><!-- --></A><H3>
-SmsFacade</H3>
-<PRE>
-public <B>SmsFacade</B>(<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A>&nbsp;manager)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="smsSend(java.lang.String, java.lang.String)"><!-- --></A><H3>
-smsSend</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Sends an SMS.")
-</FONT>public void <B>smsSend</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="destinationAddress",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="typically a phone number")</FONT>
-                                   java.lang.String&nbsp;destinationAddress,
-                                   <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="text")</FONT>
-                                   java.lang.String&nbsp;text)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="smsGetMessageCount(java.lang.Boolean, java.lang.String)"><!-- --></A><H3>
-smsGetMessageCount</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns the number of messages.")
-</FONT>public java.lang.Integer <B>smsGetMessageCount</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="unreadOnly")</FONT>
-                                                           java.lang.Boolean&nbsp;unreadOnly,
-                                                           <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="folder")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="inbox")</FONT>
-                                                           java.lang.String&nbsp;folder)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="smsGetMessageIds(java.lang.Boolean, java.lang.String)"><!-- --></A><H3>
-smsGetMessageIds</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns a List of all message IDs.")
-</FONT>public java.util.List&lt;java.lang.Integer&gt; <B>smsGetMessageIds</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="unreadOnly")</FONT>
-                                                                         java.lang.Boolean&nbsp;unreadOnly,
-                                                                         <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="folder")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="inbox")</FONT>
-                                                                         java.lang.String&nbsp;folder)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="smsGetMessages(java.lang.Boolean, java.lang.String, JSONArray)"><!-- --></A><H3>
-smsGetMessages</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns a List of all messages.",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="a List of messages as Maps")
-</FONT>public java.util.List&lt;JSONObject&gt; <B>smsGetMessages</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="unreadOnly")</FONT>
-                                                                       java.lang.Boolean&nbsp;unreadOnly,
-                                                                       <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="folder")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="inbox")</FONT>
-                                                                       java.lang.String&nbsp;folder,
-                                                                       <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="attributes")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                                                       JSONArray&nbsp;attributes)
-                                          throws JSONException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>JSONException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="smsGetMessageById(java.lang.Integer, JSONArray)"><!-- --></A><H3>
-smsGetMessageById</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns message attributes.")
-</FONT>public JSONObject <B>smsGetMessageById</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="id",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="message ID")</FONT>
-                                                   java.lang.Integer&nbsp;id,
-                                                   <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="attributes")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                                   JSONArray&nbsp;attributes)
-                             throws JSONException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>JSONException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="smsGetAttributes()"><!-- --></A><H3>
-smsGetAttributes</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns a List of all possible message attributes.")
-</FONT>public java.util.List&lt;java.lang.String&gt; <B>smsGetAttributes</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="smsDeleteMessage(java.lang.Integer)"><!-- --></A><H3>
-smsDeleteMessage</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Deletes a message.",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="True if the message was deleted")
-</FONT>public java.lang.Boolean <B>smsDeleteMessage</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="id")</FONT>
-                                                                java.lang.Integer&nbsp;id)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="smsMarkMessageRead(JSONArray, java.lang.Boolean)"><!-- --></A><H3>
-smsMarkMessageRead</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Marks messages as read.",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="number of messages marked read")
-</FONT>public java.lang.Integer <B>smsMarkMessageRead</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="ids",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="List of message IDs to mark as read.")</FONT>
-                                                                  JSONArray&nbsp;ids,
-                                                                  <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="read")</FONT>
-                                                                  java.lang.Boolean&nbsp;read)
-                                     throws JSONException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>JSONException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="shutdown()"><!-- --></A><H3>
-shutdown</H3>
-<PRE>
-public void <B>shutdown</B>()</PRE>
-<DL>
-<DD><B>Description copied from class: <CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html#shutdown()">RpcReceiver</A></CODE></B></DD>
-<DD>Invoked when the receiver is shut down.
-<P>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html#shutdown()">shutdown</A></CODE> in class <CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/SmsFacade.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/SignalStrengthFacade.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/SpeechRecognitionFacade.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/SmsFacade.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="SmsFacade.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/facade/SpeechRecognitionFacade.html b/doc/com/googlecode/android_scripting/facade/SpeechRecognitionFacade.html
deleted file mode 100644
index 7abc672b..00000000
--- a/doc/com/googlecode/android_scripting/facade/SpeechRecognitionFacade.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:01 PDT 2014 -->
-<TITLE>
-SpeechRecognitionFacade
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="SpeechRecognitionFacade";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/SpeechRecognitionFacade.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/SmsFacade.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/TextToSpeechFacade.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/SpeechRecognitionFacade.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="SpeechRecognitionFacade.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.facade</FONT>
-<BR>
-Class SpeechRecognitionFacade</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">com.googlecode.android_scripting.jsonrpc.RpcReceiver</A>
-      <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.facade.SpeechRecognitionFacade</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>SpeechRecognitionFacade</B><DT>extends <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A></DL>
-</PRE>
-
-<P>
-A facade containing RPC implementations related to the speech-to-text functionality of Android.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Felix Arends (felix.arends@gmail.com)</DD>
-</DL>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/SpeechRecognitionFacade.html#SpeechRecognitionFacade(com.googlecode.android_scripting.facade.FacadeManager)">SpeechRecognitionFacade</A></B>(<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A>&nbsp;manager)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/SpeechRecognitionFacade.html#recognizeSpeech(java.lang.String, java.lang.String, java.lang.String)">recognizeSpeech</A></B>(java.lang.String&nbsp;prompt,
-                java.lang.String&nbsp;language,
-                java.lang.String&nbsp;languageModel)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/SpeechRecognitionFacade.html#shutdown()">shutdown</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Invoked when the receiver is shut down.</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="SpeechRecognitionFacade(com.googlecode.android_scripting.facade.FacadeManager)"><!-- --></A><H3>
-SpeechRecognitionFacade</H3>
-<PRE>
-public <B>SpeechRecognitionFacade</B>(<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A>&nbsp;manager)</PRE>
-<DL>
-<DL>
-<DT><B>Parameters:</B><DD><CODE>activityLauncher</CODE> - a helper object that launches activities in a blocking manner</DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="recognizeSpeech(java.lang.String, java.lang.String, java.lang.String)"><!-- --></A><H3>
-recognizeSpeech</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Recognizes user\'s speech and returns the most likely result.",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="An empty string in case the speech cannot be recongnized.")
-</FONT>public java.lang.String <B>recognizeSpeech</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="prompt",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="text prompt to show to the user when asking them to speak")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                                              java.lang.String&nbsp;prompt,
-                                                              <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="language",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="language override to inform the recognizer that it should expect speech in a language different than the one set in the java.util.Locale.getDefault()")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                                              java.lang.String&nbsp;language,
-                                                              <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="languageModel",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="informs the recognizer which speech model to prefer (see android.speech.RecognizeIntent)")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                                              java.lang.String&nbsp;languageModel)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="shutdown()"><!-- --></A><H3>
-shutdown</H3>
-<PRE>
-public void <B>shutdown</B>()</PRE>
-<DL>
-<DD><B>Description copied from class: <CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html#shutdown()">RpcReceiver</A></CODE></B></DD>
-<DD>Invoked when the receiver is shut down.
-<P>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html#shutdown()">shutdown</A></CODE> in class <CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/SpeechRecognitionFacade.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/SmsFacade.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/TextToSpeechFacade.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/SpeechRecognitionFacade.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="SpeechRecognitionFacade.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/facade/TextToSpeechFacade.html b/doc/com/googlecode/android_scripting/facade/TextToSpeechFacade.html
deleted file mode 100644
index 0722feb4..00000000
--- a/doc/com/googlecode/android_scripting/facade/TextToSpeechFacade.html
+++ /dev/null
@@ -1,311 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:01 PDT 2014 -->
-<TITLE>
-TextToSpeechFacade
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="TextToSpeechFacade";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/TextToSpeechFacade.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/SpeechRecognitionFacade.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/ToneGeneratorFacade.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/TextToSpeechFacade.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="TextToSpeechFacade.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.facade</FONT>
-<BR>
-Class TextToSpeechFacade</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">com.googlecode.android_scripting.jsonrpc.RpcReceiver</A>
-      <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.facade.TextToSpeechFacade</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE><FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcMinSdk.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcMinSdk</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcMinSdk.html#value()">value</A>=4)
-</FONT>public class <B>TextToSpeechFacade</B><DT>extends <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A></DL>
-</PRE>
-
-<P>
-Provides Text To Speech services for API 4 or more.
-<P>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/TextToSpeechFacade.html#TextToSpeechFacade(com.googlecode.android_scripting.facade.FacadeManager)">TextToSpeechFacade</A></B>(<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A>&nbsp;manager)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/TextToSpeechFacade.html#shutdown()">shutdown</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Invoked when the receiver is shut down.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.Boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/TextToSpeechFacade.html#ttsIsSpeaking()">ttsIsSpeaking</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/TextToSpeechFacade.html#ttsSpeak(java.lang.String)">ttsSpeak</A></B>(java.lang.String&nbsp;message)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="TextToSpeechFacade(com.googlecode.android_scripting.facade.FacadeManager)"><!-- --></A><H3>
-TextToSpeechFacade</H3>
-<PRE>
-public <B>TextToSpeechFacade</B>(<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A>&nbsp;manager)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="shutdown()"><!-- --></A><H3>
-shutdown</H3>
-<PRE>
-public void <B>shutdown</B>()</PRE>
-<DL>
-<DD><B>Description copied from class: <CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html#shutdown()">RpcReceiver</A></CODE></B></DD>
-<DD>Invoked when the receiver is shut down.
-<P>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html#shutdown()">shutdown</A></CODE> in class <CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="ttsSpeak(java.lang.String)"><!-- --></A><H3>
-ttsSpeak</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Speaks the provided message via TTS.")
-</FONT>public void <B>ttsSpeak</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="message")</FONT>
-                                    java.lang.String&nbsp;message)
-              throws java.lang.InterruptedException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.lang.InterruptedException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="ttsIsSpeaking()"><!-- --></A><H3>
-ttsIsSpeaking</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns True if speech is currently in progress.")
-</FONT>public java.lang.Boolean <B>ttsIsSpeaking</B>()
-                                throws java.lang.InterruptedException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.lang.InterruptedException</CODE></DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/TextToSpeechFacade.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/SpeechRecognitionFacade.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/ToneGeneratorFacade.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/TextToSpeechFacade.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="TextToSpeechFacade.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/facade/ToneGeneratorFacade.html b/doc/com/googlecode/android_scripting/facade/ToneGeneratorFacade.html
deleted file mode 100644
index ef897049..00000000
--- a/doc/com/googlecode/android_scripting/facade/ToneGeneratorFacade.html
+++ /dev/null
@@ -1,290 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:01 PDT 2014 -->
-<TITLE>
-ToneGeneratorFacade
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="ToneGeneratorFacade";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ToneGeneratorFacade.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/TextToSpeechFacade.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/WakeLockFacade.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/ToneGeneratorFacade.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ToneGeneratorFacade.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.facade</FONT>
-<BR>
-Class ToneGeneratorFacade</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">com.googlecode.android_scripting.jsonrpc.RpcReceiver</A>
-      <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.facade.ToneGeneratorFacade</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>ToneGeneratorFacade</B><DT>extends <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A></DL>
-</PRE>
-
-<P>
-Generate DTMF tones.
-<P>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/ToneGeneratorFacade.html#ToneGeneratorFacade(com.googlecode.android_scripting.facade.FacadeManager)">ToneGeneratorFacade</A></B>(<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A>&nbsp;manager)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/ToneGeneratorFacade.html#generateDtmfTones(java.lang.String, java.lang.Integer)">generateDtmfTones</A></B>(java.lang.String&nbsp;phoneNumber,
-                  java.lang.Integer&nbsp;toneDuration)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/ToneGeneratorFacade.html#shutdown()">shutdown</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Invoked when the receiver is shut down.</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="ToneGeneratorFacade(com.googlecode.android_scripting.facade.FacadeManager)"><!-- --></A><H3>
-ToneGeneratorFacade</H3>
-<PRE>
-public <B>ToneGeneratorFacade</B>(<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A>&nbsp;manager)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="generateDtmfTones(java.lang.String, java.lang.Integer)"><!-- --></A><H3>
-generateDtmfTones</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Generate DTMF tones for the given phone number.")
-</FONT>public void <B>generateDtmfTones</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="phoneNumber")</FONT>
-                                             java.lang.String&nbsp;phoneNumber,
-                                             <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="toneDuration",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="duration of each tone in milliseconds")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="100")</FONT>
-                                             java.lang.Integer&nbsp;toneDuration)
-                       throws java.lang.InterruptedException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.lang.InterruptedException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="shutdown()"><!-- --></A><H3>
-shutdown</H3>
-<PRE>
-public void <B>shutdown</B>()</PRE>
-<DL>
-<DD><B>Description copied from class: <CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html#shutdown()">RpcReceiver</A></CODE></B></DD>
-<DD>Invoked when the receiver is shut down.
-<P>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html#shutdown()">shutdown</A></CODE> in class <CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ToneGeneratorFacade.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/TextToSpeechFacade.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/WakeLockFacade.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/ToneGeneratorFacade.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ToneGeneratorFacade.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/facade/WakeLockFacade.html b/doc/com/googlecode/android_scripting/facade/WakeLockFacade.html
deleted file mode 100644
index d02760ce..00000000
--- a/doc/com/googlecode/android_scripting/facade/WakeLockFacade.html
+++ /dev/null
@@ -1,367 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:01 PDT 2014 -->
-<TITLE>
-WakeLockFacade
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="WakeLockFacade";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/WakeLockFacade.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/ToneGeneratorFacade.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/WebCamFacade.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/WakeLockFacade.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="WakeLockFacade.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.facade</FONT>
-<BR>
-Class WakeLockFacade</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">com.googlecode.android_scripting.jsonrpc.RpcReceiver</A>
-      <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.facade.WakeLockFacade</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>WakeLockFacade</B><DT>extends <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A></DL>
-</PRE>
-
-<P>
-A facade exposing some of the functionality of the PowerManager, in particular wake locks.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Felix Arends (felixarends@gmail.com), Damon Kohler (damonkohler@gmail.com)</DD>
-</DL>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/WakeLockFacade.html#WakeLockFacade(com.googlecode.android_scripting.facade.FacadeManager)">WakeLockFacade</A></B>(<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A>&nbsp;manager)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/WakeLockFacade.html#shutdown()">shutdown</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Invoked when the receiver is shut down.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/WakeLockFacade.html#wakeLockAcquireBright()">wakeLockAcquireBright</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/WakeLockFacade.html#wakeLockAcquireDim()">wakeLockAcquireDim</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/WakeLockFacade.html#wakeLockAcquireFull()">wakeLockAcquireFull</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/WakeLockFacade.html#wakeLockAcquirePartial()">wakeLockAcquirePartial</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/WakeLockFacade.html#wakeLockRelease()">wakeLockRelease</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="WakeLockFacade(com.googlecode.android_scripting.facade.FacadeManager)"><!-- --></A><H3>
-WakeLockFacade</H3>
-<PRE>
-public <B>WakeLockFacade</B>(<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A>&nbsp;manager)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="wakeLockAcquireFull()"><!-- --></A><H3>
-wakeLockAcquireFull</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Acquires a full wake lock (CPU on, screen bright, keyboard bright).")
-</FONT>public void <B>wakeLockAcquireFull</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="wakeLockAcquirePartial()"><!-- --></A><H3>
-wakeLockAcquirePartial</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Acquires a partial wake lock (CPU on).")
-</FONT>public void <B>wakeLockAcquirePartial</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="wakeLockAcquireBright()"><!-- --></A><H3>
-wakeLockAcquireBright</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Acquires a bright wake lock (CPU on, screen bright).")
-</FONT>public void <B>wakeLockAcquireBright</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="wakeLockAcquireDim()"><!-- --></A><H3>
-wakeLockAcquireDim</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Acquires a dim wake lock (CPU on, screen dim).")
-</FONT>public void <B>wakeLockAcquireDim</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="wakeLockRelease()"><!-- --></A><H3>
-wakeLockRelease</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Releases the wake lock.")
-</FONT>public void <B>wakeLockRelease</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="shutdown()"><!-- --></A><H3>
-shutdown</H3>
-<PRE>
-public void <B>shutdown</B>()</PRE>
-<DL>
-<DD><B>Description copied from class: <CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html#shutdown()">RpcReceiver</A></CODE></B></DD>
-<DD>Invoked when the receiver is shut down.
-<P>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html#shutdown()">shutdown</A></CODE> in class <CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/WakeLockFacade.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/ToneGeneratorFacade.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/WebCamFacade.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/WakeLockFacade.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="WakeLockFacade.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/facade/WebCamFacade.html b/doc/com/googlecode/android_scripting/facade/WebCamFacade.html
deleted file mode 100644
index b0b2fc48..00000000
--- a/doc/com/googlecode/android_scripting/facade/WebCamFacade.html
+++ /dev/null
@@ -1,418 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:01 PDT 2014 -->
-<TITLE>
-WebCamFacade
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="WebCamFacade";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/WebCamFacade.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/WakeLockFacade.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/WifiFacade.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/WebCamFacade.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="WebCamFacade.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.facade</FONT>
-<BR>
-Class WebCamFacade</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">com.googlecode.android_scripting.jsonrpc.RpcReceiver</A>
-      <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.facade.WebCamFacade</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE><FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcMinSdk.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcMinSdk</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcMinSdk.html#value()">value</A>=8)
-</FONT>public class <B>WebCamFacade</B><DT>extends <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A></DL>
-</PRE>
-
-<P>
-Manages access to camera streaming.
- <br>
- <h3>Usage Notes</h3>
- <br><b>webCamStart</b> and <b>webCamStop</b> are used to start and stop an Mpeg stream on a given port. <b>webcamAdjustQuality</b> is used to ajust the quality of the streaming video.
- <br><b>cameraStartPreview</b> is used to get access to the camera preview screen. It will generate "preview" events as images become available.
- <br>The preview has two modes: data or file. If you pass a non-blank, writable file path to the <b>cameraStartPreview</b> it will store jpg images in that folder. 
- It is up to the caller to clean up these files after the fact. If no file element is provided, 
- the event will include the image data as a base64 encoded string. 
- <h3>Event details</h3>
- <br>The data element of the preview event will be a map, with the following elements defined.
- <ul>
- <li><b>format</b> - currently always "jpeg"
- <li><b>width</b> - image width (in pixels)
- <li><b>height</b> - image height (in pixels)
- <li><b>quality</b> - JPEG quality. Number from 1-100
- <li><b>filename</b> - Name of file where image was saved. Only relevant if filepath defined.
- <li><b>error</b> - included if there was an IOException saving file, ie, disk full or path write protected.
- <li><b>encoding</b> - Data encoding. If filepath defined, will be "file" otherwise "base64"
- <li><b>data</b> - Base64 encoded image data.
- </ul>
-<br>Note that "filename", "error" and "data" are mutual exclusive.
-<br>
-<br>The webcam and preview modes use the same resources, so you can't use them both at the same time. Stop one mode before starting the other.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Damon Kohler (damonkohler@gmail.com) (probably), Robbie Matthews (rjmatthews62@gmail.com)</DD>
-</DL>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/WebCamFacade.html#WebCamFacade(com.googlecode.android_scripting.facade.FacadeManager)">WebCamFacade</A></B>(<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A>&nbsp;manager)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/WebCamFacade.html#cameraStartPreview(java.lang.Integer, java.lang.Integer, java.lang.String)">cameraStartPreview</A></B>(java.lang.Integer&nbsp;resolutionLevel,
-                   java.lang.Integer&nbsp;jpegQuality,
-                   java.lang.String&nbsp;filepath)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/WebCamFacade.html#cameraStopPreview()">cameraStopPreview</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/WebCamFacade.html#shutdown()">shutdown</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Invoked when the receiver is shut down.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/WebCamFacade.html#webcamAdjustQuality(java.lang.Integer, java.lang.Integer)">webcamAdjustQuality</A></B>(java.lang.Integer&nbsp;resolutionLevel,
-                    java.lang.Integer&nbsp;jpegQuality)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.net.InetSocketAddress</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/WebCamFacade.html#webcamStart(java.lang.Integer, java.lang.Integer, java.lang.Integer)">webcamStart</A></B>(java.lang.Integer&nbsp;resolutionLevel,
-            java.lang.Integer&nbsp;jpegQuality,
-            java.lang.Integer&nbsp;port)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/WebCamFacade.html#webcamStop()">webcamStop</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="WebCamFacade(com.googlecode.android_scripting.facade.FacadeManager)"><!-- --></A><H3>
-WebCamFacade</H3>
-<PRE>
-public <B>WebCamFacade</B>(<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A>&nbsp;manager)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="webcamStart(java.lang.Integer, java.lang.Integer, java.lang.Integer)"><!-- --></A><H3>
-webcamStart</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Starts an MJPEG stream and returns a Tuple of address and port for the stream.")
-</FONT>public java.net.InetSocketAddress <B>webcamStart</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="resolutionLevel",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="increasing this number provides higher resolution")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="0")</FONT>
-                                                             java.lang.Integer&nbsp;resolutionLevel,
-                                                             <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="jpegQuality",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="a number from 0-100")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="20")</FONT>
-                                                             java.lang.Integer&nbsp;jpegQuality,
-                                                             <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="port",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="If port is specified, the webcam service will bind to port, otherwise it will pick any available port.")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="0")</FONT>
-                                                             java.lang.Integer&nbsp;port)
-                                       throws java.lang.Exception</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.lang.Exception</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="webcamAdjustQuality(java.lang.Integer, java.lang.Integer)"><!-- --></A><H3>
-webcamAdjustQuality</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Adjusts the quality of the webcam stream while it is running.")
-</FONT>public void <B>webcamAdjustQuality</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="resolutionLevel",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="increasing this number provides higher resolution")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="0")</FONT>
-                                               java.lang.Integer&nbsp;resolutionLevel,
-                                               <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="jpegQuality",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="a number from 0-100")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="20")</FONT>
-                                               java.lang.Integer&nbsp;jpegQuality)
-                         throws java.lang.Exception</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.lang.Exception</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="webcamStop()"><!-- --></A><H3>
-webcamStop</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Stops the webcam stream.")
-</FONT>public void <B>webcamStop</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="cameraStartPreview(java.lang.Integer, java.lang.Integer, java.lang.String)"><!-- --></A><H3>
-cameraStartPreview</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Start Preview Mode. Throws \'preview\' events.",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="True if successful")
-</FONT>public boolean <B>cameraStartPreview</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="resolutionLevel",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="increasing this number provides higher resolution")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="0")</FONT>
-                                                        java.lang.Integer&nbsp;resolutionLevel,
-                                                        <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="jpegQuality",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="a number from 0-100")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="20")</FONT>
-                                                        java.lang.Integer&nbsp;jpegQuality,
-                                                        <FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="filepath",<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="Path to store jpeg files.")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                                        java.lang.String&nbsp;filepath)
-                           throws java.lang.InterruptedException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.lang.InterruptedException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="cameraStopPreview()"><!-- --></A><H3>
-cameraStopPreview</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Stop the preview mode.")
-</FONT>public void <B>cameraStopPreview</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="shutdown()"><!-- --></A><H3>
-shutdown</H3>
-<PRE>
-public void <B>shutdown</B>()</PRE>
-<DL>
-<DD><B>Description copied from class: <CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html#shutdown()">RpcReceiver</A></CODE></B></DD>
-<DD>Invoked when the receiver is shut down.
-<P>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html#shutdown()">shutdown</A></CODE> in class <CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/WebCamFacade.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/WakeLockFacade.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/WifiFacade.html" title="class in com.googlecode.android_scripting.facade"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/WebCamFacade.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="WebCamFacade.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/facade/WifiFacade.html b/doc/com/googlecode/android_scripting/facade/WifiFacade.html
deleted file mode 100644
index 824baa90..00000000
--- a/doc/com/googlecode/android_scripting/facade/WifiFacade.html
+++ /dev/null
@@ -1,490 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:01 PDT 2014 -->
-<TITLE>
-WifiFacade
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="WifiFacade";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/WifiFacade.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/WebCamFacade.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/WifiFacade.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="WifiFacade.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.facade</FONT>
-<BR>
-Class WifiFacade</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">com.googlecode.android_scripting.jsonrpc.RpcReceiver</A>
-      <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.facade.WifiFacade</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>WifiFacade</B><DT>extends <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A></DL>
-</PRE>
-
-<P>
-Wifi functions.
-<P>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/WifiFacade.html#WifiFacade(com.googlecode.android_scripting.facade.FacadeManager)">WifiFacade</A></B>(<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A>&nbsp;manager)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.Boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/WifiFacade.html#checkWifiState()">checkWifiState</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/WifiFacade.html#shutdown()">shutdown</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Invoked when the receiver is shut down.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.Boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/WifiFacade.html#toggleWifiState(java.lang.Boolean)">toggleWifiState</A></B>(java.lang.Boolean&nbsp;enabled)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.Boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/WifiFacade.html#wifiDisconnect()">wifiDisconnect</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;WifiInfo</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/WifiFacade.html#wifiGetConnectionInfo()">wifiGetConnectionInfo</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.util.List&lt;ScanResult&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/WifiFacade.html#wifiGetScanResults()">wifiGetScanResults</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/WifiFacade.html#wifiLockAcquireFull()">wifiLockAcquireFull</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/WifiFacade.html#wifiLockAcquireScanOnly()">wifiLockAcquireScanOnly</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/WifiFacade.html#wifiLockRelease()">wifiLockRelease</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.Boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/WifiFacade.html#wifiReassociate()">wifiReassociate</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.Boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/WifiFacade.html#wifiReconnect()">wifiReconnect</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.Boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/facade/WifiFacade.html#wifiStartScan()">wifiStartScan</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="WifiFacade(com.googlecode.android_scripting.facade.FacadeManager)"><!-- --></A><H3>
-WifiFacade</H3>
-<PRE>
-public <B>WifiFacade</B>(<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A>&nbsp;manager)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="wifiGetScanResults()"><!-- --></A><H3>
-wifiGetScanResults</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns the list of access points found during the most recent Wifi scan.")
-</FONT>public java.util.List&lt;ScanResult&gt; <B>wifiGetScanResults</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="wifiLockAcquireFull()"><!-- --></A><H3>
-wifiLockAcquireFull</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Acquires a full Wifi lock.")
-</FONT>public void <B>wifiLockAcquireFull</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="wifiLockAcquireScanOnly()"><!-- --></A><H3>
-wifiLockAcquireScanOnly</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Acquires a scan only Wifi lock.")
-</FONT>public void <B>wifiLockAcquireScanOnly</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="wifiLockRelease()"><!-- --></A><H3>
-wifiLockRelease</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Releases a previously acquired Wifi lock.")
-</FONT>public void <B>wifiLockRelease</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="wifiStartScan()"><!-- --></A><H3>
-wifiStartScan</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Starts a scan for Wifi access points.",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="True if the scan was initiated successfully.")
-</FONT>public java.lang.Boolean <B>wifiStartScan</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="checkWifiState()"><!-- --></A><H3>
-checkWifiState</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Checks Wifi state.",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="True if Wifi is enabled.")
-</FONT>public java.lang.Boolean <B>checkWifiState</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="toggleWifiState(java.lang.Boolean)"><!-- --></A><H3>
-toggleWifiState</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Toggle Wifi on and off.",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="True if Wifi is enabled.")
-</FONT>public java.lang.Boolean <B>toggleWifiState</B>(<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="enabled")<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                                               java.lang.Boolean&nbsp;enabled)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="wifiDisconnect()"><!-- --></A><H3>
-wifiDisconnect</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Disconnects from the currently active access point.",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="True if the operation succeeded.")
-</FONT>public java.lang.Boolean <B>wifiDisconnect</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="wifiGetConnectionInfo()"><!-- --></A><H3>
-wifiGetConnectionInfo</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns information about the currently active access point.")
-</FONT>public WifiInfo <B>wifiGetConnectionInfo</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="wifiReassociate()"><!-- --></A><H3>
-wifiReassociate</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Reassociates with the currently active access point.",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="True if the operation succeeded.")
-</FONT>public java.lang.Boolean <B>wifiReassociate</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="wifiReconnect()"><!-- --></A><H3>
-wifiReconnect</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Reconnects to the currently active access point.",
-     <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="True if the operation succeeded.")
-</FONT>public java.lang.Boolean <B>wifiReconnect</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="shutdown()"><!-- --></A><H3>
-shutdown</H3>
-<PRE>
-public void <B>shutdown</B>()</PRE>
-<DL>
-<DD><B>Description copied from class: <CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html#shutdown()">RpcReceiver</A></CODE></B></DD>
-<DD>Invoked when the receiver is shut down.
-<P>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html#shutdown()">shutdown</A></CODE> in class <CODE><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/WifiFacade.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/WebCamFacade.html" title="class in com.googlecode.android_scripting.facade"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/WifiFacade.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="WifiFacade.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/facade/package-frame.html b/doc/com/googlecode/android_scripting/facade/package-frame.html
deleted file mode 100644
index b9238588..00000000
--- a/doc/com/googlecode/android_scripting/facade/package-frame.html
+++ /dev/null
@@ -1,101 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-com.googlecode.android_scripting.facade
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-
-</HEAD>
-
-<BODY BGCOLOR="white">
-<FONT size="+1" CLASS="FrameTitleFont">
-<A HREF="../../../../com/googlecode/android_scripting/facade/package-summary.html" target="classFrame">com.googlecode.android_scripting.facade</A></FONT>
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
-Interfaces</FONT>&nbsp;
-<FONT CLASS="FrameItemFont">
-<BR>
-<A HREF="AndroidFacade.Resources.html" title="interface in com.googlecode.android_scripting.facade" target="classFrame"><I>AndroidFacade.Resources</I></A>
-<BR>
-<A HREF="EventFacade.EventObserver.html" title="interface in com.googlecode.android_scripting.facade" target="classFrame"><I>EventFacade.EventObserver</I></A></FONT></TD>
-</TR>
-</TABLE>
-
-
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
-Classes</FONT>&nbsp;
-<FONT CLASS="FrameItemFont">
-<BR>
-<A HREF="ActivityResultFacade.html" title="class in com.googlecode.android_scripting.facade" target="classFrame">ActivityResultFacade</A>
-<BR>
-<A HREF="AndroidFacade.html" title="class in com.googlecode.android_scripting.facade" target="classFrame">AndroidFacade</A>
-<BR>
-<A HREF="ApplicationManagerFacade.html" title="class in com.googlecode.android_scripting.facade" target="classFrame">ApplicationManagerFacade</A>
-<BR>
-<A HREF="BatteryManagerFacade.html" title="class in com.googlecode.android_scripting.facade" target="classFrame">BatteryManagerFacade</A>
-<BR>
-<A HREF="BluetoothFacade.html" title="class in com.googlecode.android_scripting.facade" target="classFrame">BluetoothFacade</A>
-<BR>
-<A HREF="CameraFacade.html" title="class in com.googlecode.android_scripting.facade" target="classFrame">CameraFacade</A>
-<BR>
-<A HREF="CommonIntentsFacade.html" title="class in com.googlecode.android_scripting.facade" target="classFrame">CommonIntentsFacade</A>
-<BR>
-<A HREF="ContactsFacade.html" title="class in com.googlecode.android_scripting.facade" target="classFrame">ContactsFacade</A>
-<BR>
-<A HREF="EventFacade.html" title="class in com.googlecode.android_scripting.facade" target="classFrame">EventFacade</A>
-<BR>
-<A HREF="EventServer.html" title="class in com.googlecode.android_scripting.facade" target="classFrame">EventServer</A>
-<BR>
-<A HREF="EyesFreeFacade.html" title="class in com.googlecode.android_scripting.facade" target="classFrame">EyesFreeFacade</A>
-<BR>
-<A HREF="FacadeConfiguration.html" title="class in com.googlecode.android_scripting.facade" target="classFrame">FacadeConfiguration</A>
-<BR>
-<A HREF="FacadeManager.html" title="class in com.googlecode.android_scripting.facade" target="classFrame">FacadeManager</A>
-<BR>
-<A HREF="FacadeManagerFactory.html" title="class in com.googlecode.android_scripting.facade" target="classFrame">FacadeManagerFactory</A>
-<BR>
-<A HREF="LocationFacade.html" title="class in com.googlecode.android_scripting.facade" target="classFrame">LocationFacade</A>
-<BR>
-<A HREF="MediaPlayerFacade.html" title="class in com.googlecode.android_scripting.facade" target="classFrame">MediaPlayerFacade</A>
-<BR>
-<A HREF="MediaRecorderFacade.html" title="class in com.googlecode.android_scripting.facade" target="classFrame">MediaRecorderFacade</A>
-<BR>
-<A HREF="PhoneFacade.html" title="class in com.googlecode.android_scripting.facade" target="classFrame">PhoneFacade</A>
-<BR>
-<A HREF="PreferencesFacade.html" title="class in com.googlecode.android_scripting.facade" target="classFrame">PreferencesFacade</A>
-<BR>
-<A HREF="SensorManagerFacade.html" title="class in com.googlecode.android_scripting.facade" target="classFrame">SensorManagerFacade</A>
-<BR>
-<A HREF="SettingsFacade.html" title="class in com.googlecode.android_scripting.facade" target="classFrame">SettingsFacade</A>
-<BR>
-<A HREF="SignalStrengthFacade.html" title="class in com.googlecode.android_scripting.facade" target="classFrame">SignalStrengthFacade</A>
-<BR>
-<A HREF="SmsFacade.html" title="class in com.googlecode.android_scripting.facade" target="classFrame">SmsFacade</A>
-<BR>
-<A HREF="SpeechRecognitionFacade.html" title="class in com.googlecode.android_scripting.facade" target="classFrame">SpeechRecognitionFacade</A>
-<BR>
-<A HREF="TextToSpeechFacade.html" title="class in com.googlecode.android_scripting.facade" target="classFrame">TextToSpeechFacade</A>
-<BR>
-<A HREF="ToneGeneratorFacade.html" title="class in com.googlecode.android_scripting.facade" target="classFrame">ToneGeneratorFacade</A>
-<BR>
-<A HREF="WakeLockFacade.html" title="class in com.googlecode.android_scripting.facade" target="classFrame">WakeLockFacade</A>
-<BR>
-<A HREF="WebCamFacade.html" title="class in com.googlecode.android_scripting.facade" target="classFrame">WebCamFacade</A>
-<BR>
-<A HREF="WifiFacade.html" title="class in com.googlecode.android_scripting.facade" target="classFrame">WifiFacade</A></FONT></TD>
-</TR>
-</TABLE>
-
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/facade/package-summary.html b/doc/com/googlecode/android_scripting/facade/package-summary.html
deleted file mode 100644
index c219a3bf..00000000
--- a/doc/com/googlecode/android_scripting/facade/package-summary.html
+++ /dev/null
@@ -1,292 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-com.googlecode.android_scripting.facade
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="com.googlecode.android_scripting.facade";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/exception/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/ui/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/package-summary.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<H2>
-Package com.googlecode.android_scripting.facade
-</H2>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Interface Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/facade/AndroidFacade.Resources.html" title="interface in com.googlecode.android_scripting.facade">AndroidFacade.Resources</A></B></TD>
-<TD>An instance of this interface is passed to the facade.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.EventObserver.html" title="interface in com.googlecode.android_scripting.facade">EventFacade.EventObserver</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Class Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/facade/ActivityResultFacade.html" title="class in com.googlecode.android_scripting.facade">ActivityResultFacade</A></B></TD>
-<TD>Allows you to return results to a startActivityForResult call.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/facade/AndroidFacade.html" title="class in com.googlecode.android_scripting.facade">AndroidFacade</A></B></TD>
-<TD>Some general purpose Android routines.<br></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/facade/ApplicationManagerFacade.html" title="class in com.googlecode.android_scripting.facade">ApplicationManagerFacade</A></B></TD>
-<TD>Facade for managing Applications.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/facade/BatteryManagerFacade.html" title="class in com.googlecode.android_scripting.facade">BatteryManagerFacade</A></B></TD>
-<TD>Exposes Batterymanager API.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/facade/BluetoothFacade.html" title="class in com.googlecode.android_scripting.facade">BluetoothFacade</A></B></TD>
-<TD>Bluetooth functions.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/facade/CameraFacade.html" title="class in com.googlecode.android_scripting.facade">CameraFacade</A></B></TD>
-<TD>Access Camera functions.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/facade/CommonIntentsFacade.html" title="class in com.googlecode.android_scripting.facade">CommonIntentsFacade</A></B></TD>
-<TD>A selection of commonly used intents.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/facade/ContactsFacade.html" title="class in com.googlecode.android_scripting.facade">ContactsFacade</A></B></TD>
-<TD>Provides access to contacts related functionality.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.html" title="class in com.googlecode.android_scripting.facade">EventFacade</A></B></TD>
-<TD>Manage the event queue.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/facade/EventServer.html" title="class in com.googlecode.android_scripting.facade">EventServer</A></B></TD>
-<TD>An Event Forwarding server that forwards events from the rpc queue in realtime to listener
- clients.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/facade/EyesFreeFacade.html" title="class in com.googlecode.android_scripting.facade">EyesFreeFacade</A></B></TD>
-<TD>Provides Text To Speech services for API 3 or less.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/facade/FacadeConfiguration.html" title="class in com.googlecode.android_scripting.facade">FacadeConfiguration</A></B></TD>
-<TD>Encapsulates the list of supported facades and their construction.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManagerFactory.html" title="class in com.googlecode.android_scripting.facade">FacadeManagerFactory</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/facade/LocationFacade.html" title="class in com.googlecode.android_scripting.facade">LocationFacade</A></B></TD>
-<TD>This facade exposes the LocationManager related functionality.<br>
- <br>
- <b>Overview</b><br>
- Once activated by 'startLocating' the LocationFacade attempts to return location data collected
- via GPS or the cell network.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/facade/MediaPlayerFacade.html" title="class in com.googlecode.android_scripting.facade">MediaPlayerFacade</A></B></TD>
-<TD>This facade exposes basic mediaPlayer functionality.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/facade/MediaRecorderFacade.html" title="class in com.googlecode.android_scripting.facade">MediaRecorderFacade</A></B></TD>
-<TD>A facade for recording media.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/facade/PhoneFacade.html" title="class in com.googlecode.android_scripting.facade">PhoneFacade</A></B></TD>
-<TD>Exposes TelephonyManager functionality.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/facade/PreferencesFacade.html" title="class in com.googlecode.android_scripting.facade">PreferencesFacade</A></B></TD>
-<TD>This facade allows access to the Preferences interface.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/facade/SensorManagerFacade.html" title="class in com.googlecode.android_scripting.facade">SensorManagerFacade</A></B></TD>
-<TD>Exposes the SensorManager related functionality.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/facade/SettingsFacade.html" title="class in com.googlecode.android_scripting.facade">SettingsFacade</A></B></TD>
-<TD>Exposes phone settings functionality.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/facade/SignalStrengthFacade.html" title="class in com.googlecode.android_scripting.facade">SignalStrengthFacade</A></B></TD>
-<TD>Exposes SignalStrength functionality.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/facade/SmsFacade.html" title="class in com.googlecode.android_scripting.facade">SmsFacade</A></B></TD>
-<TD>Provides access to SMS related functionality.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/facade/SpeechRecognitionFacade.html" title="class in com.googlecode.android_scripting.facade">SpeechRecognitionFacade</A></B></TD>
-<TD>A facade containing RPC implementations related to the speech-to-text functionality of Android.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/facade/TextToSpeechFacade.html" title="class in com.googlecode.android_scripting.facade">TextToSpeechFacade</A></B></TD>
-<TD>Provides Text To Speech services for API 4 or more.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/facade/ToneGeneratorFacade.html" title="class in com.googlecode.android_scripting.facade">ToneGeneratorFacade</A></B></TD>
-<TD>Generate DTMF tones.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/facade/WakeLockFacade.html" title="class in com.googlecode.android_scripting.facade">WakeLockFacade</A></B></TD>
-<TD>A facade exposing some of the functionality of the PowerManager, in particular wake locks.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/facade/WebCamFacade.html" title="class in com.googlecode.android_scripting.facade">WebCamFacade</A></B></TD>
-<TD>Manages access to camera streaming.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/facade/WifiFacade.html" title="class in com.googlecode.android_scripting.facade">WifiFacade</A></B></TD>
-<TD>Wifi functions.</TD>
-</TR>
-</TABLE>
-&nbsp;
-
-<P>
-<DL>
-</DL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/exception/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/ui/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/package-summary.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/facade/package-tree.html b/doc/com/googlecode/android_scripting/facade/package-tree.html
deleted file mode 100644
index 180401db..00000000
--- a/doc/com/googlecode/android_scripting/facade/package-tree.html
+++ /dev/null
@@ -1,168 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-com.googlecode.android_scripting.facade Class Hierarchy
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="com.googlecode.android_scripting.facade Class Hierarchy";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/exception/package-tree.html"><B>PREV</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/ui/package-tree.html"><B>NEXT</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/package-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-Hierarchy For Package com.googlecode.android_scripting.facade
-</H2>
-</CENTER>
-<DL>
-<DT><B>Package Hierarchies:</B><DD><A HREF="../../../../overview-tree.html">All Packages</A></DL>
-<HR>
-<H2>
-Class Hierarchy
-</H2>
-<UL>
-<LI TYPE="circle">java.lang.Object<UL>
-<LI TYPE="circle">android.content.BroadcastReceiver<UL>
-<LI TYPE="circle">com.googlecode.android_scripting.facade.<A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.BroadcastListener.html" title="class in com.googlecode.android_scripting.facade"><B>EventFacade.BroadcastListener</B></A></UL>
-<LI TYPE="circle">com.googlecode.android_scripting.facade.<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeConfiguration.html" title="class in com.googlecode.android_scripting.facade"><B>FacadeConfiguration</B></A><LI TYPE="circle">com.googlecode.android_scripting.facade.<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManagerFactory.html" title="class in com.googlecode.android_scripting.facade"><B>FacadeManagerFactory</B></A> (implements com.googlecode.android_scripting.jsonrpc.<A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManagerFactory.html" title="interface in com.googlecode.android_scripting.jsonrpc">RpcReceiverManagerFactory</A>)
-<LI TYPE="circle">com.googlecode.android_scripting.jsonrpc.<A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc"><B>RpcReceiver</B></A><UL>
-<LI TYPE="circle">com.googlecode.android_scripting.facade.<A HREF="../../../../com/googlecode/android_scripting/facade/ActivityResultFacade.html" title="class in com.googlecode.android_scripting.facade"><B>ActivityResultFacade</B></A><LI TYPE="circle">com.googlecode.android_scripting.facade.<A HREF="../../../../com/googlecode/android_scripting/facade/AndroidFacade.html" title="class in com.googlecode.android_scripting.facade"><B>AndroidFacade</B></A><LI TYPE="circle">com.googlecode.android_scripting.facade.<A HREF="../../../../com/googlecode/android_scripting/facade/ApplicationManagerFacade.html" title="class in com.googlecode.android_scripting.facade"><B>ApplicationManagerFacade</B></A><LI TYPE="circle">com.googlecode.android_scripting.facade.<A HREF="../../../../com/googlecode/android_scripting/facade/BatteryManagerFacade.html" title="class in com.googlecode.android_scripting.facade"><B>BatteryManagerFacade</B></A><LI TYPE="circle">com.googlecode.android_scripting.facade.<A HREF="../../../../com/googlecode/android_scripting/facade/BluetoothFacade.html" title="class in com.googlecode.android_scripting.facade"><B>BluetoothFacade</B></A><LI TYPE="circle">com.googlecode.android_scripting.facade.<A HREF="../../../../com/googlecode/android_scripting/facade/CameraFacade.html" title="class in com.googlecode.android_scripting.facade"><B>CameraFacade</B></A><LI TYPE="circle">com.googlecode.android_scripting.facade.<A HREF="../../../../com/googlecode/android_scripting/facade/CommonIntentsFacade.html" title="class in com.googlecode.android_scripting.facade"><B>CommonIntentsFacade</B></A><LI TYPE="circle">com.googlecode.android_scripting.facade.<A HREF="../../../../com/googlecode/android_scripting/facade/ContactsFacade.html" title="class in com.googlecode.android_scripting.facade"><B>ContactsFacade</B></A><LI TYPE="circle">com.googlecode.android_scripting.facade.<A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.html" title="class in com.googlecode.android_scripting.facade"><B>EventFacade</B></A><LI TYPE="circle">com.googlecode.android_scripting.facade.<A HREF="../../../../com/googlecode/android_scripting/facade/EyesFreeFacade.html" title="class in com.googlecode.android_scripting.facade"><B>EyesFreeFacade</B></A><LI TYPE="circle">com.googlecode.android_scripting.facade.<A HREF="../../../../com/googlecode/android_scripting/facade/LocationFacade.html" title="class in com.googlecode.android_scripting.facade"><B>LocationFacade</B></A><LI TYPE="circle">com.googlecode.android_scripting.facade.<A HREF="../../../../com/googlecode/android_scripting/facade/MediaPlayerFacade.html" title="class in com.googlecode.android_scripting.facade"><B>MediaPlayerFacade</B></A><LI TYPE="circle">com.googlecode.android_scripting.facade.<A HREF="../../../../com/googlecode/android_scripting/facade/MediaRecorderFacade.html" title="class in com.googlecode.android_scripting.facade"><B>MediaRecorderFacade</B></A><LI TYPE="circle">com.googlecode.android_scripting.facade.<A HREF="../../../../com/googlecode/android_scripting/facade/PhoneFacade.html" title="class in com.googlecode.android_scripting.facade"><B>PhoneFacade</B></A><LI TYPE="circle">com.googlecode.android_scripting.facade.<A HREF="../../../../com/googlecode/android_scripting/facade/PreferencesFacade.html" title="class in com.googlecode.android_scripting.facade"><B>PreferencesFacade</B></A><LI TYPE="circle">com.googlecode.android_scripting.facade.<A HREF="../../../../com/googlecode/android_scripting/facade/SensorManagerFacade.html" title="class in com.googlecode.android_scripting.facade"><B>SensorManagerFacade</B></A><LI TYPE="circle">com.googlecode.android_scripting.facade.<A HREF="../../../../com/googlecode/android_scripting/facade/SettingsFacade.html" title="class in com.googlecode.android_scripting.facade"><B>SettingsFacade</B></A><LI TYPE="circle">com.googlecode.android_scripting.facade.<A HREF="../../../../com/googlecode/android_scripting/facade/SignalStrengthFacade.html" title="class in com.googlecode.android_scripting.facade"><B>SignalStrengthFacade</B></A><LI TYPE="circle">com.googlecode.android_scripting.facade.<A HREF="../../../../com/googlecode/android_scripting/facade/SmsFacade.html" title="class in com.googlecode.android_scripting.facade"><B>SmsFacade</B></A><LI TYPE="circle">com.googlecode.android_scripting.facade.<A HREF="../../../../com/googlecode/android_scripting/facade/SpeechRecognitionFacade.html" title="class in com.googlecode.android_scripting.facade"><B>SpeechRecognitionFacade</B></A><LI TYPE="circle">com.googlecode.android_scripting.facade.<A HREF="../../../../com/googlecode/android_scripting/facade/TextToSpeechFacade.html" title="class in com.googlecode.android_scripting.facade"><B>TextToSpeechFacade</B></A><LI TYPE="circle">com.googlecode.android_scripting.facade.<A HREF="../../../../com/googlecode/android_scripting/facade/ToneGeneratorFacade.html" title="class in com.googlecode.android_scripting.facade"><B>ToneGeneratorFacade</B></A><LI TYPE="circle">com.googlecode.android_scripting.facade.<A HREF="../../../../com/googlecode/android_scripting/facade/WakeLockFacade.html" title="class in com.googlecode.android_scripting.facade"><B>WakeLockFacade</B></A><LI TYPE="circle">com.googlecode.android_scripting.facade.<A HREF="../../../../com/googlecode/android_scripting/facade/WebCamFacade.html" title="class in com.googlecode.android_scripting.facade"><B>WebCamFacade</B></A><LI TYPE="circle">com.googlecode.android_scripting.facade.<A HREF="../../../../com/googlecode/android_scripting/facade/WifiFacade.html" title="class in com.googlecode.android_scripting.facade"><B>WifiFacade</B></A></UL>
-<LI TYPE="circle">com.googlecode.android_scripting.jsonrpc.<A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManager.html" title="class in com.googlecode.android_scripting.jsonrpc"><B>RpcReceiverManager</B></A><UL>
-<LI TYPE="circle">com.googlecode.android_scripting.facade.<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade"><B>FacadeManager</B></A></UL>
-<LI TYPE="circle">com.googlecode.android_scripting.<A HREF="../../../../com/googlecode/android_scripting/SimpleServer.html" title="class in com.googlecode.android_scripting"><B>SimpleServer</B></A><UL>
-<LI TYPE="circle">com.googlecode.android_scripting.facade.<A HREF="../../../../com/googlecode/android_scripting/facade/EventServer.html" title="class in com.googlecode.android_scripting.facade"><B>EventServer</B></A> (implements com.googlecode.android_scripting.facade.<A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.EventObserver.html" title="interface in com.googlecode.android_scripting.facade">EventFacade.EventObserver</A>)
-</UL>
-</UL>
-</UL>
-<H2>
-Interface Hierarchy
-</H2>
-<UL>
-<LI TYPE="circle">com.googlecode.android_scripting.facade.<A HREF="../../../../com/googlecode/android_scripting/facade/AndroidFacade.Resources.html" title="interface in com.googlecode.android_scripting.facade"><B>AndroidFacade.Resources</B></A><LI TYPE="circle">com.googlecode.android_scripting.facade.<A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.EventObserver.html" title="interface in com.googlecode.android_scripting.facade"><B>EventFacade.EventObserver</B></A></UL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/exception/package-tree.html"><B>PREV</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/ui/package-tree.html"><B>NEXT</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/facade/package-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/facade/ui/DatePickerDialogTask.html b/doc/com/googlecode/android_scripting/facade/ui/DatePickerDialogTask.html
deleted file mode 100644
index 5404ce3b..00000000
--- a/doc/com/googlecode/android_scripting/facade/ui/DatePickerDialogTask.html
+++ /dev/null
@@ -1,450 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:02 PDT 2014 -->
-<TITLE>
-DatePickerDialogTask
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="DatePickerDialogTask";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/DatePickerDialogTask.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;<A HREF="../../../../../com/googlecode/android_scripting/facade/ui/FullScreenTask.html" title="class in com.googlecode.android_scripting.facade.ui"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html?com/googlecode/android_scripting/facade/ui/DatePickerDialogTask.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="DatePickerDialogTask.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.facade.ui</FONT>
-<BR>
-Class DatePickerDialogTask</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html" title="class in com.googlecode.android_scripting.future">com.googlecode.android_scripting.future.FutureActivityTask</A>&lt;java.lang.Object&gt;
-      <IMG SRC="../../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.facade.ui.DatePickerDialogTask</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>DatePickerDialogTask</B><DT>extends <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html" title="class in com.googlecode.android_scripting.future">FutureActivityTask</A>&lt;java.lang.Object&gt;</DL>
-</PRE>
-
-<P>
-Wrapper class for date picker dialog running in separate thread.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>MeanEYE.rcf (meaneye.rcf@gmail.com)</DD>
-</DL>
-<HR>
-
-<P>
-<!-- =========== FIELD SUMMARY =========== -->
-
-<A NAME="field_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Field Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/DatePickerDialogTask.html#mDay">mDay</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/DatePickerDialogTask.html#mMonth">mMonth</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/DatePickerDialogTask.html#mYear">mYear</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/DatePickerDialogTask.html#DatePickerDialogTask(int, int, int)">DatePickerDialogTask</A></B>(int&nbsp;year,
-                     int&nbsp;month,
-                     int&nbsp;day)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/DatePickerDialogTask.html#dismissDialog()">dismissDialog</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Dismiss the <CODE>Dialog</CODE> and close <CODE>Sl4aActivity</CODE>.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;Dialog</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/DatePickerDialogTask.html#getDialog()">getDialog</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the wrapped <CODE>Dialog</CODE>.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../../com/googlecode/android_scripting/facade/EventFacade.html" title="class in com.googlecode.android_scripting.facade">EventFacade</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/DatePickerDialogTask.html#getEventFacade()">getEventFacade</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.util.concurrent.CountDownLatch</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/DatePickerDialogTask.html#getShowLatch()">getShowLatch</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the <CODE>CountDownLatch</CODE> that is counted down when the dialog is shown.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/DatePickerDialogTask.html#onCreate()">onCreate</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/DatePickerDialogTask.html#setEventFacade(com.googlecode.android_scripting.facade.EventFacade)">setEventFacade</A></B>(<A HREF="../../../../../com/googlecode/android_scripting/facade/EventFacade.html" title="class in com.googlecode.android_scripting.facade">EventFacade</A>&nbsp;mEventFacade)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_com.googlecode.android_scripting.future.FutureActivityTask"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class com.googlecode.android_scripting.future.<A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html" title="class in com.googlecode.android_scripting.future">FutureActivityTask</A></B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#finish()">finish</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#getActivity()">getActivity</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#getResult()">getResult</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onActivityResult(int, int, Intent)">onActivityResult</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onCreateContextMenu(ContextMenu, View, ContextMenuInfo)">onCreateContextMenu</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onDestroy()">onDestroy</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onKeyDown(int, KeyEvent)">onKeyDown</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onNewIntent(Intent)">onNewIntent</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onPause()">onPause</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onPrepareOptionsMenu(Menu)">onPrepareOptionsMenu</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onResume()">onResume</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onStart()">onStart</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onStop()">onStop</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#setActivity(Activity)">setActivity</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#startActivity(Intent)">startActivity</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#startActivityForResult(Intent, int)">startActivityForResult</A></CODE></TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-<A NAME="field_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Field Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="mYear"><!-- --></A><H3>
-mYear</H3>
-<PRE>
-public static int <B>mYear</B></PRE>
-<DL>
-<DL>
-</DL>
-</DL>
-<HR>
-
-<A NAME="mMonth"><!-- --></A><H3>
-mMonth</H3>
-<PRE>
-public static int <B>mMonth</B></PRE>
-<DL>
-<DL>
-</DL>
-</DL>
-<HR>
-
-<A NAME="mDay"><!-- --></A><H3>
-mDay</H3>
-<PRE>
-public static int <B>mDay</B></PRE>
-<DL>
-<DL>
-</DL>
-</DL>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="DatePickerDialogTask(int, int, int)"><!-- --></A><H3>
-DatePickerDialogTask</H3>
-<PRE>
-public <B>DatePickerDialogTask</B>(int&nbsp;year,
-                            int&nbsp;month,
-                            int&nbsp;day)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="onCreate()"><!-- --></A><H3>
-onCreate</H3>
-<PRE>
-public void <B>onCreate</B>()</PRE>
-<DL>
-<DD><DL>
-<DT><B>Overrides:</B><DD><CODE><A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onCreate()">onCreate</A></CODE> in class <CODE><A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html" title="class in com.googlecode.android_scripting.future">FutureActivityTask</A>&lt;java.lang.Object&gt;</CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getEventFacade()"><!-- --></A><H3>
-getEventFacade</H3>
-<PRE>
-public <A HREF="../../../../../com/googlecode/android_scripting/facade/EventFacade.html" title="class in com.googlecode.android_scripting.facade">EventFacade</A> <B>getEventFacade</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setEventFacade(com.googlecode.android_scripting.facade.EventFacade)"><!-- --></A><H3>
-setEventFacade</H3>
-<PRE>
-public void <B>setEventFacade</B>(<A HREF="../../../../../com/googlecode/android_scripting/facade/EventFacade.html" title="class in com.googlecode.android_scripting.facade">EventFacade</A>&nbsp;mEventFacade)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getDialog()"><!-- --></A><H3>
-getDialog</H3>
-<PRE>
-public Dialog <B>getDialog</B>()</PRE>
-<DL>
-<DD>Returns the wrapped <CODE>Dialog</CODE>.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="dismissDialog()"><!-- --></A><H3>
-dismissDialog</H3>
-<PRE>
-public void <B>dismissDialog</B>()</PRE>
-<DL>
-<DD>Dismiss the <CODE>Dialog</CODE> and close <CODE>Sl4aActivity</CODE>.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getShowLatch()"><!-- --></A><H3>
-getShowLatch</H3>
-<PRE>
-public java.util.concurrent.CountDownLatch <B>getShowLatch</B>()</PRE>
-<DL>
-<DD>Returns the <CODE>CountDownLatch</CODE> that is counted down when the dialog is shown.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/DatePickerDialogTask.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;<A HREF="../../../../../com/googlecode/android_scripting/facade/ui/FullScreenTask.html" title="class in com.googlecode.android_scripting.facade.ui"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html?com/googlecode/android_scripting/facade/ui/DatePickerDialogTask.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="DatePickerDialogTask.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/facade/ui/FullScreenTask.html b/doc/com/googlecode/android_scripting/facade/ui/FullScreenTask.html
deleted file mode 100644
index 1cdc64f7..00000000
--- a/doc/com/googlecode/android_scripting/facade/ui/FullScreenTask.html
+++ /dev/null
@@ -1,590 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:02 PDT 2014 -->
-<TITLE>
-FullScreenTask
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="FullScreenTask";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/FullScreenTask.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../com/googlecode/android_scripting/facade/ui/DatePickerDialogTask.html" title="class in com.googlecode.android_scripting.facade.ui"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../com/googlecode/android_scripting/facade/ui/SeekBarDialogTask.html" title="class in com.googlecode.android_scripting.facade.ui"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html?com/googlecode/android_scripting/facade/ui/FullScreenTask.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="FullScreenTask.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.facade.ui</FONT>
-<BR>
-Class FullScreenTask</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html" title="class in com.googlecode.android_scripting.future">com.googlecode.android_scripting.future.FutureActivityTask</A>&lt;java.lang.Object&gt;
-      <IMG SRC="../../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.facade.ui.FullScreenTask</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>FullScreenTask</B><DT>extends <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html" title="class in com.googlecode.android_scripting.future">FutureActivityTask</A>&lt;java.lang.Object&gt;</DL>
-</PRE>
-
-<P>
-<HR>
-
-<P>
-<!-- =========== FIELD SUMMARY =========== -->
-
-<A NAME="field_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Field Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;View</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/FullScreenTask.html#mView">mView</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/FullScreenTask.html#FullScreenTask(java.lang.String)">FullScreenTask</A></B>(java.lang.String&nbsp;layout)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../../com/googlecode/android_scripting/facade/EventFacade.html" title="class in com.googlecode.android_scripting.facade">EventFacade</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/FullScreenTask.html#getEventFacade()">getEventFacade</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.util.concurrent.CountDownLatch</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/FullScreenTask.html#getShowLatch()">getShowLatch</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.util.Map&lt;java.lang.String,java.util.Map&lt;java.lang.String,java.lang.String&gt;&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/FullScreenTask.html#getViewAsMap()">getViewAsMap</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.util.Map&lt;java.lang.String,java.lang.String&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/FullScreenTask.html#getViewDetail(java.lang.String)">getViewDetail</A></B>(java.lang.String&nbsp;idName)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/FullScreenTask.html#onClick(View)">onClick</A></B>(View&nbsp;view)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/FullScreenTask.html#onCreate()">onCreate</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/FullScreenTask.html#onDestroy()">onDestroy</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/FullScreenTask.html#onItemClick(, View, int, long)">onItemClick</A></B>(<any>&nbsp;aview,
-            View&nbsp;aitem,
-            int&nbsp;position,
-            long&nbsp;id)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/FullScreenTask.html#onKeyDown(int, KeyEvent)">onKeyDown</A></B>(int&nbsp;keyCode,
-          KeyEvent&nbsp;event)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/FullScreenTask.html#onPrepareOptionsMenu(Menu)">onPrepareOptionsMenu</A></B>(Menu&nbsp;menu)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/FullScreenTask.html#setEventFacade(com.googlecode.android_scripting.facade.EventFacade)">setEventFacade</A></B>(<A HREF="../../../../../com/googlecode/android_scripting/facade/EventFacade.html" title="class in com.googlecode.android_scripting.facade">EventFacade</A>&nbsp;eventFacade)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/FullScreenTask.html#setList(java.lang.String, JSONArray)">setList</A></B>(java.lang.String&nbsp;id,
-        JSONArray&nbsp;items)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/FullScreenTask.html#setOverrideKeys(java.util.List)">setOverrideKeys</A></B>(java.util.List&lt;java.lang.Integer&gt;&nbsp;overrideKeys)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/FullScreenTask.html#setUiFacade(com.googlecode.android_scripting.facade.ui.UiFacade)">setUiFacade</A></B>(<A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html" title="class in com.googlecode.android_scripting.facade.ui">UiFacade</A>&nbsp;uiFacade)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/FullScreenTask.html#setViewProperty(java.lang.String, java.lang.String, java.lang.String)">setViewProperty</A></B>(java.lang.String&nbsp;idName,
-                java.lang.String&nbsp;property,
-                java.lang.String&nbsp;value)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_com.googlecode.android_scripting.future.FutureActivityTask"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class com.googlecode.android_scripting.future.<A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html" title="class in com.googlecode.android_scripting.future">FutureActivityTask</A></B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#finish()">finish</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#getActivity()">getActivity</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#getResult()">getResult</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onActivityResult(int, int, Intent)">onActivityResult</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onCreateContextMenu(ContextMenu, View, ContextMenuInfo)">onCreateContextMenu</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onNewIntent(Intent)">onNewIntent</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onPause()">onPause</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onResume()">onResume</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onStart()">onStart</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onStop()">onStop</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#setActivity(Activity)">setActivity</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#startActivity(Intent)">startActivity</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#startActivityForResult(Intent, int)">startActivityForResult</A></CODE></TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-<A NAME="field_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Field Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="mView"><!-- --></A><H3>
-mView</H3>
-<PRE>
-public View <B>mView</B></PRE>
-<DL>
-<DL>
-</DL>
-</DL>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="FullScreenTask(java.lang.String)"><!-- --></A><H3>
-FullScreenTask</H3>
-<PRE>
-public <B>FullScreenTask</B>(java.lang.String&nbsp;layout)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="onCreate()"><!-- --></A><H3>
-onCreate</H3>
-<PRE>
-public void <B>onCreate</B>()</PRE>
-<DL>
-<DD><DL>
-<DT><B>Overrides:</B><DD><CODE><A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onCreate()">onCreate</A></CODE> in class <CODE><A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html" title="class in com.googlecode.android_scripting.future">FutureActivityTask</A>&lt;java.lang.Object&gt;</CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="onDestroy()"><!-- --></A><H3>
-onDestroy</H3>
-<PRE>
-public void <B>onDestroy</B>()</PRE>
-<DL>
-<DD><DL>
-<DT><B>Overrides:</B><DD><CODE><A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onDestroy()">onDestroy</A></CODE> in class <CODE><A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html" title="class in com.googlecode.android_scripting.future">FutureActivityTask</A>&lt;java.lang.Object&gt;</CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getEventFacade()"><!-- --></A><H3>
-getEventFacade</H3>
-<PRE>
-public <A HREF="../../../../../com/googlecode/android_scripting/facade/EventFacade.html" title="class in com.googlecode.android_scripting.facade">EventFacade</A> <B>getEventFacade</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setEventFacade(com.googlecode.android_scripting.facade.EventFacade)"><!-- --></A><H3>
-setEventFacade</H3>
-<PRE>
-public void <B>setEventFacade</B>(<A HREF="../../../../../com/googlecode/android_scripting/facade/EventFacade.html" title="class in com.googlecode.android_scripting.facade">EventFacade</A>&nbsp;eventFacade)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setUiFacade(com.googlecode.android_scripting.facade.ui.UiFacade)"><!-- --></A><H3>
-setUiFacade</H3>
-<PRE>
-public void <B>setUiFacade</B>(<A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html" title="class in com.googlecode.android_scripting.facade.ui">UiFacade</A>&nbsp;uiFacade)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getShowLatch()"><!-- --></A><H3>
-getShowLatch</H3>
-<PRE>
-public java.util.concurrent.CountDownLatch <B>getShowLatch</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getViewAsMap()"><!-- --></A><H3>
-getViewAsMap</H3>
-<PRE>
-public java.util.Map&lt;java.lang.String,java.util.Map&lt;java.lang.String,java.lang.String&gt;&gt; <B>getViewAsMap</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getViewDetail(java.lang.String)"><!-- --></A><H3>
-getViewDetail</H3>
-<PRE>
-public java.util.Map&lt;java.lang.String,java.lang.String&gt; <B>getViewDetail</B>(java.lang.String&nbsp;idName)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setViewProperty(java.lang.String, java.lang.String, java.lang.String)"><!-- --></A><H3>
-setViewProperty</H3>
-<PRE>
-public java.lang.String <B>setViewProperty</B>(java.lang.String&nbsp;idName,
-                                        java.lang.String&nbsp;property,
-                                        java.lang.String&nbsp;value)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setList(java.lang.String, JSONArray)"><!-- --></A><H3>
-setList</H3>
-<PRE>
-public java.lang.String <B>setList</B>(java.lang.String&nbsp;id,
-                                JSONArray&nbsp;items)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="onClick(View)"><!-- --></A><H3>
-onClick</H3>
-<PRE>
-public void <B>onClick</B>(View&nbsp;view)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="onKeyDown(int, KeyEvent)"><!-- --></A><H3>
-onKeyDown</H3>
-<PRE>
-public boolean <B>onKeyDown</B>(int&nbsp;keyCode,
-                         KeyEvent&nbsp;event)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Overrides:</B><DD><CODE><A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onKeyDown(int, KeyEvent)">onKeyDown</A></CODE> in class <CODE><A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html" title="class in com.googlecode.android_scripting.future">FutureActivityTask</A>&lt;java.lang.Object&gt;</CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="onPrepareOptionsMenu(Menu)"><!-- --></A><H3>
-onPrepareOptionsMenu</H3>
-<PRE>
-public boolean <B>onPrepareOptionsMenu</B>(Menu&nbsp;menu)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Overrides:</B><DD><CODE><A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onPrepareOptionsMenu(Menu)">onPrepareOptionsMenu</A></CODE> in class <CODE><A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html" title="class in com.googlecode.android_scripting.future">FutureActivityTask</A>&lt;java.lang.Object&gt;</CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="onItemClick(, View, int, long)"><!-- --></A><H3>
-onItemClick</H3>
-<PRE>
-public void <B>onItemClick</B>(<any>&nbsp;aview,
-                        View&nbsp;aitem,
-                        int&nbsp;position,
-                        long&nbsp;id)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setOverrideKeys(java.util.List)"><!-- --></A><H3>
-setOverrideKeys</H3>
-<PRE>
-public void <B>setOverrideKeys</B>(java.util.List&lt;java.lang.Integer&gt;&nbsp;overrideKeys)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/FullScreenTask.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../com/googlecode/android_scripting/facade/ui/DatePickerDialogTask.html" title="class in com.googlecode.android_scripting.facade.ui"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../com/googlecode/android_scripting/facade/ui/SeekBarDialogTask.html" title="class in com.googlecode.android_scripting.facade.ui"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html?com/googlecode/android_scripting/facade/ui/FullScreenTask.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="FullScreenTask.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/facade/ui/SeekBarDialogTask.html b/doc/com/googlecode/android_scripting/facade/ui/SeekBarDialogTask.html
deleted file mode 100644
index 7b8f4329..00000000
--- a/doc/com/googlecode/android_scripting/facade/ui/SeekBarDialogTask.html
+++ /dev/null
@@ -1,418 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:02 PDT 2014 -->
-<TITLE>
-SeekBarDialogTask
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="SeekBarDialogTask";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/SeekBarDialogTask.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../com/googlecode/android_scripting/facade/ui/FullScreenTask.html" title="class in com.googlecode.android_scripting.facade.ui"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../com/googlecode/android_scripting/facade/ui/TimePickerDialogTask.html" title="class in com.googlecode.android_scripting.facade.ui"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html?com/googlecode/android_scripting/facade/ui/SeekBarDialogTask.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="SeekBarDialogTask.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.facade.ui</FONT>
-<BR>
-Class SeekBarDialogTask</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html" title="class in com.googlecode.android_scripting.future">com.googlecode.android_scripting.future.FutureActivityTask</A>&lt;java.lang.Object&gt;
-      <IMG SRC="../../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.facade.ui.SeekBarDialogTask</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>SeekBarDialogTask</B><DT>extends <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html" title="class in com.googlecode.android_scripting.future">FutureActivityTask</A>&lt;java.lang.Object&gt;</DL>
-</PRE>
-
-<P>
-Wrapper class for dialog box with seek bar.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>MeanEYE.rcf (meaneye.rcf@gmail.com)</DD>
-</DL>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/SeekBarDialogTask.html#SeekBarDialogTask(int, int, java.lang.String, java.lang.String)">SeekBarDialogTask</A></B>(int&nbsp;progress,
-                  int&nbsp;max,
-                  java.lang.String&nbsp;title,
-                  java.lang.String&nbsp;message)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/SeekBarDialogTask.html#dismissDialog()">dismissDialog</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Dismiss the <CODE>Dialog</CODE> and close <CODE>Sl4aActivity</CODE>.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;Dialog</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/SeekBarDialogTask.html#getDialog()">getDialog</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the wrapped <CODE>Dialog</CODE>.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../../com/googlecode/android_scripting/facade/EventFacade.html" title="class in com.googlecode.android_scripting.facade">EventFacade</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/SeekBarDialogTask.html#getEventFacade()">getEventFacade</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.util.concurrent.CountDownLatch</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/SeekBarDialogTask.html#getShowLatch()">getShowLatch</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the <CODE>CountDownLatch</CODE> that is counted down when the dialog is shown.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/SeekBarDialogTask.html#onCreate()">onCreate</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/SeekBarDialogTask.html#setEventFacade(com.googlecode.android_scripting.facade.EventFacade)">setEventFacade</A></B>(<A HREF="../../../../../com/googlecode/android_scripting/facade/EventFacade.html" title="class in com.googlecode.android_scripting.facade">EventFacade</A>&nbsp;mEventFacade)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/SeekBarDialogTask.html#setNegativeButtonText(java.lang.String)">setNegativeButtonText</A></B>(java.lang.String&nbsp;text)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/SeekBarDialogTask.html#setPositiveButtonText(java.lang.String)">setPositiveButtonText</A></B>(java.lang.String&nbsp;text)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_com.googlecode.android_scripting.future.FutureActivityTask"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class com.googlecode.android_scripting.future.<A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html" title="class in com.googlecode.android_scripting.future">FutureActivityTask</A></B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#finish()">finish</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#getActivity()">getActivity</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#getResult()">getResult</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onActivityResult(int, int, Intent)">onActivityResult</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onCreateContextMenu(ContextMenu, View, ContextMenuInfo)">onCreateContextMenu</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onDestroy()">onDestroy</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onKeyDown(int, KeyEvent)">onKeyDown</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onNewIntent(Intent)">onNewIntent</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onPause()">onPause</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onPrepareOptionsMenu(Menu)">onPrepareOptionsMenu</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onResume()">onResume</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onStart()">onStart</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onStop()">onStop</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#setActivity(Activity)">setActivity</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#startActivity(Intent)">startActivity</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#startActivityForResult(Intent, int)">startActivityForResult</A></CODE></TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="SeekBarDialogTask(int, int, java.lang.String, java.lang.String)"><!-- --></A><H3>
-SeekBarDialogTask</H3>
-<PRE>
-public <B>SeekBarDialogTask</B>(int&nbsp;progress,
-                         int&nbsp;max,
-                         java.lang.String&nbsp;title,
-                         java.lang.String&nbsp;message)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="setPositiveButtonText(java.lang.String)"><!-- --></A><H3>
-setPositiveButtonText</H3>
-<PRE>
-public void <B>setPositiveButtonText</B>(java.lang.String&nbsp;text)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setNegativeButtonText(java.lang.String)"><!-- --></A><H3>
-setNegativeButtonText</H3>
-<PRE>
-public void <B>setNegativeButtonText</B>(java.lang.String&nbsp;text)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="onCreate()"><!-- --></A><H3>
-onCreate</H3>
-<PRE>
-public void <B>onCreate</B>()</PRE>
-<DL>
-<DD><DL>
-<DT><B>Overrides:</B><DD><CODE><A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onCreate()">onCreate</A></CODE> in class <CODE><A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html" title="class in com.googlecode.android_scripting.future">FutureActivityTask</A>&lt;java.lang.Object&gt;</CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getEventFacade()"><!-- --></A><H3>
-getEventFacade</H3>
-<PRE>
-public <A HREF="../../../../../com/googlecode/android_scripting/facade/EventFacade.html" title="class in com.googlecode.android_scripting.facade">EventFacade</A> <B>getEventFacade</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setEventFacade(com.googlecode.android_scripting.facade.EventFacade)"><!-- --></A><H3>
-setEventFacade</H3>
-<PRE>
-public void <B>setEventFacade</B>(<A HREF="../../../../../com/googlecode/android_scripting/facade/EventFacade.html" title="class in com.googlecode.android_scripting.facade">EventFacade</A>&nbsp;mEventFacade)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getDialog()"><!-- --></A><H3>
-getDialog</H3>
-<PRE>
-public Dialog <B>getDialog</B>()</PRE>
-<DL>
-<DD>Returns the wrapped <CODE>Dialog</CODE>.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="dismissDialog()"><!-- --></A><H3>
-dismissDialog</H3>
-<PRE>
-public void <B>dismissDialog</B>()</PRE>
-<DL>
-<DD>Dismiss the <CODE>Dialog</CODE> and close <CODE>Sl4aActivity</CODE>.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getShowLatch()"><!-- --></A><H3>
-getShowLatch</H3>
-<PRE>
-public java.util.concurrent.CountDownLatch <B>getShowLatch</B>()</PRE>
-<DL>
-<DD>Returns the <CODE>CountDownLatch</CODE> that is counted down when the dialog is shown.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/SeekBarDialogTask.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../com/googlecode/android_scripting/facade/ui/FullScreenTask.html" title="class in com.googlecode.android_scripting.facade.ui"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../com/googlecode/android_scripting/facade/ui/TimePickerDialogTask.html" title="class in com.googlecode.android_scripting.facade.ui"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html?com/googlecode/android_scripting/facade/ui/SeekBarDialogTask.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="SeekBarDialogTask.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/facade/ui/TimePickerDialogTask.html b/doc/com/googlecode/android_scripting/facade/ui/TimePickerDialogTask.html
deleted file mode 100644
index ecaaf91b..00000000
--- a/doc/com/googlecode/android_scripting/facade/ui/TimePickerDialogTask.html
+++ /dev/null
@@ -1,378 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:02 PDT 2014 -->
-<TITLE>
-TimePickerDialogTask
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="TimePickerDialogTask";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/TimePickerDialogTask.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../com/googlecode/android_scripting/facade/ui/SeekBarDialogTask.html" title="class in com.googlecode.android_scripting.facade.ui"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html" title="class in com.googlecode.android_scripting.facade.ui"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html?com/googlecode/android_scripting/facade/ui/TimePickerDialogTask.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="TimePickerDialogTask.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.facade.ui</FONT>
-<BR>
-Class TimePickerDialogTask</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html" title="class in com.googlecode.android_scripting.future">com.googlecode.android_scripting.future.FutureActivityTask</A>&lt;java.lang.Object&gt;
-      <IMG SRC="../../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.facade.ui.TimePickerDialogTask</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>TimePickerDialogTask</B><DT>extends <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html" title="class in com.googlecode.android_scripting.future">FutureActivityTask</A>&lt;java.lang.Object&gt;</DL>
-</PRE>
-
-<P>
-Wrapper class for time picker dialog running in separate thread.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>MeanEYE.rcf (meaneye.rcf@gmail.com)</DD>
-</DL>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/TimePickerDialogTask.html#TimePickerDialogTask(int, int, boolean)">TimePickerDialogTask</A></B>(int&nbsp;hour,
-                     int&nbsp;minute,
-                     boolean&nbsp;is24hour)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/TimePickerDialogTask.html#dismissDialog()">dismissDialog</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Dismiss the <CODE>Dialog</CODE> and close <CODE>Sl4aActivity</CODE>.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;Dialog</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/TimePickerDialogTask.html#getDialog()">getDialog</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the wrapped <CODE>Dialog</CODE>.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../../com/googlecode/android_scripting/facade/EventFacade.html" title="class in com.googlecode.android_scripting.facade">EventFacade</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/TimePickerDialogTask.html#getEventFacade()">getEventFacade</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.util.concurrent.CountDownLatch</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/TimePickerDialogTask.html#getShowLatch()">getShowLatch</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the <CODE>CountDownLatch</CODE> that is counted down when the dialog is shown.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/TimePickerDialogTask.html#onCreate()">onCreate</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/TimePickerDialogTask.html#setEventFacade(com.googlecode.android_scripting.facade.EventFacade)">setEventFacade</A></B>(<A HREF="../../../../../com/googlecode/android_scripting/facade/EventFacade.html" title="class in com.googlecode.android_scripting.facade">EventFacade</A>&nbsp;mEventFacade)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_com.googlecode.android_scripting.future.FutureActivityTask"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class com.googlecode.android_scripting.future.<A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html" title="class in com.googlecode.android_scripting.future">FutureActivityTask</A></B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#finish()">finish</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#getActivity()">getActivity</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#getResult()">getResult</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onActivityResult(int, int, Intent)">onActivityResult</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onCreateContextMenu(ContextMenu, View, ContextMenuInfo)">onCreateContextMenu</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onDestroy()">onDestroy</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onKeyDown(int, KeyEvent)">onKeyDown</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onNewIntent(Intent)">onNewIntent</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onPause()">onPause</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onPrepareOptionsMenu(Menu)">onPrepareOptionsMenu</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onResume()">onResume</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onStart()">onStart</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onStop()">onStop</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#setActivity(Activity)">setActivity</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#startActivity(Intent)">startActivity</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#startActivityForResult(Intent, int)">startActivityForResult</A></CODE></TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="TimePickerDialogTask(int, int, boolean)"><!-- --></A><H3>
-TimePickerDialogTask</H3>
-<PRE>
-public <B>TimePickerDialogTask</B>(int&nbsp;hour,
-                            int&nbsp;minute,
-                            boolean&nbsp;is24hour)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="onCreate()"><!-- --></A><H3>
-onCreate</H3>
-<PRE>
-public void <B>onCreate</B>()</PRE>
-<DL>
-<DD><DL>
-<DT><B>Overrides:</B><DD><CODE><A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onCreate()">onCreate</A></CODE> in class <CODE><A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html" title="class in com.googlecode.android_scripting.future">FutureActivityTask</A>&lt;java.lang.Object&gt;</CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getEventFacade()"><!-- --></A><H3>
-getEventFacade</H3>
-<PRE>
-public <A HREF="../../../../../com/googlecode/android_scripting/facade/EventFacade.html" title="class in com.googlecode.android_scripting.facade">EventFacade</A> <B>getEventFacade</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setEventFacade(com.googlecode.android_scripting.facade.EventFacade)"><!-- --></A><H3>
-setEventFacade</H3>
-<PRE>
-public void <B>setEventFacade</B>(<A HREF="../../../../../com/googlecode/android_scripting/facade/EventFacade.html" title="class in com.googlecode.android_scripting.facade">EventFacade</A>&nbsp;mEventFacade)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getDialog()"><!-- --></A><H3>
-getDialog</H3>
-<PRE>
-public Dialog <B>getDialog</B>()</PRE>
-<DL>
-<DD>Returns the wrapped <CODE>Dialog</CODE>.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="dismissDialog()"><!-- --></A><H3>
-dismissDialog</H3>
-<PRE>
-public void <B>dismissDialog</B>()</PRE>
-<DL>
-<DD>Dismiss the <CODE>Dialog</CODE> and close <CODE>Sl4aActivity</CODE>.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getShowLatch()"><!-- --></A><H3>
-getShowLatch</H3>
-<PRE>
-public java.util.concurrent.CountDownLatch <B>getShowLatch</B>()</PRE>
-<DL>
-<DD>Returns the <CODE>CountDownLatch</CODE> that is counted down when the dialog is shown.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/TimePickerDialogTask.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../com/googlecode/android_scripting/facade/ui/SeekBarDialogTask.html" title="class in com.googlecode.android_scripting.facade.ui"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html" title="class in com.googlecode.android_scripting.facade.ui"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html?com/googlecode/android_scripting/facade/ui/TimePickerDialogTask.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="TimePickerDialogTask.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/facade/ui/UiFacade.html b/doc/com/googlecode/android_scripting/facade/ui/UiFacade.html
deleted file mode 100644
index fd232560..00000000
--- a/doc/com/googlecode/android_scripting/facade/ui/UiFacade.html
+++ /dev/null
@@ -1,1392 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:02 PDT 2014 -->
-<TITLE>
-UiFacade
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="UiFacade";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/UiFacade.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../com/googlecode/android_scripting/facade/ui/TimePickerDialogTask.html" title="class in com.googlecode.android_scripting.facade.ui"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../com/googlecode/android_scripting/facade/ui/ViewInflater.html" title="class in com.googlecode.android_scripting.facade.ui"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html?com/googlecode/android_scripting/facade/ui/UiFacade.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="UiFacade.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.facade.ui</FONT>
-<BR>
-Class UiFacade</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">com.googlecode.android_scripting.jsonrpc.RpcReceiver</A>
-      <IMG SRC="../../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.facade.ui.UiFacade</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>UiFacade</B><DT>extends <A HREF="../../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A></DL>
-</PRE>
-
-<P>
-User Interface Facade. <br>
- <br>
- <b>Usage Notes</b><br>
- <br>
- The UI facade provides access to a selection of dialog boxes for general user interaction, and
- also hosts the <A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#webViewShow(java.lang.String, java.lang.Boolean)"><CODE>webViewShow(java.lang.String, java.lang.Boolean)</CODE></A> call which allows interactive use of html pages.<br>
- The general use of the dialog functions is as follows:<br>
- <ol>
- <li>Create a dialog using one of the following calls:
- <ul>
- <li><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#dialogCreateInput(java.lang.String, java.lang.String, java.lang.String, java.lang.String)"><CODE>dialogCreateInput(java.lang.String, java.lang.String, java.lang.String, java.lang.String)</CODE></A>
- <li><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#dialogCreateAlert(java.lang.String, java.lang.String)"><CODE>dialogCreateAlert(java.lang.String, java.lang.String)</CODE></A>
- <li><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#dialogCreateDatePicker(java.lang.Integer, java.lang.Integer, java.lang.Integer)"><CODE>dialogCreateDatePicker(java.lang.Integer, java.lang.Integer, java.lang.Integer)</CODE></A>
- <li><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#dialogCreateHorizontalProgress(java.lang.String, java.lang.String, java.lang.Integer)"><CODE>dialogCreateHorizontalProgress(java.lang.String, java.lang.String, java.lang.Integer)</CODE></A>
- <li><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#dialogCreatePassword(java.lang.String, java.lang.String)"><CODE>dialogCreatePassword(java.lang.String, java.lang.String)</CODE></A>
- <li><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#dialogCreateSeekBar(java.lang.Integer, java.lang.Integer, java.lang.String, java.lang.String)"><CODE>dialogCreateSeekBar(java.lang.Integer, java.lang.Integer, java.lang.String, java.lang.String)</CODE></A>
- <li><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#dialogCreateSpinnerProgress(java.lang.String, java.lang.String, java.lang.Integer)"><CODE>dialogCreateSpinnerProgress(java.lang.String, java.lang.String, java.lang.Integer)</CODE></A>
- </ul>
- <li>Set additional features to your dialog
- <ul>
- <li><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#dialogSetItems(JSONArray)"><CODE>dialogSetItems(JSONArray)</CODE></A> Set a list of items. Used like a menu.
- <li><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#dialogSetMultiChoiceItems(JSONArray, JSONArray)"><CODE>dialogSetMultiChoiceItems(JSONArray, JSONArray)</CODE></A> Set a multichoice list of items.
- <li><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#dialogSetSingleChoiceItems(JSONArray, java.lang.Integer)"><CODE>dialogSetSingleChoiceItems(JSONArray, java.lang.Integer)</CODE></A> Set a single choice list of items.
- <li><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#dialogSetPositiveButtonText(java.lang.String)"><CODE>dialogSetPositiveButtonText(java.lang.String)</CODE></A>
- <li><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#dialogSetNeutralButtonText(java.lang.String)"><CODE>dialogSetNeutralButtonText(java.lang.String)</CODE></A>
- <li><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#dialogSetNegativeButtonText(java.lang.String)"><CODE>dialogSetNegativeButtonText(java.lang.String)</CODE></A>
- <li><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#dialogSetMaxProgress(java.lang.Integer)"><CODE>dialogSetMaxProgress(java.lang.Integer)</CODE></A> Set max progress for your progress bar.
- </ul>
- <li>Display the dialog using <A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#dialogShow()"><CODE>dialogShow()</CODE></A>
- <li>Update dialog information if needed
- <ul>
- <li><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#dialogSetCurrentProgress(java.lang.Integer)"><CODE>dialogSetCurrentProgress(java.lang.Integer)</CODE></A>
- </ul>
- <li>Get the results
- <ul>
- <li>Using <A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#dialogGetResponse()"><CODE>dialogGetResponse()</CODE></A>, which will wait until the user performs an action to close
- the dialog box, or
- <li>Use eventPoll to wait for a "dialog" event.
- <li>You can find out which list items were selected using <A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#dialogGetSelectedItems()"><CODE>dialogGetSelectedItems()</CODE></A>, which
- returns an array of numeric indices to your list. For a single choice list, there will only ever
- be one of these.
- </ul>
- <li>Once done, use <A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#dialogDismiss()"><CODE>dialogDismiss()</CODE></A> to remove the dialog.
- </ol>
- <br>
- You can also manipulate menu options. The menu options are available for both <A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#dialogShow()"><CODE>dialogShow()</CODE></A>
- and <A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#fullShow(java.lang.String)"><CODE>fullShow(java.lang.String)</CODE></A>.
- <ul>
- <li><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#clearOptionsMenu()"><CODE>clearOptionsMenu()</CODE></A>
- <li><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#addOptionsMenuItem(java.lang.String, java.lang.String, java.lang.Object, java.lang.String)"><CODE>addOptionsMenuItem(java.lang.String, java.lang.String, java.lang.Object, java.lang.String)</CODE></A>
- </ul>
- <br>
- <b>Some notes:</b><br>
- Not every dialogSet function is relevant to every dialog type, ie, dialogSetMaxProgress obviously
- only applies to dialogs created with a progress bar. Also, an Alert Dialog may have a message or
- items, not both. If you set both, items will take priority.<br>
- In addition to the above functions, <A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#dialogGetInput(java.lang.String, java.lang.String, java.lang.String)"><CODE>dialogGetInput(java.lang.String, java.lang.String, java.lang.String)</CODE></A> and <A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#dialogGetPassword(java.lang.String, java.lang.String)"><CODE>dialogGetPassword(java.lang.String, java.lang.String)</CODE></A> are
- convenience functions that create, display and return the relevant dialogs in one call.<br>
- There is only ever one instance of a dialog. Any dialogCreate call will cause the existing dialog
- to be destroyed.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>MeanEYE.rcf (meaneye.rcf@gmail.com)</DD>
-</DL>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#UiFacade(com.googlecode.android_scripting.facade.FacadeManager)">UiFacade</A></B>(<A HREF="../../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A>&nbsp;manager)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#addContextMenuItem(java.lang.String, java.lang.String, java.lang.Object)">addContextMenuItem</A></B>(java.lang.String&nbsp;label,
-                   java.lang.String&nbsp;event,
-                   java.lang.Object&nbsp;data)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Context menus are used primarily with <A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#webViewShow(java.lang.String, java.lang.Boolean)"><CODE>webViewShow(java.lang.String, java.lang.Boolean)</CODE></A></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#addOptionsMenuItem(java.lang.String, java.lang.String, java.lang.Object, java.lang.String)">addOptionsMenuItem</A></B>(java.lang.String&nbsp;label,
-                   java.lang.String&nbsp;event,
-                   java.lang.Object&nbsp;data,
-                   java.lang.String&nbsp;iconName)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<b>Example (python)</b></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#clearContextMenu()">clearContextMenu</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#clearOptionsMenu()">clearOptionsMenu</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#dialogCreateAlert(java.lang.String, java.lang.String)">dialogCreateAlert</A></B>(java.lang.String&nbsp;title,
-                  java.lang.String&nbsp;message)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<b>Example (python)</b></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#dialogCreateDatePicker(java.lang.Integer, java.lang.Integer, java.lang.Integer)">dialogCreateDatePicker</A></B>(java.lang.Integer&nbsp;year,
-                       java.lang.Integer&nbsp;month,
-                       java.lang.Integer&nbsp;day)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#dialogCreateHorizontalProgress(java.lang.String, java.lang.String, java.lang.Integer)">dialogCreateHorizontalProgress</A></B>(java.lang.String&nbsp;title,
-                               java.lang.String&nbsp;message,
-                               java.lang.Integer&nbsp;max)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#dialogCreateInput(java.lang.String, java.lang.String, java.lang.String, java.lang.String)">dialogCreateInput</A></B>(java.lang.String&nbsp;title,
-                  java.lang.String&nbsp;message,
-                  java.lang.String&nbsp;text,
-                  java.lang.String&nbsp;inputType)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;For inputType, see <a
- href="http://developer.android.com/reference/android/R.styleable.html#TextView_inputType"
- >InputTypes</a>.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#dialogCreateNFCBeamMaster(java.lang.String, java.lang.String, java.lang.String)">dialogCreateNFCBeamMaster</A></B>(java.lang.String&nbsp;title,
-                          java.lang.String&nbsp;message,
-                          java.lang.String&nbsp;inputType)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#dialogCreateNFCBeamSlave(java.lang.String, java.lang.String)">dialogCreateNFCBeamSlave</A></B>(java.lang.String&nbsp;title,
-                         java.lang.String&nbsp;message)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#dialogCreatePassword(java.lang.String, java.lang.String)">dialogCreatePassword</A></B>(java.lang.String&nbsp;title,
-                     java.lang.String&nbsp;message)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#dialogCreateSeekBar(java.lang.Integer, java.lang.Integer, java.lang.String, java.lang.String)">dialogCreateSeekBar</A></B>(java.lang.Integer&nbsp;progress,
-                    java.lang.Integer&nbsp;max,
-                    java.lang.String&nbsp;title,
-                    java.lang.String&nbsp;message)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Will produce "dialog" events on change, containing:
- 
- "progress" - Position chosen, between 0 and max
- "which" = "seekbar"
- "fromuser" = true/false change is from user input
- 
- Response will contain a "progress" element.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#dialogCreateSpinnerProgress(java.lang.String, java.lang.String, java.lang.Integer)">dialogCreateSpinnerProgress</A></B>(java.lang.String&nbsp;title,
-                            java.lang.String&nbsp;message,
-                            java.lang.Integer&nbsp;max)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#dialogCreateTimePicker(java.lang.Integer, java.lang.Integer, java.lang.Boolean)">dialogCreateTimePicker</A></B>(java.lang.Integer&nbsp;hour,
-                       java.lang.Integer&nbsp;minute,
-                       java.lang.Boolean&nbsp;is24hour)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#dialogDismiss()">dialogDismiss</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#dialogGetInput(java.lang.String, java.lang.String, java.lang.String)">dialogGetInput</A></B>(java.lang.String&nbsp;title,
-               java.lang.String&nbsp;message,
-               java.lang.String&nbsp;text)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The result is the user's input, or None (null) if cancel was hit.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#dialogGetPassword(java.lang.String, java.lang.String)">dialogGetPassword</A></B>(java.lang.String&nbsp;title,
-                  java.lang.String&nbsp;message)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.Object</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#dialogGetResponse()">dialogGetResponse</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.util.Set&lt;java.lang.Integer&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#dialogGetSelectedItems()">dialogGetSelectedItems</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#dialogSetCurrentProgress(java.lang.Integer)">dialogSetCurrentProgress</A></B>(java.lang.Integer&nbsp;current)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#dialogSetItems(JSONArray)">dialogSetItems</A></B>(JSONArray&nbsp;items)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;This effectively creates list of options.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#dialogSetMaxProgress(java.lang.Integer)">dialogSetMaxProgress</A></B>(java.lang.Integer&nbsp;max)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#dialogSetMultiChoiceItems(JSONArray, JSONArray)">dialogSetMultiChoiceItems</A></B>(JSONArray&nbsp;items,
-                          JSONArray&nbsp;selected)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;This creates a list of check boxes.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#dialogSetNegativeButtonText(java.lang.String)">dialogSetNegativeButtonText</A></B>(java.lang.String&nbsp;text)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#dialogSetNeutralButtonText(java.lang.String)">dialogSetNeutralButtonText</A></B>(java.lang.String&nbsp;text)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#dialogSetPositiveButtonText(java.lang.String)">dialogSetPositiveButtonText</A></B>(java.lang.String&nbsp;text)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#dialogSetSingleChoiceItems(JSONArray, java.lang.Integer)">dialogSetSingleChoiceItems</A></B>(JSONArray&nbsp;items,
-                           java.lang.Integer&nbsp;selected)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;This creates a list of radio buttons.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#dialogShow()">dialogShow</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#fullDismiss()">fullDismiss</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;JSONArray</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#fullKeyOverride(JSONArray, java.lang.Boolean)">fullKeyOverride</A></B>(JSONArray&nbsp;keycodes,
-                java.lang.Boolean&nbsp;enable)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;This will override the default behaviour of keys while in the fullscreen mode.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.util.Map&lt;java.lang.String,java.util.Map&lt;java.lang.String,java.lang.String&gt;&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#fullQuery()">fullQuery</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.util.Map&lt;java.lang.String,java.lang.String&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#fullQueryDetail(java.lang.String)">fullQueryDetail</A></B>(java.lang.String&nbsp;id)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#fullSetList(java.lang.String, JSONArray)">fullSetList</A></B>(java.lang.String&nbsp;id,
-            JSONArray&nbsp;items)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#fullSetProperty(java.lang.String, java.lang.String, java.lang.String)">fullSetProperty</A></B>(java.lang.String&nbsp;id,
-                java.lang.String&nbsp;property,
-                java.lang.String&nbsp;value)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.util.List&lt;java.lang.String&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#fullShow(java.lang.String)">fullShow</A></B>(java.lang.String&nbsp;layout)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;See <a href=http://code.google.com/p/android-scripting/wiki/FullScreenUI>wiki page</a> for more
- detail.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#NFCBeamMessage(java.lang.String, java.lang.String, java.lang.String)">NFCBeamMessage</A></B>(java.lang.String&nbsp;content,
-               java.lang.String&nbsp;title,
-               java.lang.String&nbsp;message)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#onCreateContextMenu(ContextMenu, View, ContextMenuInfo)">onCreateContextMenu</A></B>(ContextMenu&nbsp;menu,
-                    View&nbsp;v,
-                    ContextMenuInfo&nbsp;menuInfo)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#onPrepareOptionsMenu(Menu)">onPrepareOptionsMenu</A></B>(Menu&nbsp;menu)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#shutdown()">shutdown</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Invoked when the receiver is shut down.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#webViewShow(java.lang.String, java.lang.Boolean)">webViewShow</A></B>(java.lang.String&nbsp;url,
-            java.lang.Boolean&nbsp;wait)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;See <a href=http://code.google.com/p/android-scripting/wiki/UsingWebView>wiki page</a> for more
- detail.</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="UiFacade(com.googlecode.android_scripting.facade.FacadeManager)"><!-- --></A><H3>
-UiFacade</H3>
-<PRE>
-public <B>UiFacade</B>(<A HREF="../../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A>&nbsp;manager)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="dialogCreateInput(java.lang.String, java.lang.String, java.lang.String, java.lang.String)"><!-- --></A><H3>
-dialogCreateInput</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Create a text input dialog.")
-</FONT>public void <B>dialogCreateInput</B>(<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="title",<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="title of the input box")<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="Value")</FONT>
-                                             java.lang.String&nbsp;title,
-                                             <FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="message",<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="message to display above the input box")<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="Please enter value:")</FONT>
-                                             java.lang.String&nbsp;message,
-                                             <FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="defaultText",<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="text to insert into the input box")<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                             java.lang.String&nbsp;text,
-                                             <FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="inputType",<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="type of input data, ie number or text")<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                             java.lang.String&nbsp;inputType)
-                       throws java.lang.InterruptedException</PRE>
-<DL>
-<DD>For inputType, see <a
- href="http://developer.android.com/reference/android/R.styleable.html#TextView_inputType"
- >InputTypes</a>. Some useful ones are text, number, and textUri. Multiple flags can be
- supplied, seperated by "|", ie: "textUri|textAutoComplete"
-<P>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.lang.InterruptedException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="dialogCreatePassword(java.lang.String, java.lang.String)"><!-- --></A><H3>
-dialogCreatePassword</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Create a password input dialog.")
-</FONT>public void <B>dialogCreatePassword</B>(<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="title",<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="title of the input box")<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="Password")</FONT>
-                                                java.lang.String&nbsp;title,
-                                                <FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="message",<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="message to display above the input box")<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="Please enter password:")</FONT>
-                                                java.lang.String&nbsp;message)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="dialogGetInput(java.lang.String, java.lang.String, java.lang.String)"><!-- --></A><H3>
-dialogGetInput</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Queries the user for a text input.")
-</FONT>public java.lang.String <B>dialogGetInput</B>(<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="title",<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="title of the input box")<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="Value")</FONT>
-                                                      java.lang.String&nbsp;title,
-                                                      <FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="message",<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="message to display above the input box")<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="Please enter value:")</FONT>
-                                                      java.lang.String&nbsp;message,
-                                                      <FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="defaultText",<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="text to insert into the input box")<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                                      java.lang.String&nbsp;text)
-                                throws java.lang.InterruptedException</PRE>
-<DL>
-<DD>The result is the user's input, or None (null) if cancel was hit. <br>
- Example (python)
- 
- <pre>
- import android
- droid=android.Android()
- 
- print droid.dialogGetInput("Title","Message","Default").result
- </pre>
-<P>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.lang.InterruptedException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="dialogGetPassword(java.lang.String, java.lang.String)"><!-- --></A><H3>
-dialogGetPassword</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Queries the user for a password.")
-</FONT>public java.lang.String <B>dialogGetPassword</B>(<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="title",<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="title of the password box")<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="Password")</FONT>
-                                                         java.lang.String&nbsp;title,
-                                                         <FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="message",<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="message to display above the input box")<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="Please enter password:")</FONT>
-                                                         java.lang.String&nbsp;message)
-                                   throws java.lang.InterruptedException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.lang.InterruptedException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="dialogCreateNFCBeamMaster(java.lang.String, java.lang.String, java.lang.String)"><!-- --></A><H3>
-dialogCreateNFCBeamMaster</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Create a qpython beam master.")
-</FONT>public java.lang.String <B>dialogCreateNFCBeamMaster</B>(<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="title",<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="title of the input box")<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="QPython BEAM With NFC")</FONT>
-                                                                 java.lang.String&nbsp;title,
-                                                                 <FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="message",<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="message to display above the input box")<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="Input message and Beam")</FONT>
-                                                                 java.lang.String&nbsp;message,
-                                                                 <FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="inputType",<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="type of input data, ie number or text")<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                                                 java.lang.String&nbsp;inputType)
-                                           throws java.lang.InterruptedException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.lang.InterruptedException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="NFCBeamMessage(java.lang.String, java.lang.String, java.lang.String)"><!-- --></A><H3>
-NFCBeamMessage</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Create a qpython beam master to send directory message.")
-</FONT>public java.lang.String <B>NFCBeamMessage</B>(<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="content",<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="message you want to sent")<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="Message you want to beam")</FONT>
-                                                      java.lang.String&nbsp;content,
-                                                      <FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="title",<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="title of the input box")<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="QPython Beam With NFC")</FONT>
-                                                      java.lang.String&nbsp;title,
-                                                      <FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="message",<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="message to display above the input box")<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="Beam Message")</FONT>
-                                                      java.lang.String&nbsp;message)
-                                throws java.lang.InterruptedException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.lang.InterruptedException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="dialogCreateNFCBeamSlave(java.lang.String, java.lang.String)"><!-- --></A><H3>
-dialogCreateNFCBeamSlave</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Create a qpython beam slave.")
-</FONT>public java.lang.String <B>dialogCreateNFCBeamSlave</B>(<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="title",<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="title of the input box")<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="QPython Beam With NFC")</FONT>
-                                                                java.lang.String&nbsp;title,
-                                                                <FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="message",<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="message to display above the input box")<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="Wait for beam message")</FONT>
-                                                                java.lang.String&nbsp;message)
-                                          throws java.lang.InterruptedException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.lang.InterruptedException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="dialogCreateSpinnerProgress(java.lang.String, java.lang.String, java.lang.Integer)"><!-- --></A><H3>
-dialogCreateSpinnerProgress</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Create a spinner progress dialog.")
-</FONT>public void <B>dialogCreateSpinnerProgress</B>(<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="title")<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                                       java.lang.String&nbsp;title,
-                                                       <FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="message")<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                                       java.lang.String&nbsp;message,
-                                                       <FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="maximum progress")<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="100")</FONT>
-                                                       java.lang.Integer&nbsp;max)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="dialogCreateHorizontalProgress(java.lang.String, java.lang.String, java.lang.Integer)"><!-- --></A><H3>
-dialogCreateHorizontalProgress</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Create a horizontal progress dialog.")
-</FONT>public void <B>dialogCreateHorizontalProgress</B>(<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="title")<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                                          java.lang.String&nbsp;title,
-                                                          <FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="message")<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                                          java.lang.String&nbsp;message,
-                                                          <FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="maximum progress")<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="100")</FONT>
-                                                          java.lang.Integer&nbsp;max)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="dialogCreateAlert(java.lang.String, java.lang.String)"><!-- --></A><H3>
-dialogCreateAlert</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Create alert dialog.")
-</FONT>public void <B>dialogCreateAlert</B>(<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="title")<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                             java.lang.String&nbsp;title,
-                                             <FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="message")<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                             java.lang.String&nbsp;message)</PRE>
-<DL>
-<DD><b>Example (python)</b>
- 
- <pre>
-   import android
-   droid=android.Android()
-   droid.dialogCreateAlert("I like swords.","Do you like swords?")
-   droid.dialogSetPositiveButtonText("Yes")
-   droid.dialogSetNegativeButtonText("No")
-   droid.dialogShow()
-   response=droid.dialogGetResponse().result
-   droid.dialogDismiss()
-   if response.has_key("which"):
-     result=response["which"]
-     if result=="positive":
-       print "Yay! I like swords too!"
-     elif result=="negative":
-       print "Oh. How sad."
-   elif response.has_key("canceled"): # Yes, I know it's mispelled.
-     print "You can't even make up your mind?"
-   else:
-     print "Unknown response=",response
- 
-   print "Done"
- </pre>
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="dialogCreateSeekBar(java.lang.Integer, java.lang.Integer, java.lang.String, java.lang.String)"><!-- --></A><H3>
-dialogCreateSeekBar</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Create seek bar dialog.")
-</FONT>public void <B>dialogCreateSeekBar</B>(<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="starting value")<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="50")</FONT>
-                                               java.lang.Integer&nbsp;progress,
-                                               <FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="maximum value")<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="100")</FONT>
-                                               java.lang.Integer&nbsp;max,
-                                               <FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="title")</FONT>
-                                               java.lang.String&nbsp;title,
-                                               <FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="message")</FONT>
-                                               java.lang.String&nbsp;message)</PRE>
-<DL>
-<DD>Will produce "dialog" events on change, containing:
- <ul>
- <li>"progress" - Position chosen, between 0 and max
- <li>"which" = "seekbar"
- <li>"fromuser" = true/false change is from user input
- </ul>
- Response will contain a "progress" element.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="dialogCreateTimePicker(java.lang.Integer, java.lang.Integer, java.lang.Boolean)"><!-- --></A><H3>
-dialogCreateTimePicker</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Create time picker dialog.")
-</FONT>public void <B>dialogCreateTimePicker</B>(<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="hour")<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="0")</FONT>
-                                                  java.lang.Integer&nbsp;hour,
-                                                  <FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="minute")<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="0")</FONT>
-                                                  java.lang.Integer&nbsp;minute,
-                                                  <FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="is24hour",<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="Use 24 hour clock")<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="false")</FONT>
-                                                  java.lang.Boolean&nbsp;is24hour)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="dialogCreateDatePicker(java.lang.Integer, java.lang.Integer, java.lang.Integer)"><!-- --></A><H3>
-dialogCreateDatePicker</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Create date picker dialog.")
-</FONT>public void <B>dialogCreateDatePicker</B>(<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="year")<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="1970")</FONT>
-                                                  java.lang.Integer&nbsp;year,
-                                                  <FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="month")<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="1")</FONT>
-                                                  java.lang.Integer&nbsp;month,
-                                                  <FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="day")<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="1")</FONT>
-                                                  java.lang.Integer&nbsp;day)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="dialogDismiss()"><!-- --></A><H3>
-dialogDismiss</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Dismiss dialog.")
-</FONT>public void <B>dialogDismiss</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="dialogShow()"><!-- --></A><H3>
-dialogShow</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Show dialog.")
-</FONT>public void <B>dialogShow</B>()
-                throws java.lang.InterruptedException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.lang.InterruptedException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="dialogSetCurrentProgress(java.lang.Integer)"><!-- --></A><H3>
-dialogSetCurrentProgress</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Set progress dialog current value.")
-</FONT>public void <B>dialogSetCurrentProgress</B>(<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="current")</FONT>
-                                                    java.lang.Integer&nbsp;current)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="dialogSetMaxProgress(java.lang.Integer)"><!-- --></A><H3>
-dialogSetMaxProgress</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Set progress dialog maximum value.")
-</FONT>public void <B>dialogSetMaxProgress</B>(<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="max")</FONT>
-                                                java.lang.Integer&nbsp;max)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="dialogSetPositiveButtonText(java.lang.String)"><!-- --></A><H3>
-dialogSetPositiveButtonText</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Set alert dialog positive button text.")
-</FONT>public void <B>dialogSetPositiveButtonText</B>(<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="text")</FONT>
-                                                       java.lang.String&nbsp;text)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="dialogSetNegativeButtonText(java.lang.String)"><!-- --></A><H3>
-dialogSetNegativeButtonText</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Set alert dialog button text.")
-</FONT>public void <B>dialogSetNegativeButtonText</B>(<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="text")</FONT>
-                                                       java.lang.String&nbsp;text)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="dialogSetNeutralButtonText(java.lang.String)"><!-- --></A><H3>
-dialogSetNeutralButtonText</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Set alert dialog button text.")
-</FONT>public void <B>dialogSetNeutralButtonText</B>(<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="text")</FONT>
-                                                      java.lang.String&nbsp;text)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="dialogSetItems(JSONArray)"><!-- --></A><H3>
-dialogSetItems</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Set alert dialog list items.")
-</FONT>public void <B>dialogSetItems</B>(<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="items")</FONT>
-                                          JSONArray&nbsp;items)</PRE>
-<DL>
-<DD>This effectively creates list of options. Clicking on an item will immediately return an "item"
- element, which is the index of the selected item.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="dialogSetSingleChoiceItems(JSONArray, java.lang.Integer)"><!-- --></A><H3>
-dialogSetSingleChoiceItems</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Set dialog single choice items and selected item.")
-</FONT>public void <B>dialogSetSingleChoiceItems</B>(<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="items")</FONT>
-                                                      JSONArray&nbsp;items,
-                                                      <FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="selected",<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="selected item index")<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="0")</FONT>
-                                                      java.lang.Integer&nbsp;selected)</PRE>
-<DL>
-<DD>This creates a list of radio buttons. You can select one item out of the list. A response will
- not be returned until the dialog is closed, either with the Cancel key or a button
- (positive/negative/neutral). Use <A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#dialogGetSelectedItems()"><CODE>dialogGetSelectedItems()</CODE></A> to find out what was
- selected.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="dialogSetMultiChoiceItems(JSONArray, JSONArray)"><!-- --></A><H3>
-dialogSetMultiChoiceItems</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Set dialog multiple choice items and selection.")
-</FONT>public void <B>dialogSetMultiChoiceItems</B>(<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="items")</FONT>
-                                                     JSONArray&nbsp;items,
-                                                     <FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="selected",<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="list of selected items")<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                                     JSONArray&nbsp;selected)
-                               throws JSONException</PRE>
-<DL>
-<DD>This creates a list of check boxes. You can select multiple items out of the list. A response
- will not be returned until the dialog is closed, either with the Cancel key or a button
- (positive/negative/neutral). Use <A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#dialogGetSelectedItems()"><CODE>dialogGetSelectedItems()</CODE></A> to find out what was
- selected.
-<P>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>JSONException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="dialogGetResponse()"><!-- --></A><H3>
-dialogGetResponse</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Returns dialog response.")
-</FONT>public java.lang.Object <B>dialogGetResponse</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="dialogGetSelectedItems()"><!-- --></A><H3>
-dialogGetSelectedItems</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="This method provides list of items user selected.",
-     <A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A>="Selected items")
-</FONT>public java.util.Set&lt;java.lang.Integer&gt; <B>dialogGetSelectedItems</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="webViewShow(java.lang.String, java.lang.Boolean)"><!-- --></A><H3>
-webViewShow</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Display a WebView with the given URL.")
-</FONT>public void <B>webViewShow</B>(<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="url")</FONT>
-                                       java.lang.String&nbsp;url,
-                                       <FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="wait",<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="block until the user exits the WebView")<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                       java.lang.Boolean&nbsp;wait)
-                 throws java.io.IOException</PRE>
-<DL>
-<DD>See <a href=http://code.google.com/p/android-scripting/wiki/UsingWebView>wiki page</a> for more
- detail.
-<P>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.io.IOException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="addContextMenuItem(java.lang.String, java.lang.String, java.lang.Object)"><!-- --></A><H3>
-addContextMenuItem</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Adds a new item to context menu.")
-</FONT>public void <B>addContextMenuItem</B>(<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="label",<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="label for this menu item")</FONT>
-                                              java.lang.String&nbsp;label,
-                                              <FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="event",<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="event that will be generated on menu item click")</FONT>
-                                              java.lang.String&nbsp;event,
-                                              <FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="eventData")<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                              java.lang.Object&nbsp;data)</PRE>
-<DL>
-<DD>Context menus are used primarily with <A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html#webViewShow(java.lang.String, java.lang.Boolean)"><CODE>webViewShow(java.lang.String, java.lang.Boolean)</CODE></A>
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="addOptionsMenuItem(java.lang.String, java.lang.String, java.lang.Object, java.lang.String)"><!-- --></A><H3>
-addOptionsMenuItem</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Adds a new item to options menu.")
-</FONT>public void <B>addOptionsMenuItem</B>(<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="label",<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="label for this menu item")</FONT>
-                                              java.lang.String&nbsp;label,
-                                              <FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="event",<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="event that will be generated on menu item click")</FONT>
-                                              java.lang.String&nbsp;event,
-                                              <FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="eventData")<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                              java.lang.Object&nbsp;data,
-                                              <FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="iconName",<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="Android system menu icon, see http://developer.android.com/reference/android/R.drawable.html")<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcOptional</A></FONT>
-                                              java.lang.String&nbsp;iconName)</PRE>
-<DL>
-<DD><b>Example (python)</b>
- 
- <pre>
- import android
- droid=android.Android()
- 
- droid.addOptionsMenuItem("Silly","silly",None,"star_on")
- droid.addOptionsMenuItem("Sensible","sensible","I bet.","star_off")
- droid.addOptionsMenuItem("Off","off",None,"ic_menu_revert")
- 
- print "Hit menu to see extra options."
- print "Will timeout in 10 seconds if you hit nothing."
- 
- while True: # Wait for events from the menu.
-   response=droid.eventWait(10000).result
-   if response==None:
-     break
-   print response
-   if response["name"]=="off":
-     break
- print "And done."
- 
- </pre>
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="clearContextMenu()"><!-- --></A><H3>
-clearContextMenu</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Removes all items previously added to context menu.")
-</FONT>public void <B>clearContextMenu</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="clearOptionsMenu()"><!-- --></A><H3>
-clearOptionsMenu</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Removes all items previously added to options menu.")
-</FONT>public void <B>clearOptionsMenu</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="onCreateContextMenu(ContextMenu, View, ContextMenuInfo)"><!-- --></A><H3>
-onCreateContextMenu</H3>
-<PRE>
-public void <B>onCreateContextMenu</B>(ContextMenu&nbsp;menu,
-                                View&nbsp;v,
-                                ContextMenuInfo&nbsp;menuInfo)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="onPrepareOptionsMenu(Menu)"><!-- --></A><H3>
-onPrepareOptionsMenu</H3>
-<PRE>
-public boolean <B>onPrepareOptionsMenu</B>(Menu&nbsp;menu)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="fullShow(java.lang.String)"><!-- --></A><H3>
-fullShow</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Show Full Screen.")
-</FONT>public java.util.List&lt;java.lang.String&gt; <B>fullShow</B>(<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="layout",<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="String containing View layout")</FONT>
-                                                                java.lang.String&nbsp;layout)
-                                          throws java.lang.InterruptedException</PRE>
-<DL>
-<DD>See <a href=http://code.google.com/p/android-scripting/wiki/FullScreenUI>wiki page</a> for more
- detail.
-<P>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.lang.InterruptedException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="fullDismiss()"><!-- --></A><H3>
-fullDismiss</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Dismiss Full Screen.")
-</FONT>public void <B>fullDismiss</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="fullQuery()"><!-- --></A><H3>
-fullQuery</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Get Fullscreen Properties")
-</FONT>public java.util.Map&lt;java.lang.String,java.util.Map&lt;java.lang.String,java.lang.String&gt;&gt; <B>fullQuery</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="fullQueryDetail(java.lang.String)"><!-- --></A><H3>
-fullQueryDetail</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Get fullscreen properties for a specific widget")
-</FONT>public java.util.Map&lt;java.lang.String,java.lang.String&gt; <B>fullQueryDetail</B>(<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="id",<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="id of layout widget")</FONT>
-                                                                                       java.lang.String&nbsp;id)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="fullSetProperty(java.lang.String, java.lang.String, java.lang.String)"><!-- --></A><H3>
-fullSetProperty</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Set fullscreen widget property")
-</FONT>public java.lang.String <B>fullSetProperty</B>(<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="id",<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="id of layout widget")</FONT>
-                                                       java.lang.String&nbsp;id,
-                                                       <FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="property",<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="name of property to set")</FONT>
-                                                       java.lang.String&nbsp;property,
-                                                       <FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="value",<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="value to set property to")</FONT>
-                                                       java.lang.String&nbsp;value)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="fullSetList(java.lang.String, JSONArray)"><!-- --></A><H3>
-fullSetList</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Attach a list to a fullscreen widget")
-</FONT>public java.lang.String <B>fullSetList</B>(<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="id",<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="id of layout widget")</FONT>
-                                                   java.lang.String&nbsp;id,
-                                                   <FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="list",<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="List to set")</FONT>
-                                                   JSONArray&nbsp;items)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="fullKeyOverride(JSONArray, java.lang.Boolean)"><!-- --></A><H3>
-fullKeyOverride</H3>
-<PRE>
-<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">@Rpc</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A>="Override default key actions")
-</FONT>public JSONArray <B>fullKeyOverride</B>(<FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="keycodes",<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="List of keycodes to override")</FONT>
-                                                JSONArray&nbsp;keycodes,
-                                                <FONT SIZE="-1"><A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcParameter</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A>="enable",<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A>="Turn overriding or off")<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">@RpcDefault</A>(<A HREF="../../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A>="true")</FONT>
-                                                java.lang.Boolean&nbsp;enable)
-                          throws JSONException</PRE>
-<DL>
-<DD>This will override the default behaviour of keys while in the fullscreen mode. ie:
- 
- <pre>
-   droid.fullKeyOverride([24,25],True)
- </pre>
- 
- This will override the default behaviour of the volume keys (codes 24 and 25) so that they do
- not actually adjust the volume. <br>
- Returns a list of currently overridden keycodes.
-<P>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>JSONException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="shutdown()"><!-- --></A><H3>
-shutdown</H3>
-<PRE>
-public void <B>shutdown</B>()</PRE>
-<DL>
-<DD><B>Description copied from class: <CODE><A HREF="../../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html#shutdown()">RpcReceiver</A></CODE></B></DD>
-<DD>Invoked when the receiver is shut down.
-<P>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html#shutdown()">shutdown</A></CODE> in class <CODE><A HREF="../../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/UiFacade.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../com/googlecode/android_scripting/facade/ui/TimePickerDialogTask.html" title="class in com.googlecode.android_scripting.facade.ui"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../com/googlecode/android_scripting/facade/ui/ViewInflater.html" title="class in com.googlecode.android_scripting.facade.ui"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html?com/googlecode/android_scripting/facade/ui/UiFacade.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="UiFacade.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/facade/ui/ViewInflater.html b/doc/com/googlecode/android_scripting/facade/ui/ViewInflater.html
deleted file mode 100644
index 899e5228..00000000
--- a/doc/com/googlecode/android_scripting/facade/ui/ViewInflater.html
+++ /dev/null
@@ -1,544 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:03 PDT 2014 -->
-<TITLE>
-ViewInflater
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="ViewInflater";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ViewInflater.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html" title="class in com.googlecode.android_scripting.facade.ui"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html?com/googlecode/android_scripting/facade/ui/ViewInflater.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ViewInflater.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.facade.ui</FONT>
-<BR>
-Class ViewInflater</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.facade.ui.ViewInflater</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>ViewInflater</B><DT>extends java.lang.Object</DL>
-</PRE>
-
-<P>
-<HR>
-
-<P>
-<!-- =========== FIELD SUMMARY =========== -->
-
-<A NAME="field_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Field Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/ViewInflater.html#ANDROID">ANDROID</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/ViewInflater.html#BASESEQ">BASESEQ</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.util.Map&lt;java.lang.String,java.lang.String&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/ViewInflater.html#mColorNames">mColorNames</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.util.Map&lt;java.lang.String,java.lang.Integer&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/ViewInflater.html#mRelative">mRelative</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/ViewInflater.html#ViewInflater()">ViewInflater</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/ViewInflater.html#camelCase(java.lang.String)">camelCase</A></B>(java.lang.String&nbsp;s)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-<A NAME="field_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Field Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="ANDROID"><!-- --></A><H3>
-ANDROID</H3>
-<PRE>
-public static final java.lang.String <B>ANDROID</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../constant-values.html#com.googlecode.android_scripting.facade.ui.ViewInflater.ANDROID">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="BASESEQ"><!-- --></A><H3>
-BASESEQ</H3>
-<PRE>
-public static final int <B>BASESEQ</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../constant-values.html#com.googlecode.android_scripting.facade.ui.ViewInflater.BASESEQ">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="mColorNames"><!-- --></A><H3>
-mColorNames</H3>
-<PRE>
-public static final java.util.Map&lt;java.lang.String,java.lang.String&gt; <B>mColorNames</B></PRE>
-<DL>
-<DL>
-</DL>
-</DL>
-<HR>
-
-<A NAME="mRelative"><!-- --></A><H3>
-mRelative</H3>
-<PRE>
-public static final java.util.Map&lt;java.lang.String,java.lang.Integer&gt; <B>mRelative</B></PRE>
-<DL>
-<DL>
-</DL>
-</DL>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="ViewInflater()"><!-- --></A><H3>
-ViewInflater</H3>
-<PRE>
-public <B>ViewInflater</B>()</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="getFactory()"><!-- --></A><H3>
-getFactory</H3>
-<PRE>
-public static XmlPullParserFactory <B>getFactory</B>()
-                                       throws XmlPullParserException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>XmlPullParserException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getXml()"><!-- --></A><H3>
-getXml</H3>
-<PRE>
-public static XmlPullParser <B>getXml</B>()
-                            throws XmlPullParserException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>XmlPullParserException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getXml(java.io.InputStream)"><!-- --></A><H3>
-getXml</H3>
-<PRE>
-public static XmlPullParser <B>getXml</B>(java.io.InputStream&nbsp;is)
-                            throws XmlPullParserException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>XmlPullParserException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getXml(java.io.Reader)"><!-- --></A><H3>
-getXml</H3>
-<PRE>
-public static XmlPullParser <B>getXml</B>(java.io.Reader&nbsp;ir)
-                            throws XmlPullParserException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>XmlPullParserException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="inflate(Activity, XmlPullParser)"><!-- --></A><H3>
-inflate</H3>
-<PRE>
-public View <B>inflate</B>(Activity&nbsp;context,
-                    XmlPullParser&nbsp;xml)
-             throws XmlPullParserException,
-                    java.io.IOException,
-                    java.lang.IllegalArgumentException,
-                    java.lang.IllegalAccessException,
-                    java.lang.reflect.InvocationTargetException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>XmlPullParserException</CODE>
-<DD><CODE>java.io.IOException</CODE>
-<DD><CODE>java.lang.IllegalArgumentException</CODE>
-<DD><CODE>java.lang.IllegalAccessException</CODE>
-<DD><CODE>java.lang.reflect.InvocationTargetException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setClickListener(View, android.view.View.OnClickListener, OnItemClickListener)"><!-- --></A><H3>
-setClickListener</H3>
-<PRE>
-public void <B>setClickListener</B>(View&nbsp;v,
-                             android.view.View.OnClickListener&nbsp;listener,
-                             OnItemClickListener&nbsp;itemListener)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setProperty(View, java.lang.String, java.lang.String)"><!-- --></A><H3>
-setProperty</H3>
-<PRE>
-public void <B>setProperty</B>(View&nbsp;view,
-                        java.lang.String&nbsp;attr,
-                        java.lang.String&nbsp;value)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="camelCase(java.lang.String)"><!-- --></A><H3>
-camelCase</H3>
-<PRE>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getIdList()"><!-- --></A><H3>
-getIdList</H3>
-<PRE>
-public java.util.Map&lt;java.lang.String,java.lang.Integer&gt; <B>getIdList</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getErrors()"><!-- --></A><H3>
-getErrors</H3>
-<PRE>
-public java.util.List&lt;java.lang.String&gt; <B>getErrors</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getIdName(int)"><!-- --></A><H3>
-getIdName</H3>
-<PRE>
-public java.lang.String <B>getIdName</B>(int&nbsp;id)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getId(java.lang.String)"><!-- --></A><H3>
-getId</H3>
-<PRE>
-public int <B>getId</B>(java.lang.String&nbsp;name)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getViewAsMap(View)"><!-- --></A><H3>
-getViewAsMap</H3>
-<PRE>
-public java.util.Map&lt;java.lang.String,java.util.Map&lt;java.lang.String,java.lang.String&gt;&gt; <B>getViewAsMap</B>(View&nbsp;v)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getViewInfo(View)"><!-- --></A><H3>
-getViewInfo</H3>
-<PRE>
-public java.util.Map&lt;java.lang.String,java.lang.String&gt; <B>getViewInfo</B>(View&nbsp;v)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getInputTypes()"><!-- --></A><H3>
-getInputTypes</H3>
-<PRE>
-public static java.util.Map&lt;java.lang.String,java.lang.Integer&gt; <B>getInputTypes</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setIdList(java.lang.Class)"><!-- --></A><H3>
-setIdList</H3>
-<PRE>
-public void <B>setIdList</B>(java.lang.Class&lt;?&gt;&nbsp;idClass)</PRE>
-<DL>
-<DD>Query class (typically R.id) to extract id names
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setListAdapter(View, JSONArray)"><!-- --></A><H3>
-setListAdapter</H3>
-<PRE>
-public void <B>setListAdapter</B>(View&nbsp;view,
-                           JSONArray&nbsp;items)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ViewInflater.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html" title="class in com.googlecode.android_scripting.facade.ui"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html?com/googlecode/android_scripting/facade/ui/ViewInflater.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ViewInflater.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/facade/ui/package-frame.html b/doc/com/googlecode/android_scripting/facade/ui/package-frame.html
deleted file mode 100644
index afd1e398..00000000
--- a/doc/com/googlecode/android_scripting/facade/ui/package-frame.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-com.googlecode.android_scripting.facade.ui
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-
-</HEAD>
-
-<BODY BGCOLOR="white">
-<FONT size="+1" CLASS="FrameTitleFont">
-<A HREF="../../../../../com/googlecode/android_scripting/facade/ui/package-summary.html" target="classFrame">com.googlecode.android_scripting.facade.ui</A></FONT>
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
-Classes</FONT>&nbsp;
-<FONT CLASS="FrameItemFont">
-<BR>
-<A HREF="DatePickerDialogTask.html" title="class in com.googlecode.android_scripting.facade.ui" target="classFrame">DatePickerDialogTask</A>
-<BR>
-<A HREF="FullScreenTask.html" title="class in com.googlecode.android_scripting.facade.ui" target="classFrame">FullScreenTask</A>
-<BR>
-<A HREF="SeekBarDialogTask.html" title="class in com.googlecode.android_scripting.facade.ui" target="classFrame">SeekBarDialogTask</A>
-<BR>
-<A HREF="TimePickerDialogTask.html" title="class in com.googlecode.android_scripting.facade.ui" target="classFrame">TimePickerDialogTask</A>
-<BR>
-<A HREF="UiFacade.html" title="class in com.googlecode.android_scripting.facade.ui" target="classFrame">UiFacade</A>
-<BR>
-<A HREF="ViewInflater.html" title="class in com.googlecode.android_scripting.facade.ui" target="classFrame">ViewInflater</A></FONT></TD>
-</TR>
-</TABLE>
-
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/facade/ui/package-summary.html b/doc/com/googlecode/android_scripting/facade/ui/package-summary.html
deleted file mode 100644
index 10d22441..00000000
--- a/doc/com/googlecode/android_scripting/facade/ui/package-summary.html
+++ /dev/null
@@ -1,177 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-com.googlecode.android_scripting.facade.ui
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="com.googlecode.android_scripting.facade.ui";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../com/googlecode/android_scripting/facade/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../com/googlecode/android_scripting/future/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html?com/googlecode/android_scripting/facade/ui/package-summary.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<H2>
-Package com.googlecode.android_scripting.facade.ui
-</H2>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Class Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/DatePickerDialogTask.html" title="class in com.googlecode.android_scripting.facade.ui">DatePickerDialogTask</A></B></TD>
-<TD>Wrapper class for date picker dialog running in separate thread.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/FullScreenTask.html" title="class in com.googlecode.android_scripting.facade.ui">FullScreenTask</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/SeekBarDialogTask.html" title="class in com.googlecode.android_scripting.facade.ui">SeekBarDialogTask</A></B></TD>
-<TD>Wrapper class for dialog box with seek bar.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/TimePickerDialogTask.html" title="class in com.googlecode.android_scripting.facade.ui">TimePickerDialogTask</A></B></TD>
-<TD>Wrapper class for time picker dialog running in separate thread.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html" title="class in com.googlecode.android_scripting.facade.ui">UiFacade</A></B></TD>
-<TD>User Interface Facade.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../com/googlecode/android_scripting/facade/ui/ViewInflater.html" title="class in com.googlecode.android_scripting.facade.ui">ViewInflater</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-
-<P>
-<DL>
-</DL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../com/googlecode/android_scripting/facade/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../com/googlecode/android_scripting/future/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html?com/googlecode/android_scripting/facade/ui/package-summary.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/facade/ui/package-tree.html b/doc/com/googlecode/android_scripting/facade/ui/package-tree.html
deleted file mode 100644
index cf29fb6d..00000000
--- a/doc/com/googlecode/android_scripting/facade/ui/package-tree.html
+++ /dev/null
@@ -1,157 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-com.googlecode.android_scripting.facade.ui Class Hierarchy
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="com.googlecode.android_scripting.facade.ui Class Hierarchy";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../com/googlecode/android_scripting/facade/package-tree.html"><B>PREV</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../com/googlecode/android_scripting/future/package-tree.html"><B>NEXT</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html?com/googlecode/android_scripting/facade/ui/package-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-Hierarchy For Package com.googlecode.android_scripting.facade.ui
-</H2>
-</CENTER>
-<DL>
-<DT><B>Package Hierarchies:</B><DD><A HREF="../../../../../overview-tree.html">All Packages</A></DL>
-<HR>
-<H2>
-Class Hierarchy
-</H2>
-<UL>
-<LI TYPE="circle">java.lang.Object<UL>
-<LI TYPE="circle">com.googlecode.android_scripting.future.<A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html" title="class in com.googlecode.android_scripting.future"><B>FutureActivityTask</B></A>&lt;T&gt;<UL>
-<LI TYPE="circle">com.googlecode.android_scripting.facade.ui.<A HREF="../../../../../com/googlecode/android_scripting/facade/ui/DatePickerDialogTask.html" title="class in com.googlecode.android_scripting.facade.ui"><B>DatePickerDialogTask</B></A><LI TYPE="circle">com.googlecode.android_scripting.facade.ui.<A HREF="../../../../../com/googlecode/android_scripting/facade/ui/FullScreenTask.html" title="class in com.googlecode.android_scripting.facade.ui"><B>FullScreenTask</B></A><LI TYPE="circle">com.googlecode.android_scripting.facade.ui.<A HREF="../../../../../com/googlecode/android_scripting/facade/ui/SeekBarDialogTask.html" title="class in com.googlecode.android_scripting.facade.ui"><B>SeekBarDialogTask</B></A><LI TYPE="circle">com.googlecode.android_scripting.facade.ui.<A HREF="../../../../../com/googlecode/android_scripting/facade/ui/TimePickerDialogTask.html" title="class in com.googlecode.android_scripting.facade.ui"><B>TimePickerDialogTask</B></A></UL>
-<LI TYPE="circle">com.googlecode.android_scripting.jsonrpc.<A HREF="../../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc"><B>RpcReceiver</B></A><UL>
-<LI TYPE="circle">com.googlecode.android_scripting.facade.ui.<A HREF="../../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html" title="class in com.googlecode.android_scripting.facade.ui"><B>UiFacade</B></A></UL>
-<LI TYPE="circle">com.googlecode.android_scripting.facade.ui.<A HREF="../../../../../com/googlecode/android_scripting/facade/ui/ViewInflater.html" title="class in com.googlecode.android_scripting.facade.ui"><B>ViewInflater</B></A></UL>
-</UL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../com/googlecode/android_scripting/facade/package-tree.html"><B>PREV</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../com/googlecode/android_scripting/future/package-tree.html"><B>NEXT</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html?com/googlecode/android_scripting/facade/ui/package-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/future/FutureActivityTask.html b/doc/com/googlecode/android_scripting/future/FutureActivityTask.html
deleted file mode 100644
index 0f425873..00000000
--- a/doc/com/googlecode/android_scripting/future/FutureActivityTask.html
+++ /dev/null
@@ -1,582 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:00:55 PDT 2014 -->
-<TITLE>
-FutureActivityTask
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="FutureActivityTask";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/FutureActivityTask.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/future/FutureResult.html" title="class in com.googlecode.android_scripting.future"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/future/FutureActivityTask.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="FutureActivityTask.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.future</FONT>
-<BR>
-Class FutureActivityTask&lt;T&gt;</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.future.FutureActivityTask&lt;T&gt;</B>
-</PRE>
-<DL>
-<DT><B>Direct Known Subclasses:</B> <DD><A HREF="../../../../com/googlecode/android_scripting/facade/ui/DatePickerDialogTask.html" title="class in com.googlecode.android_scripting.facade.ui">DatePickerDialogTask</A>, <A HREF="../../../../com/googlecode/android_scripting/facade/ui/FullScreenTask.html" title="class in com.googlecode.android_scripting.facade.ui">FullScreenTask</A>, <A HREF="../../../../com/googlecode/android_scripting/interpreter/html/HtmlActivityTask.html" title="class in com.googlecode.android_scripting.interpreter.html">HtmlActivityTask</A>, <A HREF="../../../../com/googlecode/android_scripting/facade/ui/SeekBarDialogTask.html" title="class in com.googlecode.android_scripting.facade.ui">SeekBarDialogTask</A>, <A HREF="../../../../com/googlecode/android_scripting/facade/ui/TimePickerDialogTask.html" title="class in com.googlecode.android_scripting.facade.ui">TimePickerDialogTask</A></DD>
-</DL>
-<HR>
-<DL>
-<DT><PRE>public abstract class <B>FutureActivityTask&lt;T&gt;</B><DT>extends java.lang.Object</DL>
-</PRE>
-
-<P>
-Encapsulates an <CODE>Activity</CODE> and a <CODE>FutureObject</CODE>.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Damon Kohler (damonkohler@gmail.com)</DD>
-</DL>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#FutureActivityTask()">FutureActivityTask</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#finish()">finish</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;Activity</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#getActivity()">getActivity</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../com/googlecode/android_scripting/future/FutureActivityTask.html" title="type parameter in FutureActivityTask">T</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#getResult()">getResult</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onActivityResult(int, int, Intent)">onActivityResult</A></B>(int&nbsp;requestCode,
-                 int&nbsp;resultCode,
-                 Intent&nbsp;data)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onCreate()">onCreate</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onCreateContextMenu(ContextMenu, View, ContextMenuInfo)">onCreateContextMenu</A></B>(ContextMenu&nbsp;menu,
-                    View&nbsp;v,
-                    ContextMenuInfo&nbsp;menuInfo)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onDestroy()">onDestroy</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onKeyDown(int, KeyEvent)">onKeyDown</A></B>(int&nbsp;keyCode,
-          KeyEvent&nbsp;event)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onNewIntent(Intent)">onNewIntent</A></B>(Intent&nbsp;intent)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onPause()">onPause</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onPrepareOptionsMenu(Menu)">onPrepareOptionsMenu</A></B>(Menu&nbsp;menu)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onResume()">onResume</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onStart()">onStart</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onStop()">onStop</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#setActivity(Activity)">setActivity</A></B>(Activity&nbsp;activity)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#startActivity(Intent)">startActivity</A></B>(Intent&nbsp;intent)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#startActivityForResult(Intent, int)">startActivityForResult</A></B>(Intent&nbsp;intent,
-                       int&nbsp;requestCode)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="FutureActivityTask()"><!-- --></A><H3>
-FutureActivityTask</H3>
-<PRE>
-public <B>FutureActivityTask</B>()</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="setActivity(Activity)"><!-- --></A><H3>
-setActivity</H3>
-<PRE>
-public void <B>setActivity</B>(Activity&nbsp;activity)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getActivity()"><!-- --></A><H3>
-getActivity</H3>
-<PRE>
-public Activity <B>getActivity</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="onCreate()"><!-- --></A><H3>
-onCreate</H3>
-<PRE>
-public void <B>onCreate</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="onStart()"><!-- --></A><H3>
-onStart</H3>
-<PRE>
-public void <B>onStart</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="onResume()"><!-- --></A><H3>
-onResume</H3>
-<PRE>
-public void <B>onResume</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="onPause()"><!-- --></A><H3>
-onPause</H3>
-<PRE>
-public void <B>onPause</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="onStop()"><!-- --></A><H3>
-onStop</H3>
-<PRE>
-public void <B>onStop</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="onDestroy()"><!-- --></A><H3>
-onDestroy</H3>
-<PRE>
-public void <B>onDestroy</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="onNewIntent(Intent)"><!-- --></A><H3>
-onNewIntent</H3>
-<PRE>
-public void <B>onNewIntent</B>(Intent&nbsp;intent)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="onCreateContextMenu(ContextMenu, View, ContextMenuInfo)"><!-- --></A><H3>
-onCreateContextMenu</H3>
-<PRE>
-public void <B>onCreateContextMenu</B>(ContextMenu&nbsp;menu,
-                                View&nbsp;v,
-                                ContextMenuInfo&nbsp;menuInfo)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="onPrepareOptionsMenu(Menu)"><!-- --></A><H3>
-onPrepareOptionsMenu</H3>
-<PRE>
-public boolean <B>onPrepareOptionsMenu</B>(Menu&nbsp;menu)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="onActivityResult(int, int, Intent)"><!-- --></A><H3>
-onActivityResult</H3>
-<PRE>
-public void <B>onActivityResult</B>(int&nbsp;requestCode,
-                             int&nbsp;resultCode,
-                             Intent&nbsp;data)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getResult()"><!-- --></A><H3>
-getResult</H3>
-<PRE>
-public <A HREF="../../../../com/googlecode/android_scripting/future/FutureActivityTask.html" title="type parameter in FutureActivityTask">T</A> <B>getResult</B>()
-            throws java.lang.InterruptedException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.lang.InterruptedException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="finish()"><!-- --></A><H3>
-finish</H3>
-<PRE>
-public void <B>finish</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="startActivity(Intent)"><!-- --></A><H3>
-startActivity</H3>
-<PRE>
-public void <B>startActivity</B>(Intent&nbsp;intent)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="startActivityForResult(Intent, int)"><!-- --></A><H3>
-startActivityForResult</H3>
-<PRE>
-public void <B>startActivityForResult</B>(Intent&nbsp;intent,
-                                   int&nbsp;requestCode)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="onKeyDown(int, KeyEvent)"><!-- --></A><H3>
-onKeyDown</H3>
-<PRE>
-public boolean <B>onKeyDown</B>(int&nbsp;keyCode,
-                         KeyEvent&nbsp;event)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/FutureActivityTask.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/future/FutureResult.html" title="class in com.googlecode.android_scripting.future"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/future/FutureActivityTask.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="FutureActivityTask.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/future/FutureResult.html b/doc/com/googlecode/android_scripting/future/FutureResult.html
deleted file mode 100644
index 5754b1ec..00000000
--- a/doc/com/googlecode/android_scripting/future/FutureResult.html
+++ /dev/null
@@ -1,384 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:00:56 PDT 2014 -->
-<TITLE>
-FutureResult
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="FutureResult";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/FutureResult.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/future/FutureActivityTask.html" title="class in com.googlecode.android_scripting.future"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/future/FutureResult.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="FutureResult.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.future</FONT>
-<BR>
-Class FutureResult&lt;T&gt;</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.future.FutureResult&lt;T&gt;</B>
-</PRE>
-<DL>
-<DT><B>All Implemented Interfaces:</B> <DD>java.util.concurrent.Future&lt;T&gt;</DD>
-</DL>
-<HR>
-<DL>
-<DT><PRE>public class <B>FutureResult&lt;T&gt;</B><DT>extends java.lang.Object<DT>implements java.util.concurrent.Future&lt;T&gt;</DL>
-</PRE>
-
-<P>
-FutureResult represents an eventual execution result for asynchronous operations.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Damon Kohler (damonkohler@gmail.com)</DD>
-</DL>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/future/FutureResult.html#FutureResult()">FutureResult</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/future/FutureResult.html#cancel(boolean)">cancel</A></B>(boolean&nbsp;mayInterruptIfRunning)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../com/googlecode/android_scripting/future/FutureResult.html" title="type parameter in FutureResult">T</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/future/FutureResult.html#get()">get</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../com/googlecode/android_scripting/future/FutureResult.html" title="type parameter in FutureResult">T</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/future/FutureResult.html#get(long, java.util.concurrent.TimeUnit)">get</A></B>(long&nbsp;timeout,
-    java.util.concurrent.TimeUnit&nbsp;unit)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/future/FutureResult.html#isCancelled()">isCancelled</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/future/FutureResult.html#isDone()">isDone</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/future/FutureResult.html#set(T)">set</A></B>(<A HREF="../../../../com/googlecode/android_scripting/future/FutureResult.html" title="type parameter in FutureResult">T</A>&nbsp;result)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="FutureResult()"><!-- --></A><H3>
-FutureResult</H3>
-<PRE>
-public <B>FutureResult</B>()</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="set(java.lang.Object)"><!-- --></A><A NAME="set(T)"><!-- --></A><H3>
-set</H3>
-<PRE>
-public void <B>set</B>(<A HREF="../../../../com/googlecode/android_scripting/future/FutureResult.html" title="type parameter in FutureResult">T</A>&nbsp;result)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="cancel(boolean)"><!-- --></A><H3>
-cancel</H3>
-<PRE>
-public boolean <B>cancel</B>(boolean&nbsp;mayInterruptIfRunning)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE>cancel</CODE> in interface <CODE>java.util.concurrent.Future&lt;<A HREF="../../../../com/googlecode/android_scripting/future/FutureResult.html" title="type parameter in FutureResult">T</A>&gt;</CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="get()"><!-- --></A><H3>
-get</H3>
-<PRE>
-public <A HREF="../../../../com/googlecode/android_scripting/future/FutureResult.html" title="type parameter in FutureResult">T</A> <B>get</B>()
-      throws java.lang.InterruptedException</PRE>
-<DL>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE>get</CODE> in interface <CODE>java.util.concurrent.Future&lt;<A HREF="../../../../com/googlecode/android_scripting/future/FutureResult.html" title="type parameter in FutureResult">T</A>&gt;</CODE></DL>
-</DD>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.lang.InterruptedException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="get(long, java.util.concurrent.TimeUnit)"><!-- --></A><H3>
-get</H3>
-<PRE>
-public <A HREF="../../../../com/googlecode/android_scripting/future/FutureResult.html" title="type parameter in FutureResult">T</A> <B>get</B>(long&nbsp;timeout,
-             java.util.concurrent.TimeUnit&nbsp;unit)
-      throws java.lang.InterruptedException</PRE>
-<DL>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE>get</CODE> in interface <CODE>java.util.concurrent.Future&lt;<A HREF="../../../../com/googlecode/android_scripting/future/FutureResult.html" title="type parameter in FutureResult">T</A>&gt;</CODE></DL>
-</DD>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.lang.InterruptedException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isCancelled()"><!-- --></A><H3>
-isCancelled</H3>
-<PRE>
-public boolean <B>isCancelled</B>()</PRE>
-<DL>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE>isCancelled</CODE> in interface <CODE>java.util.concurrent.Future&lt;<A HREF="../../../../com/googlecode/android_scripting/future/FutureResult.html" title="type parameter in FutureResult">T</A>&gt;</CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isDone()"><!-- --></A><H3>
-isDone</H3>
-<PRE>
-public boolean <B>isDone</B>()</PRE>
-<DL>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE>isDone</CODE> in interface <CODE>java.util.concurrent.Future&lt;<A HREF="../../../../com/googlecode/android_scripting/future/FutureResult.html" title="type parameter in FutureResult">T</A>&gt;</CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/FutureResult.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/future/FutureActivityTask.html" title="class in com.googlecode.android_scripting.future"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/future/FutureResult.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="FutureResult.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/future/package-frame.html b/doc/com/googlecode/android_scripting/future/package-frame.html
deleted file mode 100644
index 48642d6a..00000000
--- a/doc/com/googlecode/android_scripting/future/package-frame.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-com.googlecode.android_scripting.future
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-
-</HEAD>
-
-<BODY BGCOLOR="white">
-<FONT size="+1" CLASS="FrameTitleFont">
-<A HREF="../../../../com/googlecode/android_scripting/future/package-summary.html" target="classFrame">com.googlecode.android_scripting.future</A></FONT>
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
-Classes</FONT>&nbsp;
-<FONT CLASS="FrameItemFont">
-<BR>
-<A HREF="FutureActivityTask.html" title="class in com.googlecode.android_scripting.future" target="classFrame">FutureActivityTask</A>
-<BR>
-<A HREF="FutureResult.html" title="class in com.googlecode.android_scripting.future" target="classFrame">FutureResult</A></FONT></TD>
-</TR>
-</TABLE>
-
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/future/package-summary.html b/doc/com/googlecode/android_scripting/future/package-summary.html
deleted file mode 100644
index df39fa08..00000000
--- a/doc/com/googlecode/android_scripting/future/package-summary.html
+++ /dev/null
@@ -1,161 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-com.googlecode.android_scripting.future
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="com.googlecode.android_scripting.future";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/ui/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/future/package-summary.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<H2>
-Package com.googlecode.android_scripting.future
-</H2>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Class Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/future/FutureActivityTask.html" title="class in com.googlecode.android_scripting.future">FutureActivityTask&lt;T&gt;</A></B></TD>
-<TD>Encapsulates an <CODE>Activity</CODE> and a <CODE>FutureObject</CODE>.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/future/FutureResult.html" title="class in com.googlecode.android_scripting.future">FutureResult&lt;T&gt;</A></B></TD>
-<TD>FutureResult represents an eventual execution result for asynchronous operations.</TD>
-</TR>
-</TABLE>
-&nbsp;
-
-<P>
-<DL>
-</DL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/ui/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/future/package-summary.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/future/package-tree.html b/doc/com/googlecode/android_scripting/future/package-tree.html
deleted file mode 100644
index 68631dc3..00000000
--- a/doc/com/googlecode/android_scripting/future/package-tree.html
+++ /dev/null
@@ -1,154 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-com.googlecode.android_scripting.future Class Hierarchy
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="com.googlecode.android_scripting.future Class Hierarchy";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/ui/package-tree.html"><B>PREV</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/package-tree.html"><B>NEXT</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/future/package-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-Hierarchy For Package com.googlecode.android_scripting.future
-</H2>
-</CENTER>
-<DL>
-<DT><B>Package Hierarchies:</B><DD><A HREF="../../../../overview-tree.html">All Packages</A></DL>
-<HR>
-<H2>
-Class Hierarchy
-</H2>
-<UL>
-<LI TYPE="circle">java.lang.Object<UL>
-<LI TYPE="circle">com.googlecode.android_scripting.future.<A HREF="../../../../com/googlecode/android_scripting/future/FutureActivityTask.html" title="class in com.googlecode.android_scripting.future"><B>FutureActivityTask</B></A>&lt;T&gt;<LI TYPE="circle">com.googlecode.android_scripting.future.<A HREF="../../../../com/googlecode/android_scripting/future/FutureResult.html" title="class in com.googlecode.android_scripting.future"><B>FutureResult</B></A>&lt;T&gt; (implements java.util.concurrent.Future&lt;V&gt;)
-</UL>
-</UL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/facade/ui/package-tree.html"><B>PREV</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/package-tree.html"><B>NEXT</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/future/package-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/interpreter/ExternalClassLoader.html b/doc/com/googlecode/android_scripting/interpreter/ExternalClassLoader.html
deleted file mode 100644
index f3dd1adf..00000000
--- a/doc/com/googlecode/android_scripting/interpreter/ExternalClassLoader.html
+++ /dev/null
@@ -1,259 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:03 PDT 2014 -->
-<TITLE>
-ExternalClassLoader
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="ExternalClassLoader";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ExternalClassLoader.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/InProcessInterpreter.html" title="interface in com.googlecode.android_scripting.interpreter"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/interpreter/ExternalClassLoader.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ExternalClassLoader.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.interpreter</FONT>
-<BR>
-Class ExternalClassLoader</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.interpreter.ExternalClassLoader</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>ExternalClassLoader</B><DT>extends java.lang.Object</DL>
-</PRE>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/ExternalClassLoader.html#ExternalClassLoader()">ExternalClassLoader</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.Object</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/ExternalClassLoader.html#load(java.util.Collection, java.util.Collection, java.lang.String)">load</A></B>(java.util.Collection&lt;java.lang.String&gt;&nbsp;dexPaths,
-     java.util.Collection&lt;java.lang.String&gt;&nbsp;nativePaths,
-     java.lang.String&nbsp;className)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="ExternalClassLoader()"><!-- --></A><H3>
-ExternalClassLoader</H3>
-<PRE>
-public <B>ExternalClassLoader</B>()</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="load(java.util.Collection, java.util.Collection, java.lang.String)"><!-- --></A><H3>
-load</H3>
-<PRE>
-public java.lang.Object <B>load</B>(java.util.Collection&lt;java.lang.String&gt;&nbsp;dexPaths,
-                             java.util.Collection&lt;java.lang.String&gt;&nbsp;nativePaths,
-                             java.lang.String&nbsp;className)
-                      throws java.lang.Exception</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.lang.Exception</CODE></DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ExternalClassLoader.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/InProcessInterpreter.html" title="interface in com.googlecode.android_scripting.interpreter"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/interpreter/ExternalClassLoader.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ExternalClassLoader.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/interpreter/InProcessInterpreter.html b/doc/com/googlecode/android_scripting/interpreter/InProcessInterpreter.html
deleted file mode 100644
index 210d185b..00000000
--- a/doc/com/googlecode/android_scripting/interpreter/InProcessInterpreter.html
+++ /dev/null
@@ -1,263 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:03 PDT 2014 -->
-<TITLE>
-InProcessInterpreter
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="InProcessInterpreter";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/InProcessInterpreter.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/ExternalClassLoader.html" title="class in com.googlecode.android_scripting.interpreter"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/Interpreter.html" title="class in com.googlecode.android_scripting.interpreter"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/interpreter/InProcessInterpreter.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="InProcessInterpreter.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.interpreter</FONT>
-<BR>
-Interface InProcessInterpreter</H2>
-<HR>
-<DL>
-<DT><PRE>public interface <B>InProcessInterpreter</B></DL>
-</PRE>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.io.FileDescriptor</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InProcessInterpreter.html#getStdIn()">getStdIn</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.io.FileDescriptor</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InProcessInterpreter.html#getStdOut()">getStdOut</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InProcessInterpreter.html#runInteractive()">runInteractive</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InProcessInterpreter.html#runScript(java.lang.String)">runScript</A></B>(java.lang.String&nbsp;filename)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="getStdOut()"><!-- --></A><H3>
-getStdOut</H3>
-<PRE>
-java.io.FileDescriptor <B>getStdOut</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getStdIn()"><!-- --></A><H3>
-getStdIn</H3>
-<PRE>
-java.io.FileDescriptor <B>getStdIn</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="runInteractive()"><!-- --></A><H3>
-runInteractive</H3>
-<PRE>
-boolean <B>runInteractive</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="runScript(java.lang.String)"><!-- --></A><H3>
-runScript</H3>
-<PRE>
-void <B>runScript</B>(java.lang.String&nbsp;filename)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/InProcessInterpreter.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/ExternalClassLoader.html" title="class in com.googlecode.android_scripting.interpreter"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/Interpreter.html" title="class in com.googlecode.android_scripting.interpreter"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/interpreter/InProcessInterpreter.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="InProcessInterpreter.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/interpreter/Interpreter.html b/doc/com/googlecode/android_scripting/interpreter/Interpreter.html
deleted file mode 100644
index ab1807eb..00000000
--- a/doc/com/googlecode/android_scripting/interpreter/Interpreter.html
+++ /dev/null
@@ -1,582 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:03 PDT 2014 -->
-<TITLE>
-Interpreter
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Interpreter";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/Interpreter.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/InProcessInterpreter.html" title="interface in com.googlecode.android_scripting.interpreter"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterConfiguration.html" title="class in com.googlecode.android_scripting.interpreter"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/interpreter/Interpreter.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="Interpreter.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.interpreter</FONT>
-<BR>
-Class Interpreter</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.interpreter.Interpreter</B>
-</PRE>
-<DL>
-<DT><B>All Implemented Interfaces:</B> <DD><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.html" title="interface in com.googlecode.android_scripting.interpreter">InterpreterPropertyNames</A></DD>
-</DL>
-<DL>
-<DT><B>Direct Known Subclasses:</B> <DD><A HREF="../../../../com/googlecode/android_scripting/interpreter/html/HtmlInterpreter.html" title="class in com.googlecode.android_scripting.interpreter.html">HtmlInterpreter</A>, <A HREF="../../../../com/googlecode/android_scripting/interpreter/shell/ShellInterpreter.html" title="class in com.googlecode.android_scripting.interpreter.shell">ShellInterpreter</A></DD>
-</DL>
-<HR>
-<DL>
-<DT><PRE>public class <B>Interpreter</B><DT>extends java.lang.Object<DT>implements <A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.html" title="interface in com.googlecode.android_scripting.interpreter">InterpreterPropertyNames</A></DL>
-</PRE>
-
-<P>
-Combines all the execution-related specs of a particular interpreter installed in the system.
- This class is instantiated through a map received from a concrete InterpreterProfider.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Damon Kohler (damonkohler@gmail.com), Alexey Reznichenko (alexey.reznichenko@gmail.com)</DD>
-</DL>
-<HR>
-
-<P>
-<!-- =========== FIELD SUMMARY =========== -->
-
-<A NAME="field_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Field Summary</B></FONT></TH>
-</TR>
-</TABLE>
-&nbsp;<A NAME="fields_inherited_from_class_com.googlecode.android_scripting.interpreter.InterpreterPropertyNames"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Fields inherited from interface com.googlecode.android_scripting.interpreter.<A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.html" title="interface in com.googlecode.android_scripting.interpreter">InterpreterPropertyNames</A></B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.html#BINARY">BINARY</A>, <A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.html#EXTENSION">EXTENSION</A>, <A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.html#HAS_INTERACTIVE_MODE">HAS_INTERACTIVE_MODE</A>, <A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.html#INTERACTIVE_COMMAND">INTERACTIVE_COMMAND</A>, <A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.html#NAME">NAME</A>, <A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.html#NICE_NAME">NICE_NAME</A>, <A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.html#SCRIPT_COMMAND">SCRIPT_COMMAND</A></CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/Interpreter.html#Interpreter()">Interpreter</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/Interpreter.html" title="class in com.googlecode.android_scripting.interpreter">Interpreter</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/Interpreter.html#buildFromMaps(java.util.Map, java.util.Map, java.util.Map)">buildFromMaps</A></B>(java.util.Map&lt;java.lang.String,java.lang.String&gt;&nbsp;data,
-              java.util.Map&lt;java.lang.String,java.lang.String&gt;&nbsp;environment_variables,
-              java.util.Map&lt;java.lang.String,java.lang.String&gt;&nbsp;arguments)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.io.File</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/Interpreter.html#getBinary()">getBinary</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/Interpreter.html#getContentTemplate()">getContentTemplate</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.util.Map&lt;java.lang.String,java.lang.String&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/Interpreter.html#getEnvironmentVariables()">getEnvironmentVariables</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/Interpreter.html#getExtension()">getExtension</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/Interpreter.html#getInteractiveCommand()">getInteractiveCommand</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/Language.html" title="class in com.googlecode.android_scripting.language">Language</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/Interpreter.html#getLanguage()">getLanguage</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/Interpreter.html#getName()">getName</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/Interpreter.html#getNiceName()">getNiceName</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/Interpreter.html#getRpcText(java.lang.String, com.googlecode.android_scripting.rpc.MethodDescriptor, java.lang.String[])">getRpcText</A></B>(java.lang.String&nbsp;content,
-           <A HREF="../../../../com/googlecode/android_scripting/rpc/MethodDescriptor.html" title="class in com.googlecode.android_scripting.rpc">MethodDescriptor</A>&nbsp;rpc,
-           java.lang.String[]&nbsp;values)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/Interpreter.html#getScriptCommand()">getScriptCommand</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/Interpreter.html#hasInteractiveMode()">hasInteractiveMode</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/Interpreter.html#isInstalled()">isInstalled</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/Interpreter.html#isUninstallable()">isUninstallable</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="Interpreter()"><!-- --></A><H3>
-Interpreter</H3>
-<PRE>
-public <B>Interpreter</B>()</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="buildFromMaps(java.util.Map, java.util.Map, java.util.Map)"><!-- --></A><H3>
-buildFromMaps</H3>
-<PRE>
-public static <A HREF="../../../../com/googlecode/android_scripting/interpreter/Interpreter.html" title="class in com.googlecode.android_scripting.interpreter">Interpreter</A> <B>buildFromMaps</B>(java.util.Map&lt;java.lang.String,java.lang.String&gt;&nbsp;data,
-                                        java.util.Map&lt;java.lang.String,java.lang.String&gt;&nbsp;environment_variables,
-                                        java.util.Map&lt;java.lang.String,java.lang.String&gt;&nbsp;arguments)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getEnvironmentVariables()"><!-- --></A><H3>
-getEnvironmentVariables</H3>
-<PRE>
-public java.util.Map&lt;java.lang.String,java.lang.String&gt; <B>getEnvironmentVariables</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getScriptCommand()"><!-- --></A><H3>
-getScriptCommand</H3>
-<PRE>
-public java.lang.String <B>getScriptCommand</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getInteractiveCommand()"><!-- --></A><H3>
-getInteractiveCommand</H3>
-<PRE>
-public java.lang.String <B>getInteractiveCommand</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getBinary()"><!-- --></A><H3>
-getBinary</H3>
-<PRE>
-public java.io.File <B>getBinary</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="hasInteractiveMode()"><!-- --></A><H3>
-hasInteractiveMode</H3>
-<PRE>
-public boolean <B>hasInteractiveMode</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getExtension()"><!-- --></A><H3>
-getExtension</H3>
-<PRE>
-public java.lang.String <B>getExtension</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getName()"><!-- --></A><H3>
-getName</H3>
-<PRE>
-public java.lang.String <B>getName</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getNiceName()"><!-- --></A><H3>
-getNiceName</H3>
-<PRE>
-public java.lang.String <B>getNiceName</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getContentTemplate()"><!-- --></A><H3>
-getContentTemplate</H3>
-<PRE>
-public java.lang.String <B>getContentTemplate</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getLanguage()"><!-- --></A><H3>
-getLanguage</H3>
-<PRE>
-public <A HREF="../../../../com/googlecode/android_scripting/language/Language.html" title="class in com.googlecode.android_scripting.language">Language</A> <B>getLanguage</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getRpcText(java.lang.String, com.googlecode.android_scripting.rpc.MethodDescriptor, java.lang.String[])"><!-- --></A><H3>
-getRpcText</H3>
-<PRE>
-public java.lang.String <B>getRpcText</B>(java.lang.String&nbsp;content,
-                                   <A HREF="../../../../com/googlecode/android_scripting/rpc/MethodDescriptor.html" title="class in com.googlecode.android_scripting.rpc">MethodDescriptor</A>&nbsp;rpc,
-                                   java.lang.String[]&nbsp;values)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isInstalled()"><!-- --></A><H3>
-isInstalled</H3>
-<PRE>
-public boolean <B>isInstalled</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isUninstallable()"><!-- --></A><H3>
-isUninstallable</H3>
-<PRE>
-public boolean <B>isUninstallable</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/Interpreter.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/InProcessInterpreter.html" title="interface in com.googlecode.android_scripting.interpreter"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterConfiguration.html" title="class in com.googlecode.android_scripting.interpreter"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/interpreter/Interpreter.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="Interpreter.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/interpreter/InterpreterConfiguration.ConfigurationObserver.html b/doc/com/googlecode/android_scripting/interpreter/InterpreterConfiguration.ConfigurationObserver.html
deleted file mode 100644
index 28012091..00000000
--- a/doc/com/googlecode/android_scripting/interpreter/InterpreterConfiguration.ConfigurationObserver.html
+++ /dev/null
@@ -1,212 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:03 PDT 2014 -->
-<TITLE>
-InterpreterConfiguration.ConfigurationObserver
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="InterpreterConfiguration.ConfigurationObserver";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/InterpreterConfiguration.ConfigurationObserver.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterConfiguration.html" title="class in com.googlecode.android_scripting.interpreter"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterConstants.html" title="interface in com.googlecode.android_scripting.interpreter"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/interpreter/InterpreterConfiguration.ConfigurationObserver.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="InterpreterConfiguration.ConfigurationObserver.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.interpreter</FONT>
-<BR>
-Interface InterpreterConfiguration.ConfigurationObserver</H2>
-<DL>
-<DT><B>All Known Implementing Classes:</B> <DD><A HREF="../../../../com/hipipal/sl4alib/MNApp.html" title="class in com.hipipal.sl4alib">MNApp</A></DD>
-</DL>
-<DL>
-<DT><B>Enclosing class:</B><DD><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterConfiguration.html" title="class in com.googlecode.android_scripting.interpreter">InterpreterConfiguration</A></DD>
-</DL>
-<HR>
-<DL>
-<DT><PRE>public static interface <B>InterpreterConfiguration.ConfigurationObserver</B></DL>
-</PRE>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterConfiguration.ConfigurationObserver.html#onConfigurationChanged()">onConfigurationChanged</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="onConfigurationChanged()"><!-- --></A><H3>
-onConfigurationChanged</H3>
-<PRE>
-void <B>onConfigurationChanged</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/InterpreterConfiguration.ConfigurationObserver.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterConfiguration.html" title="class in com.googlecode.android_scripting.interpreter"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterConstants.html" title="interface in com.googlecode.android_scripting.interpreter"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/interpreter/InterpreterConfiguration.ConfigurationObserver.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="InterpreterConfiguration.ConfigurationObserver.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/interpreter/InterpreterConfiguration.html b/doc/com/googlecode/android_scripting/interpreter/InterpreterConfiguration.html
deleted file mode 100644
index 6a71c4e7..00000000
--- a/doc/com/googlecode/android_scripting/interpreter/InterpreterConfiguration.html
+++ /dev/null
@@ -1,460 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:03 PDT 2014 -->
-<TITLE>
-InterpreterConfiguration
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="InterpreterConfiguration";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/InterpreterConfiguration.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/Interpreter.html" title="class in com.googlecode.android_scripting.interpreter"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterConfiguration.ConfigurationObserver.html" title="interface in com.googlecode.android_scripting.interpreter"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/interpreter/InterpreterConfiguration.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="InterpreterConfiguration.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#nested_class_summary">NESTED</A>&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.interpreter</FONT>
-<BR>
-Class InterpreterConfiguration</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.interpreter.InterpreterConfiguration</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>InterpreterConfiguration</B><DT>extends java.lang.Object</DL>
-</PRE>
-
-<P>
-Manages and provides access to the set of available interpreters.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Damon Kohler (damonkohler@gmail.com)</DD>
-</DL>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-<A NAME="nested_class_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Nested Class Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;interface</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterConfiguration.ConfigurationObserver.html" title="interface in com.googlecode.android_scripting.interpreter">InterpreterConfiguration.ConfigurationObserver</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterConfiguration.html#InterpreterConfiguration(Context)">InterpreterConfiguration</A></B>(Context&nbsp;context)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.util.List&lt;<A HREF="../../../../com/googlecode/android_scripting/interpreter/Interpreter.html" title="class in com.googlecode.android_scripting.interpreter">Interpreter</A>&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterConfiguration.html#getInstalledInterpreters()">getInstalledInterpreters</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the list of all installed interpreters.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.util.List&lt;<A HREF="../../../../com/googlecode/android_scripting/interpreter/Interpreter.html" title="class in com.googlecode.android_scripting.interpreter">Interpreter</A>&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterConfiguration.html#getInteractiveInterpreters()">getInteractiveInterpreters</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the list of interpreters that support interactive mode execution.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/Interpreter.html" title="class in com.googlecode.android_scripting.interpreter">Interpreter</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterConfiguration.html#getInterpreterByName(java.lang.String)">getInterpreterByName</A></B>(java.lang.String&nbsp;interpreterName)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the interpreter matching the provided name or null if no interpreter was found.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/Interpreter.html" title="class in com.googlecode.android_scripting.interpreter">Interpreter</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterConfiguration.html#getInterpreterForScript(java.lang.String)">getInterpreterForScript</A></B>(java.lang.String&nbsp;scriptName)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the correct interpreter for the provided script name based on the script's extension or
- null if no interpreter was found.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.util.List&lt;? extends <A HREF="../../../../com/googlecode/android_scripting/interpreter/Interpreter.html" title="class in com.googlecode.android_scripting.interpreter">Interpreter</A>&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterConfiguration.html#getSupportedInterpreters()">getSupportedInterpreters</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the list of all known interpreters.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterConfiguration.html#isDiscoveryComplete()">isDiscoveryComplete</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterConfiguration.html#registerObserver(com.googlecode.android_scripting.interpreter.InterpreterConfiguration.ConfigurationObserver)">registerObserver</A></B>(<A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterConfiguration.ConfigurationObserver.html" title="interface in com.googlecode.android_scripting.interpreter">InterpreterConfiguration.ConfigurationObserver</A>&nbsp;observer)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterConfiguration.html#startDiscovering()">startDiscovering</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterConfiguration.html#startDiscovering(java.lang.String)">startDiscovering</A></B>(java.lang.String&nbsp;mime)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterConfiguration.html#unregisterObserver(com.googlecode.android_scripting.interpreter.InterpreterConfiguration.ConfigurationObserver)">unregisterObserver</A></B>(<A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterConfiguration.ConfigurationObserver.html" title="interface in com.googlecode.android_scripting.interpreter">InterpreterConfiguration.ConfigurationObserver</A>&nbsp;observer)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="InterpreterConfiguration(Context)"><!-- --></A><H3>
-InterpreterConfiguration</H3>
-<PRE>
-public <B>InterpreterConfiguration</B>(Context&nbsp;context)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="startDiscovering()"><!-- --></A><H3>
-startDiscovering</H3>
-<PRE>
-public void <B>startDiscovering</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="startDiscovering(java.lang.String)"><!-- --></A><H3>
-startDiscovering</H3>
-<PRE>
-public void <B>startDiscovering</B>(java.lang.String&nbsp;mime)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isDiscoveryComplete()"><!-- --></A><H3>
-isDiscoveryComplete</H3>
-<PRE>
-public boolean <B>isDiscoveryComplete</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="registerObserver(com.googlecode.android_scripting.interpreter.InterpreterConfiguration.ConfigurationObserver)"><!-- --></A><H3>
-registerObserver</H3>
-<PRE>
-public void <B>registerObserver</B>(<A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterConfiguration.ConfigurationObserver.html" title="interface in com.googlecode.android_scripting.interpreter">InterpreterConfiguration.ConfigurationObserver</A>&nbsp;observer)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="unregisterObserver(com.googlecode.android_scripting.interpreter.InterpreterConfiguration.ConfigurationObserver)"><!-- --></A><H3>
-unregisterObserver</H3>
-<PRE>
-public void <B>unregisterObserver</B>(<A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterConfiguration.ConfigurationObserver.html" title="interface in com.googlecode.android_scripting.interpreter">InterpreterConfiguration.ConfigurationObserver</A>&nbsp;observer)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getSupportedInterpreters()"><!-- --></A><H3>
-getSupportedInterpreters</H3>
-<PRE>
-public java.util.List&lt;? extends <A HREF="../../../../com/googlecode/android_scripting/interpreter/Interpreter.html" title="class in com.googlecode.android_scripting.interpreter">Interpreter</A>&gt; <B>getSupportedInterpreters</B>()</PRE>
-<DL>
-<DD>Returns the list of all known interpreters.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getInstalledInterpreters()"><!-- --></A><H3>
-getInstalledInterpreters</H3>
-<PRE>
-public java.util.List&lt;<A HREF="../../../../com/googlecode/android_scripting/interpreter/Interpreter.html" title="class in com.googlecode.android_scripting.interpreter">Interpreter</A>&gt; <B>getInstalledInterpreters</B>()</PRE>
-<DL>
-<DD>Returns the list of all installed interpreters.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getInteractiveInterpreters()"><!-- --></A><H3>
-getInteractiveInterpreters</H3>
-<PRE>
-public java.util.List&lt;<A HREF="../../../../com/googlecode/android_scripting/interpreter/Interpreter.html" title="class in com.googlecode.android_scripting.interpreter">Interpreter</A>&gt; <B>getInteractiveInterpreters</B>()</PRE>
-<DL>
-<DD>Returns the list of interpreters that support interactive mode execution.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getInterpreterByName(java.lang.String)"><!-- --></A><H3>
-getInterpreterByName</H3>
-<PRE>
-public <A HREF="../../../../com/googlecode/android_scripting/interpreter/Interpreter.html" title="class in com.googlecode.android_scripting.interpreter">Interpreter</A> <B>getInterpreterByName</B>(java.lang.String&nbsp;interpreterName)</PRE>
-<DL>
-<DD>Returns the interpreter matching the provided name or null if no interpreter was found.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getInterpreterForScript(java.lang.String)"><!-- --></A><H3>
-getInterpreterForScript</H3>
-<PRE>
-public <A HREF="../../../../com/googlecode/android_scripting/interpreter/Interpreter.html" title="class in com.googlecode.android_scripting.interpreter">Interpreter</A> <B>getInterpreterForScript</B>(java.lang.String&nbsp;scriptName)</PRE>
-<DL>
-<DD>Returns the correct interpreter for the provided script name based on the script's extension or
- null if no interpreter was found.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/InterpreterConfiguration.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/Interpreter.html" title="class in com.googlecode.android_scripting.interpreter"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterConfiguration.ConfigurationObserver.html" title="interface in com.googlecode.android_scripting.interpreter"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/interpreter/InterpreterConfiguration.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="InterpreterConfiguration.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#nested_class_summary">NESTED</A>&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/interpreter/InterpreterConstants.html b/doc/com/googlecode/android_scripting/interpreter/InterpreterConstants.html
deleted file mode 100644
index 41ce56c7..00000000
--- a/doc/com/googlecode/android_scripting/interpreter/InterpreterConstants.html
+++ /dev/null
@@ -1,446 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:03 PDT 2014 -->
-<TITLE>
-InterpreterConstants
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="InterpreterConstants";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/InterpreterConstants.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterConfiguration.ConfigurationObserver.html" title="interface in com.googlecode.android_scripting.interpreter"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterDescriptor.html" title="interface in com.googlecode.android_scripting.interpreter"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/interpreter/InterpreterConstants.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="InterpreterConstants.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;METHOD</FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;METHOD</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.interpreter</FONT>
-<BR>
-Interface InterpreterConstants</H2>
-<HR>
-<DL>
-<DT><PRE>public interface <B>InterpreterConstants</B></DL>
-</PRE>
-
-<P>
-A collection of constants required for installation/removal of an interpreter.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Damon Kohler (damonkohler@gmail.com), Alexey Reznichenko (alexey.reznichenko@gmail.com)</DD>
-</DL>
-<HR>
-
-<P>
-<!-- =========== FIELD SUMMARY =========== -->
-
-<A NAME="field_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Field Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterConstants.html#ACTION_DISCOVER_INTERPRETERS">ACTION_DISCOVER_INTERPRETERS</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterConstants.html#ACTION_INTERPRETER_ADDED">ACTION_INTERPRETER_ADDED</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterConstants.html#ACTION_INTERPRETER_REMOVED">ACTION_INTERPRETER_REMOVED</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterConstants.html#INSTALLED_PREFERENCE_KEY">INSTALLED_PREFERENCE_KEY</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterConstants.html#INTERPRETER_EXTRAS_ROOT">INTERPRETER_EXTRAS_ROOT</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterConstants.html#MIME">MIME</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterConstants.html#PROVIDER_ARGUMENTS">PROVIDER_ARGUMENTS</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterConstants.html#PROVIDER_ENVIRONMENT_VARIABLES">PROVIDER_ENVIRONMENT_VARIABLES</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterConstants.html#PROVIDER_PROPERTIES">PROVIDER_PROPERTIES</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterConstants.html#SCRIPTS_ROOT">SCRIPTS_ROOT</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterConstants.html#SDCARD_ROOT">SDCARD_ROOT</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterConstants.html#SDCARD_SL4A_DOC">SDCARD_SL4A_DOC</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterConstants.html#SDCARD_SL4A_ROOT">SDCARD_SL4A_ROOT</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterConstants.html#SL4A_DALVIK_CACHE_ROOT">SL4A_DALVIK_CACHE_ROOT</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-<A NAME="field_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Field Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="SDCARD_ROOT"><!-- --></A><H3>
-SDCARD_ROOT</H3>
-<PRE>
-static final java.lang.String <B>SDCARD_ROOT</B></PRE>
-<DL>
-<DL>
-</DL>
-</DL>
-<HR>
-
-<A NAME="SDCARD_SL4A_ROOT"><!-- --></A><H3>
-SDCARD_SL4A_ROOT</H3>
-<PRE>
-static final java.lang.String <B>SDCARD_SL4A_ROOT</B></PRE>
-<DL>
-<DL>
-</DL>
-</DL>
-<HR>
-
-<A NAME="SCRIPTS_ROOT"><!-- --></A><H3>
-SCRIPTS_ROOT</H3>
-<PRE>
-static final java.lang.String <B>SCRIPTS_ROOT</B></PRE>
-<DL>
-<DL>
-</DL>
-</DL>
-<HR>
-
-<A NAME="SDCARD_SL4A_DOC"><!-- --></A><H3>
-SDCARD_SL4A_DOC</H3>
-<PRE>
-static final java.lang.String <B>SDCARD_SL4A_DOC</B></PRE>
-<DL>
-<DL>
-</DL>
-</DL>
-<HR>
-
-<A NAME="SL4A_DALVIK_CACHE_ROOT"><!-- --></A><H3>
-SL4A_DALVIK_CACHE_ROOT</H3>
-<PRE>
-static final java.lang.String <B>SL4A_DALVIK_CACHE_ROOT</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../constant-values.html#com.googlecode.android_scripting.interpreter.InterpreterConstants.SL4A_DALVIK_CACHE_ROOT">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="INTERPRETER_EXTRAS_ROOT"><!-- --></A><H3>
-INTERPRETER_EXTRAS_ROOT</H3>
-<PRE>
-static final java.lang.String <B>INTERPRETER_EXTRAS_ROOT</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../constant-values.html#com.googlecode.android_scripting.interpreter.InterpreterConstants.INTERPRETER_EXTRAS_ROOT">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="ACTION_DISCOVER_INTERPRETERS"><!-- --></A><H3>
-ACTION_DISCOVER_INTERPRETERS</H3>
-<PRE>
-static final java.lang.String <B>ACTION_DISCOVER_INTERPRETERS</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../constant-values.html#com.googlecode.android_scripting.interpreter.InterpreterConstants.ACTION_DISCOVER_INTERPRETERS">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="ACTION_INTERPRETER_ADDED"><!-- --></A><H3>
-ACTION_INTERPRETER_ADDED</H3>
-<PRE>
-static final java.lang.String <B>ACTION_INTERPRETER_ADDED</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../constant-values.html#com.googlecode.android_scripting.interpreter.InterpreterConstants.ACTION_INTERPRETER_ADDED">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="ACTION_INTERPRETER_REMOVED"><!-- --></A><H3>
-ACTION_INTERPRETER_REMOVED</H3>
-<PRE>
-static final java.lang.String <B>ACTION_INTERPRETER_REMOVED</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../constant-values.html#com.googlecode.android_scripting.interpreter.InterpreterConstants.ACTION_INTERPRETER_REMOVED">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="PROVIDER_PROPERTIES"><!-- --></A><H3>
-PROVIDER_PROPERTIES</H3>
-<PRE>
-static final java.lang.String <B>PROVIDER_PROPERTIES</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../constant-values.html#com.googlecode.android_scripting.interpreter.InterpreterConstants.PROVIDER_PROPERTIES">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="PROVIDER_ENVIRONMENT_VARIABLES"><!-- --></A><H3>
-PROVIDER_ENVIRONMENT_VARIABLES</H3>
-<PRE>
-static final java.lang.String <B>PROVIDER_ENVIRONMENT_VARIABLES</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../constant-values.html#com.googlecode.android_scripting.interpreter.InterpreterConstants.PROVIDER_ENVIRONMENT_VARIABLES">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="PROVIDER_ARGUMENTS"><!-- --></A><H3>
-PROVIDER_ARGUMENTS</H3>
-<PRE>
-static final java.lang.String <B>PROVIDER_ARGUMENTS</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../constant-values.html#com.googlecode.android_scripting.interpreter.InterpreterConstants.PROVIDER_ARGUMENTS">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="INSTALLED_PREFERENCE_KEY"><!-- --></A><H3>
-INSTALLED_PREFERENCE_KEY</H3>
-<PRE>
-static final java.lang.String <B>INSTALLED_PREFERENCE_KEY</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../constant-values.html#com.googlecode.android_scripting.interpreter.InterpreterConstants.INSTALLED_PREFERENCE_KEY">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="MIME"><!-- --></A><H3>
-MIME</H3>
-<PRE>
-static final java.lang.String <B>MIME</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../constant-values.html#com.googlecode.android_scripting.interpreter.InterpreterConstants.MIME">Constant Field Values</A></DL>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/InterpreterConstants.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterConfiguration.ConfigurationObserver.html" title="interface in com.googlecode.android_scripting.interpreter"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterDescriptor.html" title="interface in com.googlecode.android_scripting.interpreter"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/interpreter/InterpreterConstants.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="InterpreterConstants.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;METHOD</FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;METHOD</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/interpreter/InterpreterDescriptor.html b/doc/com/googlecode/android_scripting/interpreter/InterpreterDescriptor.html
deleted file mode 100644
index 891e36ab..00000000
--- a/doc/com/googlecode/android_scripting/interpreter/InterpreterDescriptor.html
+++ /dev/null
@@ -1,603 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:03 PDT 2014 -->
-<TITLE>
-InterpreterDescriptor
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="InterpreterDescriptor";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/InterpreterDescriptor.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterConstants.html" title="interface in com.googlecode.android_scripting.interpreter"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterProcess.html" title="class in com.googlecode.android_scripting.interpreter"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/interpreter/InterpreterDescriptor.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="InterpreterDescriptor.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.interpreter</FONT>
-<BR>
-Interface InterpreterDescriptor</H2>
-<HR>
-<DL>
-<DT><PRE>public interface <B>InterpreterDescriptor</B></DL>
-</PRE>
-
-<P>
-Provides interpreter-specific info for execution/installation/removal purposes.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Alexey Reznichenko (alexey.reznichenko@gmail.com)</DD>
-</DL>
-<HR>
-
-<P>
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.util.List&lt;java.lang.String&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterDescriptor.html#getArguments(Context)">getArguments</A></B>(Context&nbsp;context)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns an array of command line arguments required to execute the interpreter (it's essential
- that the order in the array is consistent with order of arguments in the command line).</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.io.File</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterDescriptor.html#getBinary(Context)">getBinary</A></B>(Context&nbsp;context)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the binary as a File object.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.util.Map&lt;java.lang.String,java.lang.String&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterDescriptor.html#getEnvironmentVariables(Context)">getEnvironmentVariables</A></B>(Context&nbsp;context)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Should return a map of environment variables names and their values (or null if interpreter
- does not require any environment variables).</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterDescriptor.html#getExtension()">getExtension</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns supported script-file extension.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterDescriptor.html#getExtrasArchiveName()">getExtrasArchiveName</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns file name of the extras archive.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterDescriptor.html#getExtrasArchiveUrl()">getExtrasArchiveUrl</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns URL location of the extras archive.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterDescriptor.html#getInteractiveCommand(Context)">getInteractiveCommand</A></B>(Context&nbsp;context)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns execution parameters in case when script name is not provided (when interpreter is
- started in a shell mode);</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterDescriptor.html#getInterpreterArchiveName()">getInterpreterArchiveName</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns file name of the interpreter archive.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterDescriptor.html#getInterpreterArchiveUrl()">getInterpreterArchiveUrl</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns URL location of the interpreter archive.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterDescriptor.html#getName()">getName</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns unique name of the interpreter.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterDescriptor.html#getNiceName()">getNiceName</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns display name of the interpreter.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterDescriptor.html#getScriptCommand(Context)">getScriptCommand</A></B>(Context&nbsp;context)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns command line arguments to execute a with a given script (format string with one
- argument).</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterDescriptor.html#getScriptsArchiveName()">getScriptsArchiveName</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns file name of the scripts archive.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterDescriptor.html#getScriptsArchiveUrl()">getScriptsArchiveUrl</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns URL location of the scripts archive.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterDescriptor.html#getVersion()">getVersion</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns interpreter version number.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterDescriptor.html#hasExtrasArchive()">hasExtrasArchive</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns true if interpreter has an extras archive.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterDescriptor.html#hasInteractiveMode()">hasInteractiveMode</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns true if interpreter can be executed in interactive mode.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterDescriptor.html#hasInterpreterArchive()">hasInterpreterArchive</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns true if interpreter has an archive.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterDescriptor.html#hasScriptsArchive()">hasScriptsArchive</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns true if interpreter comes with a scripts archive.</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="getName()"><!-- --></A><H3>
-getName</H3>
-<PRE>
-java.lang.String <B>getName</B>()</PRE>
-<DL>
-<DD>Returns unique name of the interpreter.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getNiceName()"><!-- --></A><H3>
-getNiceName</H3>
-<PRE>
-java.lang.String <B>getNiceName</B>()</PRE>
-<DL>
-<DD>Returns display name of the interpreter.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getExtension()"><!-- --></A><H3>
-getExtension</H3>
-<PRE>
-java.lang.String <B>getExtension</B>()</PRE>
-<DL>
-<DD>Returns supported script-file extension.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getVersion()"><!-- --></A><H3>
-getVersion</H3>
-<PRE>
-int <B>getVersion</B>()</PRE>
-<DL>
-<DD>Returns interpreter version number.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getBinary(Context)"><!-- --></A><H3>
-getBinary</H3>
-<PRE>
-java.io.File <B>getBinary</B>(Context&nbsp;context)</PRE>
-<DL>
-<DD>Returns the binary as a File object. Context is the InterpreterProvider's <CODE>Context</CODE> and
- is provided to find the interpreter installation directory.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getInteractiveCommand(Context)"><!-- --></A><H3>
-getInteractiveCommand</H3>
-<PRE>
-java.lang.String <B>getInteractiveCommand</B>(Context&nbsp;context)</PRE>
-<DL>
-<DD>Returns execution parameters in case when script name is not provided (when interpreter is
- started in a shell mode);
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getScriptCommand(Context)"><!-- --></A><H3>
-getScriptCommand</H3>
-<PRE>
-java.lang.String <B>getScriptCommand</B>(Context&nbsp;context)</PRE>
-<DL>
-<DD>Returns command line arguments to execute a with a given script (format string with one
- argument).
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getArguments(Context)"><!-- --></A><H3>
-getArguments</H3>
-<PRE>
-java.util.List&lt;java.lang.String&gt; <B>getArguments</B>(Context&nbsp;context)</PRE>
-<DL>
-<DD>Returns an array of command line arguments required to execute the interpreter (it's essential
- that the order in the array is consistent with order of arguments in the command line).
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getEnvironmentVariables(Context)"><!-- --></A><H3>
-getEnvironmentVariables</H3>
-<PRE>
-java.util.Map&lt;java.lang.String,java.lang.String&gt; <B>getEnvironmentVariables</B>(Context&nbsp;context)</PRE>
-<DL>
-<DD>Should return a map of environment variables names and their values (or null if interpreter
- does not require any environment variables).
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="hasInterpreterArchive()"><!-- --></A><H3>
-hasInterpreterArchive</H3>
-<PRE>
-boolean <B>hasInterpreterArchive</B>()</PRE>
-<DL>
-<DD>Returns true if interpreter has an archive.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="hasExtrasArchive()"><!-- --></A><H3>
-hasExtrasArchive</H3>
-<PRE>
-boolean <B>hasExtrasArchive</B>()</PRE>
-<DL>
-<DD>Returns true if interpreter has an extras archive.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="hasScriptsArchive()"><!-- --></A><H3>
-hasScriptsArchive</H3>
-<PRE>
-boolean <B>hasScriptsArchive</B>()</PRE>
-<DL>
-<DD>Returns true if interpreter comes with a scripts archive.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getInterpreterArchiveName()"><!-- --></A><H3>
-getInterpreterArchiveName</H3>
-<PRE>
-java.lang.String <B>getInterpreterArchiveName</B>()</PRE>
-<DL>
-<DD>Returns file name of the interpreter archive.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getExtrasArchiveName()"><!-- --></A><H3>
-getExtrasArchiveName</H3>
-<PRE>
-java.lang.String <B>getExtrasArchiveName</B>()</PRE>
-<DL>
-<DD>Returns file name of the extras archive.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getScriptsArchiveName()"><!-- --></A><H3>
-getScriptsArchiveName</H3>
-<PRE>
-java.lang.String <B>getScriptsArchiveName</B>()</PRE>
-<DL>
-<DD>Returns file name of the scripts archive.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getInterpreterArchiveUrl()"><!-- --></A><H3>
-getInterpreterArchiveUrl</H3>
-<PRE>
-java.lang.String <B>getInterpreterArchiveUrl</B>()</PRE>
-<DL>
-<DD>Returns URL location of the interpreter archive.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getScriptsArchiveUrl()"><!-- --></A><H3>
-getScriptsArchiveUrl</H3>
-<PRE>
-java.lang.String <B>getScriptsArchiveUrl</B>()</PRE>
-<DL>
-<DD>Returns URL location of the scripts archive.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getExtrasArchiveUrl()"><!-- --></A><H3>
-getExtrasArchiveUrl</H3>
-<PRE>
-java.lang.String <B>getExtrasArchiveUrl</B>()</PRE>
-<DL>
-<DD>Returns URL location of the extras archive.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="hasInteractiveMode()"><!-- --></A><H3>
-hasInteractiveMode</H3>
-<PRE>
-boolean <B>hasInteractiveMode</B>()</PRE>
-<DL>
-<DD>Returns true if interpreter can be executed in interactive mode.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/InterpreterDescriptor.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterConstants.html" title="interface in com.googlecode.android_scripting.interpreter"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterProcess.html" title="class in com.googlecode.android_scripting.interpreter"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/interpreter/InterpreterDescriptor.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="InterpreterDescriptor.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/interpreter/InterpreterProcess.html b/doc/com/googlecode/android_scripting/interpreter/InterpreterProcess.html
deleted file mode 100644
index 0bfb1610..00000000
--- a/doc/com/googlecode/android_scripting/interpreter/InterpreterProcess.html
+++ /dev/null
@@ -1,440 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:04 PDT 2014 -->
-<TITLE>
-InterpreterProcess
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="InterpreterProcess";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/InterpreterProcess.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterDescriptor.html" title="interface in com.googlecode.android_scripting.interpreter"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.html" title="interface in com.googlecode.android_scripting.interpreter"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/interpreter/InterpreterProcess.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="InterpreterProcess.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.interpreter</FONT>
-<BR>
-Class InterpreterProcess</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../com/googlecode/android_scripting/Process.html" title="class in com.googlecode.android_scripting">com.googlecode.android_scripting.Process</A>
-      <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.interpreter.InterpreterProcess</B>
-</PRE>
-<DL>
-<DT><B>Direct Known Subclasses:</B> <DD><A HREF="../../../../com/googlecode/android_scripting/ScriptProcess.html" title="class in com.googlecode.android_scripting">ScriptProcess</A></DD>
-</DL>
-<HR>
-<DL>
-<DT><PRE>public class <B>InterpreterProcess</B><DT>extends <A HREF="../../../../com/googlecode/android_scripting/Process.html" title="class in com.googlecode.android_scripting">Process</A></DL>
-</PRE>
-
-<P>
-This is a skeletal implementation of an interpreter process.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Damon Kohler (damonkohler@gmail.com)</DD>
-</DL>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterProcess.html#InterpreterProcess(com.googlecode.android_scripting.interpreter.Interpreter, com.googlecode.android_scripting.AndroidProxy)">InterpreterProcess</A></B>(<A HREF="../../../../com/googlecode/android_scripting/interpreter/Interpreter.html" title="class in com.googlecode.android_scripting.interpreter">Interpreter</A>&nbsp;interpreter,
-                   <A HREF="../../../../com/googlecode/android_scripting/AndroidProxy.html" title="class in com.googlecode.android_scripting">AndroidProxy</A>&nbsp;proxy)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Creates a new <A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterProcess.html" title="class in com.googlecode.android_scripting.interpreter"><CODE>InterpreterProcess</CODE></A>.</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.net.InetSocketAddress</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterProcess.html#getAddress()">getAddress</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterProcess.html#getHost()">getHost</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/Interpreter.html" title="class in com.googlecode.android_scripting.interpreter">Interpreter</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterProcess.html#getInterpreter()">getInterpreter</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterProcess.html#getPort()">getPort</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManagerFactory.html" title="interface in com.googlecode.android_scripting.jsonrpc">RpcReceiverManagerFactory</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterProcess.html#getRpcReceiverManagerFactory()">getRpcReceiverManagerFactory</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterProcess.html#getSecret()">getSecret</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterProcess.html#getWorkingDirectory()">getWorkingDirectory</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterProcess.html#kill()">kill</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterProcess.html#start(java.lang.Runnable)">start</A></B>(java.lang.Runnable&nbsp;shutdownHook)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_com.googlecode.android_scripting.Process"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class com.googlecode.android_scripting.<A HREF="../../../../com/googlecode/android_scripting/Process.html" title="class in com.googlecode.android_scripting">Process</A></B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../com/googlecode/android_scripting/Process.html#addAllArguments(java.util.List)">addAllArguments</A>, <A HREF="../../../../com/googlecode/android_scripting/Process.html#addArgument(java.lang.String)">addArgument</A>, <A HREF="../../../../com/googlecode/android_scripting/Process.html#getErr()">getErr</A>, <A HREF="../../../../com/googlecode/android_scripting/Process.html#getFd()">getFd</A>, <A HREF="../../../../com/googlecode/android_scripting/Process.html#getIn()">getIn</A>, <A HREF="../../../../com/googlecode/android_scripting/Process.html#getLogFile()">getLogFile</A>, <A HREF="../../../../com/googlecode/android_scripting/Process.html#getName()">getName</A>, <A HREF="../../../../com/googlecode/android_scripting/Process.html#getOut()">getOut</A>, <A HREF="../../../../com/googlecode/android_scripting/Process.html#getPid()">getPid</A>, <A HREF="../../../../com/googlecode/android_scripting/Process.html#getUptime()">getUptime</A>, <A HREF="../../../../com/googlecode/android_scripting/Process.html#isAlive()">isAlive</A>, <A HREF="../../../../com/googlecode/android_scripting/Process.html#putAllEnvironmentVariables(java.util.Map)">putAllEnvironmentVariables</A>, <A HREF="../../../../com/googlecode/android_scripting/Process.html#putEnvironmentVariable(java.lang.String, java.lang.String)">putEnvironmentVariable</A>, <A HREF="../../../../com/googlecode/android_scripting/Process.html#setBinary(java.io.File)">setBinary</A>, <A HREF="../../../../com/googlecode/android_scripting/Process.html#setName(java.lang.String)">setName</A></CODE></TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="InterpreterProcess(com.googlecode.android_scripting.interpreter.Interpreter, com.googlecode.android_scripting.AndroidProxy)"><!-- --></A><H3>
-InterpreterProcess</H3>
-<PRE>
-public <B>InterpreterProcess</B>(<A HREF="../../../../com/googlecode/android_scripting/interpreter/Interpreter.html" title="class in com.googlecode.android_scripting.interpreter">Interpreter</A>&nbsp;interpreter,
-                          <A HREF="../../../../com/googlecode/android_scripting/AndroidProxy.html" title="class in com.googlecode.android_scripting">AndroidProxy</A>&nbsp;proxy)</PRE>
-<DL>
-<DD>Creates a new <A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterProcess.html" title="class in com.googlecode.android_scripting.interpreter"><CODE>InterpreterProcess</CODE></A>.
-<P>
-<DL>
-<DT><B>Parameters:</B><DD><CODE>launchScript</CODE> - the absolute path to a script that should be launched with the interpreter<DD><CODE>port</CODE> - the port that the AndroidProxy is listening on</DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="getInterpreter()"><!-- --></A><H3>
-getInterpreter</H3>
-<PRE>
-public <A HREF="../../../../com/googlecode/android_scripting/interpreter/Interpreter.html" title="class in com.googlecode.android_scripting.interpreter">Interpreter</A> <B>getInterpreter</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getHost()"><!-- --></A><H3>
-getHost</H3>
-<PRE>
-public java.lang.String <B>getHost</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getPort()"><!-- --></A><H3>
-getPort</H3>
-<PRE>
-public int <B>getPort</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getAddress()"><!-- --></A><H3>
-getAddress</H3>
-<PRE>
-public java.net.InetSocketAddress <B>getAddress</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getSecret()"><!-- --></A><H3>
-getSecret</H3>
-<PRE>
-public java.lang.String <B>getSecret</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getRpcReceiverManagerFactory()"><!-- --></A><H3>
-getRpcReceiverManagerFactory</H3>
-<PRE>
-public <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManagerFactory.html" title="interface in com.googlecode.android_scripting.jsonrpc">RpcReceiverManagerFactory</A> <B>getRpcReceiverManagerFactory</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="start(java.lang.Runnable)"><!-- --></A><H3>
-start</H3>
-<PRE>
-public void <B>start</B>(java.lang.Runnable&nbsp;shutdownHook)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Overrides:</B><DD><CODE><A HREF="../../../../com/googlecode/android_scripting/Process.html#start(java.lang.Runnable)">start</A></CODE> in class <CODE><A HREF="../../../../com/googlecode/android_scripting/Process.html" title="class in com.googlecode.android_scripting">Process</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="kill()"><!-- --></A><H3>
-kill</H3>
-<PRE>
-public void <B>kill</B>()</PRE>
-<DL>
-<DD><DL>
-<DT><B>Overrides:</B><DD><CODE><A HREF="../../../../com/googlecode/android_scripting/Process.html#kill()">kill</A></CODE> in class <CODE><A HREF="../../../../com/googlecode/android_scripting/Process.html" title="class in com.googlecode.android_scripting">Process</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getWorkingDirectory()"><!-- --></A><H3>
-getWorkingDirectory</H3>
-<PRE>
-public java.lang.String <B>getWorkingDirectory</B>()</PRE>
-<DL>
-<DD><DL>
-<DT><B>Overrides:</B><DD><CODE><A HREF="../../../../com/googlecode/android_scripting/Process.html#getWorkingDirectory()">getWorkingDirectory</A></CODE> in class <CODE><A HREF="../../../../com/googlecode/android_scripting/Process.html" title="class in com.googlecode.android_scripting">Process</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/InterpreterProcess.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterDescriptor.html" title="interface in com.googlecode.android_scripting.interpreter"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.html" title="interface in com.googlecode.android_scripting.interpreter"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/interpreter/InterpreterProcess.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="InterpreterProcess.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.html b/doc/com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.html
deleted file mode 100644
index f4db82a7..00000000
--- a/doc/com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.html
+++ /dev/null
@@ -1,337 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:04 PDT 2014 -->
-<TITLE>
-InterpreterPropertyNames
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="InterpreterPropertyNames";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/InterpreterPropertyNames.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterProcess.html" title="class in com.googlecode.android_scripting.interpreter"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterUtils.html" title="class in com.googlecode.android_scripting.interpreter"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="InterpreterPropertyNames.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;METHOD</FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;METHOD</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.interpreter</FONT>
-<BR>
-Interface InterpreterPropertyNames</H2>
-<DL>
-<DT><B>All Known Implementing Classes:</B> <DD><A HREF="../../../../com/googlecode/android_scripting/interpreter/html/HtmlInterpreter.html" title="class in com.googlecode.android_scripting.interpreter.html">HtmlInterpreter</A>, <A HREF="../../../../com/googlecode/android_scripting/interpreter/Interpreter.html" title="class in com.googlecode.android_scripting.interpreter">Interpreter</A>, <A HREF="../../../../com/googlecode/android_scripting/interpreter/shell/ShellInterpreter.html" title="class in com.googlecode.android_scripting.interpreter.shell">ShellInterpreter</A></DD>
-</DL>
-<HR>
-<DL>
-<DT><PRE>public interface <B>InterpreterPropertyNames</B></DL>
-</PRE>
-
-<P>
-A collection of <CODE>String</CODE> keys for querying an InterpreterProvider.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Alexey Reznichenko (alexey.reznichenko@gmail.com)</DD>
-</DL>
-<HR>
-
-<P>
-<!-- =========== FIELD SUMMARY =========== -->
-
-<A NAME="field_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Field Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.html#BINARY">BINARY</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Absolute path of the interpreter executable.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.html#EXTENSION">EXTENSION</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Supported script file extension.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.html#HAS_INTERACTIVE_MODE">HAS_INTERACTIVE_MODE</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Interpreter interactive mode flag.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.html#INTERACTIVE_COMMAND">INTERACTIVE_COMMAND</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Final argument to interpreter binary when running the interpreter interactively.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.html#NAME">NAME</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Unique name of the interpreter.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.html#NICE_NAME">NICE_NAME</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Display name of the interpreter.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.html#SCRIPT_COMMAND">SCRIPT_COMMAND</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Final argument to interpreter binary when running a script.</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-<A NAME="field_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Field Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="NAME"><!-- --></A><H3>
-NAME</H3>
-<PRE>
-static final java.lang.String <B>NAME</B></PRE>
-<DL>
-<DD>Unique name of the interpreter.
-<P>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../constant-values.html#com.googlecode.android_scripting.interpreter.InterpreterPropertyNames.NAME">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="NICE_NAME"><!-- --></A><H3>
-NICE_NAME</H3>
-<PRE>
-static final java.lang.String <B>NICE_NAME</B></PRE>
-<DL>
-<DD>Display name of the interpreter.
-<P>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../constant-values.html#com.googlecode.android_scripting.interpreter.InterpreterPropertyNames.NICE_NAME">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="EXTENSION"><!-- --></A><H3>
-EXTENSION</H3>
-<PRE>
-static final java.lang.String <B>EXTENSION</B></PRE>
-<DL>
-<DD>Supported script file extension.
-<P>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../constant-values.html#com.googlecode.android_scripting.interpreter.InterpreterPropertyNames.EXTENSION">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="BINARY"><!-- --></A><H3>
-BINARY</H3>
-<PRE>
-static final java.lang.String <B>BINARY</B></PRE>
-<DL>
-<DD>Absolute path of the interpreter executable.
-<P>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../constant-values.html#com.googlecode.android_scripting.interpreter.InterpreterPropertyNames.BINARY">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="INTERACTIVE_COMMAND"><!-- --></A><H3>
-INTERACTIVE_COMMAND</H3>
-<PRE>
-static final java.lang.String <B>INTERACTIVE_COMMAND</B></PRE>
-<DL>
-<DD>Final argument to interpreter binary when running the interpreter interactively.
-<P>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../constant-values.html#com.googlecode.android_scripting.interpreter.InterpreterPropertyNames.INTERACTIVE_COMMAND">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="SCRIPT_COMMAND"><!-- --></A><H3>
-SCRIPT_COMMAND</H3>
-<PRE>
-static final java.lang.String <B>SCRIPT_COMMAND</B></PRE>
-<DL>
-<DD>Final argument to interpreter binary when running a script.
-<P>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../constant-values.html#com.googlecode.android_scripting.interpreter.InterpreterPropertyNames.SCRIPT_COMMAND">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="HAS_INTERACTIVE_MODE"><!-- --></A><H3>
-HAS_INTERACTIVE_MODE</H3>
-<PRE>
-static final java.lang.String <B>HAS_INTERACTIVE_MODE</B></PRE>
-<DL>
-<DD>Interpreter interactive mode flag.
-<P>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../constant-values.html#com.googlecode.android_scripting.interpreter.InterpreterPropertyNames.HAS_INTERACTIVE_MODE">Constant Field Values</A></DL>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/InterpreterPropertyNames.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterProcess.html" title="class in com.googlecode.android_scripting.interpreter"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterUtils.html" title="class in com.googlecode.android_scripting.interpreter"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="InterpreterPropertyNames.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;METHOD</FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;METHOD</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/interpreter/InterpreterUtils.html b/doc/com/googlecode/android_scripting/interpreter/InterpreterUtils.html
deleted file mode 100644
index 96015213..00000000
--- a/doc/com/googlecode/android_scripting/interpreter/InterpreterUtils.html
+++ /dev/null
@@ -1,240 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:04 PDT 2014 -->
-<TITLE>
-InterpreterUtils
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="InterpreterUtils";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/InterpreterUtils.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.html" title="interface in com.googlecode.android_scripting.interpreter"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/MyInterpreter.html" title="class in com.googlecode.android_scripting.interpreter"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/interpreter/InterpreterUtils.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="InterpreterUtils.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.interpreter</FONT>
-<BR>
-Class InterpreterUtils</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.interpreter.InterpreterUtils</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>InterpreterUtils</B><DT>extends java.lang.Object</DL>
-</PRE>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.io.File</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterUtils.html#getInterpreterRoot(Context)">getInterpreterRoot</A></B>(Context&nbsp;context)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.io.File</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterUtils.html#getInterpreterRoot(Context, java.lang.String)">getInterpreterRoot</A></B>(Context&nbsp;context,
-                   java.lang.String&nbsp;interpreterName)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="getInterpreterRoot(Context)"><!-- --></A><H3>
-getInterpreterRoot</H3>
-<PRE>
-public static java.io.File <B>getInterpreterRoot</B>(Context&nbsp;context)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getInterpreterRoot(Context, java.lang.String)"><!-- --></A><H3>
-getInterpreterRoot</H3>
-<PRE>
-public static java.io.File <B>getInterpreterRoot</B>(Context&nbsp;context,
-                                              java.lang.String&nbsp;interpreterName)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/InterpreterUtils.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.html" title="interface in com.googlecode.android_scripting.interpreter"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/MyInterpreter.html" title="class in com.googlecode.android_scripting.interpreter"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/interpreter/InterpreterUtils.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="InterpreterUtils.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/interpreter/MyInterpreter.html b/doc/com/googlecode/android_scripting/interpreter/MyInterpreter.html
deleted file mode 100644
index d9fd216d..00000000
--- a/doc/com/googlecode/android_scripting/interpreter/MyInterpreter.html
+++ /dev/null
@@ -1,278 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:04 PDT 2014 -->
-<TITLE>
-MyInterpreter
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="MyInterpreter";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/MyInterpreter.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterUtils.html" title="class in com.googlecode.android_scripting.interpreter"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/interpreter/MyInterpreter.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="MyInterpreter.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.interpreter</FONT>
-<BR>
-Class MyInterpreter</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.interpreter.MyInterpreter</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>MyInterpreter</B><DT>extends java.lang.Object</DL>
-</PRE>
-
-<P>
-Wrapper for the Interpreter class.
- 
- Workaround for the default access modifier on the getArguments() method
- in the Interpreter class
-<P>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/MyInterpreter.html#MyInterpreter(com.googlecode.android_scripting.interpreter.Interpreter)">MyInterpreter</A></B>(<A HREF="../../../../com/googlecode/android_scripting/interpreter/Interpreter.html" title="class in com.googlecode.android_scripting.interpreter">Interpreter</A>&nbsp;interpreter)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.util.List&lt;java.lang.String&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/MyInterpreter.html#getArguments()">getArguments</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/Interpreter.html" title="class in com.googlecode.android_scripting.interpreter">Interpreter</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/MyInterpreter.html#getInterpreter()">getInterpreter</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="MyInterpreter(com.googlecode.android_scripting.interpreter.Interpreter)"><!-- --></A><H3>
-MyInterpreter</H3>
-<PRE>
-public <B>MyInterpreter</B>(<A HREF="../../../../com/googlecode/android_scripting/interpreter/Interpreter.html" title="class in com.googlecode.android_scripting.interpreter">Interpreter</A>&nbsp;interpreter)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="getInterpreter()"><!-- --></A><H3>
-getInterpreter</H3>
-<PRE>
-public <A HREF="../../../../com/googlecode/android_scripting/interpreter/Interpreter.html" title="class in com.googlecode.android_scripting.interpreter">Interpreter</A> <B>getInterpreter</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getArguments()"><!-- --></A><H3>
-getArguments</H3>
-<PRE>
-public java.util.List&lt;java.lang.String&gt; <B>getArguments</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/MyInterpreter.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterUtils.html" title="class in com.googlecode.android_scripting.interpreter"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/interpreter/MyInterpreter.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="MyInterpreter.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/interpreter/html/HtmlActivityTask.html b/doc/com/googlecode/android_scripting/interpreter/html/HtmlActivityTask.html
deleted file mode 100644
index 584dd943..00000000
--- a/doc/com/googlecode/android_scripting/interpreter/html/HtmlActivityTask.html
+++ /dev/null
@@ -1,346 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:01 PDT 2014 -->
-<TITLE>
-HtmlActivityTask
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="HtmlActivityTask";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/HtmlActivityTask.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;<A HREF="../../../../../com/googlecode/android_scripting/interpreter/html/HtmlInterpreter.html" title="class in com.googlecode.android_scripting.interpreter.html"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html?com/googlecode/android_scripting/interpreter/html/HtmlActivityTask.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="HtmlActivityTask.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.interpreter.html</FONT>
-<BR>
-Class HtmlActivityTask</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html" title="class in com.googlecode.android_scripting.future">com.googlecode.android_scripting.future.FutureActivityTask</A>&lt;java.lang.Void&gt;
-      <IMG SRC="../../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.interpreter.html.HtmlActivityTask</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>HtmlActivityTask</B><DT>extends <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html" title="class in com.googlecode.android_scripting.future">FutureActivityTask</A>&lt;java.lang.Void&gt;</DL>
-</PRE>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Alexey Reznichenko (alexey.reznichenko@gmail.com)</DD>
-</DL>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/interpreter/html/HtmlActivityTask.html#HtmlActivityTask(com.googlecode.android_scripting.jsonrpc.RpcReceiverManager, java.lang.String, java.lang.String, java.lang.String, boolean)">HtmlActivityTask</A></B>(<A HREF="../../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManager.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiverManager</A>&nbsp;manager,
-                 java.lang.String&nbsp;androidJsSource,
-                 java.lang.String&nbsp;jsonSource,
-                 java.lang.String&nbsp;url,
-                 boolean&nbsp;destroyManager)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManager.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiverManager</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/interpreter/html/HtmlActivityTask.html#getRpcReceiverManager()">getRpcReceiverManager</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/interpreter/html/HtmlActivityTask.html#onCreate()">onCreate</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<A NAME="methods_inherited_from_class_com.googlecode.android_scripting.future.FutureActivityTask"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class com.googlecode.android_scripting.future.<A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html" title="class in com.googlecode.android_scripting.future">FutureActivityTask</A></B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#finish()">finish</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#getActivity()">getActivity</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#getResult()">getResult</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onActivityResult(int, int, Intent)">onActivityResult</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onKeyDown(int, KeyEvent)">onKeyDown</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onNewIntent(Intent)">onNewIntent</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onPause()">onPause</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onResume()">onResume</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onStart()">onStart</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onStop()">onStop</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#setActivity(Activity)">setActivity</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#startActivity(Intent)">startActivity</A>, <A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#startActivityForResult(Intent, int)">startActivityForResult</A></CODE></TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="HtmlActivityTask(com.googlecode.android_scripting.jsonrpc.RpcReceiverManager, java.lang.String, java.lang.String, java.lang.String, boolean)"><!-- --></A><H3>
-HtmlActivityTask</H3>
-<PRE>
-public <B>HtmlActivityTask</B>(<A HREF="../../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManager.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiverManager</A>&nbsp;manager,
-                        java.lang.String&nbsp;androidJsSource,
-                        java.lang.String&nbsp;jsonSource,
-                        java.lang.String&nbsp;url,
-                        boolean&nbsp;destroyManager)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="getRpcReceiverManager()"><!-- --></A><H3>
-getRpcReceiverManager</H3>
-<PRE>
-public <A HREF="../../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManager.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiverManager</A> <B>getRpcReceiverManager</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="onCreate()"><!-- --></A><H3>
-onCreate</H3>
-<PRE>
-<DD><DL>
-<DT><B>Overrides:</B><DD><CODE><A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onCreate()">onCreate</A></CODE> in class <CODE><A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html" title="class in com.googlecode.android_scripting.future">FutureActivityTask</A>&lt;java.lang.Void&gt;</CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="onDestroy()"><!-- --></A><H3>
-onDestroy</H3>
-<PRE>
-public void <B>onDestroy</B>()</PRE>
-<DL>
-<DD><DL>
-<DT><B>Overrides:</B><DD><CODE><A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onDestroy()">onDestroy</A></CODE> in class <CODE><A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html" title="class in com.googlecode.android_scripting.future">FutureActivityTask</A>&lt;java.lang.Void&gt;</CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="shutdown()"><!-- --></A><H3>
-shutdown</H3>
-<PRE>
-public static void <B>shutdown</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="onCreateContextMenu(ContextMenu, View, ContextMenuInfo)"><!-- --></A><H3>
-onCreateContextMenu</H3>
-<PRE>
-public void <B>onCreateContextMenu</B>(ContextMenu&nbsp;menu,
-                                View&nbsp;v,
-                                ContextMenuInfo&nbsp;menuInfo)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Overrides:</B><DD><CODE><A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onCreateContextMenu(ContextMenu, View, ContextMenuInfo)">onCreateContextMenu</A></CODE> in class <CODE><A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html" title="class in com.googlecode.android_scripting.future">FutureActivityTask</A>&lt;java.lang.Void&gt;</CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="onPrepareOptionsMenu(Menu)"><!-- --></A><H3>
-onPrepareOptionsMenu</H3>
-<PRE>
-public boolean <B>onPrepareOptionsMenu</B>(Menu&nbsp;menu)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Overrides:</B><DD><CODE><A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html#onPrepareOptionsMenu(Menu)">onPrepareOptionsMenu</A></CODE> in class <CODE><A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html" title="class in com.googlecode.android_scripting.future">FutureActivityTask</A>&lt;java.lang.Void&gt;</CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/HtmlActivityTask.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;<A HREF="../../../../../com/googlecode/android_scripting/interpreter/html/HtmlInterpreter.html" title="class in com.googlecode.android_scripting.interpreter.html"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html?com/googlecode/android_scripting/interpreter/html/HtmlActivityTask.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="HtmlActivityTask.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/interpreter/html/HtmlInterpreter.html b/doc/com/googlecode/android_scripting/interpreter/html/HtmlInterpreter.html
deleted file mode 100644
index 0f49d441..00000000
--- a/doc/com/googlecode/android_scripting/interpreter/html/HtmlInterpreter.html
+++ /dev/null
@@ -1,526 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:01 PDT 2014 -->
-<TITLE>
-HtmlInterpreter
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="HtmlInterpreter";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/HtmlInterpreter.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../com/googlecode/android_scripting/interpreter/html/HtmlActivityTask.html" title="class in com.googlecode.android_scripting.interpreter.html"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html?com/googlecode/android_scripting/interpreter/html/HtmlInterpreter.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="HtmlInterpreter.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.interpreter.html</FONT>
-<BR>
-Class HtmlInterpreter</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../../com/googlecode/android_scripting/interpreter/Interpreter.html" title="class in com.googlecode.android_scripting.interpreter">com.googlecode.android_scripting.interpreter.Interpreter</A>
-      <IMG SRC="../../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.interpreter.html.HtmlInterpreter</B>
-</PRE>
-<DL>
-<DT><B>All Implemented Interfaces:</B> <DD><A HREF="../../../../../com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.html" title="interface in com.googlecode.android_scripting.interpreter">InterpreterPropertyNames</A></DD>
-</DL>
-<HR>
-<DL>
-<DT><PRE>public class <B>HtmlInterpreter</B><DT>extends <A HREF="../../../../../com/googlecode/android_scripting/interpreter/Interpreter.html" title="class in com.googlecode.android_scripting.interpreter">Interpreter</A></DL>
-</PRE>
-
-<P>
-<HR>
-
-<P>
-<!-- =========== FIELD SUMMARY =========== -->
-
-<A NAME="field_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Field Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/interpreter/html/HtmlInterpreter.html#ANDROID_JS_FILE">ANDROID_JS_FILE</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/interpreter/html/HtmlInterpreter.html#HTML">HTML</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/interpreter/html/HtmlInterpreter.html#HTML_EXTENSION">HTML_EXTENSION</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/interpreter/html/HtmlInterpreter.html#HTML_NICE_NAME">HTML_NICE_NAME</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/interpreter/html/HtmlInterpreter.html#JSON_FILE">JSON_FILE</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="fields_inherited_from_class_com.googlecode.android_scripting.interpreter.InterpreterPropertyNames"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Fields inherited from interface com.googlecode.android_scripting.interpreter.<A HREF="../../../../../com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.html" title="interface in com.googlecode.android_scripting.interpreter">InterpreterPropertyNames</A></B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../../com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.html#BINARY">BINARY</A>, <A HREF="../../../../../com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.html#EXTENSION">EXTENSION</A>, <A HREF="../../../../../com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.html#HAS_INTERACTIVE_MODE">HAS_INTERACTIVE_MODE</A>, <A HREF="../../../../../com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.html#INTERACTIVE_COMMAND">INTERACTIVE_COMMAND</A>, <A HREF="../../../../../com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.html#NAME">NAME</A>, <A HREF="../../../../../com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.html#NICE_NAME">NICE_NAME</A>, <A HREF="../../../../../com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.html#SCRIPT_COMMAND">SCRIPT_COMMAND</A></CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/interpreter/html/HtmlInterpreter.html#HtmlInterpreter(Context)">HtmlInterpreter</A></B>(Context&nbsp;context)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/interpreter/html/HtmlInterpreter.html#getAndroidJsSource()">getAndroidJsSource</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/interpreter/html/HtmlInterpreter.html#getJsonSource()">getJsonSource</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/interpreter/html/HtmlInterpreter.html#getVersion()">getVersion</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/interpreter/html/HtmlInterpreter.html#hasExtrasArchive()">hasExtrasArchive</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/interpreter/html/HtmlInterpreter.html#hasInterpreterArchive()">hasInterpreterArchive</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/interpreter/html/HtmlInterpreter.html#hasScriptsArchive()">hasScriptsArchive</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/interpreter/html/HtmlInterpreter.html#isInstalled()">isInstalled</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/interpreter/html/HtmlInterpreter.html#isUninstallable()">isUninstallable</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_com.googlecode.android_scripting.interpreter.Interpreter"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class com.googlecode.android_scripting.interpreter.<A HREF="../../../../../com/googlecode/android_scripting/interpreter/Interpreter.html" title="class in com.googlecode.android_scripting.interpreter">Interpreter</A></B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../../com/googlecode/android_scripting/interpreter/Interpreter.html#buildFromMaps(java.util.Map, java.util.Map, java.util.Map)">buildFromMaps</A>, <A HREF="../../../../../com/googlecode/android_scripting/interpreter/Interpreter.html#getBinary()">getBinary</A>, <A HREF="../../../../../com/googlecode/android_scripting/interpreter/Interpreter.html#getContentTemplate()">getContentTemplate</A>, <A HREF="../../../../../com/googlecode/android_scripting/interpreter/Interpreter.html#getEnvironmentVariables()">getEnvironmentVariables</A>, <A HREF="../../../../../com/googlecode/android_scripting/interpreter/Interpreter.html#getExtension()">getExtension</A>, <A HREF="../../../../../com/googlecode/android_scripting/interpreter/Interpreter.html#getInteractiveCommand()">getInteractiveCommand</A>, <A HREF="../../../../../com/googlecode/android_scripting/interpreter/Interpreter.html#getLanguage()">getLanguage</A>, <A HREF="../../../../../com/googlecode/android_scripting/interpreter/Interpreter.html#getName()">getName</A>, <A HREF="../../../../../com/googlecode/android_scripting/interpreter/Interpreter.html#getNiceName()">getNiceName</A>, <A HREF="../../../../../com/googlecode/android_scripting/interpreter/Interpreter.html#getRpcText(java.lang.String, com.googlecode.android_scripting.rpc.MethodDescriptor, java.lang.String[])">getRpcText</A>, <A HREF="../../../../../com/googlecode/android_scripting/interpreter/Interpreter.html#getScriptCommand()">getScriptCommand</A>, <A HREF="../../../../../com/googlecode/android_scripting/interpreter/Interpreter.html#hasInteractiveMode()">hasInteractiveMode</A></CODE></TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-<A NAME="field_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Field Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="HTML"><!-- --></A><H3>
-HTML</H3>
-<PRE>
-public static final java.lang.String <B>HTML</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../constant-values.html#com.googlecode.android_scripting.interpreter.html.HtmlInterpreter.HTML">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="HTML_EXTENSION"><!-- --></A><H3>
-HTML_EXTENSION</H3>
-<PRE>
-public static final java.lang.String <B>HTML_EXTENSION</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../constant-values.html#com.googlecode.android_scripting.interpreter.html.HtmlInterpreter.HTML_EXTENSION">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="JSON_FILE"><!-- --></A><H3>
-JSON_FILE</H3>
-<PRE>
-public static final java.lang.String <B>JSON_FILE</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../constant-values.html#com.googlecode.android_scripting.interpreter.html.HtmlInterpreter.JSON_FILE">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="ANDROID_JS_FILE"><!-- --></A><H3>
-ANDROID_JS_FILE</H3>
-<PRE>
-public static final java.lang.String <B>ANDROID_JS_FILE</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../constant-values.html#com.googlecode.android_scripting.interpreter.html.HtmlInterpreter.ANDROID_JS_FILE">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="HTML_NICE_NAME"><!-- --></A><H3>
-HTML_NICE_NAME</H3>
-<PRE>
-public static final java.lang.String <B>HTML_NICE_NAME</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../constant-values.html#com.googlecode.android_scripting.interpreter.html.HtmlInterpreter.HTML_NICE_NAME">Constant Field Values</A></DL>
-</DL>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="HtmlInterpreter(Context)"><!-- --></A><H3>
-HtmlInterpreter</H3>
-<PRE>
-public <B>HtmlInterpreter</B>(Context&nbsp;context)
-                throws java.io.IOException</PRE>
-<DL>
-<DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.io.IOException</CODE></DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="hasInterpreterArchive()"><!-- --></A><H3>
-hasInterpreterArchive</H3>
-<PRE>
-public boolean <B>hasInterpreterArchive</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="hasExtrasArchive()"><!-- --></A><H3>
-hasExtrasArchive</H3>
-<PRE>
-public boolean <B>hasExtrasArchive</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="hasScriptsArchive()"><!-- --></A><H3>
-hasScriptsArchive</H3>
-<PRE>
-public boolean <B>hasScriptsArchive</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getVersion()"><!-- --></A><H3>
-getVersion</H3>
-<PRE>
-public int <B>getVersion</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isUninstallable()"><!-- --></A><H3>
-isUninstallable</H3>
-<PRE>
-public boolean <B>isUninstallable</B>()</PRE>
-<DL>
-<DD><DL>
-<DT><B>Overrides:</B><DD><CODE><A HREF="../../../../../com/googlecode/android_scripting/interpreter/Interpreter.html#isUninstallable()">isUninstallable</A></CODE> in class <CODE><A HREF="../../../../../com/googlecode/android_scripting/interpreter/Interpreter.html" title="class in com.googlecode.android_scripting.interpreter">Interpreter</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isInstalled()"><!-- --></A><H3>
-isInstalled</H3>
-<PRE>
-public boolean <B>isInstalled</B>()</PRE>
-<DL>
-<DD><DL>
-<DT><B>Overrides:</B><DD><CODE><A HREF="../../../../../com/googlecode/android_scripting/interpreter/Interpreter.html#isInstalled()">isInstalled</A></CODE> in class <CODE><A HREF="../../../../../com/googlecode/android_scripting/interpreter/Interpreter.html" title="class in com.googlecode.android_scripting.interpreter">Interpreter</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getJsonSource()"><!-- --></A><H3>
-getJsonSource</H3>
-<PRE>
-public java.lang.String <B>getJsonSource</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getAndroidJsSource()"><!-- --></A><H3>
-getAndroidJsSource</H3>
-<PRE>
-public java.lang.String <B>getAndroidJsSource</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/HtmlInterpreter.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../com/googlecode/android_scripting/interpreter/html/HtmlActivityTask.html" title="class in com.googlecode.android_scripting.interpreter.html"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html?com/googlecode/android_scripting/interpreter/html/HtmlInterpreter.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="HtmlInterpreter.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/interpreter/html/package-frame.html b/doc/com/googlecode/android_scripting/interpreter/html/package-frame.html
deleted file mode 100644
index bd8e492c..00000000
--- a/doc/com/googlecode/android_scripting/interpreter/html/package-frame.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-com.googlecode.android_scripting.interpreter.html
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-
-</HEAD>
-
-<BODY BGCOLOR="white">
-<FONT size="+1" CLASS="FrameTitleFont">
-<A HREF="../../../../../com/googlecode/android_scripting/interpreter/html/package-summary.html" target="classFrame">com.googlecode.android_scripting.interpreter.html</A></FONT>
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
-Classes</FONT>&nbsp;
-<FONT CLASS="FrameItemFont">
-<BR>
-<A HREF="HtmlActivityTask.html" title="class in com.googlecode.android_scripting.interpreter.html" target="classFrame">HtmlActivityTask</A>
-<BR>
-<A HREF="HtmlInterpreter.html" title="class in com.googlecode.android_scripting.interpreter.html" target="classFrame">HtmlInterpreter</A></FONT></TD>
-</TR>
-</TABLE>
-
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/interpreter/html/package-summary.html b/doc/com/googlecode/android_scripting/interpreter/html/package-summary.html
deleted file mode 100644
index dde24569..00000000
--- a/doc/com/googlecode/android_scripting/interpreter/html/package-summary.html
+++ /dev/null
@@ -1,161 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-com.googlecode.android_scripting.interpreter.html
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="com.googlecode.android_scripting.interpreter.html";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../com/googlecode/android_scripting/interpreter/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../com/googlecode/android_scripting/interpreter/shell/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html?com/googlecode/android_scripting/interpreter/html/package-summary.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<H2>
-Package com.googlecode.android_scripting.interpreter.html
-</H2>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Class Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../com/googlecode/android_scripting/interpreter/html/HtmlActivityTask.html" title="class in com.googlecode.android_scripting.interpreter.html">HtmlActivityTask</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../com/googlecode/android_scripting/interpreter/html/HtmlInterpreter.html" title="class in com.googlecode.android_scripting.interpreter.html">HtmlInterpreter</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-
-<P>
-<DL>
-</DL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../com/googlecode/android_scripting/interpreter/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../com/googlecode/android_scripting/interpreter/shell/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html?com/googlecode/android_scripting/interpreter/html/package-summary.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/interpreter/html/package-tree.html b/doc/com/googlecode/android_scripting/interpreter/html/package-tree.html
deleted file mode 100644
index c0c5b286..00000000
--- a/doc/com/googlecode/android_scripting/interpreter/html/package-tree.html
+++ /dev/null
@@ -1,158 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-com.googlecode.android_scripting.interpreter.html Class Hierarchy
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="com.googlecode.android_scripting.interpreter.html Class Hierarchy";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../com/googlecode/android_scripting/interpreter/package-tree.html"><B>PREV</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../com/googlecode/android_scripting/interpreter/shell/package-tree.html"><B>NEXT</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html?com/googlecode/android_scripting/interpreter/html/package-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-Hierarchy For Package com.googlecode.android_scripting.interpreter.html
-</H2>
-</CENTER>
-<DL>
-<DT><B>Package Hierarchies:</B><DD><A HREF="../../../../../overview-tree.html">All Packages</A></DL>
-<HR>
-<H2>
-Class Hierarchy
-</H2>
-<UL>
-<LI TYPE="circle">java.lang.Object<UL>
-<LI TYPE="circle">com.googlecode.android_scripting.future.<A HREF="../../../../../com/googlecode/android_scripting/future/FutureActivityTask.html" title="class in com.googlecode.android_scripting.future"><B>FutureActivityTask</B></A>&lt;T&gt;<UL>
-<LI TYPE="circle">com.googlecode.android_scripting.interpreter.html.<A HREF="../../../../../com/googlecode/android_scripting/interpreter/html/HtmlActivityTask.html" title="class in com.googlecode.android_scripting.interpreter.html"><B>HtmlActivityTask</B></A></UL>
-<LI TYPE="circle">com.googlecode.android_scripting.interpreter.<A HREF="../../../../../com/googlecode/android_scripting/interpreter/Interpreter.html" title="class in com.googlecode.android_scripting.interpreter"><B>Interpreter</B></A> (implements com.googlecode.android_scripting.interpreter.<A HREF="../../../../../com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.html" title="interface in com.googlecode.android_scripting.interpreter">InterpreterPropertyNames</A>)
-<UL>
-<LI TYPE="circle">com.googlecode.android_scripting.interpreter.html.<A HREF="../../../../../com/googlecode/android_scripting/interpreter/html/HtmlInterpreter.html" title="class in com.googlecode.android_scripting.interpreter.html"><B>HtmlInterpreter</B></A></UL>
-</UL>
-</UL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../com/googlecode/android_scripting/interpreter/package-tree.html"><B>PREV</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../com/googlecode/android_scripting/interpreter/shell/package-tree.html"><B>NEXT</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html?com/googlecode/android_scripting/interpreter/html/package-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/interpreter/package-frame.html b/doc/com/googlecode/android_scripting/interpreter/package-frame.html
deleted file mode 100644
index 8b914187..00000000
--- a/doc/com/googlecode/android_scripting/interpreter/package-frame.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-com.googlecode.android_scripting.interpreter
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-
-</HEAD>
-
-<BODY BGCOLOR="white">
-<FONT size="+1" CLASS="FrameTitleFont">
-<A HREF="../../../../com/googlecode/android_scripting/interpreter/package-summary.html" target="classFrame">com.googlecode.android_scripting.interpreter</A></FONT>
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
-Interfaces</FONT>&nbsp;
-<FONT CLASS="FrameItemFont">
-<BR>
-<A HREF="InProcessInterpreter.html" title="interface in com.googlecode.android_scripting.interpreter" target="classFrame"><I>InProcessInterpreter</I></A>
-<BR>
-<A HREF="InterpreterConfiguration.ConfigurationObserver.html" title="interface in com.googlecode.android_scripting.interpreter" target="classFrame"><I>InterpreterConfiguration.ConfigurationObserver</I></A>
-<BR>
-<A HREF="InterpreterConstants.html" title="interface in com.googlecode.android_scripting.interpreter" target="classFrame"><I>InterpreterConstants</I></A>
-<BR>
-<A HREF="InterpreterDescriptor.html" title="interface in com.googlecode.android_scripting.interpreter" target="classFrame"><I>InterpreterDescriptor</I></A>
-<BR>
-<A HREF="InterpreterPropertyNames.html" title="interface in com.googlecode.android_scripting.interpreter" target="classFrame"><I>InterpreterPropertyNames</I></A></FONT></TD>
-</TR>
-</TABLE>
-
-
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
-Classes</FONT>&nbsp;
-<FONT CLASS="FrameItemFont">
-<BR>
-<A HREF="ExternalClassLoader.html" title="class in com.googlecode.android_scripting.interpreter" target="classFrame">ExternalClassLoader</A>
-<BR>
-<A HREF="Interpreter.html" title="class in com.googlecode.android_scripting.interpreter" target="classFrame">Interpreter</A>
-<BR>
-<A HREF="InterpreterConfiguration.html" title="class in com.googlecode.android_scripting.interpreter" target="classFrame">InterpreterConfiguration</A>
-<BR>
-<A HREF="InterpreterProcess.html" title="class in com.googlecode.android_scripting.interpreter" target="classFrame">InterpreterProcess</A>
-<BR>
-<A HREF="InterpreterUtils.html" title="class in com.googlecode.android_scripting.interpreter" target="classFrame">InterpreterUtils</A>
-<BR>
-<A HREF="MyInterpreter.html" title="class in com.googlecode.android_scripting.interpreter" target="classFrame">MyInterpreter</A></FONT></TD>
-</TR>
-</TABLE>
-
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/interpreter/package-summary.html b/doc/com/googlecode/android_scripting/interpreter/package-summary.html
deleted file mode 100644
index de4f027f..00000000
--- a/doc/com/googlecode/android_scripting/interpreter/package-summary.html
+++ /dev/null
@@ -1,207 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-com.googlecode.android_scripting.interpreter
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="com.googlecode.android_scripting.interpreter";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/future/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/html/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/interpreter/package-summary.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<H2>
-Package com.googlecode.android_scripting.interpreter
-</H2>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Interface Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InProcessInterpreter.html" title="interface in com.googlecode.android_scripting.interpreter">InProcessInterpreter</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterConfiguration.ConfigurationObserver.html" title="interface in com.googlecode.android_scripting.interpreter">InterpreterConfiguration.ConfigurationObserver</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterConstants.html" title="interface in com.googlecode.android_scripting.interpreter">InterpreterConstants</A></B></TD>
-<TD>A collection of constants required for installation/removal of an interpreter.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterDescriptor.html" title="interface in com.googlecode.android_scripting.interpreter">InterpreterDescriptor</A></B></TD>
-<TD>Provides interpreter-specific info for execution/installation/removal purposes.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.html" title="interface in com.googlecode.android_scripting.interpreter">InterpreterPropertyNames</A></B></TD>
-<TD>A collection of <CODE>String</CODE> keys for querying an InterpreterProvider.</TD>
-</TR>
-</TABLE>
-&nbsp;
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Class Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/ExternalClassLoader.html" title="class in com.googlecode.android_scripting.interpreter">ExternalClassLoader</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/Interpreter.html" title="class in com.googlecode.android_scripting.interpreter">Interpreter</A></B></TD>
-<TD>Combines all the execution-related specs of a particular interpreter installed in the system.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterConfiguration.html" title="class in com.googlecode.android_scripting.interpreter">InterpreterConfiguration</A></B></TD>
-<TD>Manages and provides access to the set of available interpreters.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterProcess.html" title="class in com.googlecode.android_scripting.interpreter">InterpreterProcess</A></B></TD>
-<TD>This is a skeletal implementation of an interpreter process.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterUtils.html" title="class in com.googlecode.android_scripting.interpreter">InterpreterUtils</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/interpreter/MyInterpreter.html" title="class in com.googlecode.android_scripting.interpreter">MyInterpreter</A></B></TD>
-<TD>Wrapper for the Interpreter class.</TD>
-</TR>
-</TABLE>
-&nbsp;
-
-<P>
-<DL>
-</DL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/future/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/html/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/interpreter/package-summary.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/interpreter/package-tree.html b/doc/com/googlecode/android_scripting/interpreter/package-tree.html
deleted file mode 100644
index 43b07059..00000000
--- a/doc/com/googlecode/android_scripting/interpreter/package-tree.html
+++ /dev/null
@@ -1,161 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-com.googlecode.android_scripting.interpreter Class Hierarchy
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="com.googlecode.android_scripting.interpreter Class Hierarchy";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/future/package-tree.html"><B>PREV</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/html/package-tree.html"><B>NEXT</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/interpreter/package-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-Hierarchy For Package com.googlecode.android_scripting.interpreter
-</H2>
-</CENTER>
-<DL>
-<DT><B>Package Hierarchies:</B><DD><A HREF="../../../../overview-tree.html">All Packages</A></DL>
-<HR>
-<H2>
-Class Hierarchy
-</H2>
-<UL>
-<LI TYPE="circle">java.lang.Object<UL>
-<LI TYPE="circle">com.googlecode.android_scripting.interpreter.<A HREF="../../../../com/googlecode/android_scripting/interpreter/ExternalClassLoader.html" title="class in com.googlecode.android_scripting.interpreter"><B>ExternalClassLoader</B></A><LI TYPE="circle">com.googlecode.android_scripting.interpreter.<A HREF="../../../../com/googlecode/android_scripting/interpreter/Interpreter.html" title="class in com.googlecode.android_scripting.interpreter"><B>Interpreter</B></A> (implements com.googlecode.android_scripting.interpreter.<A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.html" title="interface in com.googlecode.android_scripting.interpreter">InterpreterPropertyNames</A>)
-<LI TYPE="circle">com.googlecode.android_scripting.interpreter.<A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterConfiguration.html" title="class in com.googlecode.android_scripting.interpreter"><B>InterpreterConfiguration</B></A><LI TYPE="circle">com.googlecode.android_scripting.interpreter.<A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterUtils.html" title="class in com.googlecode.android_scripting.interpreter"><B>InterpreterUtils</B></A><LI TYPE="circle">com.googlecode.android_scripting.interpreter.<A HREF="../../../../com/googlecode/android_scripting/interpreter/MyInterpreter.html" title="class in com.googlecode.android_scripting.interpreter"><B>MyInterpreter</B></A><LI TYPE="circle">com.googlecode.android_scripting.<A HREF="../../../../com/googlecode/android_scripting/Process.html" title="class in com.googlecode.android_scripting"><B>Process</B></A><UL>
-<LI TYPE="circle">com.googlecode.android_scripting.interpreter.<A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterProcess.html" title="class in com.googlecode.android_scripting.interpreter"><B>InterpreterProcess</B></A></UL>
-</UL>
-</UL>
-<H2>
-Interface Hierarchy
-</H2>
-<UL>
-<LI TYPE="circle">com.googlecode.android_scripting.interpreter.<A HREF="../../../../com/googlecode/android_scripting/interpreter/InProcessInterpreter.html" title="interface in com.googlecode.android_scripting.interpreter"><B>InProcessInterpreter</B></A><LI TYPE="circle">com.googlecode.android_scripting.interpreter.<A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterConfiguration.ConfigurationObserver.html" title="interface in com.googlecode.android_scripting.interpreter"><B>InterpreterConfiguration.ConfigurationObserver</B></A><LI TYPE="circle">com.googlecode.android_scripting.interpreter.<A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterConstants.html" title="interface in com.googlecode.android_scripting.interpreter"><B>InterpreterConstants</B></A><LI TYPE="circle">com.googlecode.android_scripting.interpreter.<A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterDescriptor.html" title="interface in com.googlecode.android_scripting.interpreter"><B>InterpreterDescriptor</B></A><LI TYPE="circle">com.googlecode.android_scripting.interpreter.<A HREF="../../../../com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.html" title="interface in com.googlecode.android_scripting.interpreter"><B>InterpreterPropertyNames</B></A></UL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/future/package-tree.html"><B>PREV</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/html/package-tree.html"><B>NEXT</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/interpreter/package-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/interpreter/shell/ShellInterpreter.html b/doc/com/googlecode/android_scripting/interpreter/shell/ShellInterpreter.html
deleted file mode 100644
index 18d59ab1..00000000
--- a/doc/com/googlecode/android_scripting/interpreter/shell/ShellInterpreter.html
+++ /dev/null
@@ -1,392 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:04 PDT 2014 -->
-<TITLE>
-ShellInterpreter
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="ShellInterpreter";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ShellInterpreter.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html?com/googlecode/android_scripting/interpreter/shell/ShellInterpreter.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ShellInterpreter.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.interpreter.shell</FONT>
-<BR>
-Class ShellInterpreter</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../../com/googlecode/android_scripting/interpreter/Interpreter.html" title="class in com.googlecode.android_scripting.interpreter">com.googlecode.android_scripting.interpreter.Interpreter</A>
-      <IMG SRC="../../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.interpreter.shell.ShellInterpreter</B>
-</PRE>
-<DL>
-<DT><B>All Implemented Interfaces:</B> <DD><A HREF="../../../../../com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.html" title="interface in com.googlecode.android_scripting.interpreter">InterpreterPropertyNames</A></DD>
-</DL>
-<HR>
-<DL>
-<DT><PRE>public class <B>ShellInterpreter</B><DT>extends <A HREF="../../../../../com/googlecode/android_scripting/interpreter/Interpreter.html" title="class in com.googlecode.android_scripting.interpreter">Interpreter</A></DL>
-</PRE>
-
-<P>
-Represents the shell.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Damon Kohler (damonkohler@gmail.com)</DD>
-</DL>
-<HR>
-
-<P>
-<!-- =========== FIELD SUMMARY =========== -->
-
-<A NAME="field_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Field Summary</B></FONT></TH>
-</TR>
-</TABLE>
-&nbsp;<A NAME="fields_inherited_from_class_com.googlecode.android_scripting.interpreter.InterpreterPropertyNames"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Fields inherited from interface com.googlecode.android_scripting.interpreter.<A HREF="../../../../../com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.html" title="interface in com.googlecode.android_scripting.interpreter">InterpreterPropertyNames</A></B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../../com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.html#BINARY">BINARY</A>, <A HREF="../../../../../com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.html#EXTENSION">EXTENSION</A>, <A HREF="../../../../../com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.html#HAS_INTERACTIVE_MODE">HAS_INTERACTIVE_MODE</A>, <A HREF="../../../../../com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.html#INTERACTIVE_COMMAND">INTERACTIVE_COMMAND</A>, <A HREF="../../../../../com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.html#NAME">NAME</A>, <A HREF="../../../../../com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.html#NICE_NAME">NICE_NAME</A>, <A HREF="../../../../../com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.html#SCRIPT_COMMAND">SCRIPT_COMMAND</A></CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/interpreter/shell/ShellInterpreter.html#ShellInterpreter()">ShellInterpreter</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/interpreter/shell/ShellInterpreter.html#getVersion()">getVersion</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/interpreter/shell/ShellInterpreter.html#hasExtrasArchive()">hasExtrasArchive</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/interpreter/shell/ShellInterpreter.html#hasInterpreterArchive()">hasInterpreterArchive</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/interpreter/shell/ShellInterpreter.html#hasScriptsArchive()">hasScriptsArchive</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/interpreter/shell/ShellInterpreter.html#isInstalled()">isInstalled</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../com/googlecode/android_scripting/interpreter/shell/ShellInterpreter.html#isUninstallable()">isUninstallable</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_com.googlecode.android_scripting.interpreter.Interpreter"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class com.googlecode.android_scripting.interpreter.<A HREF="../../../../../com/googlecode/android_scripting/interpreter/Interpreter.html" title="class in com.googlecode.android_scripting.interpreter">Interpreter</A></B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../../com/googlecode/android_scripting/interpreter/Interpreter.html#buildFromMaps(java.util.Map, java.util.Map, java.util.Map)">buildFromMaps</A>, <A HREF="../../../../../com/googlecode/android_scripting/interpreter/Interpreter.html#getBinary()">getBinary</A>, <A HREF="../../../../../com/googlecode/android_scripting/interpreter/Interpreter.html#getContentTemplate()">getContentTemplate</A>, <A HREF="../../../../../com/googlecode/android_scripting/interpreter/Interpreter.html#getEnvironmentVariables()">getEnvironmentVariables</A>, <A HREF="../../../../../com/googlecode/android_scripting/interpreter/Interpreter.html#getExtension()">getExtension</A>, <A HREF="../../../../../com/googlecode/android_scripting/interpreter/Interpreter.html#getInteractiveCommand()">getInteractiveCommand</A>, <A HREF="../../../../../com/googlecode/android_scripting/interpreter/Interpreter.html#getLanguage()">getLanguage</A>, <A HREF="../../../../../com/googlecode/android_scripting/interpreter/Interpreter.html#getName()">getName</A>, <A HREF="../../../../../com/googlecode/android_scripting/interpreter/Interpreter.html#getNiceName()">getNiceName</A>, <A HREF="../../../../../com/googlecode/android_scripting/interpreter/Interpreter.html#getRpcText(java.lang.String, com.googlecode.android_scripting.rpc.MethodDescriptor, java.lang.String[])">getRpcText</A>, <A HREF="../../../../../com/googlecode/android_scripting/interpreter/Interpreter.html#getScriptCommand()">getScriptCommand</A>, <A HREF="../../../../../com/googlecode/android_scripting/interpreter/Interpreter.html#hasInteractiveMode()">hasInteractiveMode</A></CODE></TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="ShellInterpreter()"><!-- --></A><H3>
-ShellInterpreter</H3>
-<PRE>
-public <B>ShellInterpreter</B>()</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="hasInterpreterArchive()"><!-- --></A><H3>
-hasInterpreterArchive</H3>
-<PRE>
-public boolean <B>hasInterpreterArchive</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="hasExtrasArchive()"><!-- --></A><H3>
-hasExtrasArchive</H3>
-<PRE>
-public boolean <B>hasExtrasArchive</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="hasScriptsArchive()"><!-- --></A><H3>
-hasScriptsArchive</H3>
-<PRE>
-public boolean <B>hasScriptsArchive</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getVersion()"><!-- --></A><H3>
-getVersion</H3>
-<PRE>
-public int <B>getVersion</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isUninstallable()"><!-- --></A><H3>
-isUninstallable</H3>
-<PRE>
-public boolean <B>isUninstallable</B>()</PRE>
-<DL>
-<DD><DL>
-<DT><B>Overrides:</B><DD><CODE><A HREF="../../../../../com/googlecode/android_scripting/interpreter/Interpreter.html#isUninstallable()">isUninstallable</A></CODE> in class <CODE><A HREF="../../../../../com/googlecode/android_scripting/interpreter/Interpreter.html" title="class in com.googlecode.android_scripting.interpreter">Interpreter</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isInstalled()"><!-- --></A><H3>
-isInstalled</H3>
-<PRE>
-public boolean <B>isInstalled</B>()</PRE>
-<DL>
-<DD><DL>
-<DT><B>Overrides:</B><DD><CODE><A HREF="../../../../../com/googlecode/android_scripting/interpreter/Interpreter.html#isInstalled()">isInstalled</A></CODE> in class <CODE><A HREF="../../../../../com/googlecode/android_scripting/interpreter/Interpreter.html" title="class in com.googlecode.android_scripting.interpreter">Interpreter</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ShellInterpreter.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html?com/googlecode/android_scripting/interpreter/shell/ShellInterpreter.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ShellInterpreter.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/interpreter/shell/package-frame.html b/doc/com/googlecode/android_scripting/interpreter/shell/package-frame.html
deleted file mode 100644
index e359d554..00000000
--- a/doc/com/googlecode/android_scripting/interpreter/shell/package-frame.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-com.googlecode.android_scripting.interpreter.shell
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-
-</HEAD>
-
-<BODY BGCOLOR="white">
-<FONT size="+1" CLASS="FrameTitleFont">
-<A HREF="../../../../../com/googlecode/android_scripting/interpreter/shell/package-summary.html" target="classFrame">com.googlecode.android_scripting.interpreter.shell</A></FONT>
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
-Classes</FONT>&nbsp;
-<FONT CLASS="FrameItemFont">
-<BR>
-<A HREF="ShellInterpreter.html" title="class in com.googlecode.android_scripting.interpreter.shell" target="classFrame">ShellInterpreter</A></FONT></TD>
-</TR>
-</TABLE>
-
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/interpreter/shell/package-summary.html b/doc/com/googlecode/android_scripting/interpreter/shell/package-summary.html
deleted file mode 100644
index 59916072..00000000
--- a/doc/com/googlecode/android_scripting/interpreter/shell/package-summary.html
+++ /dev/null
@@ -1,157 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-com.googlecode.android_scripting.interpreter.shell
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="com.googlecode.android_scripting.interpreter.shell";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../com/googlecode/android_scripting/interpreter/html/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../com/googlecode/android_scripting/jsonrpc/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html?com/googlecode/android_scripting/interpreter/shell/package-summary.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<H2>
-Package com.googlecode.android_scripting.interpreter.shell
-</H2>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Class Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../com/googlecode/android_scripting/interpreter/shell/ShellInterpreter.html" title="class in com.googlecode.android_scripting.interpreter.shell">ShellInterpreter</A></B></TD>
-<TD>Represents the shell.</TD>
-</TR>
-</TABLE>
-&nbsp;
-
-<P>
-<DL>
-</DL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../com/googlecode/android_scripting/interpreter/html/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../com/googlecode/android_scripting/jsonrpc/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html?com/googlecode/android_scripting/interpreter/shell/package-summary.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/interpreter/shell/package-tree.html b/doc/com/googlecode/android_scripting/interpreter/shell/package-tree.html
deleted file mode 100644
index aa3c2c1b..00000000
--- a/doc/com/googlecode/android_scripting/interpreter/shell/package-tree.html
+++ /dev/null
@@ -1,156 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-com.googlecode.android_scripting.interpreter.shell Class Hierarchy
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="com.googlecode.android_scripting.interpreter.shell Class Hierarchy";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../com/googlecode/android_scripting/interpreter/html/package-tree.html"><B>PREV</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../com/googlecode/android_scripting/jsonrpc/package-tree.html"><B>NEXT</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html?com/googlecode/android_scripting/interpreter/shell/package-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-Hierarchy For Package com.googlecode.android_scripting.interpreter.shell
-</H2>
-</CENTER>
-<DL>
-<DT><B>Package Hierarchies:</B><DD><A HREF="../../../../../overview-tree.html">All Packages</A></DL>
-<HR>
-<H2>
-Class Hierarchy
-</H2>
-<UL>
-<LI TYPE="circle">java.lang.Object<UL>
-<LI TYPE="circle">com.googlecode.android_scripting.interpreter.<A HREF="../../../../../com/googlecode/android_scripting/interpreter/Interpreter.html" title="class in com.googlecode.android_scripting.interpreter"><B>Interpreter</B></A> (implements com.googlecode.android_scripting.interpreter.<A HREF="../../../../../com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.html" title="interface in com.googlecode.android_scripting.interpreter">InterpreterPropertyNames</A>)
-<UL>
-<LI TYPE="circle">com.googlecode.android_scripting.interpreter.shell.<A HREF="../../../../../com/googlecode/android_scripting/interpreter/shell/ShellInterpreter.html" title="class in com.googlecode.android_scripting.interpreter.shell"><B>ShellInterpreter</B></A></UL>
-</UL>
-</UL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../com/googlecode/android_scripting/interpreter/html/package-tree.html"><B>PREV</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../com/googlecode/android_scripting/jsonrpc/package-tree.html"><B>NEXT</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html?com/googlecode/android_scripting/interpreter/shell/package-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/jsonrpc/JsonBuilder.html b/doc/com/googlecode/android_scripting/jsonrpc/JsonBuilder.html
deleted file mode 100644
index f1162af6..00000000
--- a/doc/com/googlecode/android_scripting/jsonrpc/JsonBuilder.html
+++ /dev/null
@@ -1,222 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:03 PDT 2014 -->
-<TITLE>
-JsonBuilder
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="JsonBuilder";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/JsonBuilder.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/jsonrpc/JsonRpcResult.html" title="class in com.googlecode.android_scripting.jsonrpc"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/jsonrpc/JsonBuilder.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="JsonBuilder.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.jsonrpc</FONT>
-<BR>
-Class JsonBuilder</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.jsonrpc.JsonBuilder</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>JsonBuilder</B><DT>extends java.lang.Object</DL>
-</PRE>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.Object</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/JsonBuilder.html#build(java.lang.Object)">build</A></B>(java.lang.Object&nbsp;data)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="build(java.lang.Object)"><!-- --></A><H3>
-build</H3>
-<PRE>
-public static java.lang.Object <B>build</B>(java.lang.Object&nbsp;data)
-                              throws JSONException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>JSONException</CODE></DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/JsonBuilder.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/jsonrpc/JsonRpcResult.html" title="class in com.googlecode.android_scripting.jsonrpc"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/jsonrpc/JsonBuilder.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="JsonBuilder.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/jsonrpc/JsonRpcResult.html b/doc/com/googlecode/android_scripting/jsonrpc/JsonRpcResult.html
deleted file mode 100644
index ac319a6b..00000000
--- a/doc/com/googlecode/android_scripting/jsonrpc/JsonRpcResult.html
+++ /dev/null
@@ -1,278 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:03 PDT 2014 -->
-<TITLE>
-JsonRpcResult
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="JsonRpcResult";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/JsonRpcResult.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/jsonrpc/JsonBuilder.html" title="class in com.googlecode.android_scripting.jsonrpc"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/jsonrpc/JsonRpcServer.html" title="class in com.googlecode.android_scripting.jsonrpc"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/jsonrpc/JsonRpcResult.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="JsonRpcResult.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.jsonrpc</FONT>
-<BR>
-Class JsonRpcResult</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.jsonrpc.JsonRpcResult</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>JsonRpcResult</B><DT>extends java.lang.Object</DL>
-</PRE>
-
-<P>
-Represents a JSON RPC result.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Damon Kohler (damonkohler@gmail.com)</DD>
-<DT><B>See Also:</B><DD><CODE>http://json-rpc.org/wiki/specification</CODE></DL>
-<HR>
-
-<P>
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;JSONObject</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/JsonRpcResult.html#empty(int)">empty</A></B>(int&nbsp;id)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;JSONObject</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/JsonRpcResult.html#error(int, java.lang.Throwable)">error</A></B>(int&nbsp;id,
-      java.lang.Throwable&nbsp;t)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;JSONObject</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/JsonRpcResult.html#result(int, java.lang.Object)">result</A></B>(int&nbsp;id,
-       java.lang.Object&nbsp;data)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="empty(int)"><!-- --></A><H3>
-empty</H3>
-<PRE>
-public static JSONObject <B>empty</B>(int&nbsp;id)
-                        throws JSONException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>JSONException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="result(int, java.lang.Object)"><!-- --></A><H3>
-result</H3>
-<PRE>
-public static JSONObject <B>result</B>(int&nbsp;id,
-                                java.lang.Object&nbsp;data)
-                         throws JSONException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>JSONException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="error(int, java.lang.Throwable)"><!-- --></A><H3>
-error</H3>
-<PRE>
-public static JSONObject <B>error</B>(int&nbsp;id,
-                               java.lang.Throwable&nbsp;t)
-                        throws JSONException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>JSONException</CODE></DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/JsonRpcResult.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/jsonrpc/JsonBuilder.html" title="class in com.googlecode.android_scripting.jsonrpc"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/jsonrpc/JsonRpcServer.html" title="class in com.googlecode.android_scripting.jsonrpc"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/jsonrpc/JsonRpcResult.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="JsonRpcResult.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/jsonrpc/JsonRpcServer.html b/doc/com/googlecode/android_scripting/jsonrpc/JsonRpcServer.html
deleted file mode 100644
index bd92d410..00000000
--- a/doc/com/googlecode/android_scripting/jsonrpc/JsonRpcServer.html
+++ /dev/null
@@ -1,298 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:03 PDT 2014 -->
-<TITLE>
-JsonRpcServer
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="JsonRpcServer";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/JsonRpcServer.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/jsonrpc/JsonRpcResult.html" title="class in com.googlecode.android_scripting.jsonrpc"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/jsonrpc/JsonRpcServer.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="JsonRpcServer.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#nested_classes_inherited_from_class_com.googlecode.android_scripting.SimpleServer">NESTED</A>&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.jsonrpc</FONT>
-<BR>
-Class JsonRpcServer</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../com/googlecode/android_scripting/SimpleServer.html" title="class in com.googlecode.android_scripting">com.googlecode.android_scripting.SimpleServer</A>
-      <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.jsonrpc.JsonRpcServer</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>JsonRpcServer</B><DT>extends <A HREF="../../../../com/googlecode/android_scripting/SimpleServer.html" title="class in com.googlecode.android_scripting">SimpleServer</A></DL>
-</PRE>
-
-<P>
-A JSON RPC server that forwards RPC calls to a specified receiver object.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Damon Kohler (damonkohler@gmail.com)</DD>
-</DL>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-<A NAME="nested_class_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Nested Class Summary</B></FONT></TH>
-</TR>
-</TABLE>
-&nbsp;<A NAME="nested_classes_inherited_from_class_com.googlecode.android_scripting.SimpleServer"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Nested classes/interfaces inherited from class com.googlecode.android_scripting.<A HREF="../../../../com/googlecode/android_scripting/SimpleServer.html" title="class in com.googlecode.android_scripting">SimpleServer</A></B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../com/googlecode/android_scripting/SimpleServer.SimpleServerObserver.html" title="interface in com.googlecode.android_scripting">SimpleServer.SimpleServerObserver</A></CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/JsonRpcServer.html#JsonRpcServer(com.googlecode.android_scripting.jsonrpc.RpcReceiverManagerFactory, java.lang.String)">JsonRpcServer</A></B>(<A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManagerFactory.html" title="interface in com.googlecode.android_scripting.jsonrpc">RpcReceiverManagerFactory</A>&nbsp;managerFactory,
-              java.lang.String&nbsp;handshake)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Construct a <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/JsonRpcServer.html" title="class in com.googlecode.android_scripting.jsonrpc"><CODE>JsonRpcServer</CODE></A> connected to the provided <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManager.html" title="class in com.googlecode.android_scripting.jsonrpc"><CODE>RpcReceiverManager</CODE></A>.</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/JsonRpcServer.html#shutdown()">shutdown</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_com.googlecode.android_scripting.SimpleServer"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class com.googlecode.android_scripting.<A HREF="../../../../com/googlecode/android_scripting/SimpleServer.html" title="class in com.googlecode.android_scripting">SimpleServer</A></B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../com/googlecode/android_scripting/SimpleServer.html#addObserver(com.googlecode.android_scripting.SimpleServer.SimpleServerObserver)">addObserver</A>, <A HREF="../../../../com/googlecode/android_scripting/SimpleServer.html#getNumberOfConnections()">getNumberOfConnections</A>, <A HREF="../../../../com/googlecode/android_scripting/SimpleServer.html#getPublicInetAddress()">getPublicInetAddress</A>, <A HREF="../../../../com/googlecode/android_scripting/SimpleServer.html#removeObserver(com.googlecode.android_scripting.SimpleServer.SimpleServerObserver)">removeObserver</A>, <A HREF="../../../../com/googlecode/android_scripting/SimpleServer.html#startAllInterfaces(int)">startAllInterfaces</A>, <A HREF="../../../../com/googlecode/android_scripting/SimpleServer.html#startLocal(int)">startLocal</A>, <A HREF="../../../../com/googlecode/android_scripting/SimpleServer.html#startPublic(int)">startPublic</A></CODE></TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="JsonRpcServer(com.googlecode.android_scripting.jsonrpc.RpcReceiverManagerFactory, java.lang.String)"><!-- --></A><H3>
-JsonRpcServer</H3>
-<PRE>
-public <B>JsonRpcServer</B>(<A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManagerFactory.html" title="interface in com.googlecode.android_scripting.jsonrpc">RpcReceiverManagerFactory</A>&nbsp;managerFactory,
-                     java.lang.String&nbsp;handshake)</PRE>
-<DL>
-<DD>Construct a <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/JsonRpcServer.html" title="class in com.googlecode.android_scripting.jsonrpc"><CODE>JsonRpcServer</CODE></A> connected to the provided <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManager.html" title="class in com.googlecode.android_scripting.jsonrpc"><CODE>RpcReceiverManager</CODE></A>.
-<P>
-<DL>
-<DT><B>Parameters:</B><DD><CODE>managerFactory</CODE> - the <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManager.html" title="class in com.googlecode.android_scripting.jsonrpc"><CODE>RpcReceiverManager</CODE></A> to register with the server<DD><CODE>handshake</CODE> - the secret handshake required for authorization to use this server</DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="shutdown()"><!-- --></A><H3>
-shutdown</H3>
-<PRE>
-public void <B>shutdown</B>()</PRE>
-<DL>
-<DD><DL>
-<DT><B>Overrides:</B><DD><CODE><A HREF="../../../../com/googlecode/android_scripting/SimpleServer.html#shutdown()">shutdown</A></CODE> in class <CODE><A HREF="../../../../com/googlecode/android_scripting/SimpleServer.html" title="class in com.googlecode.android_scripting">SimpleServer</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/JsonRpcServer.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/jsonrpc/JsonRpcResult.html" title="class in com.googlecode.android_scripting.jsonrpc"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/jsonrpc/JsonRpcServer.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="JsonRpcServer.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#nested_classes_inherited_from_class_com.googlecode.android_scripting.SimpleServer">NESTED</A>&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/jsonrpc/RpcReceiver.html b/doc/com/googlecode/android_scripting/jsonrpc/RpcReceiver.html
deleted file mode 100644
index acada655..00000000
--- a/doc/com/googlecode/android_scripting/jsonrpc/RpcReceiver.html
+++ /dev/null
@@ -1,257 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:03 PDT 2014 -->
-<TITLE>
-RpcReceiver
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="RpcReceiver";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/RpcReceiver.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/jsonrpc/JsonRpcServer.html" title="class in com.googlecode.android_scripting.jsonrpc"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManager.html" title="class in com.googlecode.android_scripting.jsonrpc"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="RpcReceiver.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.jsonrpc</FONT>
-<BR>
-Class RpcReceiver</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.jsonrpc.RpcReceiver</B>
-</PRE>
-<DL>
-<DT><B>Direct Known Subclasses:</B> <DD><A HREF="../../../../com/googlecode/android_scripting/facade/ActivityResultFacade.html" title="class in com.googlecode.android_scripting.facade">ActivityResultFacade</A>, <A HREF="../../../../com/googlecode/android_scripting/facade/AndroidFacade.html" title="class in com.googlecode.android_scripting.facade">AndroidFacade</A>, <A HREF="../../../../com/googlecode/android_scripting/facade/ApplicationManagerFacade.html" title="class in com.googlecode.android_scripting.facade">ApplicationManagerFacade</A>, <A HREF="../../../../com/googlecode/android_scripting/facade/BatteryManagerFacade.html" title="class in com.googlecode.android_scripting.facade">BatteryManagerFacade</A>, <A HREF="../../../../com/googlecode/android_scripting/facade/BluetoothFacade.html" title="class in com.googlecode.android_scripting.facade">BluetoothFacade</A>, <A HREF="../../../../com/googlecode/android_scripting/facade/CameraFacade.html" title="class in com.googlecode.android_scripting.facade">CameraFacade</A>, <A HREF="../../../../com/googlecode/android_scripting/facade/CommonIntentsFacade.html" title="class in com.googlecode.android_scripting.facade">CommonIntentsFacade</A>, <A HREF="../../../../com/googlecode/android_scripting/facade/ContactsFacade.html" title="class in com.googlecode.android_scripting.facade">ContactsFacade</A>, <A HREF="../../../../com/googlecode/android_scripting/facade/EventFacade.html" title="class in com.googlecode.android_scripting.facade">EventFacade</A>, <A HREF="../../../../com/googlecode/android_scripting/facade/EyesFreeFacade.html" title="class in com.googlecode.android_scripting.facade">EyesFreeFacade</A>, <A HREF="../../../../com/googlecode/android_scripting/facade/LocationFacade.html" title="class in com.googlecode.android_scripting.facade">LocationFacade</A>, <A HREF="../../../../com/googlecode/android_scripting/facade/MediaPlayerFacade.html" title="class in com.googlecode.android_scripting.facade">MediaPlayerFacade</A>, <A HREF="../../../../com/googlecode/android_scripting/facade/MediaRecorderFacade.html" title="class in com.googlecode.android_scripting.facade">MediaRecorderFacade</A>, <A HREF="../../../../com/googlecode/android_scripting/facade/PhoneFacade.html" title="class in com.googlecode.android_scripting.facade">PhoneFacade</A>, <A HREF="../../../../com/googlecode/android_scripting/facade/PreferencesFacade.html" title="class in com.googlecode.android_scripting.facade">PreferencesFacade</A>, <A HREF="../../../../com/googlecode/android_scripting/facade/SensorManagerFacade.html" title="class in com.googlecode.android_scripting.facade">SensorManagerFacade</A>, <A HREF="../../../../com/googlecode/android_scripting/facade/SettingsFacade.html" title="class in com.googlecode.android_scripting.facade">SettingsFacade</A>, <A HREF="../../../../com/googlecode/android_scripting/facade/SignalStrengthFacade.html" title="class in com.googlecode.android_scripting.facade">SignalStrengthFacade</A>, <A HREF="../../../../com/googlecode/android_scripting/facade/SmsFacade.html" title="class in com.googlecode.android_scripting.facade">SmsFacade</A>, <A HREF="../../../../com/googlecode/android_scripting/facade/SpeechRecognitionFacade.html" title="class in com.googlecode.android_scripting.facade">SpeechRecognitionFacade</A>, <A HREF="../../../../com/googlecode/android_scripting/facade/TextToSpeechFacade.html" title="class in com.googlecode.android_scripting.facade">TextToSpeechFacade</A>, <A HREF="../../../../com/googlecode/android_scripting/facade/ToneGeneratorFacade.html" title="class in com.googlecode.android_scripting.facade">ToneGeneratorFacade</A>, <A HREF="../../../../com/googlecode/android_scripting/facade/ui/UiFacade.html" title="class in com.googlecode.android_scripting.facade.ui">UiFacade</A>, <A HREF="../../../../com/googlecode/android_scripting/facade/WakeLockFacade.html" title="class in com.googlecode.android_scripting.facade">WakeLockFacade</A>, <A HREF="../../../../com/googlecode/android_scripting/facade/WebCamFacade.html" title="class in com.googlecode.android_scripting.facade">WebCamFacade</A>, <A HREF="../../../../com/googlecode/android_scripting/facade/WifiFacade.html" title="class in com.googlecode.android_scripting.facade">WifiFacade</A></DD>
-</DL>
-<HR>
-<DL>
-<DT><PRE>public abstract class <B>RpcReceiver</B><DT>extends java.lang.Object</DL>
-</PRE>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html#RpcReceiver(com.googlecode.android_scripting.jsonrpc.RpcReceiverManager)">RpcReceiver</A></B>(<A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManager.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiverManager</A>&nbsp;manager)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>abstract &nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html#shutdown()">shutdown</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Invoked when the receiver is shut down.</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="RpcReceiver(com.googlecode.android_scripting.jsonrpc.RpcReceiverManager)"><!-- --></A><H3>
-RpcReceiver</H3>
-<PRE>
-public <B>RpcReceiver</B>(<A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManager.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiverManager</A>&nbsp;manager)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="shutdown()"><!-- --></A><H3>
-shutdown</H3>
-<PRE>
-public abstract void <B>shutdown</B>()</PRE>
-<DL>
-<DD>Invoked when the receiver is shut down.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/RpcReceiver.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/jsonrpc/JsonRpcServer.html" title="class in com.googlecode.android_scripting.jsonrpc"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManager.html" title="class in com.googlecode.android_scripting.jsonrpc"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="RpcReceiver.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/jsonrpc/RpcReceiverManager.html b/doc/com/googlecode/android_scripting/jsonrpc/RpcReceiverManager.html
deleted file mode 100644
index b2f1abf1..00000000
--- a/doc/com/googlecode/android_scripting/jsonrpc/RpcReceiverManager.html
+++ /dev/null
@@ -1,347 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:03 PDT 2014 -->
-<TITLE>
-RpcReceiverManager
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="RpcReceiverManager";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/RpcReceiverManager.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManagerFactory.html" title="interface in com.googlecode.android_scripting.jsonrpc"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/jsonrpc/RpcReceiverManager.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="RpcReceiverManager.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.jsonrpc</FONT>
-<BR>
-Class RpcReceiverManager</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.jsonrpc.RpcReceiverManager</B>
-</PRE>
-<DL>
-<DT><B>Direct Known Subclasses:</B> <DD><A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A></DD>
-</DL>
-<HR>
-<DL>
-<DT><PRE>public abstract class <B>RpcReceiverManager</B><DT>extends java.lang.Object</DL>
-</PRE>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManager.html#RpcReceiverManager(java.util.Collection)">RpcReceiverManager</A></B>(java.util.Collection&lt;java.lang.Class&lt;? extends <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A>&gt;&gt;&nbsp;classList)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/MethodDescriptor.html" title="class in com.googlecode.android_scripting.rpc">MethodDescriptor</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManager.html#getMethodDescriptor(java.lang.String)">getMethodDescriptor</A></B>(java.lang.String&nbsp;methodName)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0" SUMMARY="">
-<TR ALIGN="right" VALIGN="">
-<TD NOWRAP><FONT SIZE="-1">
-<CODE>&lt;T extends <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A>&gt; 
-<BR>
-T</CODE></FONT></TD>
-</TR>
-</TABLE>
-</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManager.html#getReceiver(java.lang.Class)">getReceiver</A></B>(java.lang.Class&lt;T&gt;&nbsp;clazz)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.util.Collection&lt;java.lang.Class&lt;? extends <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A>&gt;&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManager.html#getRpcReceiverClasses()">getRpcReceiverClasses</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.Object</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManager.html#invoke(java.lang.Class, java.lang.reflect.Method, java.lang.Object[])">invoke</A></B>(java.lang.Class&lt;? extends <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A>&gt;&nbsp;clazz,
-       java.lang.reflect.Method&nbsp;method,
-       java.lang.Object[]&nbsp;args)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManager.html#shutdown()">shutdown</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="RpcReceiverManager(java.util.Collection)"><!-- --></A><H3>
-RpcReceiverManager</H3>
-<PRE>
-public <B>RpcReceiverManager</B>(java.util.Collection&lt;java.lang.Class&lt;? extends <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A>&gt;&gt;&nbsp;classList)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="getRpcReceiverClasses()"><!-- --></A><H3>
-getRpcReceiverClasses</H3>
-<PRE>
-public java.util.Collection&lt;java.lang.Class&lt;? extends <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A>&gt;&gt; <B>getRpcReceiverClasses</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getReceiver(java.lang.Class)"><!-- --></A><H3>
-getReceiver</H3>
-<PRE>
-public &lt;T extends <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A>&gt; T <B>getReceiver</B>(java.lang.Class&lt;T&gt;&nbsp;clazz)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getMethodDescriptor(java.lang.String)"><!-- --></A><H3>
-getMethodDescriptor</H3>
-<PRE>
-public <A HREF="../../../../com/googlecode/android_scripting/rpc/MethodDescriptor.html" title="class in com.googlecode.android_scripting.rpc">MethodDescriptor</A> <B>getMethodDescriptor</B>(java.lang.String&nbsp;methodName)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="invoke(java.lang.Class, java.lang.reflect.Method, java.lang.Object[])"><!-- --></A><H3>
-invoke</H3>
-<PRE>
-public java.lang.Object <B>invoke</B>(java.lang.Class&lt;? extends <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A>&gt;&nbsp;clazz,
-                               java.lang.reflect.Method&nbsp;method,
-                               java.lang.Object[]&nbsp;args)
-                        throws java.lang.Exception</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.lang.Exception</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="shutdown()"><!-- --></A><H3>
-shutdown</H3>
-<PRE>
-public void <B>shutdown</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/RpcReceiverManager.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManagerFactory.html" title="interface in com.googlecode.android_scripting.jsonrpc"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/jsonrpc/RpcReceiverManager.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="RpcReceiverManager.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/jsonrpc/RpcReceiverManagerFactory.html b/doc/com/googlecode/android_scripting/jsonrpc/RpcReceiverManagerFactory.html
deleted file mode 100644
index 711e3337..00000000
--- a/doc/com/googlecode/android_scripting/jsonrpc/RpcReceiverManagerFactory.html
+++ /dev/null
@@ -1,228 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:03 PDT 2014 -->
-<TITLE>
-RpcReceiverManagerFactory
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="RpcReceiverManagerFactory";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/RpcReceiverManagerFactory.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManager.html" title="class in com.googlecode.android_scripting.jsonrpc"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/jsonrpc/RpcReceiverManagerFactory.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="RpcReceiverManagerFactory.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.jsonrpc</FONT>
-<BR>
-Interface RpcReceiverManagerFactory</H2>
-<DL>
-<DT><B>All Known Implementing Classes:</B> <DD><A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManagerFactory.html" title="class in com.googlecode.android_scripting.facade">FacadeManagerFactory</A></DD>
-</DL>
-<HR>
-<DL>
-<DT><PRE>public interface <B>RpcReceiverManagerFactory</B></DL>
-</PRE>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManager.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiverManager</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManagerFactory.html#create()">create</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.util.List&lt;<A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManager.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiverManager</A>&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManagerFactory.html#getRpcReceiverManagers()">getRpcReceiverManagers</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="create()"><!-- --></A><H3>
-create</H3>
-<PRE>
-<A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManager.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiverManager</A> <B>create</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getRpcReceiverManagers()"><!-- --></A><H3>
-getRpcReceiverManagers</H3>
-<PRE>
-java.util.List&lt;<A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManager.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiverManager</A>&gt; <B>getRpcReceiverManagers</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/RpcReceiverManagerFactory.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManager.html" title="class in com.googlecode.android_scripting.jsonrpc"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/jsonrpc/RpcReceiverManagerFactory.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="RpcReceiverManagerFactory.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/jsonrpc/package-frame.html b/doc/com/googlecode/android_scripting/jsonrpc/package-frame.html
deleted file mode 100644
index 310b1031..00000000
--- a/doc/com/googlecode/android_scripting/jsonrpc/package-frame.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-com.googlecode.android_scripting.jsonrpc
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-
-</HEAD>
-
-<BODY BGCOLOR="white">
-<FONT size="+1" CLASS="FrameTitleFont">
-<A HREF="../../../../com/googlecode/android_scripting/jsonrpc/package-summary.html" target="classFrame">com.googlecode.android_scripting.jsonrpc</A></FONT>
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
-Interfaces</FONT>&nbsp;
-<FONT CLASS="FrameItemFont">
-<BR>
-<A HREF="RpcReceiverManagerFactory.html" title="interface in com.googlecode.android_scripting.jsonrpc" target="classFrame"><I>RpcReceiverManagerFactory</I></A></FONT></TD>
-</TR>
-</TABLE>
-
-
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
-Classes</FONT>&nbsp;
-<FONT CLASS="FrameItemFont">
-<BR>
-<A HREF="JsonBuilder.html" title="class in com.googlecode.android_scripting.jsonrpc" target="classFrame">JsonBuilder</A>
-<BR>
-<A HREF="JsonRpcResult.html" title="class in com.googlecode.android_scripting.jsonrpc" target="classFrame">JsonRpcResult</A>
-<BR>
-<A HREF="JsonRpcServer.html" title="class in com.googlecode.android_scripting.jsonrpc" target="classFrame">JsonRpcServer</A>
-<BR>
-<A HREF="RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc" target="classFrame">RpcReceiver</A>
-<BR>
-<A HREF="RpcReceiverManager.html" title="class in com.googlecode.android_scripting.jsonrpc" target="classFrame">RpcReceiverManager</A></FONT></TD>
-</TR>
-</TABLE>
-
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/jsonrpc/package-summary.html b/doc/com/googlecode/android_scripting/jsonrpc/package-summary.html
deleted file mode 100644
index 5f54e42f..00000000
--- a/doc/com/googlecode/android_scripting/jsonrpc/package-summary.html
+++ /dev/null
@@ -1,187 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-com.googlecode.android_scripting.jsonrpc
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="com.googlecode.android_scripting.jsonrpc";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/shell/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/jsonrpc/package-summary.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<H2>
-Package com.googlecode.android_scripting.jsonrpc
-</H2>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Interface Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManagerFactory.html" title="interface in com.googlecode.android_scripting.jsonrpc">RpcReceiverManagerFactory</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Class Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/JsonBuilder.html" title="class in com.googlecode.android_scripting.jsonrpc">JsonBuilder</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/JsonRpcResult.html" title="class in com.googlecode.android_scripting.jsonrpc">JsonRpcResult</A></B></TD>
-<TD>Represents a JSON RPC result.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/JsonRpcServer.html" title="class in com.googlecode.android_scripting.jsonrpc">JsonRpcServer</A></B></TD>
-<TD>A JSON RPC server that forwards RPC calls to a specified receiver object.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManager.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiverManager</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-
-<P>
-<DL>
-</DL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/shell/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/jsonrpc/package-summary.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/jsonrpc/package-tree.html b/doc/com/googlecode/android_scripting/jsonrpc/package-tree.html
deleted file mode 100644
index ca5de39a..00000000
--- a/doc/com/googlecode/android_scripting/jsonrpc/package-tree.html
+++ /dev/null
@@ -1,160 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-com.googlecode.android_scripting.jsonrpc Class Hierarchy
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="com.googlecode.android_scripting.jsonrpc Class Hierarchy";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/shell/package-tree.html"><B>PREV</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/package-tree.html"><B>NEXT</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/jsonrpc/package-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-Hierarchy For Package com.googlecode.android_scripting.jsonrpc
-</H2>
-</CENTER>
-<DL>
-<DT><B>Package Hierarchies:</B><DD><A HREF="../../../../overview-tree.html">All Packages</A></DL>
-<HR>
-<H2>
-Class Hierarchy
-</H2>
-<UL>
-<LI TYPE="circle">java.lang.Object<UL>
-<LI TYPE="circle">com.googlecode.android_scripting.jsonrpc.<A HREF="../../../../com/googlecode/android_scripting/jsonrpc/JsonBuilder.html" title="class in com.googlecode.android_scripting.jsonrpc"><B>JsonBuilder</B></A><LI TYPE="circle">com.googlecode.android_scripting.jsonrpc.<A HREF="../../../../com/googlecode/android_scripting/jsonrpc/JsonRpcResult.html" title="class in com.googlecode.android_scripting.jsonrpc"><B>JsonRpcResult</B></A><LI TYPE="circle">com.googlecode.android_scripting.jsonrpc.<A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc"><B>RpcReceiver</B></A><LI TYPE="circle">com.googlecode.android_scripting.jsonrpc.<A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManager.html" title="class in com.googlecode.android_scripting.jsonrpc"><B>RpcReceiverManager</B></A><LI TYPE="circle">com.googlecode.android_scripting.<A HREF="../../../../com/googlecode/android_scripting/SimpleServer.html" title="class in com.googlecode.android_scripting"><B>SimpleServer</B></A><UL>
-<LI TYPE="circle">com.googlecode.android_scripting.jsonrpc.<A HREF="../../../../com/googlecode/android_scripting/jsonrpc/JsonRpcServer.html" title="class in com.googlecode.android_scripting.jsonrpc"><B>JsonRpcServer</B></A></UL>
-</UL>
-</UL>
-<H2>
-Interface Hierarchy
-</H2>
-<UL>
-<LI TYPE="circle">com.googlecode.android_scripting.jsonrpc.<A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManagerFactory.html" title="interface in com.googlecode.android_scripting.jsonrpc"><B>RpcReceiverManagerFactory</B></A></UL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/interpreter/shell/package-tree.html"><B>PREV</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/package-tree.html"><B>NEXT</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/jsonrpc/package-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/language/BeanShellLanguage.html b/doc/com/googlecode/android_scripting/language/BeanShellLanguage.html
deleted file mode 100644
index aa304eee..00000000
--- a/doc/com/googlecode/android_scripting/language/BeanShellLanguage.html
+++ /dev/null
@@ -1,242 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:01 PDT 2014 -->
-<TITLE>
-BeanShellLanguage
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="BeanShellLanguage";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/BeanShellLanguage.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/HtmlLanguage.html" title="class in com.googlecode.android_scripting.language"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/language/BeanShellLanguage.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="BeanShellLanguage.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#methods_inherited_from_class_com.googlecode.android_scripting.language.Language">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.language</FONT>
-<BR>
-Class BeanShellLanguage</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../com/googlecode/android_scripting/language/Language.html" title="class in com.googlecode.android_scripting.language">com.googlecode.android_scripting.language.Language</A>
-      <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.language.BeanShellLanguage</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>BeanShellLanguage</B><DT>extends <A HREF="../../../../com/googlecode/android_scripting/language/Language.html" title="class in com.googlecode.android_scripting.language">Language</A></DL>
-</PRE>
-
-<P>
-Represents the BeanShell programming language.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>igor.v.karp@gmail.com (Igor Karp)</DD>
-</DL>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/language/BeanShellLanguage.html#BeanShellLanguage()">BeanShellLanguage</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_com.googlecode.android_scripting.language.Language"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class com.googlecode.android_scripting.language.<A HREF="../../../../com/googlecode/android_scripting/language/Language.html" title="class in com.googlecode.android_scripting.language">Language</A></B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../com/googlecode/android_scripting/language/Language.html#autoClose(char)">autoClose</A>, <A HREF="../../../../com/googlecode/android_scripting/language/Language.html#getContentTemplate()">getContentTemplate</A>, <A HREF="../../../../com/googlecode/android_scripting/language/Language.html#getRpcText(java.lang.String, com.googlecode.android_scripting.rpc.MethodDescriptor, java.lang.String[])">getRpcText</A></CODE></TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="BeanShellLanguage()"><!-- --></A><H3>
-BeanShellLanguage</H3>
-<PRE>
-public <B>BeanShellLanguage</B>()</PRE>
-<DL>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/BeanShellLanguage.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/HtmlLanguage.html" title="class in com.googlecode.android_scripting.language"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/language/BeanShellLanguage.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="BeanShellLanguage.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#methods_inherited_from_class_com.googlecode.android_scripting.language.Language">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/language/HtmlLanguage.html b/doc/com/googlecode/android_scripting/language/HtmlLanguage.html
deleted file mode 100644
index a466ee86..00000000
--- a/doc/com/googlecode/android_scripting/language/HtmlLanguage.html
+++ /dev/null
@@ -1,234 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:01 PDT 2014 -->
-<TITLE>
-HtmlLanguage
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="HtmlLanguage";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/HtmlLanguage.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/BeanShellLanguage.html" title="class in com.googlecode.android_scripting.language"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/JavaScriptLanguage.html" title="class in com.googlecode.android_scripting.language"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/language/HtmlLanguage.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="HtmlLanguage.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#methods_inherited_from_class_com.googlecode.android_scripting.language.Language">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.language</FONT>
-<BR>
-Class HtmlLanguage</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../com/googlecode/android_scripting/language/Language.html" title="class in com.googlecode.android_scripting.language">com.googlecode.android_scripting.language.Language</A>
-      <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.language.HtmlLanguage</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>HtmlLanguage</B><DT>extends <A HREF="../../../../com/googlecode/android_scripting/language/Language.html" title="class in com.googlecode.android_scripting.language">Language</A></DL>
-</PRE>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/language/HtmlLanguage.html#HtmlLanguage()">HtmlLanguage</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_com.googlecode.android_scripting.language.Language"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class com.googlecode.android_scripting.language.<A HREF="../../../../com/googlecode/android_scripting/language/Language.html" title="class in com.googlecode.android_scripting.language">Language</A></B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../com/googlecode/android_scripting/language/Language.html#autoClose(char)">autoClose</A>, <A HREF="../../../../com/googlecode/android_scripting/language/Language.html#getContentTemplate()">getContentTemplate</A>, <A HREF="../../../../com/googlecode/android_scripting/language/Language.html#getRpcText(java.lang.String, com.googlecode.android_scripting.rpc.MethodDescriptor, java.lang.String[])">getRpcText</A></CODE></TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="HtmlLanguage()"><!-- --></A><H3>
-HtmlLanguage</H3>
-<PRE>
-public <B>HtmlLanguage</B>()</PRE>
-<DL>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/HtmlLanguage.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/BeanShellLanguage.html" title="class in com.googlecode.android_scripting.language"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/JavaScriptLanguage.html" title="class in com.googlecode.android_scripting.language"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/language/HtmlLanguage.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="HtmlLanguage.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#methods_inherited_from_class_com.googlecode.android_scripting.language.Language">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/language/JavaScriptLanguage.html b/doc/com/googlecode/android_scripting/language/JavaScriptLanguage.html
deleted file mode 100644
index 6cd971b1..00000000
--- a/doc/com/googlecode/android_scripting/language/JavaScriptLanguage.html
+++ /dev/null
@@ -1,242 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:01 PDT 2014 -->
-<TITLE>
-JavaScriptLanguage
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="JavaScriptLanguage";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/JavaScriptLanguage.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/HtmlLanguage.html" title="class in com.googlecode.android_scripting.language"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/Language.html" title="class in com.googlecode.android_scripting.language"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/language/JavaScriptLanguage.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="JavaScriptLanguage.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#methods_inherited_from_class_com.googlecode.android_scripting.language.Language">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.language</FONT>
-<BR>
-Class JavaScriptLanguage</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../com/googlecode/android_scripting/language/Language.html" title="class in com.googlecode.android_scripting.language">com.googlecode.android_scripting.language.Language</A>
-      <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.language.JavaScriptLanguage</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>JavaScriptLanguage</B><DT>extends <A HREF="../../../../com/googlecode/android_scripting/language/Language.html" title="class in com.googlecode.android_scripting.language">Language</A></DL>
-</PRE>
-
-<P>
-Represents the JavaScript programming language.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>igor.v.karp@gmail.com (Igor Karp)</DD>
-</DL>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/language/JavaScriptLanguage.html#JavaScriptLanguage()">JavaScriptLanguage</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_com.googlecode.android_scripting.language.Language"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class com.googlecode.android_scripting.language.<A HREF="../../../../com/googlecode/android_scripting/language/Language.html" title="class in com.googlecode.android_scripting.language">Language</A></B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../com/googlecode/android_scripting/language/Language.html#autoClose(char)">autoClose</A>, <A HREF="../../../../com/googlecode/android_scripting/language/Language.html#getContentTemplate()">getContentTemplate</A>, <A HREF="../../../../com/googlecode/android_scripting/language/Language.html#getRpcText(java.lang.String, com.googlecode.android_scripting.rpc.MethodDescriptor, java.lang.String[])">getRpcText</A></CODE></TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="JavaScriptLanguage()"><!-- --></A><H3>
-JavaScriptLanguage</H3>
-<PRE>
-public <B>JavaScriptLanguage</B>()</PRE>
-<DL>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/JavaScriptLanguage.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/HtmlLanguage.html" title="class in com.googlecode.android_scripting.language"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/Language.html" title="class in com.googlecode.android_scripting.language"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/language/JavaScriptLanguage.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="JavaScriptLanguage.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#methods_inherited_from_class_com.googlecode.android_scripting.language.Language">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/language/Language.html b/doc/com/googlecode/android_scripting/language/Language.html
deleted file mode 100644
index 179a88d6..00000000
--- a/doc/com/googlecode/android_scripting/language/Language.html
+++ /dev/null
@@ -1,312 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:01 PDT 2014 -->
-<TITLE>
-Language
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Language";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/Language.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/JavaScriptLanguage.html" title="class in com.googlecode.android_scripting.language"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/LuaLanguage.html" title="class in com.googlecode.android_scripting.language"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/language/Language.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="Language.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.language</FONT>
-<BR>
-Class Language</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.language.Language</B>
-</PRE>
-<DL>
-<DT><B>Direct Known Subclasses:</B> <DD><A HREF="../../../../com/googlecode/android_scripting/language/BeanShellLanguage.html" title="class in com.googlecode.android_scripting.language">BeanShellLanguage</A>, <A HREF="../../../../com/googlecode/android_scripting/language/HtmlLanguage.html" title="class in com.googlecode.android_scripting.language">HtmlLanguage</A>, <A HREF="../../../../com/googlecode/android_scripting/language/JavaScriptLanguage.html" title="class in com.googlecode.android_scripting.language">JavaScriptLanguage</A>, <A HREF="../../../../com/googlecode/android_scripting/language/LuaLanguage.html" title="class in com.googlecode.android_scripting.language">LuaLanguage</A>, <A HREF="../../../../com/googlecode/android_scripting/language/PerlLanguage.html" title="class in com.googlecode.android_scripting.language">PerlLanguage</A>, <A HREF="../../../../com/googlecode/android_scripting/language/PhpLanguage.html" title="class in com.googlecode.android_scripting.language">PhpLanguage</A>, <A HREF="../../../../com/googlecode/android_scripting/language/PythonLanguage.html" title="class in com.googlecode.android_scripting.language">PythonLanguage</A>, <A HREF="../../../../com/googlecode/android_scripting/language/RubyLanguage.html" title="class in com.googlecode.android_scripting.language">RubyLanguage</A>, <A HREF="../../../../com/googlecode/android_scripting/language/ShellLanguage.html" title="class in com.googlecode.android_scripting.language">ShellLanguage</A>, <A HREF="../../../../com/googlecode/android_scripting/language/SleepLanguage.html" title="class in com.googlecode.android_scripting.language">SleepLanguage</A>, <A HREF="../../../../com/googlecode/android_scripting/language/SquirrelLanguage.html" title="class in com.googlecode.android_scripting.language">SquirrelLanguage</A>, <A HREF="../../../../com/googlecode/android_scripting/language/TclLanguage.html" title="class in com.googlecode.android_scripting.language">TclLanguage</A></DD>
-</DL>
-<HR>
-<DL>
-<DT><PRE>public class <B>Language</B><DT>extends java.lang.Object</DL>
-</PRE>
-
-<P>
-Represents the programming language supported by the SL4A.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>igor.v.karp@gmail.com (Igor Karp)</DD>
-</DL>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/language/Language.html#Language()">Language</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/language/Language.html#autoClose(char)">autoClose</A></B>(char&nbsp;token)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the string containing opening and closing tokens if the input is an opening token.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/language/Language.html#getContentTemplate()">getContentTemplate</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the initial template for newly created script.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/language/Language.html#getRpcText(java.lang.String, com.googlecode.android_scripting.rpc.MethodDescriptor, java.lang.String[])">getRpcText</A></B>(java.lang.String&nbsp;content,
-           <A HREF="../../../../com/googlecode/android_scripting/rpc/MethodDescriptor.html" title="class in com.googlecode.android_scripting.rpc">MethodDescriptor</A>&nbsp;rpc,
-           java.lang.String[]&nbsp;values)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the RPC call text with given parameter values.</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="Language()"><!-- --></A><H3>
-Language</H3>
-<PRE>
-public <B>Language</B>()</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="getContentTemplate()"><!-- --></A><H3>
-getContentTemplate</H3>
-<PRE>
-public java.lang.String <B>getContentTemplate</B>()</PRE>
-<DL>
-<DD>Returns the initial template for newly created script.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="autoClose(char)"><!-- --></A><H3>
-autoClose</H3>
-<PRE>
-public java.lang.String <B>autoClose</B>(char&nbsp;token)</PRE>
-<DL>
-<DD>Returns the string containing opening and closing tokens if the input is an opening token.
- Returns <code>null</code> otherwise.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getRpcText(java.lang.String, com.googlecode.android_scripting.rpc.MethodDescriptor, java.lang.String[])"><!-- --></A><H3>
-getRpcText</H3>
-<PRE>
-public final java.lang.String <B>getRpcText</B>(java.lang.String&nbsp;content,
-                                         <A HREF="../../../../com/googlecode/android_scripting/rpc/MethodDescriptor.html" title="class in com.googlecode.android_scripting.rpc">MethodDescriptor</A>&nbsp;rpc,
-                                         java.lang.String[]&nbsp;values)</PRE>
-<DL>
-<DD>Returns the RPC call text with given parameter values.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/Language.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/JavaScriptLanguage.html" title="class in com.googlecode.android_scripting.language"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/LuaLanguage.html" title="class in com.googlecode.android_scripting.language"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/language/Language.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="Language.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/language/LuaLanguage.html b/doc/com/googlecode/android_scripting/language/LuaLanguage.html
deleted file mode 100644
index 402a161a..00000000
--- a/doc/com/googlecode/android_scripting/language/LuaLanguage.html
+++ /dev/null
@@ -1,242 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:01 PDT 2014 -->
-<TITLE>
-LuaLanguage
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="LuaLanguage";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/LuaLanguage.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/Language.html" title="class in com.googlecode.android_scripting.language"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/PerlLanguage.html" title="class in com.googlecode.android_scripting.language"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/language/LuaLanguage.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="LuaLanguage.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#methods_inherited_from_class_com.googlecode.android_scripting.language.Language">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.language</FONT>
-<BR>
-Class LuaLanguage</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../com/googlecode/android_scripting/language/Language.html" title="class in com.googlecode.android_scripting.language">com.googlecode.android_scripting.language.Language</A>
-      <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.language.LuaLanguage</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>LuaLanguage</B><DT>extends <A HREF="../../../../com/googlecode/android_scripting/language/Language.html" title="class in com.googlecode.android_scripting.language">Language</A></DL>
-</PRE>
-
-<P>
-Represents the Lua programming language.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>igor.v.karp@gmail.com (Igor Karp)</DD>
-</DL>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/language/LuaLanguage.html#LuaLanguage()">LuaLanguage</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_com.googlecode.android_scripting.language.Language"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class com.googlecode.android_scripting.language.<A HREF="../../../../com/googlecode/android_scripting/language/Language.html" title="class in com.googlecode.android_scripting.language">Language</A></B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../com/googlecode/android_scripting/language/Language.html#autoClose(char)">autoClose</A>, <A HREF="../../../../com/googlecode/android_scripting/language/Language.html#getContentTemplate()">getContentTemplate</A>, <A HREF="../../../../com/googlecode/android_scripting/language/Language.html#getRpcText(java.lang.String, com.googlecode.android_scripting.rpc.MethodDescriptor, java.lang.String[])">getRpcText</A></CODE></TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="LuaLanguage()"><!-- --></A><H3>
-LuaLanguage</H3>
-<PRE>
-public <B>LuaLanguage</B>()</PRE>
-<DL>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/LuaLanguage.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/Language.html" title="class in com.googlecode.android_scripting.language"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/PerlLanguage.html" title="class in com.googlecode.android_scripting.language"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/language/LuaLanguage.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="LuaLanguage.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#methods_inherited_from_class_com.googlecode.android_scripting.language.Language">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/language/PerlLanguage.html b/doc/com/googlecode/android_scripting/language/PerlLanguage.html
deleted file mode 100644
index aff038be..00000000
--- a/doc/com/googlecode/android_scripting/language/PerlLanguage.html
+++ /dev/null
@@ -1,242 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:01 PDT 2014 -->
-<TITLE>
-PerlLanguage
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="PerlLanguage";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/PerlLanguage.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/LuaLanguage.html" title="class in com.googlecode.android_scripting.language"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/PhpLanguage.html" title="class in com.googlecode.android_scripting.language"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/language/PerlLanguage.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="PerlLanguage.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#methods_inherited_from_class_com.googlecode.android_scripting.language.Language">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.language</FONT>
-<BR>
-Class PerlLanguage</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../com/googlecode/android_scripting/language/Language.html" title="class in com.googlecode.android_scripting.language">com.googlecode.android_scripting.language.Language</A>
-      <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.language.PerlLanguage</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>PerlLanguage</B><DT>extends <A HREF="../../../../com/googlecode/android_scripting/language/Language.html" title="class in com.googlecode.android_scripting.language">Language</A></DL>
-</PRE>
-
-<P>
-Represents the Perl programming language.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>igor.v.karp@gmail.com (Igor Karp)</DD>
-</DL>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/language/PerlLanguage.html#PerlLanguage()">PerlLanguage</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_com.googlecode.android_scripting.language.Language"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class com.googlecode.android_scripting.language.<A HREF="../../../../com/googlecode/android_scripting/language/Language.html" title="class in com.googlecode.android_scripting.language">Language</A></B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../com/googlecode/android_scripting/language/Language.html#autoClose(char)">autoClose</A>, <A HREF="../../../../com/googlecode/android_scripting/language/Language.html#getContentTemplate()">getContentTemplate</A>, <A HREF="../../../../com/googlecode/android_scripting/language/Language.html#getRpcText(java.lang.String, com.googlecode.android_scripting.rpc.MethodDescriptor, java.lang.String[])">getRpcText</A></CODE></TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="PerlLanguage()"><!-- --></A><H3>
-PerlLanguage</H3>
-<PRE>
-public <B>PerlLanguage</B>()</PRE>
-<DL>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/PerlLanguage.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/LuaLanguage.html" title="class in com.googlecode.android_scripting.language"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/PhpLanguage.html" title="class in com.googlecode.android_scripting.language"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/language/PerlLanguage.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="PerlLanguage.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#methods_inherited_from_class_com.googlecode.android_scripting.language.Language">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/language/PhpLanguage.html b/doc/com/googlecode/android_scripting/language/PhpLanguage.html
deleted file mode 100644
index 81029e14..00000000
--- a/doc/com/googlecode/android_scripting/language/PhpLanguage.html
+++ /dev/null
@@ -1,242 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:01 PDT 2014 -->
-<TITLE>
-PhpLanguage
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="PhpLanguage";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/PhpLanguage.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/PerlLanguage.html" title="class in com.googlecode.android_scripting.language"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/PythonLanguage.html" title="class in com.googlecode.android_scripting.language"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/language/PhpLanguage.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="PhpLanguage.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#methods_inherited_from_class_com.googlecode.android_scripting.language.Language">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.language</FONT>
-<BR>
-Class PhpLanguage</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../com/googlecode/android_scripting/language/Language.html" title="class in com.googlecode.android_scripting.language">com.googlecode.android_scripting.language.Language</A>
-      <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.language.PhpLanguage</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>PhpLanguage</B><DT>extends <A HREF="../../../../com/googlecode/android_scripting/language/Language.html" title="class in com.googlecode.android_scripting.language">Language</A></DL>
-</PRE>
-
-<P>
-Represents the PHP programming language.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>ivan@irontec.com (Ivan Mosquera Paulo)</DD>
-</DL>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/language/PhpLanguage.html#PhpLanguage()">PhpLanguage</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_com.googlecode.android_scripting.language.Language"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class com.googlecode.android_scripting.language.<A HREF="../../../../com/googlecode/android_scripting/language/Language.html" title="class in com.googlecode.android_scripting.language">Language</A></B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../com/googlecode/android_scripting/language/Language.html#autoClose(char)">autoClose</A>, <A HREF="../../../../com/googlecode/android_scripting/language/Language.html#getContentTemplate()">getContentTemplate</A>, <A HREF="../../../../com/googlecode/android_scripting/language/Language.html#getRpcText(java.lang.String, com.googlecode.android_scripting.rpc.MethodDescriptor, java.lang.String[])">getRpcText</A></CODE></TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="PhpLanguage()"><!-- --></A><H3>
-PhpLanguage</H3>
-<PRE>
-public <B>PhpLanguage</B>()</PRE>
-<DL>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/PhpLanguage.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/PerlLanguage.html" title="class in com.googlecode.android_scripting.language"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/PythonLanguage.html" title="class in com.googlecode.android_scripting.language"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/language/PhpLanguage.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="PhpLanguage.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#methods_inherited_from_class_com.googlecode.android_scripting.language.Language">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/language/PythonLanguage.html b/doc/com/googlecode/android_scripting/language/PythonLanguage.html
deleted file mode 100644
index e04991bb..00000000
--- a/doc/com/googlecode/android_scripting/language/PythonLanguage.html
+++ /dev/null
@@ -1,242 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:01 PDT 2014 -->
-<TITLE>
-PythonLanguage
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="PythonLanguage";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/PythonLanguage.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/PhpLanguage.html" title="class in com.googlecode.android_scripting.language"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/RubyLanguage.html" title="class in com.googlecode.android_scripting.language"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/language/PythonLanguage.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="PythonLanguage.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#methods_inherited_from_class_com.googlecode.android_scripting.language.Language">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.language</FONT>
-<BR>
-Class PythonLanguage</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../com/googlecode/android_scripting/language/Language.html" title="class in com.googlecode.android_scripting.language">com.googlecode.android_scripting.language.Language</A>
-      <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.language.PythonLanguage</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>PythonLanguage</B><DT>extends <A HREF="../../../../com/googlecode/android_scripting/language/Language.html" title="class in com.googlecode.android_scripting.language">Language</A></DL>
-</PRE>
-
-<P>
-Represents the Python programming language.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>igor.v.karp@gmail.com (Igor Karp)</DD>
-</DL>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/language/PythonLanguage.html#PythonLanguage()">PythonLanguage</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_com.googlecode.android_scripting.language.Language"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class com.googlecode.android_scripting.language.<A HREF="../../../../com/googlecode/android_scripting/language/Language.html" title="class in com.googlecode.android_scripting.language">Language</A></B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../com/googlecode/android_scripting/language/Language.html#autoClose(char)">autoClose</A>, <A HREF="../../../../com/googlecode/android_scripting/language/Language.html#getContentTemplate()">getContentTemplate</A>, <A HREF="../../../../com/googlecode/android_scripting/language/Language.html#getRpcText(java.lang.String, com.googlecode.android_scripting.rpc.MethodDescriptor, java.lang.String[])">getRpcText</A></CODE></TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="PythonLanguage()"><!-- --></A><H3>
-PythonLanguage</H3>
-<PRE>
-public <B>PythonLanguage</B>()</PRE>
-<DL>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/PythonLanguage.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/PhpLanguage.html" title="class in com.googlecode.android_scripting.language"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/RubyLanguage.html" title="class in com.googlecode.android_scripting.language"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/language/PythonLanguage.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="PythonLanguage.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#methods_inherited_from_class_com.googlecode.android_scripting.language.Language">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/language/RubyLanguage.html b/doc/com/googlecode/android_scripting/language/RubyLanguage.html
deleted file mode 100644
index fdfd97f8..00000000
--- a/doc/com/googlecode/android_scripting/language/RubyLanguage.html
+++ /dev/null
@@ -1,242 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:01 PDT 2014 -->
-<TITLE>
-RubyLanguage
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="RubyLanguage";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/RubyLanguage.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/PythonLanguage.html" title="class in com.googlecode.android_scripting.language"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/ShellLanguage.html" title="class in com.googlecode.android_scripting.language"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/language/RubyLanguage.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="RubyLanguage.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#methods_inherited_from_class_com.googlecode.android_scripting.language.Language">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.language</FONT>
-<BR>
-Class RubyLanguage</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../com/googlecode/android_scripting/language/Language.html" title="class in com.googlecode.android_scripting.language">com.googlecode.android_scripting.language.Language</A>
-      <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.language.RubyLanguage</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>RubyLanguage</B><DT>extends <A HREF="../../../../com/googlecode/android_scripting/language/Language.html" title="class in com.googlecode.android_scripting.language">Language</A></DL>
-</PRE>
-
-<P>
-Represents the Ruby programming language.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>igor.v.karp@gmail.com (Igor Karp)</DD>
-</DL>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/language/RubyLanguage.html#RubyLanguage()">RubyLanguage</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_com.googlecode.android_scripting.language.Language"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class com.googlecode.android_scripting.language.<A HREF="../../../../com/googlecode/android_scripting/language/Language.html" title="class in com.googlecode.android_scripting.language">Language</A></B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../com/googlecode/android_scripting/language/Language.html#autoClose(char)">autoClose</A>, <A HREF="../../../../com/googlecode/android_scripting/language/Language.html#getContentTemplate()">getContentTemplate</A>, <A HREF="../../../../com/googlecode/android_scripting/language/Language.html#getRpcText(java.lang.String, com.googlecode.android_scripting.rpc.MethodDescriptor, java.lang.String[])">getRpcText</A></CODE></TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="RubyLanguage()"><!-- --></A><H3>
-RubyLanguage</H3>
-<PRE>
-public <B>RubyLanguage</B>()</PRE>
-<DL>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/RubyLanguage.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/PythonLanguage.html" title="class in com.googlecode.android_scripting.language"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/ShellLanguage.html" title="class in com.googlecode.android_scripting.language"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/language/RubyLanguage.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="RubyLanguage.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#methods_inherited_from_class_com.googlecode.android_scripting.language.Language">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/language/ShellLanguage.html b/doc/com/googlecode/android_scripting/language/ShellLanguage.html
deleted file mode 100644
index 646e2f10..00000000
--- a/doc/com/googlecode/android_scripting/language/ShellLanguage.html
+++ /dev/null
@@ -1,242 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:02 PDT 2014 -->
-<TITLE>
-ShellLanguage
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="ShellLanguage";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ShellLanguage.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/RubyLanguage.html" title="class in com.googlecode.android_scripting.language"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/SleepLanguage.html" title="class in com.googlecode.android_scripting.language"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/language/ShellLanguage.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ShellLanguage.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#methods_inherited_from_class_com.googlecode.android_scripting.language.Language">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.language</FONT>
-<BR>
-Class ShellLanguage</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../com/googlecode/android_scripting/language/Language.html" title="class in com.googlecode.android_scripting.language">com.googlecode.android_scripting.language.Language</A>
-      <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.language.ShellLanguage</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>ShellLanguage</B><DT>extends <A HREF="../../../../com/googlecode/android_scripting/language/Language.html" title="class in com.googlecode.android_scripting.language">Language</A></DL>
-</PRE>
-
-<P>
-Represents the Shell programming language.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>igor.v.karp@gmail.com (Igor Karp)</DD>
-</DL>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/language/ShellLanguage.html#ShellLanguage()">ShellLanguage</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_com.googlecode.android_scripting.language.Language"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class com.googlecode.android_scripting.language.<A HREF="../../../../com/googlecode/android_scripting/language/Language.html" title="class in com.googlecode.android_scripting.language">Language</A></B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../com/googlecode/android_scripting/language/Language.html#autoClose(char)">autoClose</A>, <A HREF="../../../../com/googlecode/android_scripting/language/Language.html#getContentTemplate()">getContentTemplate</A>, <A HREF="../../../../com/googlecode/android_scripting/language/Language.html#getRpcText(java.lang.String, com.googlecode.android_scripting.rpc.MethodDescriptor, java.lang.String[])">getRpcText</A></CODE></TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="ShellLanguage()"><!-- --></A><H3>
-ShellLanguage</H3>
-<PRE>
-public <B>ShellLanguage</B>()</PRE>
-<DL>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ShellLanguage.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/RubyLanguage.html" title="class in com.googlecode.android_scripting.language"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/SleepLanguage.html" title="class in com.googlecode.android_scripting.language"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/language/ShellLanguage.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ShellLanguage.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#methods_inherited_from_class_com.googlecode.android_scripting.language.Language">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/language/SleepLanguage.html b/doc/com/googlecode/android_scripting/language/SleepLanguage.html
deleted file mode 100644
index ce71254e..00000000
--- a/doc/com/googlecode/android_scripting/language/SleepLanguage.html
+++ /dev/null
@@ -1,242 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:02 PDT 2014 -->
-<TITLE>
-SleepLanguage
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="SleepLanguage";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/SleepLanguage.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/ShellLanguage.html" title="class in com.googlecode.android_scripting.language"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/SquirrelLanguage.html" title="class in com.googlecode.android_scripting.language"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/language/SleepLanguage.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="SleepLanguage.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#methods_inherited_from_class_com.googlecode.android_scripting.language.Language">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.language</FONT>
-<BR>
-Class SleepLanguage</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../com/googlecode/android_scripting/language/Language.html" title="class in com.googlecode.android_scripting.language">com.googlecode.android_scripting.language.Language</A>
-      <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.language.SleepLanguage</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>SleepLanguage</B><DT>extends <A HREF="../../../../com/googlecode/android_scripting/language/Language.html" title="class in com.googlecode.android_scripting.language">Language</A></DL>
-</PRE>
-
-<P>
-Represents the Sleep programming language.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>tomcatalbino@gmail.com</DD>
-</DL>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/language/SleepLanguage.html#SleepLanguage()">SleepLanguage</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_com.googlecode.android_scripting.language.Language"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class com.googlecode.android_scripting.language.<A HREF="../../../../com/googlecode/android_scripting/language/Language.html" title="class in com.googlecode.android_scripting.language">Language</A></B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../com/googlecode/android_scripting/language/Language.html#autoClose(char)">autoClose</A>, <A HREF="../../../../com/googlecode/android_scripting/language/Language.html#getContentTemplate()">getContentTemplate</A>, <A HREF="../../../../com/googlecode/android_scripting/language/Language.html#getRpcText(java.lang.String, com.googlecode.android_scripting.rpc.MethodDescriptor, java.lang.String[])">getRpcText</A></CODE></TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="SleepLanguage()"><!-- --></A><H3>
-SleepLanguage</H3>
-<PRE>
-public <B>SleepLanguage</B>()</PRE>
-<DL>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/SleepLanguage.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/ShellLanguage.html" title="class in com.googlecode.android_scripting.language"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/SquirrelLanguage.html" title="class in com.googlecode.android_scripting.language"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/language/SleepLanguage.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="SleepLanguage.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#methods_inherited_from_class_com.googlecode.android_scripting.language.Language">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/language/SquirrelLanguage.html b/doc/com/googlecode/android_scripting/language/SquirrelLanguage.html
deleted file mode 100644
index 09bb75a5..00000000
--- a/doc/com/googlecode/android_scripting/language/SquirrelLanguage.html
+++ /dev/null
@@ -1,244 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:02 PDT 2014 -->
-<TITLE>
-SquirrelLanguage
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="SquirrelLanguage";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/SquirrelLanguage.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/SleepLanguage.html" title="class in com.googlecode.android_scripting.language"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/SupportedLanguages.html" title="class in com.googlecode.android_scripting.language"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/language/SquirrelLanguage.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="SquirrelLanguage.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#methods_inherited_from_class_com.googlecode.android_scripting.language.Language">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.language</FONT>
-<BR>
-Class SquirrelLanguage</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../com/googlecode/android_scripting/language/Language.html" title="class in com.googlecode.android_scripting.language">com.googlecode.android_scripting.language.Language</A>
-      <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.language.SquirrelLanguage</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>SquirrelLanguage</B><DT>extends <A HREF="../../../../com/googlecode/android_scripting/language/Language.html" title="class in com.googlecode.android_scripting.language">Language</A></DL>
-</PRE>
-
-<P>
-Represents the Squirrel programming language, by Alberto Demichelis
- this file adapted by Andy Tai, atai@atai.org
- based on the Python version by
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>igor.v.karp@gmail.com (Igor Karp)</DD>
-</DL>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/language/SquirrelLanguage.html#SquirrelLanguage()">SquirrelLanguage</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_com.googlecode.android_scripting.language.Language"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class com.googlecode.android_scripting.language.<A HREF="../../../../com/googlecode/android_scripting/language/Language.html" title="class in com.googlecode.android_scripting.language">Language</A></B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../com/googlecode/android_scripting/language/Language.html#autoClose(char)">autoClose</A>, <A HREF="../../../../com/googlecode/android_scripting/language/Language.html#getContentTemplate()">getContentTemplate</A>, <A HREF="../../../../com/googlecode/android_scripting/language/Language.html#getRpcText(java.lang.String, com.googlecode.android_scripting.rpc.MethodDescriptor, java.lang.String[])">getRpcText</A></CODE></TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="SquirrelLanguage()"><!-- --></A><H3>
-SquirrelLanguage</H3>
-<PRE>
-public <B>SquirrelLanguage</B>()</PRE>
-<DL>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/SquirrelLanguage.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/SleepLanguage.html" title="class in com.googlecode.android_scripting.language"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/SupportedLanguages.html" title="class in com.googlecode.android_scripting.language"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/language/SquirrelLanguage.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="SquirrelLanguage.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#methods_inherited_from_class_com.googlecode.android_scripting.language.Language">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/language/SupportedLanguages.html b/doc/com/googlecode/android_scripting/language/SupportedLanguages.html
deleted file mode 100644
index bb03509a..00000000
--- a/doc/com/googlecode/android_scripting/language/SupportedLanguages.html
+++ /dev/null
@@ -1,271 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:02 PDT 2014 -->
-<TITLE>
-SupportedLanguages
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="SupportedLanguages";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/SupportedLanguages.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/SquirrelLanguage.html" title="class in com.googlecode.android_scripting.language"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/TclLanguage.html" title="class in com.googlecode.android_scripting.language"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/language/SupportedLanguages.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="SupportedLanguages.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.language</FONT>
-<BR>
-Class SupportedLanguages</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.language.SupportedLanguages</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>SupportedLanguages</B><DT>extends java.lang.Object</DL>
-</PRE>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/language/SupportedLanguages.html#SupportedLanguages()">SupportedLanguages</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/language/SupportedLanguages.html#checkLanguageSupported(java.lang.String)">checkLanguageSupported</A></B>(java.lang.String&nbsp;name)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/Language.html" title="class in com.googlecode.android_scripting.language">Language</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/language/SupportedLanguages.html#getLanguageByExtension(java.lang.String)">getLanguageByExtension</A></B>(java.lang.String&nbsp;extension)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="SupportedLanguages()"><!-- --></A><H3>
-SupportedLanguages</H3>
-<PRE>
-public <B>SupportedLanguages</B>()</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="getLanguageByExtension(java.lang.String)"><!-- --></A><H3>
-getLanguageByExtension</H3>
-<PRE>
-public static <A HREF="../../../../com/googlecode/android_scripting/language/Language.html" title="class in com.googlecode.android_scripting.language">Language</A> <B>getLanguageByExtension</B>(java.lang.String&nbsp;extension)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="checkLanguageSupported(java.lang.String)"><!-- --></A><H3>
-checkLanguageSupported</H3>
-<PRE>
-public static boolean <B>checkLanguageSupported</B>(java.lang.String&nbsp;name)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/SupportedLanguages.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/SquirrelLanguage.html" title="class in com.googlecode.android_scripting.language"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/TclLanguage.html" title="class in com.googlecode.android_scripting.language"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/language/SupportedLanguages.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="SupportedLanguages.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/language/TclLanguage.html b/doc/com/googlecode/android_scripting/language/TclLanguage.html
deleted file mode 100644
index 2687b5e4..00000000
--- a/doc/com/googlecode/android_scripting/language/TclLanguage.html
+++ /dev/null
@@ -1,242 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:02 PDT 2014 -->
-<TITLE>
-TclLanguage
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="TclLanguage";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/TclLanguage.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/SupportedLanguages.html" title="class in com.googlecode.android_scripting.language"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/language/TclLanguage.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="TclLanguage.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#methods_inherited_from_class_com.googlecode.android_scripting.language.Language">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.language</FONT>
-<BR>
-Class TclLanguage</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../com/googlecode/android_scripting/language/Language.html" title="class in com.googlecode.android_scripting.language">com.googlecode.android_scripting.language.Language</A>
-      <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.language.TclLanguage</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>TclLanguage</B><DT>extends <A HREF="../../../../com/googlecode/android_scripting/language/Language.html" title="class in com.googlecode.android_scripting.language">Language</A></DL>
-</PRE>
-
-<P>
-Represents the Tcl programming language.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>igor.v.karp@gmail.com (Igor Karp)</DD>
-</DL>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/language/TclLanguage.html#TclLanguage()">TclLanguage</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_com.googlecode.android_scripting.language.Language"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class com.googlecode.android_scripting.language.<A HREF="../../../../com/googlecode/android_scripting/language/Language.html" title="class in com.googlecode.android_scripting.language">Language</A></B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../com/googlecode/android_scripting/language/Language.html#autoClose(char)">autoClose</A>, <A HREF="../../../../com/googlecode/android_scripting/language/Language.html#getContentTemplate()">getContentTemplate</A>, <A HREF="../../../../com/googlecode/android_scripting/language/Language.html#getRpcText(java.lang.String, com.googlecode.android_scripting.rpc.MethodDescriptor, java.lang.String[])">getRpcText</A></CODE></TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="TclLanguage()"><!-- --></A><H3>
-TclLanguage</H3>
-<PRE>
-public <B>TclLanguage</B>()</PRE>
-<DL>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/TclLanguage.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/SupportedLanguages.html" title="class in com.googlecode.android_scripting.language"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/language/TclLanguage.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="TclLanguage.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#methods_inherited_from_class_com.googlecode.android_scripting.language.Language">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/language/package-frame.html b/doc/com/googlecode/android_scripting/language/package-frame.html
deleted file mode 100644
index fd21f93e..00000000
--- a/doc/com/googlecode/android_scripting/language/package-frame.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-com.googlecode.android_scripting.language
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-
-</HEAD>
-
-<BODY BGCOLOR="white">
-<FONT size="+1" CLASS="FrameTitleFont">
-<A HREF="../../../../com/googlecode/android_scripting/language/package-summary.html" target="classFrame">com.googlecode.android_scripting.language</A></FONT>
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
-Classes</FONT>&nbsp;
-<FONT CLASS="FrameItemFont">
-<BR>
-<A HREF="BeanShellLanguage.html" title="class in com.googlecode.android_scripting.language" target="classFrame">BeanShellLanguage</A>
-<BR>
-<A HREF="HtmlLanguage.html" title="class in com.googlecode.android_scripting.language" target="classFrame">HtmlLanguage</A>
-<BR>
-<A HREF="JavaScriptLanguage.html" title="class in com.googlecode.android_scripting.language" target="classFrame">JavaScriptLanguage</A>
-<BR>
-<A HREF="Language.html" title="class in com.googlecode.android_scripting.language" target="classFrame">Language</A>
-<BR>
-<A HREF="LuaLanguage.html" title="class in com.googlecode.android_scripting.language" target="classFrame">LuaLanguage</A>
-<BR>
-<A HREF="PerlLanguage.html" title="class in com.googlecode.android_scripting.language" target="classFrame">PerlLanguage</A>
-<BR>
-<A HREF="PhpLanguage.html" title="class in com.googlecode.android_scripting.language" target="classFrame">PhpLanguage</A>
-<BR>
-<A HREF="PythonLanguage.html" title="class in com.googlecode.android_scripting.language" target="classFrame">PythonLanguage</A>
-<BR>
-<A HREF="RubyLanguage.html" title="class in com.googlecode.android_scripting.language" target="classFrame">RubyLanguage</A>
-<BR>
-<A HREF="ShellLanguage.html" title="class in com.googlecode.android_scripting.language" target="classFrame">ShellLanguage</A>
-<BR>
-<A HREF="SleepLanguage.html" title="class in com.googlecode.android_scripting.language" target="classFrame">SleepLanguage</A>
-<BR>
-<A HREF="SquirrelLanguage.html" title="class in com.googlecode.android_scripting.language" target="classFrame">SquirrelLanguage</A>
-<BR>
-<A HREF="SupportedLanguages.html" title="class in com.googlecode.android_scripting.language" target="classFrame">SupportedLanguages</A>
-<BR>
-<A HREF="TclLanguage.html" title="class in com.googlecode.android_scripting.language" target="classFrame">TclLanguage</A></FONT></TD>
-</TR>
-</TABLE>
-
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/language/package-summary.html b/doc/com/googlecode/android_scripting/language/package-summary.html
deleted file mode 100644
index 18896645..00000000
--- a/doc/com/googlecode/android_scripting/language/package-summary.html
+++ /dev/null
@@ -1,211 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-com.googlecode.android_scripting.language
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="com.googlecode.android_scripting.language";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/jsonrpc/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/language/package-summary.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<H2>
-Package com.googlecode.android_scripting.language
-</H2>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Class Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/language/BeanShellLanguage.html" title="class in com.googlecode.android_scripting.language">BeanShellLanguage</A></B></TD>
-<TD>Represents the BeanShell programming language.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/language/HtmlLanguage.html" title="class in com.googlecode.android_scripting.language">HtmlLanguage</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/language/JavaScriptLanguage.html" title="class in com.googlecode.android_scripting.language">JavaScriptLanguage</A></B></TD>
-<TD>Represents the JavaScript programming language.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/language/Language.html" title="class in com.googlecode.android_scripting.language">Language</A></B></TD>
-<TD>Represents the programming language supported by the SL4A.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/language/LuaLanguage.html" title="class in com.googlecode.android_scripting.language">LuaLanguage</A></B></TD>
-<TD>Represents the Lua programming language.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/language/PerlLanguage.html" title="class in com.googlecode.android_scripting.language">PerlLanguage</A></B></TD>
-<TD>Represents the Perl programming language.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/language/PhpLanguage.html" title="class in com.googlecode.android_scripting.language">PhpLanguage</A></B></TD>
-<TD>Represents the PHP programming language.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/language/PythonLanguage.html" title="class in com.googlecode.android_scripting.language">PythonLanguage</A></B></TD>
-<TD>Represents the Python programming language.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/language/RubyLanguage.html" title="class in com.googlecode.android_scripting.language">RubyLanguage</A></B></TD>
-<TD>Represents the Ruby programming language.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/language/ShellLanguage.html" title="class in com.googlecode.android_scripting.language">ShellLanguage</A></B></TD>
-<TD>Represents the Shell programming language.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/language/SleepLanguage.html" title="class in com.googlecode.android_scripting.language">SleepLanguage</A></B></TD>
-<TD>Represents the Sleep programming language.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/language/SquirrelLanguage.html" title="class in com.googlecode.android_scripting.language">SquirrelLanguage</A></B></TD>
-<TD>Represents the Squirrel programming language, by Alberto Demichelis
- this file adapted by Andy Tai, atai@atai.org
- based on the Python version by</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/language/SupportedLanguages.html" title="class in com.googlecode.android_scripting.language">SupportedLanguages</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/language/TclLanguage.html" title="class in com.googlecode.android_scripting.language">TclLanguage</A></B></TD>
-<TD>Represents the Tcl programming language.</TD>
-</TR>
-</TABLE>
-&nbsp;
-
-<P>
-<DL>
-</DL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/jsonrpc/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/language/package-summary.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/language/package-tree.html b/doc/com/googlecode/android_scripting/language/package-tree.html
deleted file mode 100644
index 2fa3aaa7..00000000
--- a/doc/com/googlecode/android_scripting/language/package-tree.html
+++ /dev/null
@@ -1,155 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-com.googlecode.android_scripting.language Class Hierarchy
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="com.googlecode.android_scripting.language Class Hierarchy";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/jsonrpc/package-tree.html"><B>PREV</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/package-tree.html"><B>NEXT</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/language/package-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-Hierarchy For Package com.googlecode.android_scripting.language
-</H2>
-</CENTER>
-<DL>
-<DT><B>Package Hierarchies:</B><DD><A HREF="../../../../overview-tree.html">All Packages</A></DL>
-<HR>
-<H2>
-Class Hierarchy
-</H2>
-<UL>
-<LI TYPE="circle">java.lang.Object<UL>
-<LI TYPE="circle">com.googlecode.android_scripting.language.<A HREF="../../../../com/googlecode/android_scripting/language/Language.html" title="class in com.googlecode.android_scripting.language"><B>Language</B></A><UL>
-<LI TYPE="circle">com.googlecode.android_scripting.language.<A HREF="../../../../com/googlecode/android_scripting/language/BeanShellLanguage.html" title="class in com.googlecode.android_scripting.language"><B>BeanShellLanguage</B></A><LI TYPE="circle">com.googlecode.android_scripting.language.<A HREF="../../../../com/googlecode/android_scripting/language/HtmlLanguage.html" title="class in com.googlecode.android_scripting.language"><B>HtmlLanguage</B></A><LI TYPE="circle">com.googlecode.android_scripting.language.<A HREF="../../../../com/googlecode/android_scripting/language/JavaScriptLanguage.html" title="class in com.googlecode.android_scripting.language"><B>JavaScriptLanguage</B></A><LI TYPE="circle">com.googlecode.android_scripting.language.<A HREF="../../../../com/googlecode/android_scripting/language/LuaLanguage.html" title="class in com.googlecode.android_scripting.language"><B>LuaLanguage</B></A><LI TYPE="circle">com.googlecode.android_scripting.language.<A HREF="../../../../com/googlecode/android_scripting/language/PerlLanguage.html" title="class in com.googlecode.android_scripting.language"><B>PerlLanguage</B></A><LI TYPE="circle">com.googlecode.android_scripting.language.<A HREF="../../../../com/googlecode/android_scripting/language/PhpLanguage.html" title="class in com.googlecode.android_scripting.language"><B>PhpLanguage</B></A><LI TYPE="circle">com.googlecode.android_scripting.language.<A HREF="../../../../com/googlecode/android_scripting/language/PythonLanguage.html" title="class in com.googlecode.android_scripting.language"><B>PythonLanguage</B></A><LI TYPE="circle">com.googlecode.android_scripting.language.<A HREF="../../../../com/googlecode/android_scripting/language/RubyLanguage.html" title="class in com.googlecode.android_scripting.language"><B>RubyLanguage</B></A><LI TYPE="circle">com.googlecode.android_scripting.language.<A HREF="../../../../com/googlecode/android_scripting/language/ShellLanguage.html" title="class in com.googlecode.android_scripting.language"><B>ShellLanguage</B></A><LI TYPE="circle">com.googlecode.android_scripting.language.<A HREF="../../../../com/googlecode/android_scripting/language/SleepLanguage.html" title="class in com.googlecode.android_scripting.language"><B>SleepLanguage</B></A><LI TYPE="circle">com.googlecode.android_scripting.language.<A HREF="../../../../com/googlecode/android_scripting/language/SquirrelLanguage.html" title="class in com.googlecode.android_scripting.language"><B>SquirrelLanguage</B></A><LI TYPE="circle">com.googlecode.android_scripting.language.<A HREF="../../../../com/googlecode/android_scripting/language/TclLanguage.html" title="class in com.googlecode.android_scripting.language"><B>TclLanguage</B></A></UL>
-<LI TYPE="circle">com.googlecode.android_scripting.language.<A HREF="../../../../com/googlecode/android_scripting/language/SupportedLanguages.html" title="class in com.googlecode.android_scripting.language"><B>SupportedLanguages</B></A></UL>
-</UL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/jsonrpc/package-tree.html"><B>PREV</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/package-tree.html"><B>NEXT</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/language/package-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/package-frame.html b/doc/com/googlecode/android_scripting/package-frame.html
deleted file mode 100644
index 75a65b04..00000000
--- a/doc/com/googlecode/android_scripting/package-frame.html
+++ /dev/null
@@ -1,85 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-com.googlecode.android_scripting
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-
-</HEAD>
-
-<BODY BGCOLOR="white">
-<FONT size="+1" CLASS="FrameTitleFont">
-<A HREF="../../../com/googlecode/android_scripting/package-summary.html" target="classFrame">com.googlecode.android_scripting</A></FONT>
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
-Interfaces</FONT>&nbsp;
-<FONT CLASS="FrameItemFont">
-<BR>
-<A HREF="Constants.html" title="interface in com.googlecode.android_scripting" target="classFrame"><I>Constants</I></A>
-<BR>
-<A HREF="SimpleServer.SimpleServerObserver.html" title="interface in com.googlecode.android_scripting" target="classFrame"><I>SimpleServer.SimpleServerObserver</I></A></FONT></TD>
-</TR>
-</TABLE>
-
-
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
-Classes</FONT>&nbsp;
-<FONT CLASS="FrameItemFont">
-<BR>
-<A HREF="Analytics.html" title="class in com.googlecode.android_scripting" target="classFrame">Analytics</A>
-<BR>
-<A HREF="AndroidProxy.html" title="class in com.googlecode.android_scripting" target="classFrame">AndroidProxy</A>
-<BR>
-<A HREF="BaseApplication.html" title="class in com.googlecode.android_scripting" target="classFrame">BaseApplication</A>
-<BR>
-<A HREF="Exec.html" title="class in com.googlecode.android_scripting" target="classFrame">Exec</A>
-<BR>
-<A HREF="FeaturedInterpreters.html" title="class in com.googlecode.android_scripting" target="classFrame">FeaturedInterpreters</A>
-<BR>
-<A HREF="FileUtils.html" title="class in com.googlecode.android_scripting" target="classFrame">FileUtils</A>
-<BR>
-<A HREF="ForegroundService.html" title="class in com.googlecode.android_scripting" target="classFrame">ForegroundService</A>
-<BR>
-<A HREF="FutureActivityTaskExecutor.html" title="class in com.googlecode.android_scripting" target="classFrame">FutureActivityTaskExecutor</A>
-<BR>
-<A HREF="IntentBuilders.html" title="class in com.googlecode.android_scripting" target="classFrame">IntentBuilders</A>
-<BR>
-<A HREF="IoUtils.html" title="class in com.googlecode.android_scripting" target="classFrame">IoUtils</A>
-<BR>
-<A HREF="Log.html" title="class in com.googlecode.android_scripting" target="classFrame">Log</A>
-<BR>
-<A HREF="MainThread.html" title="class in com.googlecode.android_scripting" target="classFrame">MainThread</A>
-<BR>
-<A HREF="NotificationIdFactory.html" title="class in com.googlecode.android_scripting" target="classFrame">NotificationIdFactory</A>
-<BR>
-<A HREF="Process.html" title="class in com.googlecode.android_scripting" target="classFrame">Process</A>
-<BR>
-<A HREF="ScriptLauncher.html" title="class in com.googlecode.android_scripting" target="classFrame">ScriptLauncher</A>
-<BR>
-<A HREF="ScriptProcess.html" title="class in com.googlecode.android_scripting" target="classFrame">ScriptProcess</A>
-<BR>
-<A HREF="ScriptStorageAdapter.html" title="class in com.googlecode.android_scripting" target="classFrame">ScriptStorageAdapter</A>
-<BR>
-<A HREF="SimpleServer.html" title="class in com.googlecode.android_scripting" target="classFrame">SimpleServer</A>
-<BR>
-<A HREF="SingleThreadExecutor.html" title="class in com.googlecode.android_scripting" target="classFrame">SingleThreadExecutor</A>
-<BR>
-<A HREF="StringUtils.html" title="class in com.googlecode.android_scripting" target="classFrame">StringUtils</A>
-<BR>
-<A HREF="Version.html" title="class in com.googlecode.android_scripting" target="classFrame">Version</A></FONT></TD>
-</TR>
-</TABLE>
-
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/package-summary.html b/doc/com/googlecode/android_scripting/package-summary.html
deleted file mode 100644
index 0c78755e..00000000
--- a/doc/com/googlecode/android_scripting/package-summary.html
+++ /dev/null
@@ -1,256 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-com.googlecode.android_scripting
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="com.googlecode.android_scripting";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/android/python27/support/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/activity/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/googlecode/android_scripting/package-summary.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<H2>
-Package com.googlecode.android_scripting
-</H2>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Interface Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../com/googlecode/android_scripting/Constants.html" title="interface in com.googlecode.android_scripting">Constants</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../com/googlecode/android_scripting/SimpleServer.SimpleServerObserver.html" title="interface in com.googlecode.android_scripting">SimpleServer.SimpleServerObserver</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Class Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../com/googlecode/android_scripting/Analytics.html" title="class in com.googlecode.android_scripting">Analytics</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../com/googlecode/android_scripting/AndroidProxy.html" title="class in com.googlecode.android_scripting">AndroidProxy</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../com/googlecode/android_scripting/BaseApplication.html" title="class in com.googlecode.android_scripting">BaseApplication</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../com/googlecode/android_scripting/Exec.html" title="class in com.googlecode.android_scripting">Exec</A></B></TD>
-<TD>Tools for executing commands.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../com/googlecode/android_scripting/FeaturedInterpreters.html" title="class in com.googlecode.android_scripting">FeaturedInterpreters</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../com/googlecode/android_scripting/FileUtils.html" title="class in com.googlecode.android_scripting">FileUtils</A></B></TD>
-<TD>Utility functions for handling files.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../com/googlecode/android_scripting/ForegroundService.html" title="class in com.googlecode.android_scripting">ForegroundService</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../com/googlecode/android_scripting/FutureActivityTaskExecutor.html" title="class in com.googlecode.android_scripting">FutureActivityTaskExecutor</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../com/googlecode/android_scripting/IntentBuilders.html" title="class in com.googlecode.android_scripting">IntentBuilders</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../com/googlecode/android_scripting/IoUtils.html" title="class in com.googlecode.android_scripting">IoUtils</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../com/googlecode/android_scripting/Log.html" title="class in com.googlecode.android_scripting">Log</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../com/googlecode/android_scripting/MainThread.html" title="class in com.googlecode.android_scripting">MainThread</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../com/googlecode/android_scripting/NotificationIdFactory.html" title="class in com.googlecode.android_scripting">NotificationIdFactory</A></B></TD>
-<TD>Creates unique ids to identify the notifications created by the android scripting service and the
- trigger service.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../com/googlecode/android_scripting/Process.html" title="class in com.googlecode.android_scripting">Process</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../com/googlecode/android_scripting/ScriptLauncher.html" title="class in com.googlecode.android_scripting">ScriptLauncher</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../com/googlecode/android_scripting/ScriptProcess.html" title="class in com.googlecode.android_scripting">ScriptProcess</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../com/googlecode/android_scripting/ScriptStorageAdapter.html" title="class in com.googlecode.android_scripting">ScriptStorageAdapter</A></B></TD>
-<TD>Manages storage and retrieval of scripts on the file system.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../com/googlecode/android_scripting/SimpleServer.html" title="class in com.googlecode.android_scripting">SimpleServer</A></B></TD>
-<TD>A simple server.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../com/googlecode/android_scripting/SingleThreadExecutor.html" title="class in com.googlecode.android_scripting">SingleThreadExecutor</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../com/googlecode/android_scripting/StringUtils.html" title="class in com.googlecode.android_scripting">StringUtils</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../com/googlecode/android_scripting/Version.html" title="class in com.googlecode.android_scripting">Version</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-
-<P>
-<DL>
-</DL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/android/python27/support/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/activity/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/googlecode/android_scripting/package-summary.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/package-tree.html b/doc/com/googlecode/android_scripting/package-tree.html
deleted file mode 100644
index ef5f5254..00000000
--- a/doc/com/googlecode/android_scripting/package-tree.html
+++ /dev/null
@@ -1,171 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-com.googlecode.android_scripting Class Hierarchy
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="com.googlecode.android_scripting Class Hierarchy";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/android/python27/support/package-tree.html"><B>PREV</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/activity/package-tree.html"><B>NEXT</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/googlecode/android_scripting/package-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-Hierarchy For Package com.googlecode.android_scripting
-</H2>
-</CENTER>
-<DL>
-<DT><B>Package Hierarchies:</B><DD><A HREF="../../../overview-tree.html">All Packages</A></DL>
-<HR>
-<H2>
-Class Hierarchy
-</H2>
-<UL>
-<LI TYPE="circle">java.lang.Object<UL>
-<LI TYPE="circle">java.util.concurrent.AbstractExecutorService (implements java.util.concurrent.ExecutorService)
-<UL>
-<LI TYPE="circle">java.util.concurrent.ThreadPoolExecutor<UL>
-<LI TYPE="circle">com.googlecode.android_scripting.<A HREF="../../../com/googlecode/android_scripting/SingleThreadExecutor.html" title="class in com.googlecode.android_scripting"><B>SingleThreadExecutor</B></A></UL>
-</UL>
-<LI TYPE="circle">com.googlecode.android_scripting.<A HREF="../../../com/googlecode/android_scripting/Analytics.html" title="class in com.googlecode.android_scripting"><B>Analytics</B></A><LI TYPE="circle">com.googlecode.android_scripting.<A HREF="../../../com/googlecode/android_scripting/AndroidProxy.html" title="class in com.googlecode.android_scripting"><B>AndroidProxy</B></A><LI TYPE="circle">Application<UL>
-<LI TYPE="circle">com.googlecode.android_scripting.<A HREF="../../../com/googlecode/android_scripting/BaseApplication.html" title="class in com.googlecode.android_scripting"><B>BaseApplication</B></A></UL>
-<LI TYPE="circle">com.googlecode.android_scripting.<A HREF="../../../com/googlecode/android_scripting/Exec.html" title="class in com.googlecode.android_scripting"><B>Exec</B></A><LI TYPE="circle">com.googlecode.android_scripting.<A HREF="../../../com/googlecode/android_scripting/FeaturedInterpreters.html" title="class in com.googlecode.android_scripting"><B>FeaturedInterpreters</B></A><LI TYPE="circle">com.googlecode.android_scripting.<A HREF="../../../com/googlecode/android_scripting/FileUtils.html" title="class in com.googlecode.android_scripting"><B>FileUtils</B></A><LI TYPE="circle">com.googlecode.android_scripting.<A HREF="../../../com/googlecode/android_scripting/FutureActivityTaskExecutor.html" title="class in com.googlecode.android_scripting"><B>FutureActivityTaskExecutor</B></A><LI TYPE="circle">com.googlecode.android_scripting.<A HREF="../../../com/googlecode/android_scripting/IntentBuilders.html" title="class in com.googlecode.android_scripting"><B>IntentBuilders</B></A><LI TYPE="circle">com.googlecode.android_scripting.<A HREF="../../../com/googlecode/android_scripting/IoUtils.html" title="class in com.googlecode.android_scripting"><B>IoUtils</B></A><LI TYPE="circle">com.googlecode.android_scripting.<A HREF="../../../com/googlecode/android_scripting/Log.html" title="class in com.googlecode.android_scripting"><B>Log</B></A><LI TYPE="circle">com.googlecode.android_scripting.<A HREF="../../../com/googlecode/android_scripting/MainThread.html" title="class in com.googlecode.android_scripting"><B>MainThread</B></A><LI TYPE="circle">com.googlecode.android_scripting.<A HREF="../../../com/googlecode/android_scripting/NotificationIdFactory.html" title="class in com.googlecode.android_scripting"><B>NotificationIdFactory</B></A><LI TYPE="circle">com.googlecode.android_scripting.<A HREF="../../../com/googlecode/android_scripting/Process.html" title="class in com.googlecode.android_scripting"><B>Process</B></A><UL>
-<LI TYPE="circle">com.googlecode.android_scripting.interpreter.<A HREF="../../../com/googlecode/android_scripting/interpreter/InterpreterProcess.html" title="class in com.googlecode.android_scripting.interpreter"><B>InterpreterProcess</B></A><UL>
-<LI TYPE="circle">com.googlecode.android_scripting.<A HREF="../../../com/googlecode/android_scripting/ScriptProcess.html" title="class in com.googlecode.android_scripting"><B>ScriptProcess</B></A></UL>
-</UL>
-<LI TYPE="circle">com.googlecode.android_scripting.<A HREF="../../../com/googlecode/android_scripting/ScriptLauncher.html" title="class in com.googlecode.android_scripting"><B>ScriptLauncher</B></A><LI TYPE="circle">com.googlecode.android_scripting.<A HREF="../../../com/googlecode/android_scripting/ScriptStorageAdapter.html" title="class in com.googlecode.android_scripting"><B>ScriptStorageAdapter</B></A><LI TYPE="circle">Service<UL>
-<LI TYPE="circle">com.googlecode.android_scripting.<A HREF="../../../com/googlecode/android_scripting/ForegroundService.html" title="class in com.googlecode.android_scripting"><B>ForegroundService</B></A></UL>
-<LI TYPE="circle">com.googlecode.android_scripting.<A HREF="../../../com/googlecode/android_scripting/SimpleServer.html" title="class in com.googlecode.android_scripting"><B>SimpleServer</B></A><LI TYPE="circle">com.googlecode.android_scripting.<A HREF="../../../com/googlecode/android_scripting/StringUtils.html" title="class in com.googlecode.android_scripting"><B>StringUtils</B></A><LI TYPE="circle">com.googlecode.android_scripting.<A HREF="../../../com/googlecode/android_scripting/Version.html" title="class in com.googlecode.android_scripting"><B>Version</B></A></UL>
-</UL>
-<H2>
-Interface Hierarchy
-</H2>
-<UL>
-<LI TYPE="circle">com.googlecode.android_scripting.<A HREF="../../../com/googlecode/android_scripting/Constants.html" title="interface in com.googlecode.android_scripting"><B>Constants</B></A><LI TYPE="circle">com.googlecode.android_scripting.<A HREF="../../../com/googlecode/android_scripting/SimpleServer.SimpleServerObserver.html" title="interface in com.googlecode.android_scripting"><B>SimpleServer.SimpleServerObserver</B></A></UL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/android/python27/support/package-tree.html"><B>PREV</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/activity/package-tree.html"><B>NEXT</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/googlecode/android_scripting/package-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/rpc/Converter.html b/doc/com/googlecode/android_scripting/rpc/Converter.html
deleted file mode 100644
index 17ba6aa3..00000000
--- a/doc/com/googlecode/android_scripting/rpc/Converter.html
+++ /dev/null
@@ -1,217 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:04 PDT 2014 -->
-<TITLE>
-Converter
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Converter";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/Converter.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/MethodDescriptor.html" title="class in com.googlecode.android_scripting.rpc"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/rpc/Converter.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="Converter.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.rpc</FONT>
-<BR>
-Interface Converter&lt;T&gt;</H2>
-<HR>
-<DL>
-<DT><PRE>public interface <B>Converter&lt;T&gt;</B></DL>
-</PRE>
-
-<P>
-A converter can take a String and turn it into an instance of type T (the type parameter to the
- converter).
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>igor.v.karp@gmail.com (Igor Karp)</DD>
-</DL>
-<HR>
-
-<P>
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/Converter.html" title="type parameter in Converter">T</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/rpc/Converter.html#convert(java.lang.String)">convert</A></B>(java.lang.String&nbsp;value)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Convert a string into type T.</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="convert(java.lang.String)"><!-- --></A><H3>
-convert</H3>
-<PRE>
-<A HREF="../../../../com/googlecode/android_scripting/rpc/Converter.html" title="type parameter in Converter">T</A> <B>convert</B>(java.lang.String&nbsp;value)</PRE>
-<DL>
-<DD>Convert a string into type T.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/Converter.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/MethodDescriptor.html" title="class in com.googlecode.android_scripting.rpc"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/rpc/Converter.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="Converter.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/rpc/MethodDescriptor.html b/doc/com/googlecode/android_scripting/rpc/MethodDescriptor.html
deleted file mode 100644
index 18f3d356..00000000
--- a/doc/com/googlecode/android_scripting/rpc/MethodDescriptor.html
+++ /dev/null
@@ -1,544 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:04 PDT 2014 -->
-<TITLE>
-MethodDescriptor
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="MethodDescriptor";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/MethodDescriptor.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/Converter.html" title="interface in com.googlecode.android_scripting.rpc"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/ParameterDescriptor.html" title="class in com.googlecode.android_scripting.rpc"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/rpc/MethodDescriptor.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="MethodDescriptor.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.rpc</FONT>
-<BR>
-Class MethodDescriptor</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.rpc.MethodDescriptor</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public final class <B>MethodDescriptor</B><DT>extends java.lang.Object</DL>
-</PRE>
-
-<P>
-An adapter that wraps <code>Method</code>.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>igor.v.karp@gmail.com (Igor Karp)</DD>
-</DL>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/rpc/MethodDescriptor.html#MethodDescriptor(java.lang.Class, java.lang.reflect.Method)">MethodDescriptor</A></B>(java.lang.Class&lt;? extends <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A>&gt;&nbsp;clazz,
-                 java.lang.reflect.Method&nbsp;method)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.Object</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/rpc/MethodDescriptor.html#buildIntent(JSONObject)">buildIntent</A></B>(JSONObject&nbsp;jsonObject)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.util.Collection&lt;<A HREF="../../../../com/googlecode/android_scripting/rpc/MethodDescriptor.html" title="class in com.googlecode.android_scripting.rpc">MethodDescriptor</A>&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/rpc/MethodDescriptor.html#collectFrom(java.lang.Class)">collectFrom</A></B>(java.lang.Class&lt;? extends <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A>&gt;&nbsp;clazz)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Collects all methods with <code>RPC</code> annotation from given class.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.Class&lt;? extends <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A>&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/rpc/MethodDescriptor.html#getDeclaringClass()">getDeclaringClass</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.Object</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/rpc/MethodDescriptor.html#getDefaultValue(java.lang.reflect.Type, java.lang.annotation.Annotation[])">getDefaultValue</A></B>(java.lang.reflect.Type&nbsp;parameterType,
-                java.lang.annotation.Annotation[]&nbsp;annotations)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the default value for a specific parameter.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.reflect.Type[]</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/rpc/MethodDescriptor.html#getGenericParameterTypes()">getGenericParameterTypes</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/rpc/MethodDescriptor.html#getHelp()">getHelp</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns a human-readable help text for this RPC, based on annotations in the source code.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.reflect.Method</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/rpc/MethodDescriptor.html#getMethod()">getMethod</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/rpc/MethodDescriptor.html#getName()">getName</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.annotation.Annotation[][]</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/rpc/MethodDescriptor.html#getParameterAnnotations()">getParameterAnnotations</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String[]</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/rpc/MethodDescriptor.html#getParameterHints()">getParameterHints</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns parameter hints.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/ParameterDescriptor.html" title="class in com.googlecode.android_scripting.rpc">ParameterDescriptor</A>[]</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/rpc/MethodDescriptor.html#getParameterValues(java.lang.String[])">getParameterValues</A></B>(java.lang.String[]&nbsp;values)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns parameter descriptors suitable for the RPC call text representation.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/rpc/MethodDescriptor.html#hasDefaultValue(java.lang.annotation.Annotation[])">hasDefaultValue</A></B>(java.lang.annotation.Annotation[]&nbsp;annotations)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Determines whether or not this parameter has default value.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.Object</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/rpc/MethodDescriptor.html#invoke(com.googlecode.android_scripting.jsonrpc.RpcReceiverManager, JSONArray)">invoke</A></B>(<A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManager.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiverManager</A>&nbsp;manager,
-       JSONArray&nbsp;parameters)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Invokes the call that belongs to this object with the given parameters.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/rpc/MethodDescriptor.html#toString()">toString</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="MethodDescriptor(java.lang.Class, java.lang.reflect.Method)"><!-- --></A><H3>
-MethodDescriptor</H3>
-<PRE>
-public <B>MethodDescriptor</B>(java.lang.Class&lt;? extends <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A>&gt;&nbsp;clazz,
-                        java.lang.reflect.Method&nbsp;method)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="toString()"><!-- --></A><H3>
-toString</H3>
-<PRE>
-public java.lang.String <B>toString</B>()</PRE>
-<DL>
-<DD><DL>
-<DT><B>Overrides:</B><DD><CODE>toString</CODE> in class <CODE>java.lang.Object</CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="collectFrom(java.lang.Class)"><!-- --></A><H3>
-collectFrom</H3>
-<PRE>
-public static java.util.Collection&lt;<A HREF="../../../../com/googlecode/android_scripting/rpc/MethodDescriptor.html" title="class in com.googlecode.android_scripting.rpc">MethodDescriptor</A>&gt; <B>collectFrom</B>(java.lang.Class&lt;? extends <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A>&gt;&nbsp;clazz)</PRE>
-<DL>
-<DD>Collects all methods with <code>RPC</code> annotation from given class.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="invoke(com.googlecode.android_scripting.jsonrpc.RpcReceiverManager, JSONArray)"><!-- --></A><H3>
-invoke</H3>
-<PRE>
-public java.lang.Object <B>invoke</B>(<A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiverManager.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiverManager</A>&nbsp;manager,
-                               JSONArray&nbsp;parameters)
-                        throws java.lang.Throwable</PRE>
-<DL>
-<DD>Invokes the call that belongs to this object with the given parameters. Wraps the response
- (possibly an exception) in a JSONObject.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>parameters</CODE> - <code>JSONArray</code> containing the parameters
-<DT><B>Returns:</B><DD>result
-<DT><B>Throws:</B>
-<DD><CODE>java.lang.Throwable</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="buildIntent(JSONObject)"><!-- --></A><H3>
-buildIntent</H3>
-<PRE>
-public static java.lang.Object <B>buildIntent</B>(JSONObject&nbsp;jsonObject)
-                                    throws JSONException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>JSONException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getMethod()"><!-- --></A><H3>
-getMethod</H3>
-<PRE>
-public java.lang.reflect.Method <B>getMethod</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getDeclaringClass()"><!-- --></A><H3>
-getDeclaringClass</H3>
-<PRE>
-public java.lang.Class&lt;? extends <A HREF="../../../../com/googlecode/android_scripting/jsonrpc/RpcReceiver.html" title="class in com.googlecode.android_scripting.jsonrpc">RpcReceiver</A>&gt; <B>getDeclaringClass</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getName()"><!-- --></A><H3>
-getName</H3>
-<PRE>
-public java.lang.String <B>getName</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getGenericParameterTypes()"><!-- --></A><H3>
-getGenericParameterTypes</H3>
-<PRE>
-public java.lang.reflect.Type[] <B>getGenericParameterTypes</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getParameterAnnotations()"><!-- --></A><H3>
-getParameterAnnotations</H3>
-<PRE>
-public java.lang.annotation.Annotation[][] <B>getParameterAnnotations</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getHelp()"><!-- --></A><H3>
-getHelp</H3>
-<PRE>
-public java.lang.String <B>getHelp</B>()</PRE>
-<DL>
-<DD>Returns a human-readable help text for this RPC, based on annotations in the source code.
-<P>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>derived help string</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getParameterValues(java.lang.String[])"><!-- --></A><H3>
-getParameterValues</H3>
-<PRE>
-public <A HREF="../../../../com/googlecode/android_scripting/rpc/ParameterDescriptor.html" title="class in com.googlecode.android_scripting.rpc">ParameterDescriptor</A>[] <B>getParameterValues</B>(java.lang.String[]&nbsp;values)</PRE>
-<DL>
-<DD>Returns parameter descriptors suitable for the RPC call text representation.
- 
- <p>
- Uses parameter value, default value or name, whatever is available first.
-<P>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>an array of parameter descriptors</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getParameterHints()"><!-- --></A><H3>
-getParameterHints</H3>
-<PRE>
-public java.lang.String[] <B>getParameterHints</B>()</PRE>
-<DL>
-<DD>Returns parameter hints.
-<P>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>an array of parameter hints</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getDefaultValue(java.lang.reflect.Type, java.lang.annotation.Annotation[])"><!-- --></A><H3>
-getDefaultValue</H3>
-<PRE>
-public static java.lang.Object <B>getDefaultValue</B>(java.lang.reflect.Type&nbsp;parameterType,
-                                               java.lang.annotation.Annotation[]&nbsp;annotations)</PRE>
-<DL>
-<DD>Returns the default value for a specific parameter.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>parameterType</CODE> - parameterType<DD><CODE>annotations</CODE> - annotations of the parameter</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="hasDefaultValue(java.lang.annotation.Annotation[])"><!-- --></A><H3>
-hasDefaultValue</H3>
-<PRE>
-public static boolean <B>hasDefaultValue</B>(java.lang.annotation.Annotation[]&nbsp;annotations)</PRE>
-<DL>
-<DD>Determines whether or not this parameter has default value.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>annotations</CODE> - annotations of the parameter</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/MethodDescriptor.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/Converter.html" title="interface in com.googlecode.android_scripting.rpc"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/ParameterDescriptor.html" title="class in com.googlecode.android_scripting.rpc"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/rpc/MethodDescriptor.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="MethodDescriptor.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/rpc/ParameterDescriptor.html b/doc/com/googlecode/android_scripting/rpc/ParameterDescriptor.html
deleted file mode 100644
index 9c29a314..00000000
--- a/doc/com/googlecode/android_scripting/rpc/ParameterDescriptor.html
+++ /dev/null
@@ -1,281 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:04 PDT 2014 -->
-<TITLE>
-ParameterDescriptor
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="ParameterDescriptor";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ParameterDescriptor.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/MethodDescriptor.html" title="class in com.googlecode.android_scripting.rpc"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/rpc/ParameterDescriptor.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ParameterDescriptor.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.rpc</FONT>
-<BR>
-Class ParameterDescriptor</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.rpc.ParameterDescriptor</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public final class <B>ParameterDescriptor</B><DT>extends java.lang.Object</DL>
-</PRE>
-
-<P>
-RPC parameter description.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>igor.v.karp@gmail.com (Igor Karp)</DD>
-</DL>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/rpc/ParameterDescriptor.html#ParameterDescriptor(java.lang.String, java.lang.reflect.Type)">ParameterDescriptor</A></B>(java.lang.String&nbsp;value,
-                    java.lang.reflect.Type&nbsp;type)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.reflect.Type</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/rpc/ParameterDescriptor.html#getType()">getType</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/rpc/ParameterDescriptor.html#getValue()">getValue</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="ParameterDescriptor(java.lang.String, java.lang.reflect.Type)"><!-- --></A><H3>
-ParameterDescriptor</H3>
-<PRE>
-public <B>ParameterDescriptor</B>(java.lang.String&nbsp;value,
-                           java.lang.reflect.Type&nbsp;type)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="getValue()"><!-- --></A><H3>
-getValue</H3>
-<PRE>
-public java.lang.String <B>getValue</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getType()"><!-- --></A><H3>
-getType</H3>
-<PRE>
-public java.lang.reflect.Type <B>getType</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ParameterDescriptor.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/MethodDescriptor.html" title="class in com.googlecode.android_scripting.rpc"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/rpc/ParameterDescriptor.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ParameterDescriptor.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/rpc/Rpc.html b/doc/com/googlecode/android_scripting/rpc/Rpc.html
deleted file mode 100644
index bc42d13b..00000000
--- a/doc/com/googlecode/android_scripting/rpc/Rpc.html
+++ /dev/null
@@ -1,251 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:04 PDT 2014 -->
-<TITLE>
-Rpc
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Rpc";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/Rpc.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/ParameterDescriptor.html" title="class in com.googlecode.android_scripting.rpc"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/rpc/Rpc.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="Rpc.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#annotation_type_required_element_summary">REQUIRED</A>&nbsp;|&nbsp;<A HREF="#annotation_type_optional_element_summary">OPTIONAL</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#annotation_type_element_detail">ELEMENT</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.rpc</FONT>
-<BR>
-Annotation Type Rpc</H2>
-<HR>
-<DL>
-<DT><PRE><FONT SIZE="-1">@Retention(value=RUNTIME)
-@Target(value=METHOD)
-@Documented
-</FONT>public @interface <B>Rpc</B></DL>
-</PRE>
-
-<P>
-The <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc"><CODE>Rpc</CODE></A> annotation is used to annotate server-side implementations of RPCs. It describes
- meta-information (currently a brief documentation of the function), and marks a function as the
- implementation of an RPC.
-<P>
-
-<P>
-<HR>
-
-<P>
-<!-- =========== ANNOTATION TYPE REQUIRED MEMBER SUMMARY =========== -->
-
-<A NAME="annotation_type_required_element_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Required Element Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#description()">description</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns brief description of the function.</TD>
-</TR>
-</TABLE>
-&nbsp;<!-- =========== ANNOTATION TYPE OPTIONAL MEMBER SUMMARY =========== -->
-
-<A NAME="annotation_type_optional_element_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Optional Element Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html#returns()">returns</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Gives a brief description of the functions return value (and the underlying data structure).</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ ANNOTATION TYPE MEMBER DETAIL =========== -->
-
-<A NAME="annotation_type_element_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Element Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="description()"><!-- --></A><H3>
-description</H3>
-<PRE>
-public abstract java.lang.String <B>description</B></PRE>
-<DL>
-<DD>Returns brief description of the function. Should be limited to one or two sentences.
-<P>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DL>
-<A NAME="returns()"><!-- --></A><H3>
-returns</H3>
-<PRE>
-public abstract java.lang.String <B>returns</B></PRE>
-<DL>
-<DD>Gives a brief description of the functions return value (and the underlying data structure).
-<P>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-<DL>
-<DT><B>Default:</B><DD>""</DD>
-</DL>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/Rpc.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/ParameterDescriptor.html" title="class in com.googlecode.android_scripting.rpc"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/rpc/Rpc.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="Rpc.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#annotation_type_required_element_summary">REQUIRED</A>&nbsp;|&nbsp;<A HREF="#annotation_type_optional_element_summary">OPTIONAL</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#annotation_type_element_detail">ELEMENT</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/rpc/RpcDefault.html b/doc/com/googlecode/android_scripting/rpc/RpcDefault.html
deleted file mode 100644
index cbf33653..00000000
--- a/doc/com/googlecode/android_scripting/rpc/RpcDefault.html
+++ /dev/null
@@ -1,251 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:04 PDT 2014 -->
-<TITLE>
-RpcDefault
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="RpcDefault";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/RpcDefault.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDeprecated.html" title="annotation in com.googlecode.android_scripting.rpc"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/rpc/RpcDefault.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="RpcDefault.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#annotation_type_required_element_summary">REQUIRED</A>&nbsp;|&nbsp;<A HREF="#annotation_type_optional_element_summary">OPTIONAL</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#annotation_type_element_detail">ELEMENT</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.rpc</FONT>
-<BR>
-Annotation Type RpcDefault</H2>
-<HR>
-<DL>
-<DT><PRE><FONT SIZE="-1">@Retention(value=RUNTIME)
-@Target(value=PARAMETER)
-@Documented
-</FONT>public @interface <B>RpcDefault</B></DL>
-</PRE>
-
-<P>
-Use this annotation to mark an RPC parameter that have a default value.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>igor.v.karp@gmail.com (Igor Karp)</DD>
-</DL>
-<HR>
-
-<P>
-<!-- =========== ANNOTATION TYPE REQUIRED MEMBER SUMMARY =========== -->
-
-<A NAME="annotation_type_required_element_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Required Element Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#value()">value</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The default value of the RPC parameter.</TD>
-</TR>
-</TABLE>
-&nbsp;<!-- =========== ANNOTATION TYPE OPTIONAL MEMBER SUMMARY =========== -->
-
-<A NAME="annotation_type_optional_element_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Optional Element Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.Class&lt;? extends <A HREF="../../../../com/googlecode/android_scripting/rpc/Converter.html" title="interface in com.googlecode.android_scripting.rpc">Converter</A>&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html#converter()">converter</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ ANNOTATION TYPE MEMBER DETAIL =========== -->
-
-<A NAME="annotation_type_element_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Element Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="value()"><!-- --></A><H3>
-value</H3>
-<PRE>
-public abstract java.lang.String <B>value</B></PRE>
-<DL>
-<DD>The default value of the RPC parameter.
-<P>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DL>
-<A NAME="converter()"><!-- --></A><H3>
-converter</H3>
-<PRE>
-public abstract java.lang.Class&lt;? extends <A HREF="../../../../com/googlecode/android_scripting/rpc/Converter.html" title="interface in com.googlecode.android_scripting.rpc">Converter</A>&gt; <B>converter</B></PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-<DL>
-<DT><B>Default:</B><DD>com.googlecode.android_scripting.rpc.Converter.class</DD>
-</DL>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/RpcDefault.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDeprecated.html" title="annotation in com.googlecode.android_scripting.rpc"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/rpc/RpcDefault.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="RpcDefault.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#annotation_type_required_element_summary">REQUIRED</A>&nbsp;|&nbsp;<A HREF="#annotation_type_optional_element_summary">OPTIONAL</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#annotation_type_element_detail">ELEMENT</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/rpc/RpcDeprecated.html b/doc/com/googlecode/android_scripting/rpc/RpcDeprecated.html
deleted file mode 100644
index 7b926ec1..00000000
--- a/doc/com/googlecode/android_scripting/rpc/RpcDeprecated.html
+++ /dev/null
@@ -1,249 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:04 PDT 2014 -->
-<TITLE>
-RpcDeprecated
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="RpcDeprecated";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/RpcDeprecated.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcError.html" title="class in com.googlecode.android_scripting.rpc"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/rpc/RpcDeprecated.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="RpcDeprecated.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#annotation_type_required_element_summary">REQUIRED</A>&nbsp;|&nbsp;<A HREF="#annotation_type_optional_element_summary">OPTIONAL</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#annotation_type_element_detail">ELEMENT</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.rpc</FONT>
-<BR>
-Annotation Type RpcDeprecated</H2>
-<HR>
-<DL>
-<DT><PRE><FONT SIZE="-1">@Retention(value=RUNTIME)
-@Target(value=METHOD)
-@Documented
-</FONT>public @interface <B>RpcDeprecated</B></DL>
-</PRE>
-
-<P>
-Use this annotation to mark RPC method as deprecated.
-<P>
-
-<P>
-<HR>
-
-<P>
-<!-- =========== ANNOTATION TYPE REQUIRED MEMBER SUMMARY =========== -->
-
-<A NAME="annotation_type_required_element_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Required Element Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDeprecated.html#value()">value</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The method that replaced this one.</TD>
-</TR>
-</TABLE>
-&nbsp;<!-- =========== ANNOTATION TYPE OPTIONAL MEMBER SUMMARY =========== -->
-
-<A NAME="annotation_type_optional_element_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Optional Element Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDeprecated.html#release()">release</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Release of SL4A when deprecation occurred.</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ ANNOTATION TYPE MEMBER DETAIL =========== -->
-
-<A NAME="annotation_type_element_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Element Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="value()"><!-- --></A><H3>
-value</H3>
-<PRE>
-public abstract java.lang.String <B>value</B></PRE>
-<DL>
-<DD>The method that replaced this one.
-<P>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DL>
-<A NAME="release()"><!-- --></A><H3>
-release</H3>
-<PRE>
-public abstract java.lang.String <B>release</B></PRE>
-<DL>
-<DD>Release of SL4A when deprecation occurred.
-<P>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-<DL>
-<DT><B>Default:</B><DD>"r4"</DD>
-</DL>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/RpcDeprecated.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcError.html" title="class in com.googlecode.android_scripting.rpc"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/rpc/RpcDeprecated.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="RpcDeprecated.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#annotation_type_required_element_summary">REQUIRED</A>&nbsp;|&nbsp;<A HREF="#annotation_type_optional_element_summary">OPTIONAL</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#annotation_type_element_detail">ELEMENT</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/rpc/RpcError.html b/doc/com/googlecode/android_scripting/rpc/RpcError.html
deleted file mode 100644
index 2a3a7ade..00000000
--- a/doc/com/googlecode/android_scripting/rpc/RpcError.html
+++ /dev/null
@@ -1,240 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:04 PDT 2014 -->
-<TITLE>
-RpcError
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="RpcError";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/RpcError.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDeprecated.html" title="annotation in com.googlecode.android_scripting.rpc"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcMinSdk.html" title="annotation in com.googlecode.android_scripting.rpc"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/rpc/RpcError.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="RpcError.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#methods_inherited_from_class_java.lang.Throwable">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.rpc</FONT>
-<BR>
-Class RpcError</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by ">java.lang.Throwable
-      <IMG SRC="../../../../resources/inherit.gif" ALT="extended by ">java.lang.Exception
-          <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.rpc.RpcError</B>
-</PRE>
-<DL>
-<DT><B>All Implemented Interfaces:</B> <DD>java.io.Serializable</DD>
-</DL>
-<HR>
-<DL>
-<DT><PRE>public class <B>RpcError</B><DT>extends java.lang.Exception</DL>
-</PRE>
-
-<P>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../serialized-form.html#com.googlecode.android_scripting.rpc.RpcError">Serialized Form</A></DL>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcError.html#RpcError(java.lang.String)">RpcError</A></B>(java.lang.String&nbsp;message)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Throwable"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Throwable</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>fillInStackTrace, getCause, getLocalizedMessage, getMessage, getStackTrace, initCause, printStackTrace, printStackTrace, printStackTrace, setStackTrace, toString</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="RpcError(java.lang.String)"><!-- --></A><H3>
-RpcError</H3>
-<PRE>
-public <B>RpcError</B>(java.lang.String&nbsp;message)</PRE>
-<DL>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/RpcError.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDeprecated.html" title="annotation in com.googlecode.android_scripting.rpc"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcMinSdk.html" title="annotation in com.googlecode.android_scripting.rpc"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/rpc/RpcError.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="RpcError.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#methods_inherited_from_class_java.lang.Throwable">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/rpc/RpcMinSdk.html b/doc/com/googlecode/android_scripting/rpc/RpcMinSdk.html
deleted file mode 100644
index a0356d41..00000000
--- a/doc/com/googlecode/android_scripting/rpc/RpcMinSdk.html
+++ /dev/null
@@ -1,215 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:04 PDT 2014 -->
-<TITLE>
-RpcMinSdk
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="RpcMinSdk";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/RpcMinSdk.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcError.html" title="class in com.googlecode.android_scripting.rpc"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcName.html" title="annotation in com.googlecode.android_scripting.rpc"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/rpc/RpcMinSdk.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="RpcMinSdk.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#annotation_type_required_element_summary">REQUIRED</A>&nbsp;|&nbsp;OPTIONAL</FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#annotation_type_element_detail">ELEMENT</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.rpc</FONT>
-<BR>
-Annotation Type RpcMinSdk</H2>
-<HR>
-<DL>
-<DT><PRE><FONT SIZE="-1">@Retention(value=RUNTIME)
-@Documented
-</FONT>public @interface <B>RpcMinSdk</B></DL>
-</PRE>
-
-<P>
-Use this annotation to specify minimum SDK level (if higher than 3).
-<P>
-
-<P>
-<HR>
-
-<P>
-<!-- =========== ANNOTATION TYPE REQUIRED MEMBER SUMMARY =========== -->
-
-<A NAME="annotation_type_required_element_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Required Element Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcMinSdk.html#value()">value</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Minimum SDK Level.</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ ANNOTATION TYPE MEMBER DETAIL =========== -->
-
-<A NAME="annotation_type_element_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Element Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="value()"><!-- --></A><H3>
-value</H3>
-<PRE>
-public abstract int <B>value</B></PRE>
-<DL>
-<DD>Minimum SDK Level.
-<P>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/RpcMinSdk.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcError.html" title="class in com.googlecode.android_scripting.rpc"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcName.html" title="annotation in com.googlecode.android_scripting.rpc"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/rpc/RpcMinSdk.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="RpcMinSdk.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#annotation_type_required_element_summary">REQUIRED</A>&nbsp;|&nbsp;OPTIONAL</FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#annotation_type_element_detail">ELEMENT</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/rpc/RpcName.html b/doc/com/googlecode/android_scripting/rpc/RpcName.html
deleted file mode 100644
index 4167ed17..00000000
--- a/doc/com/googlecode/android_scripting/rpc/RpcName.html
+++ /dev/null
@@ -1,220 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:04 PDT 2014 -->
-<TITLE>
-RpcName
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="RpcName";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/RpcName.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcMinSdk.html" title="annotation in com.googlecode.android_scripting.rpc"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/rpc/RpcName.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="RpcName.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#annotation_type_required_element_summary">REQUIRED</A>&nbsp;|&nbsp;OPTIONAL</FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#annotation_type_element_detail">ELEMENT</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.rpc</FONT>
-<BR>
-Annotation Type RpcName</H2>
-<HR>
-<DL>
-<DT><PRE><FONT SIZE="-1">@Retention(value=RUNTIME)
-@Target(value=METHOD)
-@Documented
-</FONT>public @interface <B>RpcName</B></DL>
-</PRE>
-
-<P>
-Use this annotation to mark an RPC parameter that have a default value.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>igor.v.karp@gmail.com (Igor Karp)</DD>
-</DL>
-<HR>
-
-<P>
-<!-- =========== ANNOTATION TYPE REQUIRED MEMBER SUMMARY =========== -->
-
-<A NAME="annotation_type_required_element_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Required Element Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcName.html#name()">name</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The default value of the RPC parameter.</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ ANNOTATION TYPE MEMBER DETAIL =========== -->
-
-<A NAME="annotation_type_element_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Element Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="name()"><!-- --></A><H3>
-name</H3>
-<PRE>
-public abstract java.lang.String <B>name</B></PRE>
-<DL>
-<DD>The default value of the RPC parameter.
-<P>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/RpcName.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcMinSdk.html" title="annotation in com.googlecode.android_scripting.rpc"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/rpc/RpcName.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="RpcName.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#annotation_type_required_element_summary">REQUIRED</A>&nbsp;|&nbsp;OPTIONAL</FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#annotation_type_element_detail">ELEMENT</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/rpc/RpcOptional.html b/doc/com/googlecode/android_scripting/rpc/RpcOptional.html
deleted file mode 100644
index c074579e..00000000
--- a/doc/com/googlecode/android_scripting/rpc/RpcOptional.html
+++ /dev/null
@@ -1,182 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:04 PDT 2014 -->
-<TITLE>
-RpcOptional
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="RpcOptional";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/RpcOptional.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcName.html" title="annotation in com.googlecode.android_scripting.rpc"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/rpc/RpcOptional.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="RpcOptional.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;REQUIRED&nbsp;|&nbsp;OPTIONAL</FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;ELEMENT</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.rpc</FONT>
-<BR>
-Annotation Type RpcOptional</H2>
-<HR>
-<DL>
-<DT><PRE><FONT SIZE="-1">@Retention(value=RUNTIME)
-@Target(value=PARAMETER)
-@Documented
-</FONT>public @interface <B>RpcOptional</B></DL>
-</PRE>
-
-<P>
-Use this annotation to mark RPC parameter as optional.
- 
- <p>
- The parameter marked as optional has no explicit default value. <code>null</code> is used as default
- value.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>igor.v.karp@gmail.com (Igor Karp)</DD>
-</DL>
-
-<P>
-
-<P>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/RpcOptional.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcName.html" title="annotation in com.googlecode.android_scripting.rpc"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/rpc/RpcOptional.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="RpcOptional.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;REQUIRED&nbsp;|&nbsp;OPTIONAL</FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;ELEMENT</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/rpc/RpcParameter.html b/doc/com/googlecode/android_scripting/rpc/RpcParameter.html
deleted file mode 100644
index b33dd471..00000000
--- a/doc/com/googlecode/android_scripting/rpc/RpcParameter.html
+++ /dev/null
@@ -1,254 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:04 PDT 2014 -->
-<TITLE>
-RpcParameter
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="RpcParameter";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/RpcParameter.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcStartEvent.html" title="annotation in com.googlecode.android_scripting.rpc"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/rpc/RpcParameter.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="RpcParameter.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#annotation_type_required_element_summary">REQUIRED</A>&nbsp;|&nbsp;<A HREF="#annotation_type_optional_element_summary">OPTIONAL</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#annotation_type_element_detail">ELEMENT</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.rpc</FONT>
-<BR>
-Annotation Type RpcParameter</H2>
-<HR>
-<DL>
-<DT><PRE><FONT SIZE="-1">@Retention(value=RUNTIME)
-@Target(value=PARAMETER)
-@Documented
-</FONT>public @interface <B>RpcParameter</B></DL>
-</PRE>
-
-<P>
-An annotation that is used to document the parameters of an RPC.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Felix Arends (felix.arends@gmail.com)</DD>
-</DL>
-<HR>
-
-<P>
-<!-- =========== ANNOTATION TYPE REQUIRED MEMBER SUMMARY =========== -->
-
-<A NAME="annotation_type_required_element_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Required Element Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#name()">name</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The name of the formal parameter.</TD>
-</TR>
-</TABLE>
-&nbsp;<!-- =========== ANNOTATION TYPE OPTIONAL MEMBER SUMMARY =========== -->
-
-<A NAME="annotation_type_optional_element_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Optional Element Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html#description()">description</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Description of the RPC.</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ ANNOTATION TYPE MEMBER DETAIL =========== -->
-
-<A NAME="annotation_type_element_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Element Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="name()"><!-- --></A><H3>
-name</H3>
-<PRE>
-public abstract java.lang.String <B>name</B></PRE>
-<DL>
-<DD>The name of the formal parameter. This should be in agreement with the java code.
-<P>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DL>
-<A NAME="description()"><!-- --></A><H3>
-description</H3>
-<PRE>
-public abstract java.lang.String <B>description</B></PRE>
-<DL>
-<DD>Description of the RPC. This should be a short descriptive statement without a full stop, such
- as 'disables the WiFi mode'.
-<P>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-<DL>
-<DT><B>Default:</B><DD>""</DD>
-</DL>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/RpcParameter.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcStartEvent.html" title="annotation in com.googlecode.android_scripting.rpc"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/rpc/RpcParameter.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="RpcParameter.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#annotation_type_required_element_summary">REQUIRED</A>&nbsp;|&nbsp;<A HREF="#annotation_type_optional_element_summary">OPTIONAL</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#annotation_type_element_detail">ELEMENT</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/rpc/RpcStartEvent.html b/doc/com/googlecode/android_scripting/rpc/RpcStartEvent.html
deleted file mode 100644
index 650d9c07..00000000
--- a/doc/com/googlecode/android_scripting/rpc/RpcStartEvent.html
+++ /dev/null
@@ -1,220 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:04 PDT 2014 -->
-<TITLE>
-RpcStartEvent
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="RpcStartEvent";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/RpcStartEvent.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcStopEvent.html" title="annotation in com.googlecode.android_scripting.rpc"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/rpc/RpcStartEvent.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="RpcStartEvent.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#annotation_type_required_element_summary">REQUIRED</A>&nbsp;|&nbsp;OPTIONAL</FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#annotation_type_element_detail">ELEMENT</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.rpc</FONT>
-<BR>
-Annotation Type RpcStartEvent</H2>
-<HR>
-<DL>
-<DT><PRE><FONT SIZE="-1">@Retention(value=RUNTIME)
-@Target(value=METHOD)
-@Documented
-</FONT>public @interface <B>RpcStartEvent</B></DL>
-</PRE>
-
-<P>
-Use this annotation to mark an RPC as one that starts generating events.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>damonkohler@gmail.com (Damon Kohler)</DD>
-</DL>
-<HR>
-
-<P>
-<!-- =========== ANNOTATION TYPE REQUIRED MEMBER SUMMARY =========== -->
-
-<A NAME="annotation_type_required_element_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Required Element Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcStartEvent.html#value()">value</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The name of the event that is generated.</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ ANNOTATION TYPE MEMBER DETAIL =========== -->
-
-<A NAME="annotation_type_element_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Element Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="value()"><!-- --></A><H3>
-value</H3>
-<PRE>
-public abstract java.lang.String <B>value</B></PRE>
-<DL>
-<DD>The name of the event that is generated.
-<P>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/RpcStartEvent.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcStopEvent.html" title="annotation in com.googlecode.android_scripting.rpc"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/rpc/RpcStartEvent.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="RpcStartEvent.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#annotation_type_required_element_summary">REQUIRED</A>&nbsp;|&nbsp;OPTIONAL</FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#annotation_type_element_detail">ELEMENT</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/rpc/RpcStopEvent.html b/doc/com/googlecode/android_scripting/rpc/RpcStopEvent.html
deleted file mode 100644
index 3b8291aa..00000000
--- a/doc/com/googlecode/android_scripting/rpc/RpcStopEvent.html
+++ /dev/null
@@ -1,220 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:04 PDT 2014 -->
-<TITLE>
-RpcStopEvent
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="RpcStopEvent";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/RpcStopEvent.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcStartEvent.html" title="annotation in com.googlecode.android_scripting.rpc"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/rpc/RpcStopEvent.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="RpcStopEvent.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#annotation_type_required_element_summary">REQUIRED</A>&nbsp;|&nbsp;OPTIONAL</FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#annotation_type_element_detail">ELEMENT</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.rpc</FONT>
-<BR>
-Annotation Type RpcStopEvent</H2>
-<HR>
-<DL>
-<DT><PRE><FONT SIZE="-1">@Retention(value=RUNTIME)
-@Target(value=METHOD)
-@Documented
-</FONT>public @interface <B>RpcStopEvent</B></DL>
-</PRE>
-
-<P>
-Use this annotation to mark an RPC as one that stops generating events.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>damonkohler@gmail.com (Damon Kohler)</DD>
-</DL>
-<HR>
-
-<P>
-<!-- =========== ANNOTATION TYPE REQUIRED MEMBER SUMMARY =========== -->
-
-<A NAME="annotation_type_required_element_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Required Element Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcStopEvent.html#value()">value</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The name of the event that stops being generated.</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ ANNOTATION TYPE MEMBER DETAIL =========== -->
-
-<A NAME="annotation_type_element_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Element Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="value()"><!-- --></A><H3>
-value</H3>
-<PRE>
-public abstract java.lang.String <B>value</B></PRE>
-<DL>
-<DD>The name of the event that stops being generated.
-<P>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/RpcStopEvent.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcStartEvent.html" title="annotation in com.googlecode.android_scripting.rpc"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/rpc/RpcStopEvent.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="RpcStopEvent.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#annotation_type_required_element_summary">REQUIRED</A>&nbsp;|&nbsp;OPTIONAL</FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#annotation_type_element_detail">ELEMENT</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/rpc/package-frame.html b/doc/com/googlecode/android_scripting/rpc/package-frame.html
deleted file mode 100644
index 8115e7a2..00000000
--- a/doc/com/googlecode/android_scripting/rpc/package-frame.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-com.googlecode.android_scripting.rpc
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-
-</HEAD>
-
-<BODY BGCOLOR="white">
-<FONT size="+1" CLASS="FrameTitleFont">
-<A HREF="../../../../com/googlecode/android_scripting/rpc/package-summary.html" target="classFrame">com.googlecode.android_scripting.rpc</A></FONT>
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
-Interfaces</FONT>&nbsp;
-<FONT CLASS="FrameItemFont">
-<BR>
-<A HREF="Converter.html" title="interface in com.googlecode.android_scripting.rpc" target="classFrame"><I>Converter</I></A></FONT></TD>
-</TR>
-</TABLE>
-
-
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
-Classes</FONT>&nbsp;
-<FONT CLASS="FrameItemFont">
-<BR>
-<A HREF="MethodDescriptor.html" title="class in com.googlecode.android_scripting.rpc" target="classFrame">MethodDescriptor</A>
-<BR>
-<A HREF="ParameterDescriptor.html" title="class in com.googlecode.android_scripting.rpc" target="classFrame">ParameterDescriptor</A></FONT></TD>
-</TR>
-</TABLE>
-
-
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
-Exceptions</FONT>&nbsp;
-<FONT CLASS="FrameItemFont">
-<BR>
-<A HREF="RpcError.html" title="class in com.googlecode.android_scripting.rpc" target="classFrame">RpcError</A></FONT></TD>
-</TR>
-</TABLE>
-
-
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
-Annotation Types</FONT>&nbsp;
-<FONT CLASS="FrameItemFont">
-<BR>
-<A HREF="Rpc.html" title="annotation in com.googlecode.android_scripting.rpc" target="classFrame">Rpc</A>
-<BR>
-<A HREF="RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc" target="classFrame">RpcDefault</A>
-<BR>
-<A HREF="RpcDeprecated.html" title="annotation in com.googlecode.android_scripting.rpc" target="classFrame">RpcDeprecated</A>
-<BR>
-<A HREF="RpcMinSdk.html" title="annotation in com.googlecode.android_scripting.rpc" target="classFrame">RpcMinSdk</A>
-<BR>
-<A HREF="RpcName.html" title="annotation in com.googlecode.android_scripting.rpc" target="classFrame">RpcName</A>
-<BR>
-<A HREF="RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc" target="classFrame">RpcOptional</A>
-<BR>
-<A HREF="RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc" target="classFrame">RpcParameter</A>
-<BR>
-<A HREF="RpcStartEvent.html" title="annotation in com.googlecode.android_scripting.rpc" target="classFrame">RpcStartEvent</A>
-<BR>
-<A HREF="RpcStopEvent.html" title="annotation in com.googlecode.android_scripting.rpc" target="classFrame">RpcStopEvent</A></FONT></TD>
-</TR>
-</TABLE>
-
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/rpc/package-summary.html b/doc/com/googlecode/android_scripting/rpc/package-summary.html
deleted file mode 100644
index 8fa39812..00000000
--- a/doc/com/googlecode/android_scripting/rpc/package-summary.html
+++ /dev/null
@@ -1,236 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-com.googlecode.android_scripting.rpc
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="com.googlecode.android_scripting.rpc";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/trigger/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/rpc/package-summary.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<H2>
-Package com.googlecode.android_scripting.rpc
-</H2>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Interface Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/rpc/Converter.html" title="interface in com.googlecode.android_scripting.rpc">Converter&lt;T&gt;</A></B></TD>
-<TD>A converter can take a String and turn it into an instance of type T (the type parameter to the
- converter).</TD>
-</TR>
-</TABLE>
-&nbsp;
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Class Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/rpc/MethodDescriptor.html" title="class in com.googlecode.android_scripting.rpc">MethodDescriptor</A></B></TD>
-<TD>An adapter that wraps <code>Method</code>.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/rpc/ParameterDescriptor.html" title="class in com.googlecode.android_scripting.rpc">ParameterDescriptor</A></B></TD>
-<TD>RPC parameter description.</TD>
-</TR>
-</TABLE>
-&nbsp;
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Exception Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcError.html" title="class in com.googlecode.android_scripting.rpc">RpcError</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Annotation Types Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc">Rpc</A></B></TD>
-<TD>The <A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc"><CODE>Rpc</CODE></A> annotation is used to annotate server-side implementations of RPCs.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc">RpcDefault</A></B></TD>
-<TD>Use this annotation to mark an RPC parameter that have a default value.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDeprecated.html" title="annotation in com.googlecode.android_scripting.rpc">RpcDeprecated</A></B></TD>
-<TD>Use this annotation to mark RPC method as deprecated.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcMinSdk.html" title="annotation in com.googlecode.android_scripting.rpc">RpcMinSdk</A></B></TD>
-<TD>Use this annotation to specify minimum SDK level (if higher than 3).</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcName.html" title="annotation in com.googlecode.android_scripting.rpc">RpcName</A></B></TD>
-<TD>Use this annotation to mark an RPC parameter that have a default value.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc">RpcOptional</A></B></TD>
-<TD>Use this annotation to mark RPC parameter as optional.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc">RpcParameter</A></B></TD>
-<TD>An annotation that is used to document the parameters of an RPC.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcStartEvent.html" title="annotation in com.googlecode.android_scripting.rpc">RpcStartEvent</A></B></TD>
-<TD>Use this annotation to mark an RPC as one that starts generating events.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/rpc/RpcStopEvent.html" title="annotation in com.googlecode.android_scripting.rpc">RpcStopEvent</A></B></TD>
-<TD>Use this annotation to mark an RPC as one that stops generating events.</TD>
-</TR>
-</TABLE>
-&nbsp;
-
-<P>
-<DL>
-</DL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/trigger/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/rpc/package-summary.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/rpc/package-tree.html b/doc/com/googlecode/android_scripting/rpc/package-tree.html
deleted file mode 100644
index 69be939c..00000000
--- a/doc/com/googlecode/android_scripting/rpc/package-tree.html
+++ /dev/null
@@ -1,177 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-com.googlecode.android_scripting.rpc Class Hierarchy
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="com.googlecode.android_scripting.rpc Class Hierarchy";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/package-tree.html"><B>PREV</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/trigger/package-tree.html"><B>NEXT</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/rpc/package-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-Hierarchy For Package com.googlecode.android_scripting.rpc
-</H2>
-</CENTER>
-<DL>
-<DT><B>Package Hierarchies:</B><DD><A HREF="../../../../overview-tree.html">All Packages</A></DL>
-<HR>
-<H2>
-Class Hierarchy
-</H2>
-<UL>
-<LI TYPE="circle">java.lang.Object<UL>
-<LI TYPE="circle">com.googlecode.android_scripting.rpc.<A HREF="../../../../com/googlecode/android_scripting/rpc/MethodDescriptor.html" title="class in com.googlecode.android_scripting.rpc"><B>MethodDescriptor</B></A><LI TYPE="circle">com.googlecode.android_scripting.rpc.<A HREF="../../../../com/googlecode/android_scripting/rpc/ParameterDescriptor.html" title="class in com.googlecode.android_scripting.rpc"><B>ParameterDescriptor</B></A><LI TYPE="circle">java.lang.Throwable (implements java.io.Serializable)
-<UL>
-<LI TYPE="circle">java.lang.Exception<UL>
-<LI TYPE="circle">com.googlecode.android_scripting.rpc.<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcError.html" title="class in com.googlecode.android_scripting.rpc"><B>RpcError</B></A></UL>
-</UL>
-</UL>
-</UL>
-<H2>
-Interface Hierarchy
-</H2>
-<UL>
-<LI TYPE="circle">com.googlecode.android_scripting.rpc.<A HREF="../../../../com/googlecode/android_scripting/rpc/Converter.html" title="interface in com.googlecode.android_scripting.rpc"><B>Converter</B></A>&lt;T&gt;</UL>
-<H2>
-Annotation Type Hierarchy
-</H2>
-<UL>
-<LI TYPE="circle">com.googlecode.android_scripting.rpc.<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcStopEvent.html" title="annotation in com.googlecode.android_scripting.rpc"><B>RpcStopEvent</B></A> (implements java.lang.annotation.Annotation)
-<LI TYPE="circle">com.googlecode.android_scripting.rpc.<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcStartEvent.html" title="annotation in com.googlecode.android_scripting.rpc"><B>RpcStartEvent</B></A> (implements java.lang.annotation.Annotation)
-<LI TYPE="circle">com.googlecode.android_scripting.rpc.<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcParameter.html" title="annotation in com.googlecode.android_scripting.rpc"><B>RpcParameter</B></A> (implements java.lang.annotation.Annotation)
-<LI TYPE="circle">com.googlecode.android_scripting.rpc.<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcOptional.html" title="annotation in com.googlecode.android_scripting.rpc"><B>RpcOptional</B></A> (implements java.lang.annotation.Annotation)
-<LI TYPE="circle">com.googlecode.android_scripting.rpc.<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcName.html" title="annotation in com.googlecode.android_scripting.rpc"><B>RpcName</B></A> (implements java.lang.annotation.Annotation)
-<LI TYPE="circle">com.googlecode.android_scripting.rpc.<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcMinSdk.html" title="annotation in com.googlecode.android_scripting.rpc"><B>RpcMinSdk</B></A> (implements java.lang.annotation.Annotation)
-<LI TYPE="circle">com.googlecode.android_scripting.rpc.<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDeprecated.html" title="annotation in com.googlecode.android_scripting.rpc"><B>RpcDeprecated</B></A> (implements java.lang.annotation.Annotation)
-<LI TYPE="circle">com.googlecode.android_scripting.rpc.<A HREF="../../../../com/googlecode/android_scripting/rpc/RpcDefault.html" title="annotation in com.googlecode.android_scripting.rpc"><B>RpcDefault</B></A> (implements java.lang.annotation.Annotation)
-<LI TYPE="circle">com.googlecode.android_scripting.rpc.<A HREF="../../../../com/googlecode/android_scripting/rpc/Rpc.html" title="annotation in com.googlecode.android_scripting.rpc"><B>Rpc</B></A> (implements java.lang.annotation.Annotation)
-</UL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/language/package-tree.html"><B>PREV</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/trigger/package-tree.html"><B>NEXT</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/rpc/package-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/trigger/EventGenerationControllingObserver.html b/doc/com/googlecode/android_scripting/trigger/EventGenerationControllingObserver.html
deleted file mode 100644
index 3338bd57..00000000
--- a/doc/com/googlecode/android_scripting/trigger/EventGenerationControllingObserver.html
+++ /dev/null
@@ -1,299 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:00:58 PDT 2014 -->
-<TITLE>
-EventGenerationControllingObserver
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="EventGenerationControllingObserver";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/EventGenerationControllingObserver.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/trigger/ScriptTrigger.html" title="class in com.googlecode.android_scripting.trigger"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/trigger/EventGenerationControllingObserver.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="EventGenerationControllingObserver.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.trigger</FONT>
-<BR>
-Class EventGenerationControllingObserver</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.trigger.EventGenerationControllingObserver</B>
-</PRE>
-<DL>
-<DT><B>All Implemented Interfaces:</B> <DD><A HREF="../../../../com/googlecode/android_scripting/trigger/TriggerRepository.TriggerRepositoryObserver.html" title="interface in com.googlecode.android_scripting.trigger">TriggerRepository.TriggerRepositoryObserver</A></DD>
-</DL>
-<HR>
-<DL>
-<DT><PRE>public class <B>EventGenerationControllingObserver</B><DT>extends java.lang.Object<DT>implements <A HREF="../../../../com/googlecode/android_scripting/trigger/TriggerRepository.TriggerRepositoryObserver.html" title="interface in com.googlecode.android_scripting.trigger">TriggerRepository.TriggerRepositoryObserver</A></DL>
-</PRE>
-
-<P>
-A <A HREF="../../../../com/googlecode/android_scripting/trigger/TriggerRepository.TriggerRepositoryObserver.html" title="interface in com.googlecode.android_scripting.trigger"><CODE>TriggerRepository.TriggerRepositoryObserver</CODE></A> that starts and stops the monitoring of events depending on
- whether or not triggers for the event exist.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Felix Arends (felix.arends@gmail.com)</DD>
-</DL>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/trigger/EventGenerationControllingObserver.html#EventGenerationControllingObserver(com.googlecode.android_scripting.facade.FacadeManager)">EventGenerationControllingObserver</A></B>(<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A>&nbsp;facadeManager)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Creates a new StartEventMonitoringObserver for the given trigger repository.</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/trigger/EventGenerationControllingObserver.html#onPut(com.googlecode.android_scripting.trigger.Trigger)">onPut</A></B>(<A HREF="../../../../com/googlecode/android_scripting/trigger/Trigger.html" title="interface in com.googlecode.android_scripting.trigger">Trigger</A>&nbsp;trigger)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Invoked just before the trigger is added to the repository.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/trigger/EventGenerationControllingObserver.html#onRemove(com.googlecode.android_scripting.trigger.Trigger)">onRemove</A></B>(<A HREF="../../../../com/googlecode/android_scripting/trigger/Trigger.html" title="interface in com.googlecode.android_scripting.trigger">Trigger</A>&nbsp;trigger)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Invoked just after the trigger has been removed from the repository.</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="EventGenerationControllingObserver(com.googlecode.android_scripting.facade.FacadeManager)"><!-- --></A><H3>
-EventGenerationControllingObserver</H3>
-<PRE>
-public <B>EventGenerationControllingObserver</B>(<A HREF="../../../../com/googlecode/android_scripting/facade/FacadeManager.html" title="class in com.googlecode.android_scripting.facade">FacadeManager</A>&nbsp;facadeManager)</PRE>
-<DL>
-<DD>Creates a new StartEventMonitoringObserver for the given trigger repository.
-<P>
-<DL>
-<DT><B>Parameters:</B><DD><CODE>facadeManager</CODE> - <DD><CODE>triggerRepository</CODE> - </DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="onPut(com.googlecode.android_scripting.trigger.Trigger)"><!-- --></A><H3>
-onPut</H3>
-<PRE>
-public void <B>onPut</B>(<A HREF="../../../../com/googlecode/android_scripting/trigger/Trigger.html" title="interface in com.googlecode.android_scripting.trigger">Trigger</A>&nbsp;trigger)</PRE>
-<DL>
-<DD><B>Description copied from interface: <CODE><A HREF="../../../../com/googlecode/android_scripting/trigger/TriggerRepository.TriggerRepositoryObserver.html#onPut(com.googlecode.android_scripting.trigger.Trigger)">TriggerRepository.TriggerRepositoryObserver</A></CODE></B></DD>
-<DD>Invoked just before the trigger is added to the repository.
-<P>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../../../com/googlecode/android_scripting/trigger/TriggerRepository.TriggerRepositoryObserver.html#onPut(com.googlecode.android_scripting.trigger.Trigger)">onPut</A></CODE> in interface <CODE><A HREF="../../../../com/googlecode/android_scripting/trigger/TriggerRepository.TriggerRepositoryObserver.html" title="interface in com.googlecode.android_scripting.trigger">TriggerRepository.TriggerRepositoryObserver</A></CODE></DL>
-</DD>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>trigger</CODE> - The trigger about to be added to the repository.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="onRemove(com.googlecode.android_scripting.trigger.Trigger)"><!-- --></A><H3>
-onRemove</H3>
-<PRE>
-public void <B>onRemove</B>(<A HREF="../../../../com/googlecode/android_scripting/trigger/Trigger.html" title="interface in com.googlecode.android_scripting.trigger">Trigger</A>&nbsp;trigger)</PRE>
-<DL>
-<DD><B>Description copied from interface: <CODE><A HREF="../../../../com/googlecode/android_scripting/trigger/TriggerRepository.TriggerRepositoryObserver.html#onRemove(com.googlecode.android_scripting.trigger.Trigger)">TriggerRepository.TriggerRepositoryObserver</A></CODE></B></DD>
-<DD>Invoked just after the trigger has been removed from the repository.
-<P>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../../../com/googlecode/android_scripting/trigger/TriggerRepository.TriggerRepositoryObserver.html#onRemove(com.googlecode.android_scripting.trigger.Trigger)">onRemove</A></CODE> in interface <CODE><A HREF="../../../../com/googlecode/android_scripting/trigger/TriggerRepository.TriggerRepositoryObserver.html" title="interface in com.googlecode.android_scripting.trigger">TriggerRepository.TriggerRepositoryObserver</A></CODE></DL>
-</DD>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>trigger</CODE> - The trigger that has just been removed from the repository.</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/EventGenerationControllingObserver.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/trigger/ScriptTrigger.html" title="class in com.googlecode.android_scripting.trigger"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/trigger/EventGenerationControllingObserver.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="EventGenerationControllingObserver.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/trigger/ScriptTrigger.html b/doc/com/googlecode/android_scripting/trigger/ScriptTrigger.html
deleted file mode 100644
index f24f1a3b..00000000
--- a/doc/com/googlecode/android_scripting/trigger/ScriptTrigger.html
+++ /dev/null
@@ -1,320 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:00:58 PDT 2014 -->
-<TITLE>
-ScriptTrigger
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="ScriptTrigger";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ScriptTrigger.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/trigger/EventGenerationControllingObserver.html" title="class in com.googlecode.android_scripting.trigger"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/trigger/Trigger.html" title="interface in com.googlecode.android_scripting.trigger"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/trigger/ScriptTrigger.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ScriptTrigger.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.trigger</FONT>
-<BR>
-Class ScriptTrigger</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.trigger.ScriptTrigger</B>
-</PRE>
-<DL>
-<DT><B>All Implemented Interfaces:</B> <DD><A HREF="../../../../com/googlecode/android_scripting/trigger/Trigger.html" title="interface in com.googlecode.android_scripting.trigger">Trigger</A>, java.io.Serializable</DD>
-</DL>
-<HR>
-<DL>
-<DT><PRE>public class <B>ScriptTrigger</B><DT>extends java.lang.Object<DT>implements <A HREF="../../../../com/googlecode/android_scripting/trigger/Trigger.html" title="interface in com.googlecode.android_scripting.trigger">Trigger</A></DL>
-</PRE>
-
-<P>
-A trigger implementation that launches a given script when the event occurs.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Felix Arends (felix.arends@gmail.com)</DD>
-<DT><B>See Also:</B><DD><A HREF="../../../../serialized-form.html#com.googlecode.android_scripting.trigger.ScriptTrigger">Serialized Form</A></DL>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/trigger/ScriptTrigger.html#ScriptTrigger(java.lang.String, java.io.File)">ScriptTrigger</A></B>(java.lang.String&nbsp;eventName,
-              java.io.File&nbsp;script)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/trigger/ScriptTrigger.html#getEventName()">getEventName</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the event name that this <A HREF="../../../../com/googlecode/android_scripting/trigger/Trigger.html" title="interface in com.googlecode.android_scripting.trigger"><CODE>Trigger</CODE></A> is interested in.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.io.File</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/trigger/ScriptTrigger.html#getScript()">getScript</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/trigger/ScriptTrigger.html#handleEvent(com.googlecode.android_scripting.event.Event, Context)">handleEvent</A></B>(<A HREF="../../../../com/googlecode/android_scripting/event/Event.html" title="class in com.googlecode.android_scripting.event">Event</A>&nbsp;event,
-            Context&nbsp;context)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Handles an event from the event queue.</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="ScriptTrigger(java.lang.String, java.io.File)"><!-- --></A><H3>
-ScriptTrigger</H3>
-<PRE>
-public <B>ScriptTrigger</B>(java.lang.String&nbsp;eventName,
-                     java.io.File&nbsp;script)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="handleEvent(com.googlecode.android_scripting.event.Event, Context)"><!-- --></A><H3>
-handleEvent</H3>
-<PRE>
-public void <B>handleEvent</B>(<A HREF="../../../../com/googlecode/android_scripting/event/Event.html" title="class in com.googlecode.android_scripting.event">Event</A>&nbsp;event,
-                        Context&nbsp;context)</PRE>
-<DL>
-<DD><B>Description copied from interface: <CODE><A HREF="../../../../com/googlecode/android_scripting/trigger/Trigger.html#handleEvent(com.googlecode.android_scripting.event.Event, Context)">Trigger</A></CODE></B></DD>
-<DD>Handles an event from the event queue.
-<P>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../../../com/googlecode/android_scripting/trigger/Trigger.html#handleEvent(com.googlecode.android_scripting.event.Event, Context)">handleEvent</A></CODE> in interface <CODE><A HREF="../../../../com/googlecode/android_scripting/trigger/Trigger.html" title="interface in com.googlecode.android_scripting.trigger">Trigger</A></CODE></DL>
-</DD>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>event</CODE> - Event to handle<DD><CODE>context</CODE> - TODO</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getEventName()"><!-- --></A><H3>
-getEventName</H3>
-<PRE>
-public java.lang.String <B>getEventName</B>()</PRE>
-<DL>
-<DD><B>Description copied from interface: <CODE><A HREF="../../../../com/googlecode/android_scripting/trigger/Trigger.html#getEventName()">Trigger</A></CODE></B></DD>
-<DD>Returns the event name that this <A HREF="../../../../com/googlecode/android_scripting/trigger/Trigger.html" title="interface in com.googlecode.android_scripting.trigger"><CODE>Trigger</CODE></A> is interested in.
-<P>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../../../com/googlecode/android_scripting/trigger/Trigger.html#getEventName()">getEventName</A></CODE> in interface <CODE><A HREF="../../../../com/googlecode/android_scripting/trigger/Trigger.html" title="interface in com.googlecode.android_scripting.trigger">Trigger</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getScript()"><!-- --></A><H3>
-getScript</H3>
-<PRE>
-public java.io.File <B>getScript</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ScriptTrigger.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/trigger/EventGenerationControllingObserver.html" title="class in com.googlecode.android_scripting.trigger"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/trigger/Trigger.html" title="interface in com.googlecode.android_scripting.trigger"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/trigger/ScriptTrigger.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ScriptTrigger.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/trigger/Trigger.html b/doc/com/googlecode/android_scripting/trigger/Trigger.html
deleted file mode 100644
index 7dd0b609..00000000
--- a/doc/com/googlecode/android_scripting/trigger/Trigger.html
+++ /dev/null
@@ -1,252 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:00:58 PDT 2014 -->
-<TITLE>
-Trigger
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Trigger";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/Trigger.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/trigger/ScriptTrigger.html" title="class in com.googlecode.android_scripting.trigger"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/trigger/TriggerRepository.html" title="class in com.googlecode.android_scripting.trigger"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/trigger/Trigger.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="Trigger.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.trigger</FONT>
-<BR>
-Interface Trigger</H2>
-<DL>
-<DT><B>All Superinterfaces:</B> <DD>java.io.Serializable</DD>
-</DL>
-<DL>
-<DT><B>All Known Implementing Classes:</B> <DD><A HREF="../../../../com/googlecode/android_scripting/trigger/ScriptTrigger.html" title="class in com.googlecode.android_scripting.trigger">ScriptTrigger</A></DD>
-</DL>
-<HR>
-<DL>
-<DT><PRE>public interface <B>Trigger</B><DT>extends java.io.Serializable</DL>
-</PRE>
-
-<P>
-Interface implemented by objects listening to events on the event queue inside of the
- <CODE>SerivceManager</CODE>.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Felix Arends (felix.arends@gmail.com)</DD>
-</DL>
-<HR>
-
-<P>
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/trigger/Trigger.html#getEventName()">getEventName</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the event name that this <A HREF="../../../../com/googlecode/android_scripting/trigger/Trigger.html" title="interface in com.googlecode.android_scripting.trigger"><CODE>Trigger</CODE></A> is interested in.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/trigger/Trigger.html#handleEvent(com.googlecode.android_scripting.event.Event, Context)">handleEvent</A></B>(<A HREF="../../../../com/googlecode/android_scripting/event/Event.html" title="class in com.googlecode.android_scripting.event">Event</A>&nbsp;event,
-            Context&nbsp;context)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Handles an event from the event queue.</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="handleEvent(com.googlecode.android_scripting.event.Event, Context)"><!-- --></A><H3>
-handleEvent</H3>
-<PRE>
-void <B>handleEvent</B>(<A HREF="../../../../com/googlecode/android_scripting/event/Event.html" title="class in com.googlecode.android_scripting.event">Event</A>&nbsp;event,
-                 Context&nbsp;context)</PRE>
-<DL>
-<DD>Handles an event from the event queue.
-<P>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>event</CODE> - Event to handle<DD><CODE>context</CODE> - TODO</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getEventName()"><!-- --></A><H3>
-getEventName</H3>
-<PRE>
-java.lang.String <B>getEventName</B>()</PRE>
-<DL>
-<DD>Returns the event name that this <A HREF="../../../../com/googlecode/android_scripting/trigger/Trigger.html" title="interface in com.googlecode.android_scripting.trigger"><CODE>Trigger</CODE></A> is interested in.
-<P>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/Trigger.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/trigger/ScriptTrigger.html" title="class in com.googlecode.android_scripting.trigger"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/trigger/TriggerRepository.html" title="class in com.googlecode.android_scripting.trigger"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/trigger/Trigger.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="Trigger.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/trigger/TriggerRepository.TriggerRepositoryObserver.html b/doc/com/googlecode/android_scripting/trigger/TriggerRepository.TriggerRepositoryObserver.html
deleted file mode 100644
index 91cfecfd..00000000
--- a/doc/com/googlecode/android_scripting/trigger/TriggerRepository.TriggerRepositoryObserver.html
+++ /dev/null
@@ -1,239 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:00:59 PDT 2014 -->
-<TITLE>
-TriggerRepository.TriggerRepositoryObserver
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="TriggerRepository.TriggerRepositoryObserver";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/TriggerRepository.TriggerRepositoryObserver.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/trigger/TriggerRepository.html" title="class in com.googlecode.android_scripting.trigger"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/trigger/TriggerRepository.TriggerRepositoryObserver.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="TriggerRepository.TriggerRepositoryObserver.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.trigger</FONT>
-<BR>
-Interface TriggerRepository.TriggerRepositoryObserver</H2>
-<DL>
-<DT><B>All Known Implementing Classes:</B> <DD><A HREF="../../../../com/googlecode/android_scripting/trigger/EventGenerationControllingObserver.html" title="class in com.googlecode.android_scripting.trigger">EventGenerationControllingObserver</A></DD>
-</DL>
-<DL>
-<DT><B>Enclosing class:</B><DD><A HREF="../../../../com/googlecode/android_scripting/trigger/TriggerRepository.html" title="class in com.googlecode.android_scripting.trigger">TriggerRepository</A></DD>
-</DL>
-<HR>
-<DL>
-<DT><PRE>public static interface <B>TriggerRepository.TriggerRepositoryObserver</B></DL>
-</PRE>
-
-<P>
-An interface for objects that are notified when a trigger is added to the repository.
-<P>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/trigger/TriggerRepository.TriggerRepositoryObserver.html#onPut(com.googlecode.android_scripting.trigger.Trigger)">onPut</A></B>(<A HREF="../../../../com/googlecode/android_scripting/trigger/Trigger.html" title="interface in com.googlecode.android_scripting.trigger">Trigger</A>&nbsp;trigger)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Invoked just before the trigger is added to the repository.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/trigger/TriggerRepository.TriggerRepositoryObserver.html#onRemove(com.googlecode.android_scripting.trigger.Trigger)">onRemove</A></B>(<A HREF="../../../../com/googlecode/android_scripting/trigger/Trigger.html" title="interface in com.googlecode.android_scripting.trigger">Trigger</A>&nbsp;trigger)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Invoked just after the trigger has been removed from the repository.</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="onPut(com.googlecode.android_scripting.trigger.Trigger)"><!-- --></A><H3>
-onPut</H3>
-<PRE>
-void <B>onPut</B>(<A HREF="../../../../com/googlecode/android_scripting/trigger/Trigger.html" title="interface in com.googlecode.android_scripting.trigger">Trigger</A>&nbsp;trigger)</PRE>
-<DL>
-<DD>Invoked just before the trigger is added to the repository.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>trigger</CODE> - The trigger about to be added to the repository.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="onRemove(com.googlecode.android_scripting.trigger.Trigger)"><!-- --></A><H3>
-onRemove</H3>
-<PRE>
-void <B>onRemove</B>(<A HREF="../../../../com/googlecode/android_scripting/trigger/Trigger.html" title="interface in com.googlecode.android_scripting.trigger">Trigger</A>&nbsp;trigger)</PRE>
-<DL>
-<DD>Invoked just after the trigger has been removed from the repository.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>trigger</CODE> - The trigger that has just been removed from the repository.</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/TriggerRepository.TriggerRepositoryObserver.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/trigger/TriggerRepository.html" title="class in com.googlecode.android_scripting.trigger"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/trigger/TriggerRepository.TriggerRepositoryObserver.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="TriggerRepository.TriggerRepositoryObserver.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/trigger/TriggerRepository.html b/doc/com/googlecode/android_scripting/trigger/TriggerRepository.html
deleted file mode 100644
index 37c02350..00000000
--- a/doc/com/googlecode/android_scripting/trigger/TriggerRepository.html
+++ /dev/null
@@ -1,409 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:00:59 PDT 2014 -->
-<TITLE>
-TriggerRepository
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="TriggerRepository";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/TriggerRepository.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/trigger/Trigger.html" title="interface in com.googlecode.android_scripting.trigger"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/trigger/TriggerRepository.TriggerRepositoryObserver.html" title="interface in com.googlecode.android_scripting.trigger"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/trigger/TriggerRepository.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="TriggerRepository.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#nested_class_summary">NESTED</A>&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.trigger</FONT>
-<BR>
-Class TriggerRepository</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.googlecode.android_scripting.trigger.TriggerRepository</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>TriggerRepository</B><DT>extends java.lang.Object</DL>
-</PRE>
-
-<P>
-A repository maintaining all currently scheduled triggers. This includes, for example, alarms or
- observers of arriving text messages etc. This class is responsible for serializing the list of
- triggers to the shared preferences store, and retrieving it from there.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Felix Arends (felix.arends@gmail.com), Damon Kohler (damonkohler@gmail.com)</DD>
-</DL>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-<A NAME="nested_class_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Nested Class Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;interface</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/trigger/TriggerRepository.TriggerRepositoryObserver.html" title="interface in com.googlecode.android_scripting.trigger">TriggerRepository.TriggerRepositoryObserver</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;An interface for objects that are notified when a trigger is added to the repository.</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/trigger/TriggerRepository.html#TriggerRepository(Context)">TriggerRepository</A></B>(Context&nbsp;context)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/trigger/TriggerRepository.html#addObserver(com.googlecode.android_scripting.trigger.TriggerRepository.TriggerRepositoryObserver)">addObserver</A></B>(<A HREF="../../../../com/googlecode/android_scripting/trigger/TriggerRepository.TriggerRepositoryObserver.html" title="interface in com.googlecode.android_scripting.trigger">TriggerRepository.TriggerRepositoryObserver</A>&nbsp;observer)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Adds a <A HREF="../../../../com/googlecode/android_scripting/trigger/TriggerRepository.TriggerRepositoryObserver.html" title="interface in com.googlecode.android_scripting.trigger"><CODE>TriggerRepository.TriggerRepositoryObserver</CODE></A>.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/trigger/TriggerRepository.html#bootstrapObserver(com.googlecode.android_scripting.trigger.TriggerRepository.TriggerRepositoryObserver)">bootstrapObserver</A></B>(<A HREF="../../../../com/googlecode/android_scripting/trigger/TriggerRepository.TriggerRepositoryObserver.html" title="interface in com.googlecode.android_scripting.trigger">TriggerRepository.TriggerRepositoryObserver</A>&nbsp;observer)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Adds the given <A HREF="../../../../com/googlecode/android_scripting/trigger/TriggerRepository.TriggerRepositoryObserver.html" title="interface in com.googlecode.android_scripting.trigger"><CODE>TriggerRepository.TriggerRepositoryObserver</CODE></A> and invokes
- <A HREF="../../../../com/googlecode/android_scripting/trigger/TriggerRepository.TriggerRepositoryObserver.html#onPut(com.googlecode.android_scripting.trigger.Trigger)"><CODE>TriggerRepository.TriggerRepositoryObserver.onPut(com.googlecode.android_scripting.trigger.Trigger)</CODE></A> for all existing triggers.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;com.google.common.collect.Multimap&lt;java.lang.String,<A HREF="../../../../com/googlecode/android_scripting/trigger/Trigger.html" title="interface in com.googlecode.android_scripting.trigger">Trigger</A>&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/trigger/TriggerRepository.html#getAllTriggers()">getAllTriggers</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns a list of all triggers.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/trigger/TriggerRepository.html#isEmpty()">isEmpty</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns <code>true</code> iff the list of triggers is empty.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/trigger/TriggerRepository.html#put(com.googlecode.android_scripting.trigger.Trigger)">put</A></B>(<A HREF="../../../../com/googlecode/android_scripting/trigger/Trigger.html" title="interface in com.googlecode.android_scripting.trigger">Trigger</A>&nbsp;trigger)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Adds a new trigger to the repository.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/trigger/TriggerRepository.html#remove(com.googlecode.android_scripting.trigger.Trigger)">remove</A></B>(<A HREF="../../../../com/googlecode/android_scripting/trigger/Trigger.html" title="interface in com.googlecode.android_scripting.trigger">Trigger</A>&nbsp;trigger)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Removes a specific <A HREF="../../../../com/googlecode/android_scripting/trigger/Trigger.html" title="interface in com.googlecode.android_scripting.trigger"><CODE>Trigger</CODE></A>.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/googlecode/android_scripting/trigger/TriggerRepository.html#removeObserver(com.googlecode.android_scripting.trigger.TriggerRepository.TriggerRepositoryObserver)">removeObserver</A></B>(<A HREF="../../../../com/googlecode/android_scripting/trigger/TriggerRepository.TriggerRepositoryObserver.html" title="interface in com.googlecode.android_scripting.trigger">TriggerRepository.TriggerRepositoryObserver</A>&nbsp;observer)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Removes a <A HREF="../../../../com/googlecode/android_scripting/trigger/TriggerRepository.TriggerRepositoryObserver.html" title="interface in com.googlecode.android_scripting.trigger"><CODE>TriggerRepository.TriggerRepositoryObserver</CODE></A>.</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="TriggerRepository(Context)"><!-- --></A><H3>
-TriggerRepository</H3>
-<PRE>
-public <B>TriggerRepository</B>(Context&nbsp;context)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="getAllTriggers()"><!-- --></A><H3>
-getAllTriggers</H3>
-<PRE>
-public com.google.common.collect.Multimap&lt;java.lang.String,<A HREF="../../../../com/googlecode/android_scripting/trigger/Trigger.html" title="interface in com.googlecode.android_scripting.trigger">Trigger</A>&gt; <B>getAllTriggers</B>()</PRE>
-<DL>
-<DD>Returns a list of all triggers. The list is unmodifiable.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="put(com.googlecode.android_scripting.trigger.Trigger)"><!-- --></A><H3>
-put</H3>
-<PRE>
-public void <B>put</B>(<A HREF="../../../../com/googlecode/android_scripting/trigger/Trigger.html" title="interface in com.googlecode.android_scripting.trigger">Trigger</A>&nbsp;trigger)</PRE>
-<DL>
-<DD>Adds a new trigger to the repository.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>trigger</CODE> - the <A HREF="../../../../com/googlecode/android_scripting/trigger/Trigger.html" title="interface in com.googlecode.android_scripting.trigger"><CODE>Trigger</CODE></A> to add</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="remove(com.googlecode.android_scripting.trigger.Trigger)"><!-- --></A><H3>
-remove</H3>
-<PRE>
-public void <B>remove</B>(<A HREF="../../../../com/googlecode/android_scripting/trigger/Trigger.html" title="interface in com.googlecode.android_scripting.trigger">Trigger</A>&nbsp;trigger)</PRE>
-<DL>
-<DD>Removes a specific <A HREF="../../../../com/googlecode/android_scripting/trigger/Trigger.html" title="interface in com.googlecode.android_scripting.trigger"><CODE>Trigger</CODE></A>.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isEmpty()"><!-- --></A><H3>
-isEmpty</H3>
-<PRE>
-public boolean <B>isEmpty</B>()</PRE>
-<DL>
-<DD>Returns <code>true</code> iff the list of triggers is empty.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="addObserver(com.googlecode.android_scripting.trigger.TriggerRepository.TriggerRepositoryObserver)"><!-- --></A><H3>
-addObserver</H3>
-<PRE>
-public void <B>addObserver</B>(<A HREF="../../../../com/googlecode/android_scripting/trigger/TriggerRepository.TriggerRepositoryObserver.html" title="interface in com.googlecode.android_scripting.trigger">TriggerRepository.TriggerRepositoryObserver</A>&nbsp;observer)</PRE>
-<DL>
-<DD>Adds a <A HREF="../../../../com/googlecode/android_scripting/trigger/TriggerRepository.TriggerRepositoryObserver.html" title="interface in com.googlecode.android_scripting.trigger"><CODE>TriggerRepository.TriggerRepositoryObserver</CODE></A>.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="bootstrapObserver(com.googlecode.android_scripting.trigger.TriggerRepository.TriggerRepositoryObserver)"><!-- --></A><H3>
-bootstrapObserver</H3>
-<PRE>
-public void <B>bootstrapObserver</B>(<A HREF="../../../../com/googlecode/android_scripting/trigger/TriggerRepository.TriggerRepositoryObserver.html" title="interface in com.googlecode.android_scripting.trigger">TriggerRepository.TriggerRepositoryObserver</A>&nbsp;observer)</PRE>
-<DL>
-<DD>Adds the given <A HREF="../../../../com/googlecode/android_scripting/trigger/TriggerRepository.TriggerRepositoryObserver.html" title="interface in com.googlecode.android_scripting.trigger"><CODE>TriggerRepository.TriggerRepositoryObserver</CODE></A> and invokes
- <A HREF="../../../../com/googlecode/android_scripting/trigger/TriggerRepository.TriggerRepositoryObserver.html#onPut(com.googlecode.android_scripting.trigger.Trigger)"><CODE>TriggerRepository.TriggerRepositoryObserver.onPut(com.googlecode.android_scripting.trigger.Trigger)</CODE></A> for all existing triggers.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>observer</CODE> - The observer to add.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="removeObserver(com.googlecode.android_scripting.trigger.TriggerRepository.TriggerRepositoryObserver)"><!-- --></A><H3>
-removeObserver</H3>
-<PRE>
-public void <B>removeObserver</B>(<A HREF="../../../../com/googlecode/android_scripting/trigger/TriggerRepository.TriggerRepositoryObserver.html" title="interface in com.googlecode.android_scripting.trigger">TriggerRepository.TriggerRepositoryObserver</A>&nbsp;observer)</PRE>
-<DL>
-<DD>Removes a <A HREF="../../../../com/googlecode/android_scripting/trigger/TriggerRepository.TriggerRepositoryObserver.html" title="interface in com.googlecode.android_scripting.trigger"><CODE>TriggerRepository.TriggerRepositoryObserver</CODE></A>.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/TriggerRepository.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/trigger/Trigger.html" title="interface in com.googlecode.android_scripting.trigger"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/trigger/TriggerRepository.TriggerRepositoryObserver.html" title="interface in com.googlecode.android_scripting.trigger"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/trigger/TriggerRepository.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="TriggerRepository.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#nested_class_summary">NESTED</A>&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/trigger/package-frame.html b/doc/com/googlecode/android_scripting/trigger/package-frame.html
deleted file mode 100644
index a814ee2f..00000000
--- a/doc/com/googlecode/android_scripting/trigger/package-frame.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-com.googlecode.android_scripting.trigger
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-
-</HEAD>
-
-<BODY BGCOLOR="white">
-<FONT size="+1" CLASS="FrameTitleFont">
-<A HREF="../../../../com/googlecode/android_scripting/trigger/package-summary.html" target="classFrame">com.googlecode.android_scripting.trigger</A></FONT>
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
-Interfaces</FONT>&nbsp;
-<FONT CLASS="FrameItemFont">
-<BR>
-<A HREF="Trigger.html" title="interface in com.googlecode.android_scripting.trigger" target="classFrame"><I>Trigger</I></A>
-<BR>
-<A HREF="TriggerRepository.TriggerRepositoryObserver.html" title="interface in com.googlecode.android_scripting.trigger" target="classFrame"><I>TriggerRepository.TriggerRepositoryObserver</I></A></FONT></TD>
-</TR>
-</TABLE>
-
-
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
-Classes</FONT>&nbsp;
-<FONT CLASS="FrameItemFont">
-<BR>
-<A HREF="EventGenerationControllingObserver.html" title="class in com.googlecode.android_scripting.trigger" target="classFrame">EventGenerationControllingObserver</A>
-<BR>
-<A HREF="ScriptTrigger.html" title="class in com.googlecode.android_scripting.trigger" target="classFrame">ScriptTrigger</A>
-<BR>
-<A HREF="TriggerRepository.html" title="class in com.googlecode.android_scripting.trigger" target="classFrame">TriggerRepository</A></FONT></TD>
-</TR>
-</TABLE>
-
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/trigger/package-summary.html b/doc/com/googlecode/android_scripting/trigger/package-summary.html
deleted file mode 100644
index 03311437..00000000
--- a/doc/com/googlecode/android_scripting/trigger/package-summary.html
+++ /dev/null
@@ -1,185 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-com.googlecode.android_scripting.trigger
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="com.googlecode.android_scripting.trigger";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/util/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/trigger/package-summary.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<H2>
-Package com.googlecode.android_scripting.trigger
-</H2>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Interface Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/trigger/Trigger.html" title="interface in com.googlecode.android_scripting.trigger">Trigger</A></B></TD>
-<TD>Interface implemented by objects listening to events on the event queue inside of the
- <CODE>SerivceManager</CODE>.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/trigger/TriggerRepository.TriggerRepositoryObserver.html" title="interface in com.googlecode.android_scripting.trigger">TriggerRepository.TriggerRepositoryObserver</A></B></TD>
-<TD>An interface for objects that are notified when a trigger is added to the repository.</TD>
-</TR>
-</TABLE>
-&nbsp;
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Class Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/trigger/EventGenerationControllingObserver.html" title="class in com.googlecode.android_scripting.trigger">EventGenerationControllingObserver</A></B></TD>
-<TD>A <A HREF="../../../../com/googlecode/android_scripting/trigger/TriggerRepository.TriggerRepositoryObserver.html" title="interface in com.googlecode.android_scripting.trigger"><CODE>TriggerRepository.TriggerRepositoryObserver</CODE></A> that starts and stops the monitoring of events depending on
- whether or not triggers for the event exist.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/trigger/ScriptTrigger.html" title="class in com.googlecode.android_scripting.trigger">ScriptTrigger</A></B></TD>
-<TD>A trigger implementation that launches a given script when the event occurs.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/trigger/TriggerRepository.html" title="class in com.googlecode.android_scripting.trigger">TriggerRepository</A></B></TD>
-<TD>A repository maintaining all currently scheduled triggers.</TD>
-</TR>
-</TABLE>
-&nbsp;
-
-<P>
-<DL>
-</DL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/util/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/trigger/package-summary.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/trigger/package-tree.html b/doc/com/googlecode/android_scripting/trigger/package-tree.html
deleted file mode 100644
index b224f548..00000000
--- a/doc/com/googlecode/android_scripting/trigger/package-tree.html
+++ /dev/null
@@ -1,162 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-com.googlecode.android_scripting.trigger Class Hierarchy
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="com.googlecode.android_scripting.trigger Class Hierarchy";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/package-tree.html"><B>PREV</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/util/package-tree.html"><B>NEXT</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/trigger/package-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-Hierarchy For Package com.googlecode.android_scripting.trigger
-</H2>
-</CENTER>
-<DL>
-<DT><B>Package Hierarchies:</B><DD><A HREF="../../../../overview-tree.html">All Packages</A></DL>
-<HR>
-<H2>
-Class Hierarchy
-</H2>
-<UL>
-<LI TYPE="circle">java.lang.Object<UL>
-<LI TYPE="circle">com.googlecode.android_scripting.trigger.<A HREF="../../../../com/googlecode/android_scripting/trigger/EventGenerationControllingObserver.html" title="class in com.googlecode.android_scripting.trigger"><B>EventGenerationControllingObserver</B></A> (implements com.googlecode.android_scripting.trigger.<A HREF="../../../../com/googlecode/android_scripting/trigger/TriggerRepository.TriggerRepositoryObserver.html" title="interface in com.googlecode.android_scripting.trigger">TriggerRepository.TriggerRepositoryObserver</A>)
-<LI TYPE="circle">com.googlecode.android_scripting.trigger.<A HREF="../../../../com/googlecode/android_scripting/trigger/ScriptTrigger.html" title="class in com.googlecode.android_scripting.trigger"><B>ScriptTrigger</B></A> (implements com.googlecode.android_scripting.trigger.<A HREF="../../../../com/googlecode/android_scripting/trigger/Trigger.html" title="interface in com.googlecode.android_scripting.trigger">Trigger</A>)
-<LI TYPE="circle">com.googlecode.android_scripting.trigger.<A HREF="../../../../com/googlecode/android_scripting/trigger/TriggerRepository.html" title="class in com.googlecode.android_scripting.trigger"><B>TriggerRepository</B></A></UL>
-</UL>
-<H2>
-Interface Hierarchy
-</H2>
-<UL>
-<LI TYPE="circle">java.io.Serializable<UL>
-<LI TYPE="circle">com.googlecode.android_scripting.trigger.<A HREF="../../../../com/googlecode/android_scripting/trigger/Trigger.html" title="interface in com.googlecode.android_scripting.trigger"><B>Trigger</B></A></UL>
-<LI TYPE="circle">com.googlecode.android_scripting.trigger.<A HREF="../../../../com/googlecode/android_scripting/trigger/TriggerRepository.TriggerRepositoryObserver.html" title="interface in com.googlecode.android_scripting.trigger"><B>TriggerRepository.TriggerRepositoryObserver</B></A></UL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/rpc/package-tree.html"><B>PREV</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/util/package-tree.html"><B>NEXT</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/trigger/package-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/util/VisibleForTesting.html b/doc/com/googlecode/android_scripting/util/VisibleForTesting.html
deleted file mode 100644
index d6122e22..00000000
--- a/doc/com/googlecode/android_scripting/util/VisibleForTesting.html
+++ /dev/null
@@ -1,176 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-VisibleForTesting
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="VisibleForTesting";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/VisibleForTesting.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/util/VisibleForTesting.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="VisibleForTesting.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;REQUIRED&nbsp;|&nbsp;OPTIONAL</FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;ELEMENT</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.googlecode.android_scripting.util</FONT>
-<BR>
-Annotation Type VisibleForTesting</H2>
-<HR>
-<DL>
-<DT><PRE>public @interface <B>VisibleForTesting</B></DL>
-</PRE>
-
-<P>
-An annotation that indicates that the visibility of a type or member has been relaxed from
- private to package to make the code testable.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>igor.v.karp@gmail.com (Igor Karp)</DD>
-</DL>
-
-<P>
-
-<P>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/VisibleForTesting.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/util/VisibleForTesting.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="VisibleForTesting.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;REQUIRED&nbsp;|&nbsp;OPTIONAL</FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;ELEMENT</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/util/package-frame.html b/doc/com/googlecode/android_scripting/util/package-frame.html
deleted file mode 100644
index 60698d3b..00000000
--- a/doc/com/googlecode/android_scripting/util/package-frame.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-com.googlecode.android_scripting.util
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-
-</HEAD>
-
-<BODY BGCOLOR="white">
-<FONT size="+1" CLASS="FrameTitleFont">
-<A HREF="../../../../com/googlecode/android_scripting/util/package-summary.html" target="classFrame">com.googlecode.android_scripting.util</A></FONT>
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
-Annotation Types</FONT>&nbsp;
-<FONT CLASS="FrameItemFont">
-<BR>
-<A HREF="VisibleForTesting.html" title="annotation in com.googlecode.android_scripting.util" target="classFrame">VisibleForTesting</A></FONT></TD>
-</TR>
-</TABLE>
-
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/util/package-summary.html b/doc/com/googlecode/android_scripting/util/package-summary.html
deleted file mode 100644
index 2e85306a..00000000
--- a/doc/com/googlecode/android_scripting/util/package-summary.html
+++ /dev/null
@@ -1,158 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-com.googlecode.android_scripting.util
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="com.googlecode.android_scripting.util";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/trigger/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/hipipal/sl4alib/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/util/package-summary.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<H2>
-Package com.googlecode.android_scripting.util
-</H2>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Annotation Types Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/googlecode/android_scripting/util/VisibleForTesting.html" title="annotation in com.googlecode.android_scripting.util">VisibleForTesting</A></B></TD>
-<TD>An annotation that indicates that the visibility of a type or member has been relaxed from
- private to package to make the code testable.</TD>
-</TR>
-</TABLE>
-&nbsp;
-
-<P>
-<DL>
-</DL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/trigger/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/hipipal/sl4alib/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/util/package-summary.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/googlecode/android_scripting/util/package-tree.html b/doc/com/googlecode/android_scripting/util/package-tree.html
deleted file mode 100644
index 4f79d726..00000000
--- a/doc/com/googlecode/android_scripting/util/package-tree.html
+++ /dev/null
@@ -1,152 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:07 PDT 2014 -->
-<TITLE>
-com.googlecode.android_scripting.util Class Hierarchy
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="com.googlecode.android_scripting.util Class Hierarchy";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/trigger/package-tree.html"><B>PREV</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/hipipal/sl4alib/package-tree.html"><B>NEXT</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/util/package-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-Hierarchy For Package com.googlecode.android_scripting.util
-</H2>
-</CENTER>
-<DL>
-<DT><B>Package Hierarchies:</B><DD><A HREF="../../../../overview-tree.html">All Packages</A></DL>
-<HR>
-<H2>
-Annotation Type Hierarchy
-</H2>
-<UL>
-<LI TYPE="circle">com.googlecode.android_scripting.util.<A HREF="../../../../com/googlecode/android_scripting/util/VisibleForTesting.html" title="annotation in com.googlecode.android_scripting.util"><B>VisibleForTesting</B></A> (implements java.lang.annotation.Annotation)
-</UL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/googlecode/android_scripting/trigger/package-tree.html"><B>PREV</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/hipipal/sl4alib/package-tree.html"><B>NEXT</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../index.html?com/googlecode/android_scripting/util/package-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/hipipal/sl4alib/CONF.html b/doc/com/hipipal/sl4alib/CONF.html
deleted file mode 100644
index 392537b2..00000000
--- a/doc/com/hipipal/sl4alib/CONF.html
+++ /dev/null
@@ -1,387 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:04 PDT 2014 -->
-<TITLE>
-CONF
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="CONF";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/CONF.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;<A HREF="../../../com/hipipal/sl4alib/MNApp.html" title="class in com.hipipal.sl4alib"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/hipipal/sl4alib/CONF.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="CONF.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#methods_inherited_from_class_java.lang.Object">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.hipipal.sl4alib</FONT>
-<BR>
-Class CONF</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../resources/inherit.gif" ALT="extended by ">com.zuowuxuxi.config.CONF
-      <IMG SRC="../../../resources/inherit.gif" ALT="extended by "><B>com.hipipal.sl4alib.CONF</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>CONF</B><DT>extends com.zuowuxuxi.config.CONF</DL>
-</PRE>
-
-<P>
-<HR>
-
-<P>
-<!-- =========== FIELD SUMMARY =========== -->
-
-<A NAME="field_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Field Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/hipipal/sl4alib/CONF.html#API_SCRIPT">API_SCRIPT</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/hipipal/sl4alib/CONF.html#BASE_PATH">BASE_PATH</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/hipipal/sl4alib/CONF.html#DFROM_QPY">DFROM_QPY</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/hipipal/sl4alib/CONF.html#GOOGLE_TRACKER_ID">GOOGLE_TRACKER_ID</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/hipipal/sl4alib/CONF.html#PY_NOTI_FLAG">PY_NOTI_FLAG</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/hipipal/sl4alib/CONF.html#QR_APP">QR_APP</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/hipipal/sl4alib/CONF.html#QR_WH">QR_WH</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/hipipal/sl4alib/CONF.html#SCRIPT_SITE">SCRIPT_SITE</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../com/hipipal/sl4alib/CONF.html#CONF()">CONF</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-<A NAME="field_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Field Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="BASE_PATH"><!-- --></A><H3>
-BASE_PATH</H3>
-<PRE>
-public static final java.lang.String <B>BASE_PATH</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#com.hipipal.sl4alib.CONF.BASE_PATH">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="DFROM_QPY"><!-- --></A><H3>
-DFROM_QPY</H3>
-<PRE>
-public static final java.lang.String <B>DFROM_QPY</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#com.hipipal.sl4alib.CONF.DFROM_QPY">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="SCRIPT_SITE"><!-- --></A><H3>
-SCRIPT_SITE</H3>
-<PRE>
-public static final java.lang.String <B>SCRIPT_SITE</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#com.hipipal.sl4alib.CONF.SCRIPT_SITE">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="QR_APP"><!-- --></A><H3>
-QR_APP</H3>
-<PRE>
-public static final java.lang.String <B>QR_APP</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#com.hipipal.sl4alib.CONF.QR_APP">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="QR_WH"><!-- --></A><H3>
-QR_WH</H3>
-<PRE>
-public static final java.lang.String <B>QR_WH</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#com.hipipal.sl4alib.CONF.QR_WH">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="GOOGLE_TRACKER_ID"><!-- --></A><H3>
-GOOGLE_TRACKER_ID</H3>
-<PRE>
-public static final java.lang.String <B>GOOGLE_TRACKER_ID</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#com.hipipal.sl4alib.CONF.GOOGLE_TRACKER_ID">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="PY_NOTI_FLAG"><!-- --></A><H3>
-PY_NOTI_FLAG</H3>
-<PRE>
-public static final int <B>PY_NOTI_FLAG</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#com.hipipal.sl4alib.CONF.PY_NOTI_FLAG">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="API_SCRIPT"><!-- --></A><H3>
-API_SCRIPT</H3>
-<PRE>
-public static final java.lang.String <B>API_SCRIPT</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#com.hipipal.sl4alib.CONF.API_SCRIPT">Constant Field Values</A></DL>
-</DL>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="CONF()"><!-- --></A><H3>
-CONF</H3>
-<PRE>
-public <B>CONF</B>()</PRE>
-<DL>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/CONF.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;<A HREF="../../../com/hipipal/sl4alib/MNApp.html" title="class in com.hipipal.sl4alib"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/hipipal/sl4alib/CONF.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="CONF.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#methods_inherited_from_class_java.lang.Object">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/hipipal/sl4alib/MNApp.html b/doc/com/hipipal/sl4alib/MNApp.html
deleted file mode 100644
index d0c7b49b..00000000
--- a/doc/com/hipipal/sl4alib/MNApp.html
+++ /dev/null
@@ -1,457 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:04 PDT 2014 -->
-<TITLE>
-MNApp
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="MNApp";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/MNApp.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/hipipal/sl4alib/CONF.html" title="class in com.hipipal.sl4alib"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/hipipal/sl4alib/PyScriptService.html" title="class in com.hipipal.sl4alib"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/hipipal/sl4alib/MNApp.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="MNApp.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.hipipal.sl4alib</FONT>
-<BR>
-Class MNApp</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../resources/inherit.gif" ALT="extended by ">GDApplication
-      <IMG SRC="../../../resources/inherit.gif" ALT="extended by "><B>com.hipipal.sl4alib.MNApp</B>
-</PRE>
-<DL>
-<DT><B>All Implemented Interfaces:</B> <DD><A HREF="../../../com/googlecode/android_scripting/interpreter/InterpreterConfiguration.ConfigurationObserver.html" title="interface in com.googlecode.android_scripting.interpreter">InterpreterConfiguration.ConfigurationObserver</A></DD>
-</DL>
-<HR>
-<DL>
-<DT><PRE>public class <B>MNApp</B><DT>extends GDApplication<DT>implements <A HREF="../../../com/googlecode/android_scripting/interpreter/InterpreterConfiguration.ConfigurationObserver.html" title="interface in com.googlecode.android_scripting.interpreter">InterpreterConfiguration.ConfigurationObserver</A></DL>
-</PRE>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../com/hipipal/sl4alib/MNApp.html#MNApp()">MNApp</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../com/googlecode/android_scripting/interpreter/InterpreterConfiguration.html" title="class in com.googlecode.android_scripting.interpreter">InterpreterConfiguration</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/hipipal/sl4alib/MNApp.html#getInterpreterConfiguration()">getInterpreterConfiguration</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;Intent</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/hipipal/sl4alib/MNApp.html#getMainApplicationIntent()">getMainApplicationIntent</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../com/googlecode/android_scripting/FutureActivityTaskExecutor.html" title="class in com.googlecode.android_scripting">FutureActivityTaskExecutor</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/hipipal/sl4alib/MNApp.html#getTaskExecutor()">getTaskExecutor</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../com/googlecode/android_scripting/trigger/TriggerRepository.html" title="class in com.googlecode.android_scripting.trigger">TriggerRepository</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/hipipal/sl4alib/MNApp.html#getTriggerRepository()">getTriggerRepository</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/hipipal/sl4alib/MNApp.html#logout(Context)">logout</A></B>(Context&nbsp;context)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/hipipal/sl4alib/MNApp.html#onConfigurationChanged()">onConfigurationChanged</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/hipipal/sl4alib/MNApp.html#onCreate()">onCreate</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/hipipal/sl4alib/MNApp.html#readyToStart()">readyToStart</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/hipipal/sl4alib/MNApp.html#stopTraker()">stopTraker</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/hipipal/sl4alib/MNApp.html#trackPageView(java.lang.String)">trackPageView</A></B>(java.lang.String&nbsp;page)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="MNApp()"><!-- --></A><H3>
-MNApp</H3>
-<PRE>
-public <B>MNApp</B>()</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="onCreate()"><!-- --></A><H3>
-onCreate</H3>
-<PRE>
-public void <B>onCreate</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="trackPageView(java.lang.String)"><!-- --></A><H3>
-trackPageView</H3>
-<PRE>
-public void <B>trackPageView</B>(java.lang.String&nbsp;page)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="stopTraker()"><!-- --></A><H3>
-stopTraker</H3>
-<PRE>
-public void <B>stopTraker</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getMainApplicationIntent()"><!-- --></A><H3>
-getMainApplicationIntent</H3>
-<PRE>
-public Intent <B>getMainApplicationIntent</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="logout(Context)"><!-- --></A><H3>
-logout</H3>
-<PRE>
-public void <B>logout</B>(Context&nbsp;context)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getTaskExecutor()"><!-- --></A><H3>
-getTaskExecutor</H3>
-<PRE>
-public <A HREF="../../../com/googlecode/android_scripting/FutureActivityTaskExecutor.html" title="class in com.googlecode.android_scripting">FutureActivityTaskExecutor</A> <B>getTaskExecutor</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getInterpreterConfiguration()"><!-- --></A><H3>
-getInterpreterConfiguration</H3>
-<PRE>
-public <A HREF="../../../com/googlecode/android_scripting/interpreter/InterpreterConfiguration.html" title="class in com.googlecode.android_scripting.interpreter">InterpreterConfiguration</A> <B>getInterpreterConfiguration</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getTriggerRepository()"><!-- --></A><H3>
-getTriggerRepository</H3>
-<PRE>
-public <A HREF="../../../com/googlecode/android_scripting/trigger/TriggerRepository.html" title="class in com.googlecode.android_scripting.trigger">TriggerRepository</A> <B>getTriggerRepository</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="onConfigurationChanged()"><!-- --></A><H3>
-onConfigurationChanged</H3>
-<PRE>
-public void <B>onConfigurationChanged</B>()</PRE>
-<DL>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../../com/googlecode/android_scripting/interpreter/InterpreterConfiguration.ConfigurationObserver.html#onConfigurationChanged()">onConfigurationChanged</A></CODE> in interface <CODE><A HREF="../../../com/googlecode/android_scripting/interpreter/InterpreterConfiguration.ConfigurationObserver.html" title="interface in com.googlecode.android_scripting.interpreter">InterpreterConfiguration.ConfigurationObserver</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="readyToStart()"><!-- --></A><H3>
-readyToStart</H3>
-<PRE>
-public boolean <B>readyToStart</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/MNApp.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/hipipal/sl4alib/CONF.html" title="class in com.hipipal.sl4alib"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/hipipal/sl4alib/PyScriptService.html" title="class in com.hipipal.sl4alib"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/hipipal/sl4alib/MNApp.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="MNApp.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/hipipal/sl4alib/PyScriptService.LocalBinder.html b/doc/com/hipipal/sl4alib/PyScriptService.LocalBinder.html
deleted file mode 100644
index a882dd54..00000000
--- a/doc/com/hipipal/sl4alib/PyScriptService.LocalBinder.html
+++ /dev/null
@@ -1,256 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:04 PDT 2014 -->
-<TITLE>
-PyScriptService.LocalBinder
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="PyScriptService.LocalBinder";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/PyScriptService.LocalBinder.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/hipipal/sl4alib/PyScriptService.html" title="class in com.hipipal.sl4alib"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/hipipal/sl4alib/PyScriptService.startMyAsyncTask.html" title="class in com.hipipal.sl4alib"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/hipipal/sl4alib/PyScriptService.LocalBinder.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="PyScriptService.LocalBinder.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.hipipal.sl4alib</FONT>
-<BR>
-Class PyScriptService.LocalBinder</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../resources/inherit.gif" ALT="extended by ">Binder
-      <IMG SRC="../../../resources/inherit.gif" ALT="extended by "><B>com.hipipal.sl4alib.PyScriptService.LocalBinder</B>
-</PRE>
-<DL>
-<DT><B>Enclosing class:</B><DD><A HREF="../../../com/hipipal/sl4alib/PyScriptService.html" title="class in com.hipipal.sl4alib">PyScriptService</A></DD>
-</DL>
-<HR>
-<DL>
-<DT><PRE>public class <B>PyScriptService.LocalBinder</B><DT>extends Binder</DL>
-</PRE>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../com/hipipal/sl4alib/PyScriptService.LocalBinder.html#PyScriptService.LocalBinder()">PyScriptService.LocalBinder</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../com/hipipal/sl4alib/PyScriptService.html" title="class in com.hipipal.sl4alib">PyScriptService</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/hipipal/sl4alib/PyScriptService.LocalBinder.html#getService()">getService</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="PyScriptService.LocalBinder()"><!-- --></A><H3>
-PyScriptService.LocalBinder</H3>
-<PRE>
-public <B>PyScriptService.LocalBinder</B>()</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="getService()"><!-- --></A><H3>
-getService</H3>
-<PRE>
-public <A HREF="../../../com/hipipal/sl4alib/PyScriptService.html" title="class in com.hipipal.sl4alib">PyScriptService</A> <B>getService</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/PyScriptService.LocalBinder.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/hipipal/sl4alib/PyScriptService.html" title="class in com.hipipal.sl4alib"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/hipipal/sl4alib/PyScriptService.startMyAsyncTask.html" title="class in com.hipipal.sl4alib"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/hipipal/sl4alib/PyScriptService.LocalBinder.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="PyScriptService.LocalBinder.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/hipipal/sl4alib/PyScriptService.html b/doc/com/hipipal/sl4alib/PyScriptService.html
deleted file mode 100644
index 72c2ed2e..00000000
--- a/doc/com/hipipal/sl4alib/PyScriptService.html
+++ /dev/null
@@ -1,414 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:04 PDT 2014 -->
-<TITLE>
-PyScriptService
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="PyScriptService";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/PyScriptService.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/hipipal/sl4alib/MNApp.html" title="class in com.hipipal.sl4alib"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/hipipal/sl4alib/PyScriptService.LocalBinder.html" title="class in com.hipipal.sl4alib"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/hipipal/sl4alib/PyScriptService.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="PyScriptService.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#nested_class_summary">NESTED</A>&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.hipipal.sl4alib</FONT>
-<BR>
-Class PyScriptService</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../resources/inherit.gif" ALT="extended by ">Service
-      <IMG SRC="../../../resources/inherit.gif" ALT="extended by "><B>com.hipipal.sl4alib.PyScriptService</B>
-</PRE>
-<DL>
-<DT><B>Direct Known Subclasses:</B> <DD><A HREF="../../../com/hipipal/sl4alib/PyScriptService2.html" title="class in com.hipipal.sl4alib">PyScriptService2</A></DD>
-</DL>
-<HR>
-<DL>
-<DT><PRE>public class <B>PyScriptService</B><DT>extends Service</DL>
-</PRE>
-
-<P>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-<A NAME="nested_class_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Nested Class Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;class</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/hipipal/sl4alib/PyScriptService.LocalBinder.html" title="class in com.hipipal.sl4alib">PyScriptService.LocalBinder</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;class</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/hipipal/sl4alib/PyScriptService.startMyAsyncTask.html" title="class in com.hipipal.sl4alib">PyScriptService.startMyAsyncTask</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<!-- =========== FIELD SUMMARY =========== -->
-
-<A NAME="field_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Field Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/hipipal/sl4alib/PyScriptService.html#scriptName">scriptName</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../com/hipipal/sl4alib/PyScriptService.html#PyScriptService()">PyScriptService</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;Context</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/hipipal/sl4alib/PyScriptService.html#getAppContext()">getAppContext</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;IBinder</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/hipipal/sl4alib/PyScriptService.html#onBind(Intent)">onBind</A></B>(Intent&nbsp;intent)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/hipipal/sl4alib/PyScriptService.html#onCreate()">onCreate</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/hipipal/sl4alib/PyScriptService.html#onDestroy()">onDestroy</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/hipipal/sl4alib/PyScriptService.html#onStart(Intent, int)">onStart</A></B>(Intent&nbsp;intent,
-        int&nbsp;startId)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/hipipal/sl4alib/PyScriptService.html#updateNotify(Message)">updateNotify</A></B>(Message&nbsp;msg)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-<A NAME="field_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Field Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="scriptName"><!-- --></A><H3>
-scriptName</H3>
-<PRE>
-public static java.lang.String <B>scriptName</B></PRE>
-<DL>
-<DL>
-</DL>
-</DL>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="PyScriptService()"><!-- --></A><H3>
-PyScriptService</H3>
-<PRE>
-public <B>PyScriptService</B>()</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="onDestroy()"><!-- --></A><H3>
-onDestroy</H3>
-<PRE>
-public void <B>onDestroy</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="onBind(Intent)"><!-- --></A><H3>
-onBind</H3>
-<PRE>
-public IBinder <B>onBind</B>(Intent&nbsp;intent)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getAppContext()"><!-- --></A><H3>
-getAppContext</H3>
-<PRE>
-public static Context <B>getAppContext</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="onCreate()"><!-- --></A><H3>
-onCreate</H3>
-<PRE>
-public void <B>onCreate</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="onStart(Intent, int)"><!-- --></A><H3>
-onStart</H3>
-<PRE>
-public void <B>onStart</B>(Intent&nbsp;intent,
-                    int&nbsp;startId)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="updateNotify(Message)"><!-- --></A><H3>
-updateNotify</H3>
-<PRE>
-public void <B>updateNotify</B>(Message&nbsp;msg)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/PyScriptService.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/hipipal/sl4alib/MNApp.html" title="class in com.hipipal.sl4alib"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/hipipal/sl4alib/PyScriptService.LocalBinder.html" title="class in com.hipipal.sl4alib"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/hipipal/sl4alib/PyScriptService.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="PyScriptService.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#nested_class_summary">NESTED</A>&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/hipipal/sl4alib/PyScriptService.startMyAsyncTask.html b/doc/com/hipipal/sl4alib/PyScriptService.startMyAsyncTask.html
deleted file mode 100644
index f67dde9a..00000000
--- a/doc/com/hipipal/sl4alib/PyScriptService.startMyAsyncTask.html
+++ /dev/null
@@ -1,228 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:04 PDT 2014 -->
-<TITLE>
-PyScriptService.startMyAsyncTask
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="PyScriptService.startMyAsyncTask";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/PyScriptService.startMyAsyncTask.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/hipipal/sl4alib/PyScriptService.LocalBinder.html" title="class in com.hipipal.sl4alib"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/hipipal/sl4alib/PyScriptService2.html" title="class in com.hipipal.sl4alib"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/hipipal/sl4alib/PyScriptService.startMyAsyncTask.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="PyScriptService.startMyAsyncTask.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#methods_inherited_from_class_java.lang.Object">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.hipipal.sl4alib</FONT>
-<BR>
-Class PyScriptService.startMyAsyncTask</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../resources/inherit.gif" ALT="extended by "><any>
-      <IMG SRC="../../../resources/inherit.gif" ALT="extended by "><B>com.hipipal.sl4alib.PyScriptService.startMyAsyncTask</B>
-</PRE>
-<DL>
-<DT><B>Enclosing class:</B><DD><A HREF="../../../com/hipipal/sl4alib/PyScriptService.html" title="class in com.hipipal.sl4alib">PyScriptService</A></DD>
-</DL>
-<HR>
-<DL>
-<DT><PRE>public class <B>PyScriptService.startMyAsyncTask</B><DT>extends <any></DL>
-</PRE>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../com/hipipal/sl4alib/PyScriptService.startMyAsyncTask.html#PyScriptService.startMyAsyncTask()">PyScriptService.startMyAsyncTask</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="PyScriptService.startMyAsyncTask()"><!-- --></A><H3>
-PyScriptService.startMyAsyncTask</H3>
-<PRE>
-public <B>PyScriptService.startMyAsyncTask</B>()</PRE>
-<DL>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/PyScriptService.startMyAsyncTask.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/hipipal/sl4alib/PyScriptService.LocalBinder.html" title="class in com.hipipal.sl4alib"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/hipipal/sl4alib/PyScriptService2.html" title="class in com.hipipal.sl4alib"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/hipipal/sl4alib/PyScriptService.startMyAsyncTask.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="PyScriptService.startMyAsyncTask.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#methods_inherited_from_class_java.lang.Object">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/hipipal/sl4alib/PyScriptService2.html b/doc/com/hipipal/sl4alib/PyScriptService2.html
deleted file mode 100644
index 581b9a53..00000000
--- a/doc/com/hipipal/sl4alib/PyScriptService2.html
+++ /dev/null
@@ -1,272 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:04 PDT 2014 -->
-<TITLE>
-PyScriptService2
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="PyScriptService2";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/PyScriptService2.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/hipipal/sl4alib/PyScriptService.startMyAsyncTask.html" title="class in com.hipipal.sl4alib"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/hipipal/sl4alib/SL4ADialogActivity.html" title="class in com.hipipal.sl4alib"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/hipipal/sl4alib/PyScriptService2.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="PyScriptService2.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#nested_classes_inherited_from_class_com.hipipal.sl4alib.PyScriptService">NESTED</A>&nbsp;|&nbsp;<A HREF="#fields_inherited_from_class_com.hipipal.sl4alib.PyScriptService">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#methods_inherited_from_class_com.hipipal.sl4alib.PyScriptService">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.hipipal.sl4alib</FONT>
-<BR>
-Class PyScriptService2</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../resources/inherit.gif" ALT="extended by ">Service
-      <IMG SRC="../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../com/hipipal/sl4alib/PyScriptService.html" title="class in com.hipipal.sl4alib">com.hipipal.sl4alib.PyScriptService</A>
-          <IMG SRC="../../../resources/inherit.gif" ALT="extended by "><B>com.hipipal.sl4alib.PyScriptService2</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>PyScriptService2</B><DT>extends <A HREF="../../../com/hipipal/sl4alib/PyScriptService.html" title="class in com.hipipal.sl4alib">PyScriptService</A></DL>
-</PRE>
-
-<P>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-<A NAME="nested_class_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Nested Class Summary</B></FONT></TH>
-</TR>
-</TABLE>
-&nbsp;<A NAME="nested_classes_inherited_from_class_com.hipipal.sl4alib.PyScriptService"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Nested classes/interfaces inherited from class com.hipipal.sl4alib.<A HREF="../../../com/hipipal/sl4alib/PyScriptService.html" title="class in com.hipipal.sl4alib">PyScriptService</A></B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../com/hipipal/sl4alib/PyScriptService.LocalBinder.html" title="class in com.hipipal.sl4alib">PyScriptService.LocalBinder</A>, <A HREF="../../../com/hipipal/sl4alib/PyScriptService.startMyAsyncTask.html" title="class in com.hipipal.sl4alib">PyScriptService.startMyAsyncTask</A></CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- =========== FIELD SUMMARY =========== -->
-
-<A NAME="field_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Field Summary</B></FONT></TH>
-</TR>
-</TABLE>
-&nbsp;<A NAME="fields_inherited_from_class_com.hipipal.sl4alib.PyScriptService"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Fields inherited from class com.hipipal.sl4alib.<A HREF="../../../com/hipipal/sl4alib/PyScriptService.html" title="class in com.hipipal.sl4alib">PyScriptService</A></B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../com/hipipal/sl4alib/PyScriptService.html#scriptName">scriptName</A></CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../com/hipipal/sl4alib/PyScriptService2.html#PyScriptService2()">PyScriptService2</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_com.hipipal.sl4alib.PyScriptService"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class com.hipipal.sl4alib.<A HREF="../../../com/hipipal/sl4alib/PyScriptService.html" title="class in com.hipipal.sl4alib">PyScriptService</A></B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../com/hipipal/sl4alib/PyScriptService.html#getAppContext()">getAppContext</A>, <A HREF="../../../com/hipipal/sl4alib/PyScriptService.html#onBind(Intent)">onBind</A>, <A HREF="../../../com/hipipal/sl4alib/PyScriptService.html#onCreate()">onCreate</A>, <A HREF="../../../com/hipipal/sl4alib/PyScriptService.html#onDestroy()">onDestroy</A>, <A HREF="../../../com/hipipal/sl4alib/PyScriptService.html#onStart(Intent, int)">onStart</A>, <A HREF="../../../com/hipipal/sl4alib/PyScriptService.html#updateNotify(Message)">updateNotify</A></CODE></TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="PyScriptService2()"><!-- --></A><H3>
-PyScriptService2</H3>
-<PRE>
-public <B>PyScriptService2</B>()</PRE>
-<DL>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/PyScriptService2.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/hipipal/sl4alib/PyScriptService.startMyAsyncTask.html" title="class in com.hipipal.sl4alib"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/hipipal/sl4alib/SL4ADialogActivity.html" title="class in com.hipipal.sl4alib"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/hipipal/sl4alib/PyScriptService2.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="PyScriptService2.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#nested_classes_inherited_from_class_com.hipipal.sl4alib.PyScriptService">NESTED</A>&nbsp;|&nbsp;<A HREF="#fields_inherited_from_class_com.hipipal.sl4alib.PyScriptService">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#methods_inherited_from_class_com.hipipal.sl4alib.PyScriptService">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/hipipal/sl4alib/SL4ADialogActivity.html b/doc/com/hipipal/sl4alib/SL4ADialogActivity.html
deleted file mode 100644
index 47bab2b5..00000000
--- a/doc/com/hipipal/sl4alib/SL4ADialogActivity.html
+++ /dev/null
@@ -1,225 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:04 PDT 2014 -->
-<TITLE>
-SL4ADialogActivity
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="SL4ADialogActivity";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/SL4ADialogActivity.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/hipipal/sl4alib/PyScriptService2.html" title="class in com.hipipal.sl4alib"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/hipipal/sl4alib/SL4AScript.html" title="class in com.hipipal.sl4alib"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/hipipal/sl4alib/SL4ADialogActivity.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="SL4ADialogActivity.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#methods_inherited_from_class_java.lang.Object">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.hipipal.sl4alib</FONT>
-<BR>
-Class SL4ADialogActivity</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../resources/inherit.gif" ALT="extended by ">Activity
-      <IMG SRC="../../../resources/inherit.gif" ALT="extended by "><B>com.hipipal.sl4alib.SL4ADialogActivity</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>SL4ADialogActivity</B><DT>extends Activity</DL>
-</PRE>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../com/hipipal/sl4alib/SL4ADialogActivity.html#SL4ADialogActivity()">SL4ADialogActivity</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="SL4ADialogActivity()"><!-- --></A><H3>
-SL4ADialogActivity</H3>
-<PRE>
-public <B>SL4ADialogActivity</B>()</PRE>
-<DL>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/SL4ADialogActivity.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/hipipal/sl4alib/PyScriptService2.html" title="class in com.hipipal.sl4alib"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/hipipal/sl4alib/SL4AScript.html" title="class in com.hipipal.sl4alib"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/hipipal/sl4alib/SL4ADialogActivity.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="SL4ADialogActivity.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#methods_inherited_from_class_java.lang.Object">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/hipipal/sl4alib/SL4AScript.html b/doc/com/hipipal/sl4alib/SL4AScript.html
deleted file mode 100644
index 54117299..00000000
--- a/doc/com/hipipal/sl4alib/SL4AScript.html
+++ /dev/null
@@ -1,325 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:05 PDT 2014 -->
-<TITLE>
-SL4AScript
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="SL4AScript";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/SL4AScript.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/hipipal/sl4alib/SL4ADialogActivity.html" title="class in com.hipipal.sl4alib"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/hipipal/sl4alib/SL4AScriptActivity.html" title="class in com.hipipal.sl4alib"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/hipipal/sl4alib/SL4AScript.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="SL4AScript.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.hipipal.sl4alib</FONT>
-<BR>
-Class SL4AScript</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../resources/inherit.gif" ALT="extended by "><B>com.hipipal.sl4alib.SL4AScript</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>SL4AScript</B><DT>extends java.lang.Object</DL>
-</PRE>
-
-<P>
-<HR>
-
-<P>
-<!-- =========== FIELD SUMMARY =========== -->
-
-<A NAME="field_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Field Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/hipipal/sl4alib/SL4AScript.html#ID">ID</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/hipipal/sl4alib/SL4AScript.html#sFileName">sFileName</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../com/hipipal/sl4alib/SL4AScript.html#SL4AScript()">SL4AScript</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/hipipal/sl4alib/SL4AScript.html#getFileExtension(Context)">getFileExtension</A></B>(Context&nbsp;context)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/hipipal/sl4alib/SL4AScript.html#getFileName(Context)">getFileName</A></B>(Context&nbsp;context)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-<A NAME="field_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Field Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="ID"><!-- --></A><H3>
-ID</H3>
-<PRE>
-public static final int <B>ID</B></PRE>
-<DL>
-<DL>
-</DL>
-</DL>
-<HR>
-
-<A NAME="sFileName"><!-- --></A><H3>
-sFileName</H3>
-<PRE>
-public static java.lang.String <B>sFileName</B></PRE>
-<DL>
-<DL>
-</DL>
-</DL>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="SL4AScript()"><!-- --></A><H3>
-SL4AScript</H3>
-<PRE>
-public <B>SL4AScript</B>()</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="getFileName(Context)"><!-- --></A><H3>
-getFileName</H3>
-<PRE>
-public static java.lang.String <B>getFileName</B>(Context&nbsp;context)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getFileExtension(Context)"><!-- --></A><H3>
-getFileExtension</H3>
-<PRE>
-public static java.lang.String <B>getFileExtension</B>(Context&nbsp;context)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/SL4AScript.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/hipipal/sl4alib/SL4ADialogActivity.html" title="class in com.hipipal.sl4alib"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/hipipal/sl4alib/SL4AScriptActivity.html" title="class in com.hipipal.sl4alib"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/hipipal/sl4alib/SL4AScript.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="SL4AScript.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/hipipal/sl4alib/SL4AScriptActivity.html b/doc/com/hipipal/sl4alib/SL4AScriptActivity.html
deleted file mode 100644
index 92fe7a0a..00000000
--- a/doc/com/hipipal/sl4alib/SL4AScriptActivity.html
+++ /dev/null
@@ -1,229 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:05 PDT 2014 -->
-<TITLE>
-SL4AScriptActivity
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="SL4AScriptActivity";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/SL4AScriptActivity.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/hipipal/sl4alib/SL4AScript.html" title="class in com.hipipal.sl4alib"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/hipipal/sl4alib/SL4AScriptService.html" title="class in com.hipipal.sl4alib"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/hipipal/sl4alib/SL4AScriptActivity.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="SL4AScriptActivity.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#methods_inherited_from_class_java.lang.Object">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.hipipal.sl4alib</FONT>
-<BR>
-Class SL4AScriptActivity</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../resources/inherit.gif" ALT="extended by ">Activity
-      <IMG SRC="../../../resources/inherit.gif" ALT="extended by "><B>com.hipipal.sl4alib.SL4AScriptActivity</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>SL4AScriptActivity</B><DT>extends Activity</DL>
-</PRE>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Alexey Reznichenko (alexey.reznichenko@gmail.com)</DD>
-</DL>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../com/hipipal/sl4alib/SL4AScriptActivity.html#SL4AScriptActivity()">SL4AScriptActivity</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="SL4AScriptActivity()"><!-- --></A><H3>
-SL4AScriptActivity</H3>
-<PRE>
-public <B>SL4AScriptActivity</B>()</PRE>
-<DL>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/SL4AScriptActivity.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/hipipal/sl4alib/SL4AScript.html" title="class in com.hipipal.sl4alib"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/hipipal/sl4alib/SL4AScriptService.html" title="class in com.hipipal.sl4alib"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/hipipal/sl4alib/SL4AScriptActivity.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="SL4AScriptActivity.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#methods_inherited_from_class_java.lang.Object">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/hipipal/sl4alib/SL4AScriptService.LocalBinder.html b/doc/com/hipipal/sl4alib/SL4AScriptService.LocalBinder.html
deleted file mode 100644
index 0d0a8703..00000000
--- a/doc/com/hipipal/sl4alib/SL4AScriptService.LocalBinder.html
+++ /dev/null
@@ -1,256 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:05 PDT 2014 -->
-<TITLE>
-SL4AScriptService.LocalBinder
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="SL4AScriptService.LocalBinder";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/SL4AScriptService.LocalBinder.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/hipipal/sl4alib/SL4AScriptService.html" title="class in com.hipipal.sl4alib"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/hipipal/sl4alib/SL4AScriptService.LocalBinder.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="SL4AScriptService.LocalBinder.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.hipipal.sl4alib</FONT>
-<BR>
-Class SL4AScriptService.LocalBinder</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../resources/inherit.gif" ALT="extended by ">Binder
-      <IMG SRC="../../../resources/inherit.gif" ALT="extended by "><B>com.hipipal.sl4alib.SL4AScriptService.LocalBinder</B>
-</PRE>
-<DL>
-<DT><B>Enclosing class:</B><DD><A HREF="../../../com/hipipal/sl4alib/SL4AScriptService.html" title="class in com.hipipal.sl4alib">SL4AScriptService</A></DD>
-</DL>
-<HR>
-<DL>
-<DT><PRE>public class <B>SL4AScriptService.LocalBinder</B><DT>extends Binder</DL>
-</PRE>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../com/hipipal/sl4alib/SL4AScriptService.LocalBinder.html#SL4AScriptService.LocalBinder()">SL4AScriptService.LocalBinder</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../com/hipipal/sl4alib/SL4AScriptService.html" title="class in com.hipipal.sl4alib">SL4AScriptService</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/hipipal/sl4alib/SL4AScriptService.LocalBinder.html#getService()">getService</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="SL4AScriptService.LocalBinder()"><!-- --></A><H3>
-SL4AScriptService.LocalBinder</H3>
-<PRE>
-public <B>SL4AScriptService.LocalBinder</B>()</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="getService()"><!-- --></A><H3>
-getService</H3>
-<PRE>
-public <A HREF="../../../com/hipipal/sl4alib/SL4AScriptService.html" title="class in com.hipipal.sl4alib">SL4AScriptService</A> <B>getService</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/SL4AScriptService.LocalBinder.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/hipipal/sl4alib/SL4AScriptService.html" title="class in com.hipipal.sl4alib"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/hipipal/sl4alib/SL4AScriptService.LocalBinder.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="SL4AScriptService.LocalBinder.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/hipipal/sl4alib/SL4AScriptService.html b/doc/com/hipipal/sl4alib/SL4AScriptService.html
deleted file mode 100644
index 5600d039..00000000
--- a/doc/com/hipipal/sl4alib/SL4AScriptService.html
+++ /dev/null
@@ -1,331 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:05 PDT 2014 -->
-<TITLE>
-SL4AScriptService
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="SL4AScriptService";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/SL4AScriptService.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/hipipal/sl4alib/SL4AScriptActivity.html" title="class in com.hipipal.sl4alib"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/hipipal/sl4alib/SL4AScriptService.LocalBinder.html" title="class in com.hipipal.sl4alib"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/hipipal/sl4alib/SL4AScriptService.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="SL4AScriptService.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#nested_class_summary">NESTED</A>&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.hipipal.sl4alib</FONT>
-<BR>
-Class SL4AScriptService</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../resources/inherit.gif" ALT="extended by ">Service
-      <IMG SRC="../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../com/googlecode/android_scripting/ForegroundService.html" title="class in com.googlecode.android_scripting">com.googlecode.android_scripting.ForegroundService</A>
-          <IMG SRC="../../../resources/inherit.gif" ALT="extended by "><B>com.hipipal.sl4alib.SL4AScriptService</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>SL4AScriptService</B><DT>extends <A HREF="../../../com/googlecode/android_scripting/ForegroundService.html" title="class in com.googlecode.android_scripting">ForegroundService</A></DL>
-</PRE>
-
-<P>
-A service that allows scripts and the RPC server to run in the background.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Alexey Reznichenko (alexey.reznichenko@gmail.com), Manuel Naranjo (manuel@aircable.net)</DD>
-</DL>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-<A NAME="nested_class_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Nested Class Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;class</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/hipipal/sl4alib/SL4AScriptService.LocalBinder.html" title="class in com.hipipal.sl4alib">SL4AScriptService.LocalBinder</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../com/hipipal/sl4alib/SL4AScriptService.html#SL4AScriptService()">SL4AScriptService</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;IBinder</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/hipipal/sl4alib/SL4AScriptService.html#onBind(Intent)">onBind</A></B>(Intent&nbsp;intent)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/hipipal/sl4alib/SL4AScriptService.html#onCreate()">onCreate</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/hipipal/sl4alib/SL4AScriptService.html#onStart(Intent, int)">onStart</A></B>(Intent&nbsp;intent,
-        int&nbsp;startId)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_com.googlecode.android_scripting.ForegroundService"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class com.googlecode.android_scripting.<A HREF="../../../com/googlecode/android_scripting/ForegroundService.html" title="class in com.googlecode.android_scripting">ForegroundService</A></B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../com/googlecode/android_scripting/ForegroundService.html#onDestroy()">onDestroy</A></CODE></TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="SL4AScriptService()"><!-- --></A><H3>
-SL4AScriptService</H3>
-<PRE>
-public <B>SL4AScriptService</B>()</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="onBind(Intent)"><!-- --></A><H3>
-onBind</H3>
-<PRE>
-public IBinder <B>onBind</B>(Intent&nbsp;intent)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="onCreate()"><!-- --></A><H3>
-onCreate</H3>
-<PRE>
-public void <B>onCreate</B>()</PRE>
-<DL>
-<DD><DL>
-<DT><B>Overrides:</B><DD><CODE><A HREF="../../../com/googlecode/android_scripting/ForegroundService.html#onCreate()">onCreate</A></CODE> in class <CODE><A HREF="../../../com/googlecode/android_scripting/ForegroundService.html" title="class in com.googlecode.android_scripting">ForegroundService</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="onStart(Intent, int)"><!-- --></A><H3>
-onStart</H3>
-<PRE>
-public void <B>onStart</B>(Intent&nbsp;intent,
-                    int&nbsp;startId)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/SL4AScriptService.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/hipipal/sl4alib/SL4AScriptActivity.html" title="class in com.hipipal.sl4alib"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/hipipal/sl4alib/SL4AScriptService.LocalBinder.html" title="class in com.hipipal.sl4alib"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/hipipal/sl4alib/SL4AScriptService.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="SL4AScriptService.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#nested_class_summary">NESTED</A>&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/hipipal/sl4alib/package-frame.html b/doc/com/hipipal/sl4alib/package-frame.html
deleted file mode 100644
index c32c23a4..00000000
--- a/doc/com/hipipal/sl4alib/package-frame.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:07 PDT 2014 -->
-<TITLE>
-com.hipipal.sl4alib
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-
-</HEAD>
-
-<BODY BGCOLOR="white">
-<FONT size="+1" CLASS="FrameTitleFont">
-<A HREF="../../../com/hipipal/sl4alib/package-summary.html" target="classFrame">com.hipipal.sl4alib</A></FONT>
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
-Classes</FONT>&nbsp;
-<FONT CLASS="FrameItemFont">
-<BR>
-<A HREF="CONF.html" title="class in com.hipipal.sl4alib" target="classFrame">CONF</A>
-<BR>
-<A HREF="MNApp.html" title="class in com.hipipal.sl4alib" target="classFrame">MNApp</A>
-<BR>
-<A HREF="PyScriptService.html" title="class in com.hipipal.sl4alib" target="classFrame">PyScriptService</A>
-<BR>
-<A HREF="PyScriptService2.html" title="class in com.hipipal.sl4alib" target="classFrame">PyScriptService2</A>
-<BR>
-<A HREF="SL4ADialogActivity.html" title="class in com.hipipal.sl4alib" target="classFrame">SL4ADialogActivity</A>
-<BR>
-<A HREF="SL4AScript.html" title="class in com.hipipal.sl4alib" target="classFrame">SL4AScript</A>
-<BR>
-<A HREF="SL4AScriptActivity.html" title="class in com.hipipal.sl4alib" target="classFrame">SL4AScriptActivity</A>
-<BR>
-<A HREF="SL4AScriptService.html" title="class in com.hipipal.sl4alib" target="classFrame">SL4AScriptService</A></FONT></TD>
-</TR>
-</TABLE>
-
-
-</BODY>
-</HTML>
diff --git a/doc/com/hipipal/sl4alib/package-summary.html b/doc/com/hipipal/sl4alib/package-summary.html
deleted file mode 100644
index 6a243165..00000000
--- a/doc/com/hipipal/sl4alib/package-summary.html
+++ /dev/null
@@ -1,185 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:07 PDT 2014 -->
-<TITLE>
-com.hipipal.sl4alib
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="com.hipipal.sl4alib";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/util/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/trilead/ssh2/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/hipipal/sl4alib/package-summary.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<H2>
-Package com.hipipal.sl4alib
-</H2>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Class Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../com/hipipal/sl4alib/CONF.html" title="class in com.hipipal.sl4alib">CONF</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../com/hipipal/sl4alib/MNApp.html" title="class in com.hipipal.sl4alib">MNApp</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../com/hipipal/sl4alib/PyScriptService.html" title="class in com.hipipal.sl4alib">PyScriptService</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../com/hipipal/sl4alib/PyScriptService2.html" title="class in com.hipipal.sl4alib">PyScriptService2</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../com/hipipal/sl4alib/SL4ADialogActivity.html" title="class in com.hipipal.sl4alib">SL4ADialogActivity</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../com/hipipal/sl4alib/SL4AScript.html" title="class in com.hipipal.sl4alib">SL4AScript</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../com/hipipal/sl4alib/SL4AScriptActivity.html" title="class in com.hipipal.sl4alib">SL4AScriptActivity</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../com/hipipal/sl4alib/SL4AScriptService.html" title="class in com.hipipal.sl4alib">SL4AScriptService</A></B></TD>
-<TD>A service that allows scripts and the RPC server to run in the background.</TD>
-</TR>
-</TABLE>
-&nbsp;
-
-<P>
-<DL>
-</DL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/util/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/trilead/ssh2/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/hipipal/sl4alib/package-summary.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/hipipal/sl4alib/package-tree.html b/doc/com/hipipal/sl4alib/package-tree.html
deleted file mode 100644
index 3743b243..00000000
--- a/doc/com/hipipal/sl4alib/package-tree.html
+++ /dev/null
@@ -1,176 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:07 PDT 2014 -->
-<TITLE>
-com.hipipal.sl4alib Class Hierarchy
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="com.hipipal.sl4alib Class Hierarchy";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/util/package-tree.html"><B>PREV</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/trilead/ssh2/package-tree.html"><B>NEXT</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/hipipal/sl4alib/package-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-Hierarchy For Package com.hipipal.sl4alib
-</H2>
-</CENTER>
-<DL>
-<DT><B>Package Hierarchies:</B><DD><A HREF="../../../overview-tree.html">All Packages</A></DL>
-<HR>
-<H2>
-Class Hierarchy
-</H2>
-<UL>
-<LI TYPE="circle">java.lang.Object<UL>
-<LI TYPE="circle"><any><UL>
-<LI TYPE="circle">com.hipipal.sl4alib.<A HREF="../../../com/hipipal/sl4alib/PyScriptService.startMyAsyncTask.html" title="class in com.hipipal.sl4alib"><B>PyScriptService.startMyAsyncTask</B></A></UL>
-<LI TYPE="circle">Activity<UL>
-<LI TYPE="circle">com.hipipal.sl4alib.<A HREF="../../../com/hipipal/sl4alib/SL4AScriptActivity.html" title="class in com.hipipal.sl4alib"><B>SL4AScriptActivity</B></A></UL>
-<LI TYPE="circle">Activity<UL>
-<LI TYPE="circle">com.hipipal.sl4alib.<A HREF="../../../com/hipipal/sl4alib/SL4ADialogActivity.html" title="class in com.hipipal.sl4alib"><B>SL4ADialogActivity</B></A></UL>
-<LI TYPE="circle">Binder<UL>
-<LI TYPE="circle">com.hipipal.sl4alib.<A HREF="../../../com/hipipal/sl4alib/SL4AScriptService.LocalBinder.html" title="class in com.hipipal.sl4alib"><B>SL4AScriptService.LocalBinder</B></A></UL>
-<LI TYPE="circle">Binder<UL>
-<LI TYPE="circle">com.hipipal.sl4alib.<A HREF="../../../com/hipipal/sl4alib/PyScriptService.LocalBinder.html" title="class in com.hipipal.sl4alib"><B>PyScriptService.LocalBinder</B></A></UL>
-<LI TYPE="circle">com.zuowuxuxi.config.CONF<UL>
-<LI TYPE="circle">com.hipipal.sl4alib.<A HREF="../../../com/hipipal/sl4alib/CONF.html" title="class in com.hipipal.sl4alib"><B>CONF</B></A></UL>
-<LI TYPE="circle">GDApplication<UL>
-<LI TYPE="circle">com.hipipal.sl4alib.<A HREF="../../../com/hipipal/sl4alib/MNApp.html" title="class in com.hipipal.sl4alib"><B>MNApp</B></A> (implements com.googlecode.android_scripting.interpreter.<A HREF="../../../com/googlecode/android_scripting/interpreter/InterpreterConfiguration.ConfigurationObserver.html" title="interface in com.googlecode.android_scripting.interpreter">InterpreterConfiguration.ConfigurationObserver</A>)
-</UL>
-<LI TYPE="circle">Service<UL>
-<LI TYPE="circle">com.googlecode.android_scripting.<A HREF="../../../com/googlecode/android_scripting/ForegroundService.html" title="class in com.googlecode.android_scripting"><B>ForegroundService</B></A><UL>
-<LI TYPE="circle">com.hipipal.sl4alib.<A HREF="../../../com/hipipal/sl4alib/SL4AScriptService.html" title="class in com.hipipal.sl4alib"><B>SL4AScriptService</B></A></UL>
-</UL>
-<LI TYPE="circle">Service<UL>
-<LI TYPE="circle">com.hipipal.sl4alib.<A HREF="../../../com/hipipal/sl4alib/PyScriptService.html" title="class in com.hipipal.sl4alib"><B>PyScriptService</B></A><UL>
-<LI TYPE="circle">com.hipipal.sl4alib.<A HREF="../../../com/hipipal/sl4alib/PyScriptService2.html" title="class in com.hipipal.sl4alib"><B>PyScriptService2</B></A></UL>
-</UL>
-<LI TYPE="circle">com.hipipal.sl4alib.<A HREF="../../../com/hipipal/sl4alib/SL4AScript.html" title="class in com.hipipal.sl4alib"><B>SL4AScript</B></A></UL>
-</UL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/googlecode/android_scripting/util/package-tree.html"><B>PREV</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/trilead/ssh2/package-tree.html"><B>NEXT</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/hipipal/sl4alib/package-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/trilead/ssh2/StreamGobbler.html b/doc/com/trilead/ssh2/StreamGobbler.html
deleted file mode 100644
index d83bfa38..00000000
--- a/doc/com/trilead/ssh2/StreamGobbler.html
+++ /dev/null
@@ -1,427 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:05 PDT 2014 -->
-<TITLE>
-StreamGobbler
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="StreamGobbler";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/StreamGobbler.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/trilead/ssh2/StreamGobbler.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="StreamGobbler.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.trilead.ssh2</FONT>
-<BR>
-Class StreamGobbler</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../resources/inherit.gif" ALT="extended by ">java.io.InputStream
-      <IMG SRC="../../../resources/inherit.gif" ALT="extended by "><B>com.trilead.ssh2.StreamGobbler</B>
-</PRE>
-<DL>
-<DT><B>All Implemented Interfaces:</B> <DD>java.io.Closeable</DD>
-</DL>
-<HR>
-<DL>
-<DT><PRE>public class <B>StreamGobbler</B><DT>extends java.io.InputStream</DL>
-</PRE>
-
-<P>
-A <code>StreamGobbler</code> is an InputStream that uses an internal worker thread to constantly
- consume input from another InputStream. It uses a buffer to store the consumed data. The buffer
- size is automatically adjusted, if needed.
- <p>
- This class is sometimes very convenient - if you wrap a session's STDOUT and STDERR InputStreams
- with instances of this class, then you don't have to bother about the shared window of STDOUT and
- STDERR in the low level SSH-2 protocol, since all arriving data will be immediatelly consumed by
- the worker threads. Also, as a side effect, the streams will be buffered (e.g., single byte
- read() operations are faster).
- <p>
- Other SSH for Java libraries include this functionality by default in their STDOUT and STDERR
- InputStream implementations, however, please be aware that this approach has also a downside:
- <p>
- If you do not call the StreamGobbler's <code>read()</code> method often enough and the peer is
- constantly sending huge amounts of data, then you will sooner or later encounter a low memory
- situation due to the aggregated data (well, it also depends on the Java heap size). Joe Average
- will like this class anyway - a paranoid programmer would never use such an approach.
- <p>
- The term "StreamGobbler" was taken from an article called "When Runtime.exec() won't", see
- http://www.javaworld.com/javaworld/jw-12-2000/jw-1229-traps.html.
-<P>
-
-<P>
-<DL>
-<DT><B>Version:</B></DT>
-  <DD>$Id: StreamGobbler.java,v 1.1 2007/10/15 12:49:56 cplattne Exp $</DD>
-<DT><B>Author:</B></DT>
-  <DD>Christian Plattner, plattner@trilead.com</DD>
-</DL>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../com/trilead/ssh2/StreamGobbler.html#StreamGobbler(java.io.InputStream, java.io.File, int)">StreamGobbler</A></B>(java.io.InputStream&nbsp;is,
-              java.io.File&nbsp;log,
-              int&nbsp;buffer_size)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/trilead/ssh2/StreamGobbler.html#available()">available</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/trilead/ssh2/StreamGobbler.html#close()">close</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/trilead/ssh2/StreamGobbler.html#read()">read</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/trilead/ssh2/StreamGobbler.html#read(byte[])">read</A></B>(byte[]&nbsp;b)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/trilead/ssh2/StreamGobbler.html#read(byte[], int, int)">read</A></B>(byte[]&nbsp;b,
-     int&nbsp;off,
-     int&nbsp;len)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/trilead/ssh2/StreamGobbler.html#writeToFile(byte[])">writeToFile</A></B>(byte[]&nbsp;buffer)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.io.InputStream"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.io.InputStream</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>mark, markSupported, reset, skip</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="StreamGobbler(java.io.InputStream, java.io.File, int)"><!-- --></A><H3>
-StreamGobbler</H3>
-<PRE>
-public <B>StreamGobbler</B>(java.io.InputStream&nbsp;is,
-                     java.io.File&nbsp;log,
-                     int&nbsp;buffer_size)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="writeToFile(byte[])"><!-- --></A><H3>
-writeToFile</H3>
-<PRE>
-public void <B>writeToFile</B>(byte[]&nbsp;buffer)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="read()"><!-- --></A><H3>
-read</H3>
-<PRE>
-public int <B>read</B>()
-         throws java.io.IOException</PRE>
-<DL>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE>read</CODE> in class <CODE>java.io.InputStream</CODE></DL>
-</DD>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.io.IOException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="available()"><!-- --></A><H3>
-available</H3>
-<PRE>
-public int <B>available</B>()
-              throws java.io.IOException</PRE>
-<DL>
-<DD><DL>
-<DT><B>Overrides:</B><DD><CODE>available</CODE> in class <CODE>java.io.InputStream</CODE></DL>
-</DD>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.io.IOException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="read(byte[])"><!-- --></A><H3>
-read</H3>
-<PRE>
-public int <B>read</B>(byte[]&nbsp;b)
-         throws java.io.IOException</PRE>
-<DL>
-<DD><DL>
-<DT><B>Overrides:</B><DD><CODE>read</CODE> in class <CODE>java.io.InputStream</CODE></DL>
-</DD>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.io.IOException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="close()"><!-- --></A><H3>
-close</H3>
-<PRE>
-public void <B>close</B>()
-           throws java.io.IOException</PRE>
-<DL>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE>close</CODE> in interface <CODE>java.io.Closeable</CODE><DT><B>Overrides:</B><DD><CODE>close</CODE> in class <CODE>java.io.InputStream</CODE></DL>
-</DD>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.io.IOException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="read(byte[], int, int)"><!-- --></A><H3>
-read</H3>
-<PRE>
-public int <B>read</B>(byte[]&nbsp;b,
-                int&nbsp;off,
-                int&nbsp;len)
-         throws java.io.IOException</PRE>
-<DL>
-<DD><DL>
-<DT><B>Overrides:</B><DD><CODE>read</CODE> in class <CODE>java.io.InputStream</CODE></DL>
-</DD>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.io.IOException</CODE></DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/StreamGobbler.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/trilead/ssh2/StreamGobbler.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="StreamGobbler.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/trilead/ssh2/package-frame.html b/doc/com/trilead/ssh2/package-frame.html
deleted file mode 100644
index 90afe868..00000000
--- a/doc/com/trilead/ssh2/package-frame.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:07 PDT 2014 -->
-<TITLE>
-com.trilead.ssh2
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-
-</HEAD>
-
-<BODY BGCOLOR="white">
-<FONT size="+1" CLASS="FrameTitleFont">
-<A HREF="../../../com/trilead/ssh2/package-summary.html" target="classFrame">com.trilead.ssh2</A></FONT>
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
-Classes</FONT>&nbsp;
-<FONT CLASS="FrameItemFont">
-<BR>
-<A HREF="StreamGobbler.html" title="class in com.trilead.ssh2" target="classFrame">StreamGobbler</A></FONT></TD>
-</TR>
-</TABLE>
-
-
-</BODY>
-</HTML>
diff --git a/doc/com/trilead/ssh2/package-summary.html b/doc/com/trilead/ssh2/package-summary.html
deleted file mode 100644
index c8da7a85..00000000
--- a/doc/com/trilead/ssh2/package-summary.html
+++ /dev/null
@@ -1,158 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:07 PDT 2014 -->
-<TITLE>
-com.trilead.ssh2
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="com.trilead.ssh2";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/hipipal/sl4alib/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
-&nbsp;NEXT PACKAGE</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/trilead/ssh2/package-summary.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<H2>
-Package com.trilead.ssh2
-</H2>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Class Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../com/trilead/ssh2/StreamGobbler.html" title="class in com.trilead.ssh2">StreamGobbler</A></B></TD>
-<TD>A <code>StreamGobbler</code> is an InputStream that uses an internal worker thread to constantly
- consume input from another InputStream.</TD>
-</TR>
-</TABLE>
-&nbsp;
-
-<P>
-<DL>
-</DL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/hipipal/sl4alib/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
-&nbsp;NEXT PACKAGE</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/trilead/ssh2/package-summary.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/com/trilead/ssh2/package-tree.html b/doc/com/trilead/ssh2/package-tree.html
deleted file mode 100644
index ea23dd15..00000000
--- a/doc/com/trilead/ssh2/package-tree.html
+++ /dev/null
@@ -1,156 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:07 PDT 2014 -->
-<TITLE>
-com.trilead.ssh2 Class Hierarchy
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="com.trilead.ssh2 Class Hierarchy";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/hipipal/sl4alib/package-tree.html"><B>PREV</B></A>&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/trilead/ssh2/package-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-Hierarchy For Package com.trilead.ssh2
-</H2>
-</CENTER>
-<DL>
-<DT><B>Package Hierarchies:</B><DD><A HREF="../../../overview-tree.html">All Packages</A></DL>
-<HR>
-<H2>
-Class Hierarchy
-</H2>
-<UL>
-<LI TYPE="circle">java.lang.Object<UL>
-<LI TYPE="circle">java.io.InputStream (implements java.io.Closeable)
-<UL>
-<LI TYPE="circle">com.trilead.ssh2.<A HREF="../../../com/trilead/ssh2/StreamGobbler.html" title="class in com.trilead.ssh2"><B>StreamGobbler</B></A></UL>
-</UL>
-</UL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/hipipal/sl4alib/package-tree.html"><B>PREV</B></A>&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/trilead/ssh2/package-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/constant-values.html b/doc/constant-values.html
deleted file mode 100644
index afb40976..00000000
--- a/doc/constant-values.html
+++ /dev/null
@@ -1,716 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:07 PDT 2014 -->
-<TITLE>
-Constant Field Values
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Constant Field Values";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html?constant-values.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="constant-values.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H1>
-Constant Field Values</H1>
-</CENTER>
-<HR SIZE="4" NOSHADE>
-<B>Contents</B><UL>
-<LI><A HREF="#com.android">com.android.*</A>
-<LI><A HREF="#com.googlecode">com.googlecode.*</A>
-<LI><A HREF="#com.hipipal">com.hipipal.*</A>
-</UL>
-
-<A NAME="com.android"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left"><FONT SIZE="+2">
-com.android.*</FONT></TH>
-</TR>
-</TABLE>
-
-<P>
-
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="3">com.android.python27.config.<A HREF="com/android/python27/config/GlobalConstants.html" title="interface in com.android.python27.config">GlobalConstants</A></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.android.python27.config.GlobalConstants.LOCAL_ZIP_NAME"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/android/python27/config/GlobalConstants.html#LOCAL_ZIP_NAME">LOCAL_ZIP_NAME</A></CODE></TD>
-<TD ALIGN="right"><CODE>"my_local.zip"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.android.python27.config.GlobalConstants.LOG_TAG"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/android/python27/config/GlobalConstants.html#LOG_TAG">LOG_TAG</A></CODE></TD>
-<TD ALIGN="right"><CODE>"PythonAPK"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.android.python27.config.GlobalConstants.PACKAGE_NAME"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/android/python27/config/GlobalConstants.html#PACKAGE_NAME">PACKAGE_NAME</A></CODE></TD>
-<TD ALIGN="right"><CODE>"com.hipipal.mi"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.android.python27.config.GlobalConstants.PYTHON_EXTRAS_ZIP_NAME"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/android/python27/config/GlobalConstants.html#PYTHON_EXTRAS_ZIP_NAME">PYTHON_EXTRAS_ZIP_NAME</A></CODE></TD>
-<TD ALIGN="right"><CODE>"python_extras_27.zip"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.android.python27.config.GlobalConstants.PYTHON_MAIN_SCRIPT_NAME"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/android/python27/config/GlobalConstants.html#PYTHON_MAIN_SCRIPT_NAME">PYTHON_MAIN_SCRIPT_NAME</A></CODE></TD>
-<TD ALIGN="right"><CODE>"hello.py"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.android.python27.config.GlobalConstants.PYTHON_NICE_NAME"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/android/python27/config/GlobalConstants.html#PYTHON_NICE_NAME">PYTHON_NICE_NAME</A></CODE></TD>
-<TD ALIGN="right"><CODE>"Python 2.7.2"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.android.python27.config.GlobalConstants.PYTHON_PROJECT_ZIP_NAME"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/android/python27/config/GlobalConstants.html#PYTHON_PROJECT_ZIP_NAME">PYTHON_PROJECT_ZIP_NAME</A></CODE></TD>
-<TD ALIGN="right"><CODE>"my_python_project.zip"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.android.python27.config.GlobalConstants.PYTHON_ZIP_NAME"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/android/python27/config/GlobalConstants.html#PYTHON_ZIP_NAME">PYTHON_ZIP_NAME</A></CODE></TD>
-<TD ALIGN="right"><CODE>"python_27.zip"</CODE></TD>
-</TR>
-</FONT></TD>
-</TR>
-</TABLE>
-
-<P>
-
-<P>
-<A NAME="com.googlecode"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left"><FONT SIZE="+2">
-com.googlecode.*</FONT></TH>
-</TR>
-</TABLE>
-
-<P>
-
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="3">com.googlecode.android_scripting.<A HREF="com/googlecode/android_scripting/Constants.html" title="interface in com.googlecode.android_scripting">Constants</A></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.Constants.ACTION_ACTIVITY_RESULT"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/Constants.html#ACTION_ACTIVITY_RESULT">ACTION_ACTIVITY_RESULT</A></CODE></TD>
-<TD ALIGN="right"><CODE>"com.googlecode.android_scripting.action.ACTIVITY_RESULT"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.Constants.ACTION_CANCEL_NOTIFICATION"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/Constants.html#ACTION_CANCEL_NOTIFICATION">ACTION_CANCEL_NOTIFICATION</A></CODE></TD>
-<TD ALIGN="right"><CODE>"com.googlecode.android_scripting.action.CANCEL_NOTIFICAITON"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.Constants.ACTION_EDIT_SCRIPT"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/Constants.html#ACTION_EDIT_SCRIPT">ACTION_EDIT_SCRIPT</A></CODE></TD>
-<TD ALIGN="right"><CODE>"com.googlecode.android_scripting.action.EDIT_SCRIPT"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.Constants.ACTION_KILL_ALL"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/Constants.html#ACTION_KILL_ALL">ACTION_KILL_ALL</A></CODE></TD>
-<TD ALIGN="right"><CODE>"com.googlecode.android_scripting.action.KILL_ALL"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.Constants.ACTION_KILL_PROCESS"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/Constants.html#ACTION_KILL_PROCESS">ACTION_KILL_PROCESS</A></CODE></TD>
-<TD ALIGN="right"><CODE>"com.googlecode.android_scripting.action.KILL_PROCESS"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.Constants.ACTION_LAUNCH_BACKGROUND_SCRIPT"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/Constants.html#ACTION_LAUNCH_BACKGROUND_SCRIPT">ACTION_LAUNCH_BACKGROUND_SCRIPT</A></CODE></TD>
-<TD ALIGN="right"><CODE>"com.googlecode.android_scripting.action.LAUNCH_BACKGROUND_SCRIPT"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.Constants.ACTION_LAUNCH_FOREGROUND_SCRIPT"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/Constants.html#ACTION_LAUNCH_FOREGROUND_SCRIPT">ACTION_LAUNCH_FOREGROUND_SCRIPT</A></CODE></TD>
-<TD ALIGN="right"><CODE>"com.googlecode.android_scripting.action.LAUNCH_FOREGROUND_SCRIPT"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.Constants.ACTION_LAUNCH_INTERPRETER"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/Constants.html#ACTION_LAUNCH_INTERPRETER">ACTION_LAUNCH_INTERPRETER</A></CODE></TD>
-<TD ALIGN="right"><CODE>"com.googlecode.android_scripting.action.LAUNCH_INTERPRETER"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.Constants.ACTION_LAUNCH_SCRIPT_FOR_RESULT"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/Constants.html#ACTION_LAUNCH_SCRIPT_FOR_RESULT">ACTION_LAUNCH_SCRIPT_FOR_RESULT</A></CODE></TD>
-<TD ALIGN="right"><CODE>"com.googlecode.android_scripting.action.ACTION_LAUNCH_SCRIPT_FOR_RESULT"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.Constants.ACTION_LAUNCH_SERVER"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/Constants.html#ACTION_LAUNCH_SERVER">ACTION_LAUNCH_SERVER</A></CODE></TD>
-<TD ALIGN="right"><CODE>"com.googlecode.android_scripting.action.LAUNCH_SERVER"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.Constants.ACTION_SAVE_AND_RUN_SCRIPT"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/Constants.html#ACTION_SAVE_AND_RUN_SCRIPT">ACTION_SAVE_AND_RUN_SCRIPT</A></CODE></TD>
-<TD ALIGN="right"><CODE>"com.googlecode.android_scripting.action.SAVE_AND_RUN_SCRIPT"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.Constants.ACTION_SAVE_SCRIPT"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/Constants.html#ACTION_SAVE_SCRIPT">ACTION_SAVE_SCRIPT</A></CODE></TD>
-<TD ALIGN="right"><CODE>"com.googlecode.android_scripting.action.SAVE_SCRIPT"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.Constants.ACTION_SHOW_RUNNING_SCRIPTS"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/Constants.html#ACTION_SHOW_RUNNING_SCRIPTS">ACTION_SHOW_RUNNING_SCRIPTS</A></CODE></TD>
-<TD ALIGN="right"><CODE>"com.googlecode.android_scripting.action.SHOW_RUNNING_SCRIPTS"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.Constants.EXTRA_API_PROMPT_RPC_NAME"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/Constants.html#EXTRA_API_PROMPT_RPC_NAME">EXTRA_API_PROMPT_RPC_NAME</A></CODE></TD>
-<TD ALIGN="right"><CODE>"com.googlecode.android_scripting.extra.API_PROMPT_RPC_NAME"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.Constants.EXTRA_API_PROMPT_VALUES"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/Constants.html#EXTRA_API_PROMPT_VALUES">EXTRA_API_PROMPT_VALUES</A></CODE></TD>
-<TD ALIGN="right"><CODE>"com.googlecode.android_scripting.extra.API_PROMPT_VALUES"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.Constants.EXTRA_DEVICE_ADDRESS"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/Constants.html#EXTRA_DEVICE_ADDRESS">EXTRA_DEVICE_ADDRESS</A></CODE></TD>
-<TD ALIGN="right"><CODE>"com.googlecode.android_scripting.extra.device_address"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.Constants.EXTRA_INTERPRETER_NAME"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/Constants.html#EXTRA_INTERPRETER_NAME">EXTRA_INTERPRETER_NAME</A></CODE></TD>
-<TD ALIGN="right"><CODE>"com.googlecode.android_scripting.extra.INTERPRETER_NAME"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.Constants.EXTRA_IS_NEW_SCRIPT"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/Constants.html#EXTRA_IS_NEW_SCRIPT">EXTRA_IS_NEW_SCRIPT</A></CODE></TD>
-<TD ALIGN="right"><CODE>"com.googlecode.android_scripting.extra.IS_NEW_SCRIPT"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.Constants.EXTRA_LAUNCH_IN_BACKGROUND"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/Constants.html#EXTRA_LAUNCH_IN_BACKGROUND">EXTRA_LAUNCH_IN_BACKGROUND</A></CODE></TD>
-<TD ALIGN="right"><CODE>"com.googlecode.android_scripting.extra.EXTRA_LAUNCH_IN_BACKGROUND"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.Constants.EXTRA_PROCESS_ID"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/Constants.html#EXTRA_PROCESS_ID">EXTRA_PROCESS_ID</A></CODE></TD>
-<TD ALIGN="right"><CODE>"com.googlecode.android_scripting.extra.SCRIPT_PROCESS_ID"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.Constants.EXTRA_PROXY_PORT"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/Constants.html#EXTRA_PROXY_PORT">EXTRA_PROXY_PORT</A></CODE></TD>
-<TD ALIGN="right"><CODE>"com.googlecode.android_scripting.extra.PROXY_PORT"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.Constants.EXTRA_RESULT"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/Constants.html#EXTRA_RESULT">EXTRA_RESULT</A></CODE></TD>
-<TD ALIGN="right"><CODE>"SCRIPT_RESULT"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.Constants.EXTRA_RPC_HELP_TEXT"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/Constants.html#EXTRA_RPC_HELP_TEXT">EXTRA_RPC_HELP_TEXT</A></CODE></TD>
-<TD ALIGN="right"><CODE>"com.googlecode.android_scripting.extra.RPC_HELP_TEXT"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.Constants.EXTRA_SCRIPT_CONTENT"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/Constants.html#EXTRA_SCRIPT_CONTENT">EXTRA_SCRIPT_CONTENT</A></CODE></TD>
-<TD ALIGN="right"><CODE>"com.googlecode.android_scripting.extra.SCRIPT_CONTENT"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.Constants.EXTRA_SCRIPT_PATH"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/Constants.html#EXTRA_SCRIPT_PATH">EXTRA_SCRIPT_PATH</A></CODE></TD>
-<TD ALIGN="right"><CODE>"com.googlecode.android_scripting.extra.SCRIPT_PATH"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.Constants.EXTRA_SCRIPT_TEXT"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/Constants.html#EXTRA_SCRIPT_TEXT">EXTRA_SCRIPT_TEXT</A></CODE></TD>
-<TD ALIGN="right"><CODE>"com.googlecode.android_scripting.extra.SCRIPT_TEXT"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.Constants.EXTRA_TASK_ID"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/Constants.html#EXTRA_TASK_ID">EXTRA_TASK_ID</A></CODE></TD>
-<TD ALIGN="right"><CODE>"com.googlecode.android_scripting.extra.EXTRA_TASK_ID"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.Constants.EXTRA_TRIGGER_ID"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/Constants.html#EXTRA_TRIGGER_ID">EXTRA_TRIGGER_ID</A></CODE></TD>
-<TD ALIGN="right"><CODE>"com.googlecode.android_scripting.extra.EXTRA_TRIGGER_ID"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.Constants.EXTRA_USE_EXTERNAL_IP"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/Constants.html#EXTRA_USE_EXTERNAL_IP">EXTRA_USE_EXTERNAL_IP</A></CODE></TD>
-<TD ALIGN="right"><CODE>"com.googlecode.android_scripting.extra.USE_PUBLIC_IP"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.Constants.EXTRA_USE_SERVICE_PORT"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/Constants.html#EXTRA_USE_SERVICE_PORT">EXTRA_USE_SERVICE_PORT</A></CODE></TD>
-<TD ALIGN="right"><CODE>"com.googlecode.android_scripting.extra.USE_SERVICE_PORT"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.Constants.FORCE_BROWSER"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/Constants.html#FORCE_BROWSER">FORCE_BROWSER</A></CODE></TD>
-<TD ALIGN="right"><CODE>"helpForceBrowser"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.Constants.HIDE_NOTIFY"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/Constants.html#HIDE_NOTIFY">HIDE_NOTIFY</A></CODE></TD>
-<TD ALIGN="right"><CODE>"hideServiceNotifications"</CODE></TD>
-</TR>
-</FONT></TD>
-</TR>
-</TABLE>
-
-<P>
-
-<P>
-
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="3">com.googlecode.android_scripting.facade.<A HREF="com/googlecode/android_scripting/facade/BatteryManagerFacade.html" title="class in com.googlecode.android_scripting.facade">BatteryManagerFacade</A></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.facade.BatteryManagerFacade.BATTERY_PLUGGED_AC"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/facade/BatteryManagerFacade.html#BATTERY_PLUGGED_AC">BATTERY_PLUGGED_AC</A></CODE></TD>
-<TD ALIGN="right"><CODE>1</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.facade.BatteryManagerFacade.BATTERY_PLUGGED_USB"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/facade/BatteryManagerFacade.html#BATTERY_PLUGGED_USB">BATTERY_PLUGGED_USB</A></CODE></TD>
-<TD ALIGN="right"><CODE>2</CODE></TD>
-</TR>
-</FONT></TD>
-</TR>
-</TABLE>
-
-<P>
-
-<P>
-
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="3">com.googlecode.android_scripting.facade.ui.<A HREF="com/googlecode/android_scripting/facade/ui/ViewInflater.html" title="class in com.googlecode.android_scripting.facade.ui">ViewInflater</A></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.facade.ui.ViewInflater.ANDROID"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/facade/ui/ViewInflater.html#ANDROID">ANDROID</A></CODE></TD>
-<TD ALIGN="right"><CODE>"http://schemas.android.com/apk/res/android"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.facade.ui.ViewInflater.BASESEQ"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/facade/ui/ViewInflater.html#BASESEQ">BASESEQ</A></CODE></TD>
-<TD ALIGN="right"><CODE>2131689472</CODE></TD>
-</TR>
-</FONT></TD>
-</TR>
-</TABLE>
-
-<P>
-
-<P>
-
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="3">com.googlecode.android_scripting.interpreter.<A HREF="com/googlecode/android_scripting/interpreter/InterpreterConstants.html" title="interface in com.googlecode.android_scripting.interpreter">InterpreterConstants</A></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.interpreter.InterpreterConstants.ACTION_DISCOVER_INTERPRETERS"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/interpreter/InterpreterConstants.html#ACTION_DISCOVER_INTERPRETERS">ACTION_DISCOVER_INTERPRETERS</A></CODE></TD>
-<TD ALIGN="right"><CODE>"com.googlecode.android_scripting.DISCOVER_INTERPRETERS"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.interpreter.InterpreterConstants.ACTION_INTERPRETER_ADDED"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/interpreter/InterpreterConstants.html#ACTION_INTERPRETER_ADDED">ACTION_INTERPRETER_ADDED</A></CODE></TD>
-<TD ALIGN="right"><CODE>"com.googlecode.android_scripting.INTERPRETER_ADDED"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.interpreter.InterpreterConstants.ACTION_INTERPRETER_REMOVED"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/interpreter/InterpreterConstants.html#ACTION_INTERPRETER_REMOVED">ACTION_INTERPRETER_REMOVED</A></CODE></TD>
-<TD ALIGN="right"><CODE>"com.googlecode.android_scripting.INTERPRETER_REMOVED"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.interpreter.InterpreterConstants.INSTALLED_PREFERENCE_KEY"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/interpreter/InterpreterConstants.html#INSTALLED_PREFERENCE_KEY">INSTALLED_PREFERENCE_KEY</A></CODE></TD>
-<TD ALIGN="right"><CODE>"SL4A.interpreter.installed"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.interpreter.InterpreterConstants.INTERPRETER_EXTRAS_ROOT"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/interpreter/InterpreterConstants.html#INTERPRETER_EXTRAS_ROOT">INTERPRETER_EXTRAS_ROOT</A></CODE></TD>
-<TD ALIGN="right"><CODE>"/extras/"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.interpreter.InterpreterConstants.MIME"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/interpreter/InterpreterConstants.html#MIME">MIME</A></CODE></TD>
-<TD ALIGN="right"><CODE>"script/"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.interpreter.InterpreterConstants.PROVIDER_ARGUMENTS"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/interpreter/InterpreterConstants.html#PROVIDER_ARGUMENTS">PROVIDER_ARGUMENTS</A></CODE></TD>
-<TD ALIGN="right"><CODE>"com.googlecode.android_scripting.args"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.interpreter.InterpreterConstants.PROVIDER_ENVIRONMENT_VARIABLES"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/interpreter/InterpreterConstants.html#PROVIDER_ENVIRONMENT_VARIABLES">PROVIDER_ENVIRONMENT_VARIABLES</A></CODE></TD>
-<TD ALIGN="right"><CODE>"com.googlecode.android_scripting.env"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.interpreter.InterpreterConstants.PROVIDER_PROPERTIES"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/interpreter/InterpreterConstants.html#PROVIDER_PROPERTIES">PROVIDER_PROPERTIES</A></CODE></TD>
-<TD ALIGN="right"><CODE>"com.googlecode.android_scripting.base"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.interpreter.InterpreterConstants.SL4A_DALVIK_CACHE_ROOT"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/interpreter/InterpreterConstants.html#SL4A_DALVIK_CACHE_ROOT">SL4A_DALVIK_CACHE_ROOT</A></CODE></TD>
-<TD ALIGN="right"><CODE>"/dalvik-cache/"</CODE></TD>
-</TR>
-</FONT></TD>
-</TR>
-</TABLE>
-
-<P>
-
-<P>
-
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="3">com.googlecode.android_scripting.interpreter.<A HREF="com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.html" title="interface in com.googlecode.android_scripting.interpreter">InterpreterPropertyNames</A></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.interpreter.InterpreterPropertyNames.BINARY"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.html#BINARY">BINARY</A></CODE></TD>
-<TD ALIGN="right"><CODE>"binary"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.interpreter.InterpreterPropertyNames.EXTENSION"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.html#EXTENSION">EXTENSION</A></CODE></TD>
-<TD ALIGN="right"><CODE>"extension"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.interpreter.InterpreterPropertyNames.HAS_INTERACTIVE_MODE"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.html#HAS_INTERACTIVE_MODE">HAS_INTERACTIVE_MODE</A></CODE></TD>
-<TD ALIGN="right"><CODE>"hasInteractiveMode"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.interpreter.InterpreterPropertyNames.INTERACTIVE_COMMAND"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.html#INTERACTIVE_COMMAND">INTERACTIVE_COMMAND</A></CODE></TD>
-<TD ALIGN="right"><CODE>"interactiveCommand"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.interpreter.InterpreterPropertyNames.NAME"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.html#NAME">NAME</A></CODE></TD>
-<TD ALIGN="right"><CODE>"name"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.interpreter.InterpreterPropertyNames.NICE_NAME"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.html#NICE_NAME">NICE_NAME</A></CODE></TD>
-<TD ALIGN="right"><CODE>"niceName"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.interpreter.InterpreterPropertyNames.SCRIPT_COMMAND"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.html#SCRIPT_COMMAND">SCRIPT_COMMAND</A></CODE></TD>
-<TD ALIGN="right"><CODE>"scriptCommand"</CODE></TD>
-</TR>
-</FONT></TD>
-</TR>
-</TABLE>
-
-<P>
-
-<P>
-
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="3">com.googlecode.android_scripting.interpreter.html.<A HREF="com/googlecode/android_scripting/interpreter/html/HtmlInterpreter.html" title="class in com.googlecode.android_scripting.interpreter.html">HtmlInterpreter</A></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.interpreter.html.HtmlInterpreter.ANDROID_JS_FILE"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/interpreter/html/HtmlInterpreter.html#ANDROID_JS_FILE">ANDROID_JS_FILE</A></CODE></TD>
-<TD ALIGN="right"><CODE>"android.js"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.interpreter.html.HtmlInterpreter.HTML"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/interpreter/html/HtmlInterpreter.html#HTML">HTML</A></CODE></TD>
-<TD ALIGN="right"><CODE>"html"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.interpreter.html.HtmlInterpreter.HTML_EXTENSION"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/interpreter/html/HtmlInterpreter.html#HTML_EXTENSION">HTML_EXTENSION</A></CODE></TD>
-<TD ALIGN="right"><CODE>".html"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.interpreter.html.HtmlInterpreter.HTML_NICE_NAME"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/interpreter/html/HtmlInterpreter.html#HTML_NICE_NAME">HTML_NICE_NAME</A></CODE></TD>
-<TD ALIGN="right"><CODE>"HTML and JavaScript"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.googlecode.android_scripting.interpreter.html.HtmlInterpreter.JSON_FILE"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/googlecode/android_scripting/interpreter/html/HtmlInterpreter.html#JSON_FILE">JSON_FILE</A></CODE></TD>
-<TD ALIGN="right"><CODE>"json2.js"</CODE></TD>
-</TR>
-</FONT></TD>
-</TR>
-</TABLE>
-
-<P>
-
-<P>
-<A NAME="com.hipipal"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left"><FONT SIZE="+2">
-com.hipipal.*</FONT></TH>
-</TR>
-</TABLE>
-
-<P>
-
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="3">com.hipipal.sl4alib.<A HREF="com/hipipal/sl4alib/CONF.html" title="class in com.hipipal.sl4alib">CONF</A></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.hipipal.sl4alib.CONF.API_SCRIPT"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/hipipal/sl4alib/CONF.html#API_SCRIPT">API_SCRIPT</A></CODE></TD>
-<TD ALIGN="right"><CODE>".last_api.py"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.hipipal.sl4alib.CONF.BASE_PATH"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/hipipal/sl4alib/CONF.html#BASE_PATH">BASE_PATH</A></CODE></TD>
-<TD ALIGN="right"><CODE>"com.hipipal.qpyplus"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.hipipal.sl4alib.CONF.DFROM_QPY"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/hipipal/sl4alib/CONF.html#DFROM_QPY">DFROM_QPY</A></CODE></TD>
-<TD ALIGN="right"><CODE>"scripts"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.hipipal.sl4alib.CONF.GOOGLE_TRACKER_ID"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/hipipal/sl4alib/CONF.html#GOOGLE_TRACKER_ID">GOOGLE_TRACKER_ID</A></CODE></TD>
-<TD ALIGN="right"><CODE>"UA-34788925-1"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.hipipal.sl4alib.CONF.PY_NOTI_FLAG"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/hipipal/sl4alib/CONF.html#PY_NOTI_FLAG">PY_NOTI_FLAG</A></CODE></TD>
-<TD ALIGN="right"><CODE>123400</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.hipipal.sl4alib.CONF.QR_APP"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/hipipal/sl4alib/CONF.html#QR_APP">QR_APP</A></CODE></TD>
-<TD ALIGN="right"><CODE>"http://qpython.com/"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.hipipal.sl4alib.CONF.QR_WH"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/hipipal/sl4alib/CONF.html#QR_WH">QR_WH</A></CODE></TD>
-<TD ALIGN="right"><CODE>"250"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.hipipal.sl4alib.CONF.SCRIPT_SITE"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/hipipal/sl4alib/CONF.html#SCRIPT_SITE">SCRIPT_SITE</A></CODE></TD>
-<TD ALIGN="right"><CODE>"http://qpython.org/"</CODE></TD>
-</TR>
-</FONT></TD>
-</TR>
-</TABLE>
-
-<P>
-
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html?constant-values.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="constant-values.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/doc/overview-frame.html b/doc/overview-frame.html
deleted file mode 100644
index 1159c86d..00000000
--- a/doc/overview-frame.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:06 PDT 2014 -->
-<TITLE>
-Overview List
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-
-
-</HEAD>
-
-<BODY BGCOLOR="white">
-
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TH ALIGN="left" NOWRAP><FONT size="+1" CLASS="FrameTitleFont">
-<B></B></FONT></TH>
-</TR>
-</TABLE>
-
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="allclasses-frame.html" target="packageFrame">All Classes</A></FONT>
-<P>
-<FONT size="+1" CLASS="FrameHeadingFont">
-Packages</FONT>
-<BR>
-<FONT CLASS="FrameItemFont"><A HREF="com/android/python27/config/package-frame.html" target="packageFrame">com.android.python27.config</A></FONT>
-<BR>
-<FONT CLASS="FrameItemFont"><A HREF="com/android/python27/process/package-frame.html" target="packageFrame">com.android.python27.process</A></FONT>
-<BR>
-<FONT CLASS="FrameItemFont"><A HREF="com/android/python27/support/package-frame.html" target="packageFrame">com.android.python27.support</A></FONT>
-<BR>
-<FONT CLASS="FrameItemFont"><A HREF="com/googlecode/android_scripting/package-frame.html" target="packageFrame">com.googlecode.android_scripting</A></FONT>
-<BR>
-<FONT CLASS="FrameItemFont"><A HREF="com/googlecode/android_scripting/activity/package-frame.html" target="packageFrame">com.googlecode.android_scripting.activity</A></FONT>
-<BR>
-<FONT CLASS="FrameItemFont"><A HREF="com/googlecode/android_scripting/bluetooth/package-frame.html" target="packageFrame">com.googlecode.android_scripting.bluetooth</A></FONT>
-<BR>
-<FONT CLASS="FrameItemFont"><A HREF="com/googlecode/android_scripting/event/package-frame.html" target="packageFrame">com.googlecode.android_scripting.event</A></FONT>
-<BR>
-<FONT CLASS="FrameItemFont"><A HREF="com/googlecode/android_scripting/exception/package-frame.html" target="packageFrame">com.googlecode.android_scripting.exception</A></FONT>
-<BR>
-<FONT CLASS="FrameItemFont"><A HREF="com/googlecode/android_scripting/facade/package-frame.html" target="packageFrame">com.googlecode.android_scripting.facade</A></FONT>
-<BR>
-<FONT CLASS="FrameItemFont"><A HREF="com/googlecode/android_scripting/facade/ui/package-frame.html" target="packageFrame">com.googlecode.android_scripting.facade.ui</A></FONT>
-<BR>
-<FONT CLASS="FrameItemFont"><A HREF="com/googlecode/android_scripting/future/package-frame.html" target="packageFrame">com.googlecode.android_scripting.future</A></FONT>
-<BR>
-<FONT CLASS="FrameItemFont"><A HREF="com/googlecode/android_scripting/interpreter/package-frame.html" target="packageFrame">com.googlecode.android_scripting.interpreter</A></FONT>
-<BR>
-<FONT CLASS="FrameItemFont"><A HREF="com/googlecode/android_scripting/interpreter/html/package-frame.html" target="packageFrame">com.googlecode.android_scripting.interpreter.html</A></FONT>
-<BR>
-<FONT CLASS="FrameItemFont"><A HREF="com/googlecode/android_scripting/interpreter/shell/package-frame.html" target="packageFrame">com.googlecode.android_scripting.interpreter.shell</A></FONT>
-<BR>
-<FONT CLASS="FrameItemFont"><A HREF="com/googlecode/android_scripting/jsonrpc/package-frame.html" target="packageFrame">com.googlecode.android_scripting.jsonrpc</A></FONT>
-<BR>
-<FONT CLASS="FrameItemFont"><A HREF="com/googlecode/android_scripting/language/package-frame.html" target="packageFrame">com.googlecode.android_scripting.language</A></FONT>
-<BR>
-<FONT CLASS="FrameItemFont"><A HREF="com/googlecode/android_scripting/rpc/package-frame.html" target="packageFrame">com.googlecode.android_scripting.rpc</A></FONT>
-<BR>
-<FONT CLASS="FrameItemFont"><A HREF="com/googlecode/android_scripting/trigger/package-frame.html" target="packageFrame">com.googlecode.android_scripting.trigger</A></FONT>
-<BR>
-<FONT CLASS="FrameItemFont"><A HREF="com/googlecode/android_scripting/util/package-frame.html" target="packageFrame">com.googlecode.android_scripting.util</A></FONT>
-<BR>
-<FONT CLASS="FrameItemFont"><A HREF="com/hipipal/sl4alib/package-frame.html" target="packageFrame">com.hipipal.sl4alib</A></FONT>
-<BR>
-<FONT CLASS="FrameItemFont"><A HREF="com/trilead/ssh2/package-frame.html" target="packageFrame">com.trilead.ssh2</A></FONT>
-<BR>
-</TD>
-</TR>
-</TABLE>
-
-<P>
-&nbsp;
-</BODY>
-</HTML>
diff --git a/doc/package-list b/doc/package-list
deleted file mode 100644
index ec881145..00000000
--- a/doc/package-list
+++ /dev/null
@@ -1,21 +0,0 @@
-com.android.python27.config
-com.android.python27.process
-com.android.python27.support
-com.googlecode.android_scripting
-com.googlecode.android_scripting.activity
-com.googlecode.android_scripting.bluetooth
-com.googlecode.android_scripting.event
-com.googlecode.android_scripting.exception
-com.googlecode.android_scripting.facade
-com.googlecode.android_scripting.facade.ui
-com.googlecode.android_scripting.future
-com.googlecode.android_scripting.interpreter
-com.googlecode.android_scripting.interpreter.html
-com.googlecode.android_scripting.interpreter.shell
-com.googlecode.android_scripting.jsonrpc
-com.googlecode.android_scripting.language
-com.googlecode.android_scripting.rpc
-com.googlecode.android_scripting.trigger
-com.googlecode.android_scripting.util
-com.hipipal.sl4alib
-com.trilead.ssh2
diff --git a/doc/resources/inherit.gif b/doc/resources/inherit.gif
deleted file mode 100644
index c814867a..00000000
Binary files a/doc/resources/inherit.gif and /dev/null differ
diff --git a/doc/serialized-form.html b/doc/serialized-form.html
deleted file mode 100644
index 0e6b0c82..00000000
--- a/doc/serialized-form.html
+++ /dev/null
@@ -1,229 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_65) on Sun Apr 13 11:01:07 PDT 2014 -->
-<TITLE>
-Serialized Form
-</TITLE>
-
-<META NAME="date" CONTENT="2014-04-13">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Serialized Form";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html?serialized-form.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="serialized-form.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H1>
-Serialized Form</H1>
-</CENTER>
-<HR SIZE="4" NOSHADE>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="center"><FONT SIZE="+2">
-<B>Package</B> <B>com.googlecode.android_scripting.exception</B></FONT></TH>
-</TR>
-</TABLE>
-
-<P>
-<A NAME="com.googlecode.android_scripting.exception.Sl4aException"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Class <A HREF="com/googlecode/android_scripting/exception/Sl4aException.html" title="class in com.googlecode.android_scripting.exception">com.googlecode.android_scripting.exception.Sl4aException</A> extends java.lang.Exception implements Serializable</B></FONT></TH>
-</TR>
-</TABLE>
-
-<P>
-<HR SIZE="4" NOSHADE>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="center"><FONT SIZE="+2">
-<B>Package</B> <B>com.googlecode.android_scripting.rpc</B></FONT></TH>
-</TR>
-</TABLE>
-
-<P>
-<A NAME="com.googlecode.android_scripting.rpc.RpcError"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Class <A HREF="com/googlecode/android_scripting/rpc/RpcError.html" title="class in com.googlecode.android_scripting.rpc">com.googlecode.android_scripting.rpc.RpcError</A> extends java.lang.Exception implements Serializable</B></FONT></TH>
-</TR>
-</TABLE>
-
-<P>
-<HR SIZE="4" NOSHADE>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="center"><FONT SIZE="+2">
-<B>Package</B> <B>com.googlecode.android_scripting.trigger</B></FONT></TH>
-</TR>
-</TABLE>
-
-<P>
-<A NAME="com.googlecode.android_scripting.trigger.ScriptTrigger"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Class <A HREF="com/googlecode/android_scripting/trigger/ScriptTrigger.html" title="class in com.googlecode.android_scripting.trigger">com.googlecode.android_scripting.trigger.ScriptTrigger</A> extends java.lang.Object implements Serializable</B></FONT></TH>
-</TR>
-</TABLE>
-
-<P>
-<B>serialVersionUID:&nbsp;</B>1804599219214041409L
-
-<P>
-<A NAME="serializedForm"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Serialized Fields</B></FONT></TH>
-</TR>
-</TABLE>
-
-<H3>
-mScript</H3>
-<PRE>
-java.io.File <B>mScript</B></PRE>
-<DL>
-<DL>
-</DL>
-</DL>
-<HR>
-<H3>
-mEventName</H3>
-<PRE>
-java.lang.String <B>mEventName</B></PRE>
-<DL>
-<DL>
-</DL>
-</DL>
-
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html?serialized-form.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="serialized-form.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/QPython_3x_featues.md b/docs/QPython_3x_featues.md
new file mode 100644
index 00000000..491234b5
--- /dev/null
+++ b/docs/QPython_3x_featues.md
@@ -0,0 +1,36 @@
+# QPython 3x featues
+
+Because google play and some appstores have strict requirements on the permissions of the app, we use different strategies in different appstores, which is why the branch name will be different. For example, L means Limited, and S means it contains Sensitive permissions.
+
+## Python
+- Python3.6.6
+- QRCode Reader
+- Editor
+- QPYPI
+- Ftp
+
+## Android Permissions
+
+### Both QPython 3S and 3L
+
+- android.permission.INTERNET
+- android.permission.ACCESS_SUPERUSER
+- android.permission.WAKE_LOCK
+- android.permission.ACCESS_NETWORK_STATE
+- android.permission.ACCESS_WIFI_STATE
+- android.permission.RECEIVE_BOOT_COMPLETED
+- android.permission.CAMERA
+- android.permission.FLASHLIGHT
+- android.permission.VIBRATE
+- android.permission.RECEIVE_USER_PRESENT
+- com.android.vending.BILLING
+- com.android.browser.permission.READ_HISTORY_BOOKMARKS
+- com.android.browser.permission.WRITE_HISTORY_BOOKMARKS
+- com.android.launcher.permission.INSTALL_SHORTCUT
+- com.android.launcher.permission.UNINSTALL_SHORTCUT
+- android.permission.READ_EXTERNAL_STORAGE
+- android.permission.WRITE_EXTERNAL_STORAGE
+- android.permission.ACCESS_COARSE_LOCATION
+- android.permission.ACCESS_FINE_LOCATION
+
+### QPython 3S
diff --git a/docs/QPython_Ox_featues.md b/docs/QPython_Ox_featues.md
new file mode 100644
index 00000000..fdfb8c09
--- /dev/null
+++ b/docs/QPython_Ox_featues.md
@@ -0,0 +1,40 @@
+# QPython Ox featues
+
+Because google play and some appstores have strict requirements on the permissions of the app, we use different strategies in different appstores, which is why the branch name will be different. For example, L means Limited, and S means it contains Sensitive permissions.
+
+## Python
+- Python3 + Python2 basis
+- QRCode Reader
+- Editor
+- QPYPI
+- Ftp
+- Course
+
+## Permissions
+### Both QPython OL and OS
+- android.permission.INTERNET
+- android.permission.ACCESS_SUPERUSER
+- android.permission.WAKE_LOCK
+- android.permission.ACCESS_NETWORK_STATE
+- android.permission.ACCESS_WIFI_STATE
+- android.permission.RECEIVE_BOOT_COMPLETED
+- android.permission.CAMERA
+- android.permission.FLASHLIGHT
+- android.permission.VIBRATE
+- android.permission.RECEIVE_USER_PRESENT
+- com.android.vending.BILLING
+- com.android.browser.permission.READ_HISTORY_BOOKMARKS
+- com.android.browser.permission.WRITE_HISTORY_BOOKMARKS
+- com.android.launcher.permission.INSTALL_SHORTCUT
+- com.android.launcher.permission.UNINSTALL_SHORTCUT
+- android.permission.READ_EXTERNAL_STORAGE
+- android.permission.WRITE_EXTERNAL_STORAGE
+- android.permission.ACCESS_COARSE_LOCATION
+- android.permission.ACCESS_FINE_LOCATION
+
+### QPython OS
+- android.permission.FOREGROUND_SERVICE
+- android.permission.BLUETOOTH
+- android.permission.BLUETOOTH_ADMIN
+- android.permission.NFC
+- android.permission.RECORD_AUDIO
diff --git a/docs/README.md b/docs/README.md
new file mode 100644
index 00000000..42a966ab
--- /dev/null
+++ b/docs/README.md
@@ -0,0 +1,2 @@
+# About
+QPython documentation
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 00000000..12d6a46b
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,19 @@
+## Project-wide Gradle settings.
+#
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+#
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+# Default value: -Xmx1024m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+#
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+#Sun May 29 21:58:12 CST 2016
+org.gradle.jvmargs=-Xmx2048m
+org.gradle.daemon=true
+android.debug.obsoleteApi=true
+#android.useDeprecatedNdk=true
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 00000000..f6b961fd
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradlew b/gradlew
new file mode 100755
index 00000000..cccdd3d5
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 00000000..e95643d6
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/libs/armeabi/libcom_googlecode_android_scripting_Exec.so b/libs/armeabi/libcom_googlecode_android_scripting_Exec.so
deleted file mode 100644
index 04635e30..00000000
Binary files a/libs/armeabi/libcom_googlecode_android_scripting_Exec.so and /dev/null differ
diff --git a/libs/guava-r06.jar b/libs/guava-r06.jar
deleted file mode 100644
index 8ff3a817..00000000
Binary files a/libs/guava-r06.jar and /dev/null differ
diff --git a/local.properties b/local.properties
new file mode 100644
index 00000000..4929a5a2
--- /dev/null
+++ b/local.properties
@@ -0,0 +1,9 @@
+## This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+#Thu Aug 02 10:23:49 CST 2018
+ndk.dir=/Users/yanhecun/Library/Android/sdk/ndk-bundle
+sdk.dir=/Users/yanhecun/Library/Android/sdk
diff --git a/proguard.cfg b/proguard.cfg
deleted file mode 100644
index b1cdf17b..00000000
--- a/proguard.cfg
+++ /dev/null
@@ -1,40 +0,0 @@
--optimizationpasses 5
--dontusemixedcaseclassnames
--dontskipnonpubliclibraryclasses
--dontpreverify
--verbose
--optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
-
--keep public class * extends android.app.Activity
--keep public class * extends android.app.Application
--keep public class * extends android.app.Service
--keep public class * extends android.content.BroadcastReceiver
--keep public class * extends android.content.ContentProvider
--keep public class * extends android.app.backup.BackupAgentHelper
--keep public class * extends android.preference.Preference
--keep public class com.android.vending.licensing.ILicensingService
-
--keepclasseswithmembernames class * {
-    native <methods>;
-}
-
--keepclasseswithmembers class * {
-    public <init>(android.content.Context, android.util.AttributeSet);
-}
-
--keepclasseswithmembers class * {
-    public <init>(android.content.Context, android.util.AttributeSet, int);
-}
-
--keepclassmembers class * extends android.app.Activity {
-   public void *(android.view.View);
-}
-
--keepclassmembers enum * {
-    public static **[] values();
-    public static ** valueOf(java.lang.String);
-}
-
--keep class * implements android.os.Parcelable {
-  public static final android.os.Parcelable$Creator *;
-}
diff --git a/project.properties b/project.properties
deleted file mode 100644
index 74ee095f..00000000
--- a/project.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system use,
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-
-# Project target.
-target=android-20
-android.library.reference.1=../QBaselib
-android.library=true
diff --git a/qbaselib b/qbaselib
new file mode 160000
index 00000000..d379973c
--- /dev/null
+++ b/qbaselib
@@ -0,0 +1 @@
+Subproject commit d379973cb724f65f342a1fbfc7b426b185b7ce32
diff --git a/qftplib b/qftplib
new file mode 160000
index 00000000..c1ab9384
--- /dev/null
+++ b/qftplib
@@ -0,0 +1 @@
+Subproject commit c1ab93848ec77ba6670332acff1e712a3c00301b
diff --git a/qpypluginman/build.gradle b/qpypluginman/build.gradle
new file mode 100644
index 00000000..3d455a43
--- /dev/null
+++ b/qpypluginman/build.gradle
@@ -0,0 +1,31 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion rootProject.ext.compileSdkVersion
+
+    defaultConfig {
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
+        versionCode 1
+        versionName "1.0"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+    lintOptions {
+        abortOnError false
+    }
+}
+
+dependencies {
+//    api fileTree(include: ['*.jar'], dir: 'libs')
+    //testApi 'junit:junit:4.12'
+    api rootProject.ext.libOkHttp3
+    api rootProject.ext.libRxJava
+    api rootProject.ext.libRxAndroid
+    api rootProject.ext.libFileDownloaderLib
+    api rootProject.ext.libSupportV4
+}
diff --git a/qpypluginman/proguard-rules.pro b/qpypluginman/proguard-rules.pro
new file mode 100644
index 00000000..36693fa1
--- /dev/null
+++ b/qpypluginman/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in C:\Users\Jay\AppData\Local\Android\Sdk/tools/proguard/proguard-android.txt
+# You can edit the include mPath and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/qpypluginman/src/main/AndroidManifest.xml b/qpypluginman/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..3592f067
--- /dev/null
+++ b/qpypluginman/src/main/AndroidManifest.xml
@@ -0,0 +1,8 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.quseit.common.updater">
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+
+</manifest>
diff --git a/qpypluginman/src/main/java/com/quseit/common/updater/Updater.java b/qpypluginman/src/main/java/com/quseit/common/updater/Updater.java
new file mode 100644
index 00000000..08de8c45
--- /dev/null
+++ b/qpypluginman/src/main/java/com/quseit/common/updater/Updater.java
@@ -0,0 +1,178 @@
+package com.quseit.common.updater;
+
+
+import android.app.Application;
+import android.content.Context;
+
+import com.quseit.common.updater.convertor.Convertor;
+import com.quseit.common.updater.downloader.DefaultDownloader;
+import com.quseit.common.updater.downloader.Downloader;
+import com.quseit.common.updater.service.DefaultService;
+import com.quseit.common.updater.service.Service;
+import com.quseit.common.updater.updatepkg.UpdatePackage;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+
+import rx.Observable;
+import rx.Subscriber;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.functions.Action1;
+import rx.functions.Func1;
+import rx.schedulers.Schedulers;
+
+public class Updater {
+    public static final String TAG = "Updater";
+    private static List<UpdatePackage> pkgs;
+
+    private static Service service;
+    private static Convertor convertor;
+    private static Downloader downloader;
+
+    private static String url;
+    private static Context context;
+
+    public static synchronized void init(Application app, String url, Convertor convertor) {
+        Updater.context = app.getApplicationContext();
+        Updater.url = url;
+        Updater.convertor = convertor;
+
+        Updater.service = new DefaultService();
+        Updater.downloader = new DefaultDownloader(app.getApplicationContext());
+    }
+
+    // download service
+    public static void downloadAs(String file, String url, String savePath) {
+        Updater.downloader.download(file, url, savePath,  new Downloader.Callback() {
+            @Override
+            public void pending(String name) {
+
+            }
+
+            @Override
+            public void complete(String name, File installer) {
+            }
+
+            @Override
+            public void error(String err) {
+
+            }
+        });
+    }
+    // update servivce
+    public static void checkUpdate(final CheckUpdateCallback callback) {
+        Observable
+                .create(new Observable.OnSubscribe<String>() {
+                    @Override
+                    public void call(Subscriber<? super String> subscriber) {
+                        try {
+                            String response = service.request(url);
+                            subscriber.onNext(response);
+                        } catch (IOException e) {
+                            subscriber.onError(e);
+                        } finally {
+                            subscriber.onCompleted();
+                        }
+                    }
+                })
+                .subscribeOn(Schedulers.io())
+                .observeOn(Schedulers.computation())
+                .map(new Func1<String, List<? extends UpdatePackage>>() {
+                    @Override
+                    public List<? extends UpdatePackage> call(String response) {
+                        return convertor.transform(response);
+                    }
+                })
+                .flatMap(new Func1<List<? extends UpdatePackage>, Observable<UpdatePackage>>() {
+                    @Override
+                    public Observable<UpdatePackage> call(List<? extends UpdatePackage> updatePkgs) {
+                        return Observable.from(updatePkgs);
+                    }
+                })
+                .filter(new Func1<UpdatePackage, Boolean>() {
+                    @Override
+                    public Boolean call(UpdatePackage updatePackage) {
+                        return updatePackage.checkVersion();
+                    }
+                })
+                .toList()
+                .doOnNext(new Action1<List<UpdatePackage>>() {
+                    @Override
+                    public void call(List<UpdatePackage> pkgs) {
+                        // 保存最新的获取的更新包
+                        Updater.pkgs = pkgs;
+                    }
+                })
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(
+                        new Action1<List<UpdatePackage>>() {
+                            @Override
+                            public void call(List<UpdatePackage> updatePackages) {
+                                if (!updatePackages.isEmpty()) {
+                                    callback.hasUpdate(updatePackages);
+                                } else {
+                                    callback.noneUpdate();
+                                }
+                            }
+                        },
+                        new Action1<Throwable>() {
+                            @Override
+                            public void call(Throwable throwable) {
+                                throwable.printStackTrace();
+                                callback.error(throwable);
+                            }
+                        });
+    }
+
+    public static void update(UpdatePackage pkg) {
+        downloadAndInstall(pkg);
+    }
+
+    public static void update() {
+        // 检查是否调用过 checkUpdate
+        if (Updater.pkgs == null) {
+            return;
+        }
+
+        downloadAndInstall(pkgs);
+    }
+
+    private static void downloadAndInstall(final UpdatePackage pkg) {
+        downloader.download(pkg.getName(), pkg.getDownloadUrl(),
+                new Downloader.Callback() {
+                    @Override
+                    public void pending(String name) {
+
+                    }
+
+                    @Override
+                    public void complete(String name, File installer) {
+                        pkg.install(installer);
+                    }
+
+                    @Override
+                    public void error(String err) {
+
+                    }
+                });
+    }
+
+    private static void downloadAndInstall(List<UpdatePackage> pkgs) {
+        for (UpdatePackage pkg : pkgs) {
+            downloadAndInstall(pkg);
+        }
+    }
+
+    public static Context getContext() {
+        return context;
+    }
+
+    public interface CheckUpdateCallback {
+        void hasUpdate(List<UpdatePackage> pkgs);
+
+        void noneUpdate();
+
+        void error(Throwable e);
+    }
+}
diff --git a/qpypluginman/src/main/java/com/quseit/common/updater/callback/DialogCallback.java b/qpypluginman/src/main/java/com/quseit/common/updater/callback/DialogCallback.java
new file mode 100644
index 00000000..53f7b155
--- /dev/null
+++ b/qpypluginman/src/main/java/com/quseit/common/updater/callback/DialogCallback.java
@@ -0,0 +1,138 @@
+package com.quseit.common.updater.callback;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.support.v4.app.DialogFragment;
+import android.support.v4.app.FragmentActivity;
+import android.widget.Toast;
+
+import com.quseit.common.updater.R;
+import com.quseit.common.updater.Updater;
+import com.quseit.common.updater.updatepkg.UpdatePackage;
+
+import java.util.List;
+
+public class DialogCallback implements Updater.CheckUpdateCallback {
+    private FragmentActivity mActivity;
+    private boolean mIsSilence;
+
+    public DialogCallback(FragmentActivity activity, boolean isSilence) {
+        mActivity = activity;
+        mIsSilence = isSilence;
+    }
+
+    @Override
+    public void hasUpdate(List<UpdatePackage> pkgs) {
+        StringBuilder description = new StringBuilder();
+        for (UpdatePackage pkg : pkgs) {
+            description
+                    .append(pkg.getName())
+                    .append("：")
+                    .append("\n")
+                    .append(pkg.getVersionDescription())
+                    .append("\n\n");
+        }
+        description.delete(description.length() - 2, description.length());
+
+        DialogFragment dialog = SimpleReminderDialogFragment.newInstance(description.toString());
+        try {
+            dialog.show(mActivity.getSupportFragmentManager(), SimpleReminderDialogFragment.TAG);
+        } catch (Exception e) {
+            // mActivity 不可用时忽略
+        }
+    }
+
+    @Override
+    public void noneUpdate() {
+        try {
+            if (!mIsSilence) {
+                Toast.makeText(mActivity, R.string.latest_version, Toast.LENGTH_SHORT).show();
+            }
+        } catch (Exception e) {
+            // mActivity 不可用时忽略
+        }
+    }
+
+    @Override
+    public void error(Throwable e) {
+        try {
+            if (!mIsSilence) {
+                Toast.makeText(mActivity, R.string.check_update_error, Toast.LENGTH_SHORT).show();
+            }
+        } catch (Exception e1) {
+            // mActivity 不可用时忽略
+        }
+    }
+
+    public static class SimpleReminderDialogFragment extends DialogFragment {
+        public static final String TAG = "SimpleReminderDialogFragment";
+        private static final String DESCRIPTION = "description";
+
+        public static SimpleReminderDialogFragment newInstance(String description) {
+            Bundle args = new Bundle();
+            args.putString(DESCRIPTION, description);
+            SimpleReminderDialogFragment fragment = new SimpleReminderDialogFragment();
+            fragment.setArguments(args);
+            return fragment;
+        }
+
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState) {
+            return new AlertDialog.Builder(getActivity())
+                    .setTitle(R.string.has_update)
+                    .setPositiveButton(R.string.update, new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialogInterface, int i) {
+                            Updater.update();
+                            dismiss();
+                        }
+                    })
+                    .setNegativeButton(R.string.show_detail, new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialogInterface, int i) {
+                            String description = getArguments().getString(DESCRIPTION);
+                            DialogFragment dialog = DetailReminderDialogFragment.newInstance(description);
+                            dialog.show(getFragmentManager(), DetailReminderDialogFragment.TAG);
+                            dismiss();
+                        }
+                    })
+                    .create();
+        }
+    }
+
+    public static class DetailReminderDialogFragment extends DialogFragment {
+        public static final String TAG = "DetailReminderDialogFragment";
+        private static final String DESCRIPTION = "description";
+
+        public static DetailReminderDialogFragment newInstance(String description) {
+            Bundle args = new Bundle();
+            args.putString(DESCRIPTION, description);
+            DetailReminderDialogFragment fragment = new DetailReminderDialogFragment();
+            fragment.setArguments(args);
+            return fragment;
+        }
+
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState) {
+            return new AlertDialog.Builder(getActivity())
+                    .setTitle(R.string.has_update)
+                    .setMessage(getArguments().getString(DESCRIPTION))
+                    .setPositiveButton(R.string.update, new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialogInterface, int i) {
+                            Updater.update();
+                            dismiss();
+                        }
+                    })
+                    .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialogInterface, int i) {
+                            dismiss();
+                        }
+                    })
+                    .create();
+        }
+    }
+}
diff --git a/qpypluginman/src/main/java/com/quseit/common/updater/convertor/Convertor.java b/qpypluginman/src/main/java/com/quseit/common/updater/convertor/Convertor.java
new file mode 100644
index 00000000..972d93da
--- /dev/null
+++ b/qpypluginman/src/main/java/com/quseit/common/updater/convertor/Convertor.java
@@ -0,0 +1,10 @@
+package com.quseit.common.updater.convertor;
+
+
+import com.quseit.common.updater.updatepkg.UpdatePackage;
+
+import java.util.List;
+
+public interface Convertor {
+    List<? extends UpdatePackage> transform(String response);
+}
diff --git a/qpypluginman/src/main/java/com/quseit/common/updater/downloader/DefaultDownloader.java b/qpypluginman/src/main/java/com/quseit/common/updater/downloader/DefaultDownloader.java
new file mode 100644
index 00000000..3cd3182e
--- /dev/null
+++ b/qpypluginman/src/main/java/com/quseit/common/updater/downloader/DefaultDownloader.java
@@ -0,0 +1,104 @@
+package com.quseit.common.updater.downloader;
+
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.os.Environment;
+import android.support.v4.app.NotificationCompat;
+import android.util.Log;
+
+import com.liulishuo.filedownloader.BaseDownloadTask;
+import com.liulishuo.filedownloader.FileDownloadListener;
+import com.liulishuo.filedownloader.FileDownloader;
+import com.quseit.common.updater.R;
+
+import java.io.File;
+
+import static android.os.Environment.getExternalStoragePublicDirectory;
+
+public class DefaultDownloader implements Downloader {
+    public static final String TAG = "DefaultDownloader";
+    public final String DEFAULT_PATH;
+    private final Context context;
+    private final NotificationManager notificationManager;
+
+    public DefaultDownloader(Context context) {
+        this.context = context;
+        FileDownloader.init(context);
+        notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+        DEFAULT_PATH = getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).getAbsolutePath();
+    }
+
+    @Override
+    public void download(final String name, String url, final Callback callback) {
+        String path = DEFAULT_PATH + "/" + name;
+        download(name, url, path, callback);
+    }
+
+    @Override
+    public void download(final String name, String url, final String path, final Callback callback) {
+        Log.d(TAG, "download:"+name+":"+url+"["+path+"]");
+        FileDownloader.getImpl()
+        .create(url)
+        .setPath(path, false)
+        .setCallbackProgressTimes(2000)
+        .setListener(new FileDownloadListener() {
+            @Override
+            protected void pending(BaseDownloadTask task, int soFarBytes, int totalBytes) {
+                Log.d(TAG, "download:pending:");
+                callback.pending(name);
+            }
+
+            @Override
+            protected void progress(BaseDownloadTask task, int soFarBytes, int totalBytes) {
+                Log.d(TAG, "download:progress:");
+
+                Notification notification = new NotificationCompat.Builder(context)
+                        .setSmallIcon(R.drawable.ic_cloud_download_black_24dp)
+                        .setContentTitle(context.getText(R.string.downloading))
+                        .setContentText(name)
+                        .setProgress(totalBytes, soFarBytes, false)
+                        .build();
+                notificationManager.notify(name.hashCode(), notification);
+            }
+
+            @Override
+            protected void completed(BaseDownloadTask task) {
+                Log.d(TAG, "download:completed:");
+
+                //notificationManager.cancel(name.hashCode());
+                Notification notification = new NotificationCompat.Builder(context)
+                        .setSmallIcon(R.drawable.ic_cloud_download_black_24dp)
+                        .setContentTitle(context.getText(R.string.downloaded))
+                        .setContentText(name)
+                        .setProgress(100, 100, false)
+                        .build();
+
+                notificationManager.notify(name.hashCode(),notification);
+                File file = new File(task.getTargetFilePath());
+                callback.complete(name, file);
+            }
+
+            @Override
+            protected void paused(BaseDownloadTask task, int soFarBytes, int totalBytes) {
+                Log.d(TAG, "download:paused:");
+
+            }
+
+            @Override
+            protected void error(BaseDownloadTask task, Throwable e) {
+                Log.d(TAG, "download:error:"+e.getLocalizedMessage());
+                callback.error(e.getLocalizedMessage());
+
+            }
+
+            @Override
+            protected void warn(BaseDownloadTask task) {
+                Log.d(TAG, "download:warn:");
+
+            }
+        })
+        .start();
+
+    }
+}
\ No newline at end of file
diff --git a/qpypluginman/src/main/java/com/quseit/common/updater/downloader/Downloader.java b/qpypluginman/src/main/java/com/quseit/common/updater/downloader/Downloader.java
new file mode 100644
index 00000000..260db300
--- /dev/null
+++ b/qpypluginman/src/main/java/com/quseit/common/updater/downloader/Downloader.java
@@ -0,0 +1,15 @@
+package com.quseit.common.updater.downloader;
+
+import java.io.File;
+
+public interface Downloader {
+    void download(String name, String url, Callback callback);
+
+    void download(String name, String url, String savePath, Callback callback);
+
+    interface Callback {
+        void pending(String name);
+        void complete(String name, File installer);
+        void error(String err);
+    }
+}
diff --git a/qpypluginman/src/main/java/com/quseit/common/updater/service/DefaultService.java b/qpypluginman/src/main/java/com/quseit/common/updater/service/DefaultService.java
new file mode 100644
index 00000000..3fde70af
--- /dev/null
+++ b/qpypluginman/src/main/java/com/quseit/common/updater/service/DefaultService.java
@@ -0,0 +1,22 @@
+package com.quseit.common.updater.service;
+
+import java.io.IOException;
+
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+
+public class DefaultService implements Service {
+    private final OkHttpClient client;
+
+    public DefaultService() {
+        client = new OkHttpClient();
+    }
+
+    @Override
+    public String request(String url) throws IOException {
+        Request request = new Request.Builder()
+                .url(url)
+                .build();
+        return client.newCall(request).execute().body().string();
+    }
+}
diff --git a/qpypluginman/src/main/java/com/quseit/common/updater/service/Service.java b/qpypluginman/src/main/java/com/quseit/common/updater/service/Service.java
new file mode 100644
index 00000000..6690791c
--- /dev/null
+++ b/qpypluginman/src/main/java/com/quseit/common/updater/service/Service.java
@@ -0,0 +1,7 @@
+package com.quseit.common.updater.service;
+
+import java.io.IOException;
+
+public interface Service {
+    String request(String url) throws IOException;
+}
diff --git a/qpypluginman/src/main/java/com/quseit/common/updater/updatepkg/Apk.java b/qpypluginman/src/main/java/com/quseit/common/updater/updatepkg/Apk.java
new file mode 100644
index 00000000..55c3a465
--- /dev/null
+++ b/qpypluginman/src/main/java/com/quseit/common/updater/updatepkg/Apk.java
@@ -0,0 +1,70 @@
+package com.quseit.common.updater.updatepkg;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.net.Uri;
+
+import com.quseit.common.updater.Updater;
+
+import java.io.File;
+
+public class Apk implements UpdatePackage {
+    private String name;
+    private String version;
+    private int versionCode;
+    private String description;
+    private String url;
+
+    public Apk(String name, String version, int versionCode, String description, String url) {
+        this.name = name;
+        this.version = version;
+        this.versionCode = versionCode;
+        this.description = description;
+        this.url = url;
+    }
+
+    @Override
+    public String getName() {
+        return this.name;
+    }
+
+    @Override
+    public String getVersion() {
+        return String.valueOf(this.version);
+    }
+
+    public String getVersionDescription() {
+        return this.description;
+    }
+
+    @Override
+    public String getDownloadUrl() {
+        return this.url;
+    }
+
+    @Override
+    public boolean checkVersion() {
+        Context context = Updater.getContext();
+        PackageManager packageManager = context.getPackageManager();
+        PackageInfo packageInfo = null;
+        try {
+            packageInfo = packageManager.getPackageInfo(context.getPackageName(), 0);
+
+        } catch (PackageManager.NameNotFoundException e) {
+            e.printStackTrace();
+        }
+        int localVersion = packageInfo.versionCode;
+        return this.versionCode > localVersion;
+    }
+
+    @Override
+    public void install(File installFile) {
+        Uri uri = Uri.fromFile(installFile);
+        Intent intent = new Intent(Intent.ACTION_VIEW);
+        intent.setDataAndType(uri, "application/vnd.android.package-archive");
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        Updater.getContext().startActivity(intent);
+    }
+}
diff --git a/qpypluginman/src/main/java/com/quseit/common/updater/updatepkg/UpdatePackage.java b/qpypluginman/src/main/java/com/quseit/common/updater/updatepkg/UpdatePackage.java
new file mode 100644
index 00000000..e274e6fe
--- /dev/null
+++ b/qpypluginman/src/main/java/com/quseit/common/updater/updatepkg/UpdatePackage.java
@@ -0,0 +1,18 @@
+package com.quseit.common.updater.updatepkg;
+
+import java.io.File;
+
+public interface UpdatePackage {
+
+    String getName();
+
+    String getVersion();
+
+    String getVersionDescription();
+
+    String getDownloadUrl();
+
+    boolean checkVersion();
+
+    void install(File file);
+}
diff --git a/qpypluginman/src/main/res/drawable/ic_cloud_download_black_24dp.png b/qpypluginman/src/main/res/drawable/ic_cloud_download_black_24dp.png
new file mode 100644
index 00000000..1b590a24
Binary files /dev/null and b/qpypluginman/src/main/res/drawable/ic_cloud_download_black_24dp.png differ
diff --git a/qpypluginman/src/main/res/values-zh-rCn/strings.xml b/qpypluginman/src/main/res/values-zh-rCn/strings.xml
new file mode 100644
index 00000000..a2154f42
--- /dev/null
+++ b/qpypluginman/src/main/res/values-zh-rCn/strings.xml
@@ -0,0 +1,11 @@
+<resources>
+    <string name="check_update_error">检查更新失败</string>
+    <string name="latest_version">您的应用已经是最新版本</string>
+    <string name="has_update">应用有更新</string>
+    <string name="update">更新</string>
+    <string name="show_detail">显示详情</string>
+    <string name="cancel">取消</string>
+    <string name="downloading">正在下载</string>
+    <string name="downloaded">下载完成</string>
+
+</resources>
diff --git a/qpypluginman/src/main/res/values-zh-rTW/strings.xml b/qpypluginman/src/main/res/values-zh-rTW/strings.xml
new file mode 100644
index 00000000..bc9f6cf0
--- /dev/null
+++ b/qpypluginman/src/main/res/values-zh-rTW/strings.xml
@@ -0,0 +1,11 @@
+<resources>
+    <string name="check_update_error">檢查更新失敗</string>
+    <string name="latest_version">已經更新</string>
+    <string name="reminder">提示</string>
+    <string name="has_update">有可使用的新版本</string>
+    <string name="update">更新</string>
+    <string name="show_detail">顯示詳細內容</string>
+    <string name="cancel">取消</string>
+    <string name="downloading">正在下載</string>
+    <string name="download_complete">已下載</string>
+</resources>
diff --git a/qpypluginman/src/main/res/values/strings.xml b/qpypluginman/src/main/res/values/strings.xml
new file mode 100644
index 00000000..f700bcae
--- /dev/null
+++ b/qpypluginman/src/main/res/values/strings.xml
@@ -0,0 +1,11 @@
+<resources>
+    <string name="check_update_error">Check update fail</string>
+    <string name="latest_version">Already update</string>
+    <string name="has_update">New version available</string>
+    <string name="update">Update</string>
+    <string name="show_detail">Show detail</string>
+    <string name="cancel">Cancel</string>
+    <string name="downloading">Downloading</string>
+    <string name="downloaded">Completed</string>
+
+</resources>
diff --git a/qpysdk/README b/qpysdk/README
new file mode 100644
index 00000000..de389147
--- /dev/null
+++ b/qpysdk/README
@@ -0,0 +1 @@
+QPYTHON SDK
diff --git a/qpysdk/build.gradle b/qpysdk/build.gradle
new file mode 100644
index 00000000..deab3e87
--- /dev/null
+++ b/qpysdk/build.gradle
@@ -0,0 +1,45 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion rootProject.ext.compileSdkVersion
+    buildToolsVersion rootProject.ext.buildToolsVersion
+
+    defaultConfig {
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
+        versionCode 1
+        versionName "1.0"
+
+        ndk {
+            abiFilters 'armeabi-v7a',"arm64-v8a"
+        }
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+    externalNativeBuild {
+        ndkBuild {
+            path 'src/main/jni/Android.mk'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    lintOptions {
+        abortOnError false
+    }
+}
+
+
+dependencies {
+//    api fileTree(dir: 'libs', include: ['*.jar'])
+//    api files('libs/locale_platform.jar')
+    api rootProject.ext.libGoogleGuava
+    api project(':qbaselib')
+    api project(':qpysl4a')
+}
diff --git a/libs/locale_platform.jar b/qpysdk/libs/locale_platform.jar
similarity index 100%
rename from libs/locale_platform.jar
rename to qpysdk/libs/locale_platform.jar
diff --git a/qpysdk/proguard-rules.pro b/qpysdk/proguard-rules.pro
new file mode 100644
index 00000000..336f38c4
--- /dev/null
+++ b/qpysdk/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /Users/yhc/Library/Android/sdk/tools/proguard/proguard-android.txt
+# You can edit the include mPath and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/qpysdk/src/main/AndroidManifest.xml b/qpysdk/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..7ec0ded8
--- /dev/null
+++ b/qpysdk/src/main/AndroidManifest.xml
@@ -0,0 +1,11 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.quseit.qpyengine">
+
+    <!--<application-->
+        <!--android:allowBackup="true"-->
+        <!--android:label="@string/app_name"-->
+        <!--android:supportsRtl="true">-->
+
+    <!--</application>-->
+
+</manifest>
diff --git a/assets/android.js b/qpysdk/src/main/assets/android.js
similarity index 94%
rename from assets/android.js
rename to qpysdk/src/main/assets/android.js
index 9c263658..9712150f 100644
--- a/assets/android.js
+++ b/qpysdk/src/main/assets/android.js
@@ -1,4 +1,4 @@
-var Android = function() { 
+var AndroidHelper = function() { 
   this._callbacks = [], 
   this._id = 0, 
   this._call = function(method, params) { 
diff --git a/qpysdk/src/main/assets/html/index.html b/qpysdk/src/main/assets/html/index.html
new file mode 100644
index 00000000..aee35474
--- /dev/null
+++ b/qpysdk/src/main/assets/html/index.html
@@ -0,0 +1,56 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <style>
+        .loading div{
+        position: relative;
+        top:240px;
+        width: 8px;
+        height: 8px;
+        border-radius: 8px;
+        background: #777;
+        display: inline-block;
+        margin: 4px;
+        transition: top .2s;
+        }
+    </style>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=0, minimum-scale=1.0, maximum-scale=1.0">
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black">
+<title>MIAndLib WebView</title>
+<link rel="stylesheet" type="text/css" href="../stylesheets/css/style.css" />
+<script type="text/javascript" src="../stylesheets/js/jquery.min.js"></script>
+<!--script type="text/javascript" src="../android.js"></script>
+<script type="text/javascript" src="../json2.js"></script-->
+
+</head>
+<body>
+<div id="header"></div>
+<div id="wrapper"><div id='mainEle'>
+    <div class="loading"><div></div><div></div><div></div><div></div><div></div>&emsp;&emsp;&emsp;</div>
+</div></div>
+<div id="footer"></div>
+</body>
+<script>
+function loading_animate(){
+    var num = 0
+    $('.loading div').each(function(){
+        var _this = $(this)
+        setTimeout(function(){
+            _this.css({'transition': 'top .25s ease-out', 'top': '48px'});
+        },200*num);
+        setTimeout(function(){
+            _this.css({'transition': 'top .5s ease-in-out', 'top': '32px'});
+        },250+200*num);
+        setTimeout(function(){
+            _this.css({'transition': 'top .25s ease-in', 'top': '40px'});
+        },750+200*num);
+        num++;
+    });
+    setTimeout(loading_animate, num*200 + 950)
+}
+loading_animate()
+</script>
+<script type="text/javascript" src="index.js"></script>
+</html>
diff --git a/qpysdk/src/main/assets/html/index.js b/qpysdk/src/main/assets/html/index.js
new file mode 100644
index 00000000..3b27247a
--- /dev/null
+++ b/qpysdk/src/main/assets/html/index.js
@@ -0,0 +1,29 @@
+var total = 0
+function gotoApp() {
+	total = total+1
+	if (total>=10) {
+		//setTimeout('milib.closeWait()',100);
+	    $('#mainEle').html('<div id="loading">Fail to start QPyWebapp, please check manually.</div>');
+	    milib.onNext("timeout");
+
+	} else {
+	 	if (milib.isSrvOk("")) {
+	    	setTimeout('window.location=milib.getSrv()',100);
+		} else {
+			if (total<15) {
+		    	setTimeout('gotoApp()',3000);
+		    }
+		}
+	}
+}
+
+{
+    $('#mainEle').html('<div class="loading"><div></div><div></div><div></div><div></div><div></div><div></div>&emsp;&emsp;&emsp;</div>');
+    //milib.showWait();
+    milib.loadConsole("");
+
+    gotoApp();
+
+    /*var droid = new AndroidHelper();
+    droid.makeToast('HelloWorld')*/
+}
diff --git a/assets/json2.js b/qpysdk/src/main/assets/json2.js
similarity index 100%
rename from assets/json2.js
rename to qpysdk/src/main/assets/json2.js
diff --git a/qpysdk/src/main/assets/stylesheets/css/bootstrap.min.css b/qpysdk/src/main/assets/stylesheets/css/bootstrap.min.css
new file mode 100644
index 00000000..88269128
--- /dev/null
+++ b/qpysdk/src/main/assets/stylesheets/css/bootstrap.min.css
@@ -0,0 +1,7 @@
+/*!
+ * Bootstrap v4.1.3 (https://getbootstrap.com/)
+ * Copyright 2011-2018 The Bootstrap Authors
+ * Copyright 2011-2018 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ */:root{--blue:#007bff;--indigo:#6610f2;--purple:#6f42c1;--pink:#e83e8c;--red:#dc3545;--orange:#fd7e14;--yellow:#ffc107;--green:#28a745;--teal:#20c997;--cyan:#17a2b8;--white:#fff;--gray:#6c757d;--gray-dark:#343a40;--primary:#007bff;--secondary:#6c757d;--success:#28a745;--info:#17a2b8;--warning:#ffc107;--danger:#dc3545;--light:#f8f9fa;--dark:#343a40;--breakpoint-xs:0;--breakpoint-sm:576px;--breakpoint-md:768px;--breakpoint-lg:992px;--breakpoint-xl:1200px;--font-family-sans-serif:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";--font-family-monospace:SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace}*,::after,::before{box-sizing:border-box}html{font-family:sans-serif;line-height:1.15;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;-ms-overflow-style:scrollbar;-webkit-tap-highlight-color:transparent}@-ms-viewport{width:device-width}article,aside,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}body{margin:0;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";font-size:1rem;font-weight:400;line-height:1.5;color:#212529;text-align:left;background-color:#fff}[tabindex="-1"]:focus{outline:0!important}hr{box-sizing:content-box;height:0;overflow:visible}h1,h2,h3,h4,h5,h6{margin-top:0;margin-bottom:.5rem}p{margin-top:0;margin-bottom:1rem}abbr[data-original-title],abbr[title]{text-decoration:underline;-webkit-text-decoration:underline dotted;text-decoration:underline dotted;cursor:help;border-bottom:0}address{margin-bottom:1rem;font-style:normal;line-height:inherit}dl,ol,ul{margin-top:0;margin-bottom:1rem}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}dt{font-weight:700}dd{margin-bottom:.5rem;margin-left:0}blockquote{margin:0 0 1rem}dfn{font-style:italic}b,strong{font-weight:bolder}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}a{color:#007bff;text-decoration:none;background-color:transparent;-webkit-text-decoration-skip:objects}a:hover{color:#0056b3;text-decoration:underline}a:not([href]):not([tabindex]){color:inherit;text-decoration:none}a:not([href]):not([tabindex]):focus,a:not([href]):not([tabindex]):hover{color:inherit;text-decoration:none}a:not([href]):not([tabindex]):focus{outline:0}code,kbd,pre,samp{font-family:SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace;font-size:1em}pre{margin-top:0;margin-bottom:1rem;overflow:auto;-ms-overflow-style:scrollbar}figure{margin:0 0 1rem}img{vertical-align:middle;border-style:none}svg{overflow:hidden;vertical-align:middle}table{border-collapse:collapse}caption{padding-top:.75rem;padding-bottom:.75rem;color:#6c757d;text-align:left;caption-side:bottom}th{text-align:inherit}label{display:inline-block;margin-bottom:.5rem}button{border-radius:0}button:focus{outline:1px dotted;outline:5px auto -webkit-focus-ring-color}button,input,optgroup,select,textarea{margin:0;font-family:inherit;font-size:inherit;line-height:inherit}button,input{overflow:visible}button,select{text-transform:none}[type=reset],[type=submit],button,html [type=button]{-webkit-appearance:button}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{padding:0;border-style:none}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=date],input[type=datetime-local],input[type=month],input[type=time]{-webkit-appearance:listbox}textarea{overflow:auto;resize:vertical}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;max-width:100%;padding:0;margin-bottom:.5rem;font-size:1.5rem;line-height:inherit;color:inherit;white-space:normal}progress{vertical-align:baseline}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{outline-offset:-2px;-webkit-appearance:none}[type=search]::-webkit-search-cancel-button,[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{font:inherit;-webkit-appearance:button}output{display:inline-block}summary{display:list-item;cursor:pointer}template{display:none}[hidden]{display:none!important}.h1,.h2,.h3,.h4,.h5,.h6,h1,h2,h3,h4,h5,h6{margin-bottom:.5rem;font-family:inherit;font-weight:500;line-height:1.2;color:inherit}.h1,h1{font-size:2.5rem}.h2,h2{font-size:2rem}.h3,h3{font-size:1.75rem}.h4,h4{font-size:1.5rem}.h5,h5{font-size:1.25rem}.h6,h6{font-size:1rem}.lead{font-size:1.25rem;font-weight:300}.display-1{font-size:6rem;font-weight:300;line-height:1.2}.display-2{font-size:5.5rem;font-weight:300;line-height:1.2}.display-3{font-size:4.5rem;font-weight:300;line-height:1.2}.display-4{font-size:3.5rem;font-weight:300;line-height:1.2}hr{margin-top:1rem;margin-bottom:1rem;border:0;border-top:1px solid rgba(0,0,0,.1)}.small,small{font-size:80%;font-weight:400}.mark,mark{padding:.2em;background-color:#fcf8e3}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;list-style:none}.list-inline-item{display:inline-block}.list-inline-item:not(:last-child){margin-right:.5rem}.initialism{font-size:90%;text-transform:uppercase}.blockquote{margin-bottom:1rem;font-size:1.25rem}.blockquote-footer{display:block;font-size:80%;color:#6c757d}.blockquote-footer::before{content:"\2014 \00A0"}.img-fluid{max-width:100%;height:auto}.img-thumbnail{padding:.25rem;background-color:#fff;border:1px solid #dee2e6;border-radius:.25rem;max-width:100%;height:auto}.figure{display:inline-block}.figure-img{margin-bottom:.5rem;line-height:1}.figure-caption{font-size:90%;color:#6c757d}code{font-size:87.5%;color:#e83e8c;word-break:break-word}a>code{color:inherit}kbd{padding:.2rem .4rem;font-size:87.5%;color:#fff;background-color:#212529;border-radius:.2rem}kbd kbd{padding:0;font-size:100%;font-weight:700}pre{display:block;font-size:87.5%;color:#212529}pre code{font-size:inherit;color:inherit;word-break:normal}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{width:100%;padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}@media (min-width:576px){.container{max-width:540px}}@media (min-width:768px){.container{max-width:720px}}@media (min-width:992px){.container{max-width:960px}}@media (min-width:1200px){.container{max-width:1140px}}.container-fluid{width:100%;padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}.row{display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;margin-right:-15px;margin-left:-15px}.no-gutters{margin-right:0;margin-left:0}.no-gutters>.col,.no-gutters>[class*=col-]{padding-right:0;padding-left:0}.col,.col-1,.col-10,.col-11,.col-12,.col-2,.col-3,.col-4,.col-5,.col-6,.col-7,.col-8,.col-9,.col-auto,.col-lg,.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-lg-auto,.col-md,.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-md-auto,.col-sm,.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-sm-auto,.col-xl,.col-xl-1,.col-xl-10,.col-xl-11,.col-xl-12,.col-xl-2,.col-xl-3,.col-xl-4,.col-xl-5,.col-xl-6,.col-xl-7,.col-xl-8,.col-xl-9,.col-xl-auto{position:relative;width:100%;min-height:1px;padding-right:15px;padding-left:15px}.col{-ms-flex-preferred-size:0;flex-basis:0;-ms-flex-positive:1;flex-grow:1;max-width:100%}.col-auto{-ms-flex:0 0 auto;flex:0 0 auto;width:auto;max-width:none}.col-1{-ms-flex:0 0 8.333333%;flex:0 0 8.333333%;max-width:8.333333%}.col-2{-ms-flex:0 0 16.666667%;flex:0 0 16.666667%;max-width:16.666667%}.col-3{-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.col-4{-ms-flex:0 0 33.333333%;flex:0 0 33.333333%;max-width:33.333333%}.col-5{-ms-flex:0 0 41.666667%;flex:0 0 41.666667%;max-width:41.666667%}.col-6{-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.col-7{-ms-flex:0 0 58.333333%;flex:0 0 58.333333%;max-width:58.333333%}.col-8{-ms-flex:0 0 66.666667%;flex:0 0 66.666667%;max-width:66.666667%}.col-9{-ms-flex:0 0 75%;flex:0 0 75%;max-width:75%}.col-10{-ms-flex:0 0 83.333333%;flex:0 0 83.333333%;max-width:83.333333%}.col-11{-ms-flex:0 0 91.666667%;flex:0 0 91.666667%;max-width:91.666667%}.col-12{-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.order-first{-ms-flex-order:-1;order:-1}.order-last{-ms-flex-order:13;order:13}.order-0{-ms-flex-order:0;order:0}.order-1{-ms-flex-order:1;order:1}.order-2{-ms-flex-order:2;order:2}.order-3{-ms-flex-order:3;order:3}.order-4{-ms-flex-order:4;order:4}.order-5{-ms-flex-order:5;order:5}.order-6{-ms-flex-order:6;order:6}.order-7{-ms-flex-order:7;order:7}.order-8{-ms-flex-order:8;order:8}.order-9{-ms-flex-order:9;order:9}.order-10{-ms-flex-order:10;order:10}.order-11{-ms-flex-order:11;order:11}.order-12{-ms-flex-order:12;order:12}.offset-1{margin-left:8.333333%}.offset-2{margin-left:16.666667%}.offset-3{margin-left:25%}.offset-4{margin-left:33.333333%}.offset-5{margin-left:41.666667%}.offset-6{margin-left:50%}.offset-7{margin-left:58.333333%}.offset-8{margin-left:66.666667%}.offset-9{margin-left:75%}.offset-10{margin-left:83.333333%}.offset-11{margin-left:91.666667%}@media (min-width:576px){.col-sm{-ms-flex-preferred-size:0;flex-basis:0;-ms-flex-positive:1;flex-grow:1;max-width:100%}.col-sm-auto{-ms-flex:0 0 auto;flex:0 0 auto;width:auto;max-width:none}.col-sm-1{-ms-flex:0 0 8.333333%;flex:0 0 8.333333%;max-width:8.333333%}.col-sm-2{-ms-flex:0 0 16.666667%;flex:0 0 16.666667%;max-width:16.666667%}.col-sm-3{-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.col-sm-4{-ms-flex:0 0 33.333333%;flex:0 0 33.333333%;max-width:33.333333%}.col-sm-5{-ms-flex:0 0 41.666667%;flex:0 0 41.666667%;max-width:41.666667%}.col-sm-6{-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.col-sm-7{-ms-flex:0 0 58.333333%;flex:0 0 58.333333%;max-width:58.333333%}.col-sm-8{-ms-flex:0 0 66.666667%;flex:0 0 66.666667%;max-width:66.666667%}.col-sm-9{-ms-flex:0 0 75%;flex:0 0 75%;max-width:75%}.col-sm-10{-ms-flex:0 0 83.333333%;flex:0 0 83.333333%;max-width:83.333333%}.col-sm-11{-ms-flex:0 0 91.666667%;flex:0 0 91.666667%;max-width:91.666667%}.col-sm-12{-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.order-sm-first{-ms-flex-order:-1;order:-1}.order-sm-last{-ms-flex-order:13;order:13}.order-sm-0{-ms-flex-order:0;order:0}.order-sm-1{-ms-flex-order:1;order:1}.order-sm-2{-ms-flex-order:2;order:2}.order-sm-3{-ms-flex-order:3;order:3}.order-sm-4{-ms-flex-order:4;order:4}.order-sm-5{-ms-flex-order:5;order:5}.order-sm-6{-ms-flex-order:6;order:6}.order-sm-7{-ms-flex-order:7;order:7}.order-sm-8{-ms-flex-order:8;order:8}.order-sm-9{-ms-flex-order:9;order:9}.order-sm-10{-ms-flex-order:10;order:10}.order-sm-11{-ms-flex-order:11;order:11}.order-sm-12{-ms-flex-order:12;order:12}.offset-sm-0{margin-left:0}.offset-sm-1{margin-left:8.333333%}.offset-sm-2{margin-left:16.666667%}.offset-sm-3{margin-left:25%}.offset-sm-4{margin-left:33.333333%}.offset-sm-5{margin-left:41.666667%}.offset-sm-6{margin-left:50%}.offset-sm-7{margin-left:58.333333%}.offset-sm-8{margin-left:66.666667%}.offset-sm-9{margin-left:75%}.offset-sm-10{margin-left:83.333333%}.offset-sm-11{margin-left:91.666667%}}@media (min-width:768px){.col-md{-ms-flex-preferred-size:0;flex-basis:0;-ms-flex-positive:1;flex-grow:1;max-width:100%}.col-md-auto{-ms-flex:0 0 auto;flex:0 0 auto;width:auto;max-width:none}.col-md-1{-ms-flex:0 0 8.333333%;flex:0 0 8.333333%;max-width:8.333333%}.col-md-2{-ms-flex:0 0 16.666667%;flex:0 0 16.666667%;max-width:16.666667%}.col-md-3{-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.col-md-4{-ms-flex:0 0 33.333333%;flex:0 0 33.333333%;max-width:33.333333%}.col-md-5{-ms-flex:0 0 41.666667%;flex:0 0 41.666667%;max-width:41.666667%}.col-md-6{-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.col-md-7{-ms-flex:0 0 58.333333%;flex:0 0 58.333333%;max-width:58.333333%}.col-md-8{-ms-flex:0 0 66.666667%;flex:0 0 66.666667%;max-width:66.666667%}.col-md-9{-ms-flex:0 0 75%;flex:0 0 75%;max-width:75%}.col-md-10{-ms-flex:0 0 83.333333%;flex:0 0 83.333333%;max-width:83.333333%}.col-md-11{-ms-flex:0 0 91.666667%;flex:0 0 91.666667%;max-width:91.666667%}.col-md-12{-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.order-md-first{-ms-flex-order:-1;order:-1}.order-md-last{-ms-flex-order:13;order:13}.order-md-0{-ms-flex-order:0;order:0}.order-md-1{-ms-flex-order:1;order:1}.order-md-2{-ms-flex-order:2;order:2}.order-md-3{-ms-flex-order:3;order:3}.order-md-4{-ms-flex-order:4;order:4}.order-md-5{-ms-flex-order:5;order:5}.order-md-6{-ms-flex-order:6;order:6}.order-md-7{-ms-flex-order:7;order:7}.order-md-8{-ms-flex-order:8;order:8}.order-md-9{-ms-flex-order:9;order:9}.order-md-10{-ms-flex-order:10;order:10}.order-md-11{-ms-flex-order:11;order:11}.order-md-12{-ms-flex-order:12;order:12}.offset-md-0{margin-left:0}.offset-md-1{margin-left:8.333333%}.offset-md-2{margin-left:16.666667%}.offset-md-3{margin-left:25%}.offset-md-4{margin-left:33.333333%}.offset-md-5{margin-left:41.666667%}.offset-md-6{margin-left:50%}.offset-md-7{margin-left:58.333333%}.offset-md-8{margin-left:66.666667%}.offset-md-9{margin-left:75%}.offset-md-10{margin-left:83.333333%}.offset-md-11{margin-left:91.666667%}}@media (min-width:992px){.col-lg{-ms-flex-preferred-size:0;flex-basis:0;-ms-flex-positive:1;flex-grow:1;max-width:100%}.col-lg-auto{-ms-flex:0 0 auto;flex:0 0 auto;width:auto;max-width:none}.col-lg-1{-ms-flex:0 0 8.333333%;flex:0 0 8.333333%;max-width:8.333333%}.col-lg-2{-ms-flex:0 0 16.666667%;flex:0 0 16.666667%;max-width:16.666667%}.col-lg-3{-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.col-lg-4{-ms-flex:0 0 33.333333%;flex:0 0 33.333333%;max-width:33.333333%}.col-lg-5{-ms-flex:0 0 41.666667%;flex:0 0 41.666667%;max-width:41.666667%}.col-lg-6{-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.col-lg-7{-ms-flex:0 0 58.333333%;flex:0 0 58.333333%;max-width:58.333333%}.col-lg-8{-ms-flex:0 0 66.666667%;flex:0 0 66.666667%;max-width:66.666667%}.col-lg-9{-ms-flex:0 0 75%;flex:0 0 75%;max-width:75%}.col-lg-10{-ms-flex:0 0 83.333333%;flex:0 0 83.333333%;max-width:83.333333%}.col-lg-11{-ms-flex:0 0 91.666667%;flex:0 0 91.666667%;max-width:91.666667%}.col-lg-12{-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.order-lg-first{-ms-flex-order:-1;order:-1}.order-lg-last{-ms-flex-order:13;order:13}.order-lg-0{-ms-flex-order:0;order:0}.order-lg-1{-ms-flex-order:1;order:1}.order-lg-2{-ms-flex-order:2;order:2}.order-lg-3{-ms-flex-order:3;order:3}.order-lg-4{-ms-flex-order:4;order:4}.order-lg-5{-ms-flex-order:5;order:5}.order-lg-6{-ms-flex-order:6;order:6}.order-lg-7{-ms-flex-order:7;order:7}.order-lg-8{-ms-flex-order:8;order:8}.order-lg-9{-ms-flex-order:9;order:9}.order-lg-10{-ms-flex-order:10;order:10}.order-lg-11{-ms-flex-order:11;order:11}.order-lg-12{-ms-flex-order:12;order:12}.offset-lg-0{margin-left:0}.offset-lg-1{margin-left:8.333333%}.offset-lg-2{margin-left:16.666667%}.offset-lg-3{margin-left:25%}.offset-lg-4{margin-left:33.333333%}.offset-lg-5{margin-left:41.666667%}.offset-lg-6{margin-left:50%}.offset-lg-7{margin-left:58.333333%}.offset-lg-8{margin-left:66.666667%}.offset-lg-9{margin-left:75%}.offset-lg-10{margin-left:83.333333%}.offset-lg-11{margin-left:91.666667%}}@media (min-width:1200px){.col-xl{-ms-flex-preferred-size:0;flex-basis:0;-ms-flex-positive:1;flex-grow:1;max-width:100%}.col-xl-auto{-ms-flex:0 0 auto;flex:0 0 auto;width:auto;max-width:none}.col-xl-1{-ms-flex:0 0 8.333333%;flex:0 0 8.333333%;max-width:8.333333%}.col-xl-2{-ms-flex:0 0 16.666667%;flex:0 0 16.666667%;max-width:16.666667%}.col-xl-3{-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.col-xl-4{-ms-flex:0 0 33.333333%;flex:0 0 33.333333%;max-width:33.333333%}.col-xl-5{-ms-flex:0 0 41.666667%;flex:0 0 41.666667%;max-width:41.666667%}.col-xl-6{-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.col-xl-7{-ms-flex:0 0 58.333333%;flex:0 0 58.333333%;max-width:58.333333%}.col-xl-8{-ms-flex:0 0 66.666667%;flex:0 0 66.666667%;max-width:66.666667%}.col-xl-9{-ms-flex:0 0 75%;flex:0 0 75%;max-width:75%}.col-xl-10{-ms-flex:0 0 83.333333%;flex:0 0 83.333333%;max-width:83.333333%}.col-xl-11{-ms-flex:0 0 91.666667%;flex:0 0 91.666667%;max-width:91.666667%}.col-xl-12{-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.order-xl-first{-ms-flex-order:-1;order:-1}.order-xl-last{-ms-flex-order:13;order:13}.order-xl-0{-ms-flex-order:0;order:0}.order-xl-1{-ms-flex-order:1;order:1}.order-xl-2{-ms-flex-order:2;order:2}.order-xl-3{-ms-flex-order:3;order:3}.order-xl-4{-ms-flex-order:4;order:4}.order-xl-5{-ms-flex-order:5;order:5}.order-xl-6{-ms-flex-order:6;order:6}.order-xl-7{-ms-flex-order:7;order:7}.order-xl-8{-ms-flex-order:8;order:8}.order-xl-9{-ms-flex-order:9;order:9}.order-xl-10{-ms-flex-order:10;order:10}.order-xl-11{-ms-flex-order:11;order:11}.order-xl-12{-ms-flex-order:12;order:12}.offset-xl-0{margin-left:0}.offset-xl-1{margin-left:8.333333%}.offset-xl-2{margin-left:16.666667%}.offset-xl-3{margin-left:25%}.offset-xl-4{margin-left:33.333333%}.offset-xl-5{margin-left:41.666667%}.offset-xl-6{margin-left:50%}.offset-xl-7{margin-left:58.333333%}.offset-xl-8{margin-left:66.666667%}.offset-xl-9{margin-left:75%}.offset-xl-10{margin-left:83.333333%}.offset-xl-11{margin-left:91.666667%}}.table{width:100%;margin-bottom:1rem;background-color:transparent}.table td,.table th{padding:.75rem;vertical-align:top;border-top:1px solid #dee2e6}.table thead th{vertical-align:bottom;border-bottom:2px solid #dee2e6}.table tbody+tbody{border-top:2px solid #dee2e6}.table .table{background-color:#fff}.table-sm td,.table-sm th{padding:.3rem}.table-bordered{border:1px solid #dee2e6}.table-bordered td,.table-bordered th{border:1px solid #dee2e6}.table-bordered thead td,.table-bordered thead th{border-bottom-width:2px}.table-borderless tbody+tbody,.table-borderless td,.table-borderless th,.table-borderless thead th{border:0}.table-striped tbody tr:nth-of-type(odd){background-color:rgba(0,0,0,.05)}.table-hover tbody tr:hover{background-color:rgba(0,0,0,.075)}.table-primary,.table-primary>td,.table-primary>th{background-color:#b8daff}.table-hover .table-primary:hover{background-color:#9fcdff}.table-hover .table-primary:hover>td,.table-hover .table-primary:hover>th{background-color:#9fcdff}.table-secondary,.table-secondary>td,.table-secondary>th{background-color:#d6d8db}.table-hover .table-secondary:hover{background-color:#c8cbcf}.table-hover .table-secondary:hover>td,.table-hover .table-secondary:hover>th{background-color:#c8cbcf}.table-success,.table-success>td,.table-success>th{background-color:#c3e6cb}.table-hover .table-success:hover{background-color:#b1dfbb}.table-hover .table-success:hover>td,.table-hover .table-success:hover>th{background-color:#b1dfbb}.table-info,.table-info>td,.table-info>th{background-color:#bee5eb}.table-hover .table-info:hover{background-color:#abdde5}.table-hover .table-info:hover>td,.table-hover .table-info:hover>th{background-color:#abdde5}.table-warning,.table-warning>td,.table-warning>th{background-color:#ffeeba}.table-hover .table-warning:hover{background-color:#ffe8a1}.table-hover .table-warning:hover>td,.table-hover .table-warning:hover>th{background-color:#ffe8a1}.table-danger,.table-danger>td,.table-danger>th{background-color:#f5c6cb}.table-hover .table-danger:hover{background-color:#f1b0b7}.table-hover .table-danger:hover>td,.table-hover .table-danger:hover>th{background-color:#f1b0b7}.table-light,.table-light>td,.table-light>th{background-color:#fdfdfe}.table-hover .table-light:hover{background-color:#ececf6}.table-hover .table-light:hover>td,.table-hover .table-light:hover>th{background-color:#ececf6}.table-dark,.table-dark>td,.table-dark>th{background-color:#c6c8ca}.table-hover .table-dark:hover{background-color:#b9bbbe}.table-hover .table-dark:hover>td,.table-hover .table-dark:hover>th{background-color:#b9bbbe}.table-active,.table-active>td,.table-active>th{background-color:rgba(0,0,0,.075)}.table-hover .table-active:hover{background-color:rgba(0,0,0,.075)}.table-hover .table-active:hover>td,.table-hover .table-active:hover>th{background-color:rgba(0,0,0,.075)}.table .thead-dark th{color:#fff;background-color:#212529;border-color:#32383e}.table .thead-light th{color:#495057;background-color:#e9ecef;border-color:#dee2e6}.table-dark{color:#fff;background-color:#212529}.table-dark td,.table-dark th,.table-dark thead th{border-color:#32383e}.table-dark.table-bordered{border:0}.table-dark.table-striped tbody tr:nth-of-type(odd){background-color:rgba(255,255,255,.05)}.table-dark.table-hover tbody tr:hover{background-color:rgba(255,255,255,.075)}@media (max-width:575.98px){.table-responsive-sm{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch;-ms-overflow-style:-ms-autohiding-scrollbar}.table-responsive-sm>.table-bordered{border:0}}@media (max-width:767.98px){.table-responsive-md{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch;-ms-overflow-style:-ms-autohiding-scrollbar}.table-responsive-md>.table-bordered{border:0}}@media (max-width:991.98px){.table-responsive-lg{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch;-ms-overflow-style:-ms-autohiding-scrollbar}.table-responsive-lg>.table-bordered{border:0}}@media (max-width:1199.98px){.table-responsive-xl{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch;-ms-overflow-style:-ms-autohiding-scrollbar}.table-responsive-xl>.table-bordered{border:0}}.table-responsive{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch;-ms-overflow-style:-ms-autohiding-scrollbar}.table-responsive>.table-bordered{border:0}.form-control{display:block;width:100%;height:calc(2.25rem + 2px);padding:.375rem .75rem;font-size:1rem;line-height:1.5;color:#495057;background-color:#fff;background-clip:padding-box;border:1px solid #ced4da;border-radius:.25rem;transition:border-color .15s ease-in-out,box-shadow .15s ease-in-out}@media screen and (prefers-reduced-motion:reduce){.form-control{transition:none}}.form-control::-ms-expand{background-color:transparent;border:0}.form-control:focus{color:#495057;background-color:#fff;border-color:#80bdff;outline:0;box-shadow:0 0 0 .2rem rgba(0,123,255,.25)}.form-control::-webkit-input-placeholder{color:#6c757d;opacity:1}.form-control::-moz-placeholder{color:#6c757d;opacity:1}.form-control:-ms-input-placeholder{color:#6c757d;opacity:1}.form-control::-ms-input-placeholder{color:#6c757d;opacity:1}.form-control::placeholder{color:#6c757d;opacity:1}.form-control:disabled,.form-control[readonly]{background-color:#e9ecef;opacity:1}select.form-control:focus::-ms-value{color:#495057;background-color:#fff}.form-control-file,.form-control-range{display:block;width:100%}.col-form-label{padding-top:calc(.375rem + 1px);padding-bottom:calc(.375rem + 1px);margin-bottom:0;font-size:inherit;line-height:1.5}.col-form-label-lg{padding-top:calc(.5rem + 1px);padding-bottom:calc(.5rem + 1px);font-size:1.25rem;line-height:1.5}.col-form-label-sm{padding-top:calc(.25rem + 1px);padding-bottom:calc(.25rem + 1px);font-size:.875rem;line-height:1.5}.form-control-plaintext{display:block;width:100%;padding-top:.375rem;padding-bottom:.375rem;margin-bottom:0;line-height:1.5;color:#212529;background-color:transparent;border:solid transparent;border-width:1px 0}.form-control-plaintext.form-control-lg,.form-control-plaintext.form-control-sm{padding-right:0;padding-left:0}.form-control-sm{height:calc(1.8125rem + 2px);padding:.25rem .5rem;font-size:.875rem;line-height:1.5;border-radius:.2rem}.form-control-lg{height:calc(2.875rem + 2px);padding:.5rem 1rem;font-size:1.25rem;line-height:1.5;border-radius:.3rem}select.form-control[multiple],select.form-control[size]{height:auto}textarea.form-control{height:auto}.form-group{margin-bottom:1rem}.form-text{display:block;margin-top:.25rem}.form-row{display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;margin-right:-5px;margin-left:-5px}.form-row>.col,.form-row>[class*=col-]{padding-right:5px;padding-left:5px}.form-check{position:relative;display:block;padding-left:1.25rem}.form-check-input{position:absolute;margin-top:.3rem;margin-left:-1.25rem}.form-check-input:disabled~.form-check-label{color:#6c757d}.form-check-label{margin-bottom:0}.form-check-inline{display:-ms-inline-flexbox;display:inline-flex;-ms-flex-align:center;align-items:center;padding-left:0;margin-right:.75rem}.form-check-inline .form-check-input{position:static;margin-top:0;margin-right:.3125rem;margin-left:0}.valid-feedback{display:none;width:100%;margin-top:.25rem;font-size:80%;color:#28a745}.valid-tooltip{position:absolute;top:100%;z-index:5;display:none;max-width:100%;padding:.25rem .5rem;margin-top:.1rem;font-size:.875rem;line-height:1.5;color:#fff;background-color:rgba(40,167,69,.9);border-radius:.25rem}.custom-select.is-valid,.form-control.is-valid,.was-validated .custom-select:valid,.was-validated .form-control:valid{border-color:#28a745}.custom-select.is-valid:focus,.form-control.is-valid:focus,.was-validated .custom-select:valid:focus,.was-validated .form-control:valid:focus{border-color:#28a745;box-shadow:0 0 0 .2rem rgba(40,167,69,.25)}.custom-select.is-valid~.valid-feedback,.custom-select.is-valid~.valid-tooltip,.form-control.is-valid~.valid-feedback,.form-control.is-valid~.valid-tooltip,.was-validated .custom-select:valid~.valid-feedback,.was-validated .custom-select:valid~.valid-tooltip,.was-validated .form-control:valid~.valid-feedback,.was-validated .form-control:valid~.valid-tooltip{display:block}.form-control-file.is-valid~.valid-feedback,.form-control-file.is-valid~.valid-tooltip,.was-validated .form-control-file:valid~.valid-feedback,.was-validated .form-control-file:valid~.valid-tooltip{display:block}.form-check-input.is-valid~.form-check-label,.was-validated .form-check-input:valid~.form-check-label{color:#28a745}.form-check-input.is-valid~.valid-feedback,.form-check-input.is-valid~.valid-tooltip,.was-validated .form-check-input:valid~.valid-feedback,.was-validated .form-check-input:valid~.valid-tooltip{display:block}.custom-control-input.is-valid~.custom-control-label,.was-validated .custom-control-input:valid~.custom-control-label{color:#28a745}.custom-control-input.is-valid~.custom-control-label::before,.was-validated .custom-control-input:valid~.custom-control-label::before{background-color:#71dd8a}.custom-control-input.is-valid~.valid-feedback,.custom-control-input.is-valid~.valid-tooltip,.was-validated .custom-control-input:valid~.valid-feedback,.was-validated .custom-control-input:valid~.valid-tooltip{display:block}.custom-control-input.is-valid:checked~.custom-control-label::before,.was-validated .custom-control-input:valid:checked~.custom-control-label::before{background-color:#34ce57}.custom-control-input.is-valid:focus~.custom-control-label::before,.was-validated .custom-control-input:valid:focus~.custom-control-label::before{box-shadow:0 0 0 1px #fff,0 0 0 .2rem rgba(40,167,69,.25)}.custom-file-input.is-valid~.custom-file-label,.was-validated .custom-file-input:valid~.custom-file-label{border-color:#28a745}.custom-file-input.is-valid~.custom-file-label::after,.was-validated .custom-file-input:valid~.custom-file-label::after{border-color:inherit}.custom-file-input.is-valid~.valid-feedback,.custom-file-input.is-valid~.valid-tooltip,.was-validated .custom-file-input:valid~.valid-feedback,.was-validated .custom-file-input:valid~.valid-tooltip{display:block}.custom-file-input.is-valid:focus~.custom-file-label,.was-validated .custom-file-input:valid:focus~.custom-file-label{box-shadow:0 0 0 .2rem rgba(40,167,69,.25)}.invalid-feedback{display:none;width:100%;margin-top:.25rem;font-size:80%;color:#dc3545}.invalid-tooltip{position:absolute;top:100%;z-index:5;display:none;max-width:100%;padding:.25rem .5rem;margin-top:.1rem;font-size:.875rem;line-height:1.5;color:#fff;background-color:rgba(220,53,69,.9);border-radius:.25rem}.custom-select.is-invalid,.form-control.is-invalid,.was-validated .custom-select:invalid,.was-validated .form-control:invalid{border-color:#dc3545}.custom-select.is-invalid:focus,.form-control.is-invalid:focus,.was-validated .custom-select:invalid:focus,.was-validated .form-control:invalid:focus{border-color:#dc3545;box-shadow:0 0 0 .2rem rgba(220,53,69,.25)}.custom-select.is-invalid~.invalid-feedback,.custom-select.is-invalid~.invalid-tooltip,.form-control.is-invalid~.invalid-feedback,.form-control.is-invalid~.invalid-tooltip,.was-validated .custom-select:invalid~.invalid-feedback,.was-validated .custom-select:invalid~.invalid-tooltip,.was-validated .form-control:invalid~.invalid-feedback,.was-validated .form-control:invalid~.invalid-tooltip{display:block}.form-control-file.is-invalid~.invalid-feedback,.form-control-file.is-invalid~.invalid-tooltip,.was-validated .form-control-file:invalid~.invalid-feedback,.was-validated .form-control-file:invalid~.invalid-tooltip{display:block}.form-check-input.is-invalid~.form-check-label,.was-validated .form-check-input:invalid~.form-check-label{color:#dc3545}.form-check-input.is-invalid~.invalid-feedback,.form-check-input.is-invalid~.invalid-tooltip,.was-validated .form-check-input:invalid~.invalid-feedback,.was-validated .form-check-input:invalid~.invalid-tooltip{display:block}.custom-control-input.is-invalid~.custom-control-label,.was-validated .custom-control-input:invalid~.custom-control-label{color:#dc3545}.custom-control-input.is-invalid~.custom-control-label::before,.was-validated .custom-control-input:invalid~.custom-control-label::before{background-color:#efa2a9}.custom-control-input.is-invalid~.invalid-feedback,.custom-control-input.is-invalid~.invalid-tooltip,.was-validated .custom-control-input:invalid~.invalid-feedback,.was-validated .custom-control-input:invalid~.invalid-tooltip{display:block}.custom-control-input.is-invalid:checked~.custom-control-label::before,.was-validated .custom-control-input:invalid:checked~.custom-control-label::before{background-color:#e4606d}.custom-control-input.is-invalid:focus~.custom-control-label::before,.was-validated .custom-control-input:invalid:focus~.custom-control-label::before{box-shadow:0 0 0 1px #fff,0 0 0 .2rem rgba(220,53,69,.25)}.custom-file-input.is-invalid~.custom-file-label,.was-validated .custom-file-input:invalid~.custom-file-label{border-color:#dc3545}.custom-file-input.is-invalid~.custom-file-label::after,.was-validated .custom-file-input:invalid~.custom-file-label::after{border-color:inherit}.custom-file-input.is-invalid~.invalid-feedback,.custom-file-input.is-invalid~.invalid-tooltip,.was-validated .custom-file-input:invalid~.invalid-feedback,.was-validated .custom-file-input:invalid~.invalid-tooltip{display:block}.custom-file-input.is-invalid:focus~.custom-file-label,.was-validated .custom-file-input:invalid:focus~.custom-file-label{box-shadow:0 0 0 .2rem rgba(220,53,69,.25)}.form-inline{display:-ms-flexbox;display:flex;-ms-flex-flow:row wrap;flex-flow:row wrap;-ms-flex-align:center;align-items:center}.form-inline .form-check{width:100%}@media (min-width:576px){.form-inline label{display:-ms-flexbox;display:flex;-ms-flex-align:center;align-items:center;-ms-flex-pack:center;justify-content:center;margin-bottom:0}.form-inline .form-group{display:-ms-flexbox;display:flex;-ms-flex:0 0 auto;flex:0 0 auto;-ms-flex-flow:row wrap;flex-flow:row wrap;-ms-flex-align:center;align-items:center;margin-bottom:0}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .form-control-plaintext{display:inline-block}.form-inline .custom-select,.form-inline .input-group{width:auto}.form-inline .form-check{display:-ms-flexbox;display:flex;-ms-flex-align:center;align-items:center;-ms-flex-pack:center;justify-content:center;width:auto;padding-left:0}.form-inline .form-check-input{position:relative;margin-top:0;margin-right:.25rem;margin-left:0}.form-inline .custom-control{-ms-flex-align:center;align-items:center;-ms-flex-pack:center;justify-content:center}.form-inline .custom-control-label{margin-bottom:0}}.btn{display:inline-block;font-weight:400;text-align:center;white-space:nowrap;vertical-align:middle;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;border:1px solid transparent;padding:.375rem .75rem;font-size:1rem;line-height:1.5;border-radius:.25rem;transition:color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out}@media screen and (prefers-reduced-motion:reduce){.btn{transition:none}}.btn:focus,.btn:hover{text-decoration:none}.btn.focus,.btn:focus{outline:0;box-shadow:0 0 0 .2rem rgba(0,123,255,.25)}.btn.disabled,.btn:disabled{opacity:.65}.btn:not(:disabled):not(.disabled){cursor:pointer}a.btn.disabled,fieldset:disabled a.btn{pointer-events:none}.btn-primary{color:#fff;background-color:#007bff;border-color:#007bff}.btn-primary:hover{color:#fff;background-color:#0069d9;border-color:#0062cc}.btn-primary.focus,.btn-primary:focus{box-shadow:0 0 0 .2rem rgba(0,123,255,.5)}.btn-primary.disabled,.btn-primary:disabled{color:#fff;background-color:#007bff;border-color:#007bff}.btn-primary:not(:disabled):not(.disabled).active,.btn-primary:not(:disabled):not(.disabled):active,.show>.btn-primary.dropdown-toggle{color:#fff;background-color:#0062cc;border-color:#005cbf}.btn-primary:not(:disabled):not(.disabled).active:focus,.btn-primary:not(:disabled):not(.disabled):active:focus,.show>.btn-primary.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(0,123,255,.5)}.btn-secondary{color:#fff;background-color:#6c757d;border-color:#6c757d}.btn-secondary:hover{color:#fff;background-color:#5a6268;border-color:#545b62}.btn-secondary.focus,.btn-secondary:focus{box-shadow:0 0 0 .2rem rgba(108,117,125,.5)}.btn-secondary.disabled,.btn-secondary:disabled{color:#fff;background-color:#6c757d;border-color:#6c757d}.btn-secondary:not(:disabled):not(.disabled).active,.btn-secondary:not(:disabled):not(.disabled):active,.show>.btn-secondary.dropdown-toggle{color:#fff;background-color:#545b62;border-color:#4e555b}.btn-secondary:not(:disabled):not(.disabled).active:focus,.btn-secondary:not(:disabled):not(.disabled):active:focus,.show>.btn-secondary.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(108,117,125,.5)}.btn-success{color:#fff;background-color:#28a745;border-color:#28a745}.btn-success:hover{color:#fff;background-color:#218838;border-color:#1e7e34}.btn-success.focus,.btn-success:focus{box-shadow:0 0 0 .2rem rgba(40,167,69,.5)}.btn-success.disabled,.btn-success:disabled{color:#fff;background-color:#28a745;border-color:#28a745}.btn-success:not(:disabled):not(.disabled).active,.btn-success:not(:disabled):not(.disabled):active,.show>.btn-success.dropdown-toggle{color:#fff;background-color:#1e7e34;border-color:#1c7430}.btn-success:not(:disabled):not(.disabled).active:focus,.btn-success:not(:disabled):not(.disabled):active:focus,.show>.btn-success.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(40,167,69,.5)}.btn-info{color:#fff;background-color:#17a2b8;border-color:#17a2b8}.btn-info:hover{color:#fff;background-color:#138496;border-color:#117a8b}.btn-info.focus,.btn-info:focus{box-shadow:0 0 0 .2rem rgba(23,162,184,.5)}.btn-info.disabled,.btn-info:disabled{color:#fff;background-color:#17a2b8;border-color:#17a2b8}.btn-info:not(:disabled):not(.disabled).active,.btn-info:not(:disabled):not(.disabled):active,.show>.btn-info.dropdown-toggle{color:#fff;background-color:#117a8b;border-color:#10707f}.btn-info:not(:disabled):not(.disabled).active:focus,.btn-info:not(:disabled):not(.disabled):active:focus,.show>.btn-info.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(23,162,184,.5)}.btn-warning{color:#212529;background-color:#ffc107;border-color:#ffc107}.btn-warning:hover{color:#212529;background-color:#e0a800;border-color:#d39e00}.btn-warning.focus,.btn-warning:focus{box-shadow:0 0 0 .2rem rgba(255,193,7,.5)}.btn-warning.disabled,.btn-warning:disabled{color:#212529;background-color:#ffc107;border-color:#ffc107}.btn-warning:not(:disabled):not(.disabled).active,.btn-warning:not(:disabled):not(.disabled):active,.show>.btn-warning.dropdown-toggle{color:#212529;background-color:#d39e00;border-color:#c69500}.btn-warning:not(:disabled):not(.disabled).active:focus,.btn-warning:not(:disabled):not(.disabled):active:focus,.show>.btn-warning.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(255,193,7,.5)}.btn-danger{color:#fff;background-color:#dc3545;border-color:#dc3545}.btn-danger:hover{color:#fff;background-color:#c82333;border-color:#bd2130}.btn-danger.focus,.btn-danger:focus{box-shadow:0 0 0 .2rem rgba(220,53,69,.5)}.btn-danger.disabled,.btn-danger:disabled{color:#fff;background-color:#dc3545;border-color:#dc3545}.btn-danger:not(:disabled):not(.disabled).active,.btn-danger:not(:disabled):not(.disabled):active,.show>.btn-danger.dropdown-toggle{color:#fff;background-color:#bd2130;border-color:#b21f2d}.btn-danger:not(:disabled):not(.disabled).active:focus,.btn-danger:not(:disabled):not(.disabled):active:focus,.show>.btn-danger.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(220,53,69,.5)}.btn-light{color:#212529;background-color:#f8f9fa;border-color:#f8f9fa}.btn-light:hover{color:#212529;background-color:#e2e6ea;border-color:#dae0e5}.btn-light.focus,.btn-light:focus{box-shadow:0 0 0 .2rem rgba(248,249,250,.5)}.btn-light.disabled,.btn-light:disabled{color:#212529;background-color:#f8f9fa;border-color:#f8f9fa}.btn-light:not(:disabled):not(.disabled).active,.btn-light:not(:disabled):not(.disabled):active,.show>.btn-light.dropdown-toggle{color:#212529;background-color:#dae0e5;border-color:#d3d9df}.btn-light:not(:disabled):not(.disabled).active:focus,.btn-light:not(:disabled):not(.disabled):active:focus,.show>.btn-light.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(248,249,250,.5)}.btn-dark{color:#fff;background-color:#343a40;border-color:#343a40}.btn-dark:hover{color:#fff;background-color:#23272b;border-color:#1d2124}.btn-dark.focus,.btn-dark:focus{box-shadow:0 0 0 .2rem rgba(52,58,64,.5)}.btn-dark.disabled,.btn-dark:disabled{color:#fff;background-color:#343a40;border-color:#343a40}.btn-dark:not(:disabled):not(.disabled).active,.btn-dark:not(:disabled):not(.disabled):active,.show>.btn-dark.dropdown-toggle{color:#fff;background-color:#1d2124;border-color:#171a1d}.btn-dark:not(:disabled):not(.disabled).active:focus,.btn-dark:not(:disabled):not(.disabled):active:focus,.show>.btn-dark.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(52,58,64,.5)}.btn-outline-primary{color:#007bff;background-color:transparent;background-image:none;border-color:#007bff}.btn-outline-primary:hover{color:#fff;background-color:#007bff;border-color:#007bff}.btn-outline-primary.focus,.btn-outline-primary:focus{box-shadow:0 0 0 .2rem rgba(0,123,255,.5)}.btn-outline-primary.disabled,.btn-outline-primary:disabled{color:#007bff;background-color:transparent}.btn-outline-primary:not(:disabled):not(.disabled).active,.btn-outline-primary:not(:disabled):not(.disabled):active,.show>.btn-outline-primary.dropdown-toggle{color:#fff;background-color:#007bff;border-color:#007bff}.btn-outline-primary:not(:disabled):not(.disabled).active:focus,.btn-outline-primary:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-primary.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(0,123,255,.5)}.btn-outline-secondary{color:#6c757d;background-color:transparent;background-image:none;border-color:#6c757d}.btn-outline-secondary:hover{color:#fff;background-color:#6c757d;border-color:#6c757d}.btn-outline-secondary.focus,.btn-outline-secondary:focus{box-shadow:0 0 0 .2rem rgba(108,117,125,.5)}.btn-outline-secondary.disabled,.btn-outline-secondary:disabled{color:#6c757d;background-color:transparent}.btn-outline-secondary:not(:disabled):not(.disabled).active,.btn-outline-secondary:not(:disabled):not(.disabled):active,.show>.btn-outline-secondary.dropdown-toggle{color:#fff;background-color:#6c757d;border-color:#6c757d}.btn-outline-secondary:not(:disabled):not(.disabled).active:focus,.btn-outline-secondary:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-secondary.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(108,117,125,.5)}.btn-outline-success{color:#28a745;background-color:transparent;background-image:none;border-color:#28a745}.btn-outline-success:hover{color:#fff;background-color:#28a745;border-color:#28a745}.btn-outline-success.focus,.btn-outline-success:focus{box-shadow:0 0 0 .2rem rgba(40,167,69,.5)}.btn-outline-success.disabled,.btn-outline-success:disabled{color:#28a745;background-color:transparent}.btn-outline-success:not(:disabled):not(.disabled).active,.btn-outline-success:not(:disabled):not(.disabled):active,.show>.btn-outline-success.dropdown-toggle{color:#fff;background-color:#28a745;border-color:#28a745}.btn-outline-success:not(:disabled):not(.disabled).active:focus,.btn-outline-success:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-success.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(40,167,69,.5)}.btn-outline-info{color:#17a2b8;background-color:transparent;background-image:none;border-color:#17a2b8}.btn-outline-info:hover{color:#fff;background-color:#17a2b8;border-color:#17a2b8}.btn-outline-info.focus,.btn-outline-info:focus{box-shadow:0 0 0 .2rem rgba(23,162,184,.5)}.btn-outline-info.disabled,.btn-outline-info:disabled{color:#17a2b8;background-color:transparent}.btn-outline-info:not(:disabled):not(.disabled).active,.btn-outline-info:not(:disabled):not(.disabled):active,.show>.btn-outline-info.dropdown-toggle{color:#fff;background-color:#17a2b8;border-color:#17a2b8}.btn-outline-info:not(:disabled):not(.disabled).active:focus,.btn-outline-info:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-info.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(23,162,184,.5)}.btn-outline-warning{color:#ffc107;background-color:transparent;background-image:none;border-color:#ffc107}.btn-outline-warning:hover{color:#212529;background-color:#ffc107;border-color:#ffc107}.btn-outline-warning.focus,.btn-outline-warning:focus{box-shadow:0 0 0 .2rem rgba(255,193,7,.5)}.btn-outline-warning.disabled,.btn-outline-warning:disabled{color:#ffc107;background-color:transparent}.btn-outline-warning:not(:disabled):not(.disabled).active,.btn-outline-warning:not(:disabled):not(.disabled):active,.show>.btn-outline-warning.dropdown-toggle{color:#212529;background-color:#ffc107;border-color:#ffc107}.btn-outline-warning:not(:disabled):not(.disabled).active:focus,.btn-outline-warning:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-warning.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(255,193,7,.5)}.btn-outline-danger{color:#dc3545;background-color:transparent;background-image:none;border-color:#dc3545}.btn-outline-danger:hover{color:#fff;background-color:#dc3545;border-color:#dc3545}.btn-outline-danger.focus,.btn-outline-danger:focus{box-shadow:0 0 0 .2rem rgba(220,53,69,.5)}.btn-outline-danger.disabled,.btn-outline-danger:disabled{color:#dc3545;background-color:transparent}.btn-outline-danger:not(:disabled):not(.disabled).active,.btn-outline-danger:not(:disabled):not(.disabled):active,.show>.btn-outline-danger.dropdown-toggle{color:#fff;background-color:#dc3545;border-color:#dc3545}.btn-outline-danger:not(:disabled):not(.disabled).active:focus,.btn-outline-danger:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-danger.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(220,53,69,.5)}.btn-outline-light{color:#f8f9fa;background-color:transparent;background-image:none;border-color:#f8f9fa}.btn-outline-light:hover{color:#212529;background-color:#f8f9fa;border-color:#f8f9fa}.btn-outline-light.focus,.btn-outline-light:focus{box-shadow:0 0 0 .2rem rgba(248,249,250,.5)}.btn-outline-light.disabled,.btn-outline-light:disabled{color:#f8f9fa;background-color:transparent}.btn-outline-light:not(:disabled):not(.disabled).active,.btn-outline-light:not(:disabled):not(.disabled):active,.show>.btn-outline-light.dropdown-toggle{color:#212529;background-color:#f8f9fa;border-color:#f8f9fa}.btn-outline-light:not(:disabled):not(.disabled).active:focus,.btn-outline-light:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-light.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(248,249,250,.5)}.btn-outline-dark{color:#343a40;background-color:transparent;background-image:none;border-color:#343a40}.btn-outline-dark:hover{color:#fff;background-color:#343a40;border-color:#343a40}.btn-outline-dark.focus,.btn-outline-dark:focus{box-shadow:0 0 0 .2rem rgba(52,58,64,.5)}.btn-outline-dark.disabled,.btn-outline-dark:disabled{color:#343a40;background-color:transparent}.btn-outline-dark:not(:disabled):not(.disabled).active,.btn-outline-dark:not(:disabled):not(.disabled):active,.show>.btn-outline-dark.dropdown-toggle{color:#fff;background-color:#343a40;border-color:#343a40}.btn-outline-dark:not(:disabled):not(.disabled).active:focus,.btn-outline-dark:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-dark.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(52,58,64,.5)}.btn-link{font-weight:400;color:#007bff;background-color:transparent}.btn-link:hover{color:#0056b3;text-decoration:underline;background-color:transparent;border-color:transparent}.btn-link.focus,.btn-link:focus{text-decoration:underline;border-color:transparent;box-shadow:none}.btn-link.disabled,.btn-link:disabled{color:#6c757d;pointer-events:none}.btn-group-lg>.btn,.btn-lg{padding:.5rem 1rem;font-size:1.25rem;line-height:1.5;border-radius:.3rem}.btn-group-sm>.btn,.btn-sm{padding:.25rem .5rem;font-size:.875rem;line-height:1.5;border-radius:.2rem}.btn-block{display:block;width:100%}.btn-block+.btn-block{margin-top:.5rem}input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-block{width:100%}.fade{transition:opacity .15s linear}@media screen and (prefers-reduced-motion:reduce){.fade{transition:none}}.fade:not(.show){opacity:0}.collapse:not(.show){display:none}.collapsing{position:relative;height:0;overflow:hidden;transition:height .35s ease}@media screen and (prefers-reduced-motion:reduce){.collapsing{transition:none}}.dropdown,.dropleft,.dropright,.dropup{position:relative}.dropdown-toggle::after{display:inline-block;width:0;height:0;margin-left:.255em;vertical-align:.255em;content:"";border-top:.3em solid;border-right:.3em solid transparent;border-bottom:0;border-left:.3em solid transparent}.dropdown-toggle:empty::after{margin-left:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:10rem;padding:.5rem 0;margin:.125rem 0 0;font-size:1rem;color:#212529;text-align:left;list-style:none;background-color:#fff;background-clip:padding-box;border:1px solid rgba(0,0,0,.15);border-radius:.25rem}.dropdown-menu-right{right:0;left:auto}.dropup .dropdown-menu{top:auto;bottom:100%;margin-top:0;margin-bottom:.125rem}.dropup .dropdown-toggle::after{display:inline-block;width:0;height:0;margin-left:.255em;vertical-align:.255em;content:"";border-top:0;border-right:.3em solid transparent;border-bottom:.3em solid;border-left:.3em solid transparent}.dropup .dropdown-toggle:empty::after{margin-left:0}.dropright .dropdown-menu{top:0;right:auto;left:100%;margin-top:0;margin-left:.125rem}.dropright .dropdown-toggle::after{display:inline-block;width:0;height:0;margin-left:.255em;vertical-align:.255em;content:"";border-top:.3em solid transparent;border-right:0;border-bottom:.3em solid transparent;border-left:.3em solid}.dropright .dropdown-toggle:empty::after{margin-left:0}.dropright .dropdown-toggle::after{vertical-align:0}.dropleft .dropdown-menu{top:0;right:100%;left:auto;margin-top:0;margin-right:.125rem}.dropleft .dropdown-toggle::after{display:inline-block;width:0;height:0;margin-left:.255em;vertical-align:.255em;content:""}.dropleft .dropdown-toggle::after{display:none}.dropleft .dropdown-toggle::before{display:inline-block;width:0;height:0;margin-right:.255em;vertical-align:.255em;content:"";border-top:.3em solid transparent;border-right:.3em solid;border-bottom:.3em solid transparent}.dropleft .dropdown-toggle:empty::after{margin-left:0}.dropleft .dropdown-toggle::before{vertical-align:0}.dropdown-menu[x-placement^=bottom],.dropdown-menu[x-placement^=left],.dropdown-menu[x-placement^=right],.dropdown-menu[x-placement^=top]{right:auto;bottom:auto}.dropdown-divider{height:0;margin:.5rem 0;overflow:hidden;border-top:1px solid #e9ecef}.dropdown-item{display:block;width:100%;padding:.25rem 1.5rem;clear:both;font-weight:400;color:#212529;text-align:inherit;white-space:nowrap;background-color:transparent;border:0}.dropdown-item:focus,.dropdown-item:hover{color:#16181b;text-decoration:none;background-color:#f8f9fa}.dropdown-item.active,.dropdown-item:active{color:#fff;text-decoration:none;background-color:#007bff}.dropdown-item.disabled,.dropdown-item:disabled{color:#6c757d;background-color:transparent}.dropdown-menu.show{display:block}.dropdown-header{display:block;padding:.5rem 1.5rem;margin-bottom:0;font-size:.875rem;color:#6c757d;white-space:nowrap}.dropdown-item-text{display:block;padding:.25rem 1.5rem;color:#212529}.btn-group,.btn-group-vertical{position:relative;display:-ms-inline-flexbox;display:inline-flex;vertical-align:middle}.btn-group-vertical>.btn,.btn-group>.btn{position:relative;-ms-flex:0 1 auto;flex:0 1 auto}.btn-group-vertical>.btn:hover,.btn-group>.btn:hover{z-index:1}.btn-group-vertical>.btn.active,.btn-group-vertical>.btn:active,.btn-group-vertical>.btn:focus,.btn-group>.btn.active,.btn-group>.btn:active,.btn-group>.btn:focus{z-index:1}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group,.btn-group-vertical .btn+.btn,.btn-group-vertical .btn+.btn-group,.btn-group-vertical .btn-group+.btn,.btn-group-vertical .btn-group+.btn-group{margin-left:-1px}.btn-toolbar{display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;-ms-flex-pack:start;justify-content:flex-start}.btn-toolbar .input-group{width:auto}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn-group:not(:last-child)>.btn,.btn-group>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:not(:first-child)>.btn,.btn-group>.btn:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.dropdown-toggle-split{padding-right:.5625rem;padding-left:.5625rem}.dropdown-toggle-split::after,.dropright .dropdown-toggle-split::after,.dropup .dropdown-toggle-split::after{margin-left:0}.dropleft .dropdown-toggle-split::before{margin-right:0}.btn-group-sm>.btn+.dropdown-toggle-split,.btn-sm+.dropdown-toggle-split{padding-right:.375rem;padding-left:.375rem}.btn-group-lg>.btn+.dropdown-toggle-split,.btn-lg+.dropdown-toggle-split{padding-right:.75rem;padding-left:.75rem}.btn-group-vertical{-ms-flex-direction:column;flex-direction:column;-ms-flex-align:start;align-items:flex-start;-ms-flex-pack:center;justify-content:center}.btn-group-vertical .btn,.btn-group-vertical .btn-group{width:100%}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn-group:not(:last-child)>.btn,.btn-group-vertical>.btn:not(:last-child):not(.dropdown-toggle){border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:not(:first-child)>.btn,.btn-group-vertical>.btn:not(:first-child){border-top-left-radius:0;border-top-right-radius:0}.btn-group-toggle>.btn,.btn-group-toggle>.btn-group>.btn{margin-bottom:0}.btn-group-toggle>.btn input[type=checkbox],.btn-group-toggle>.btn input[type=radio],.btn-group-toggle>.btn-group>.btn input[type=checkbox],.btn-group-toggle>.btn-group>.btn input[type=radio]{position:absolute;clip:rect(0,0,0,0);pointer-events:none}.input-group{position:relative;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;-ms-flex-align:stretch;align-items:stretch;width:100%}.input-group>.custom-file,.input-group>.custom-select,.input-group>.form-control{position:relative;-ms-flex:1 1 auto;flex:1 1 auto;width:1%;margin-bottom:0}.input-group>.custom-file+.custom-file,.input-group>.custom-file+.custom-select,.input-group>.custom-file+.form-control,.input-group>.custom-select+.custom-file,.input-group>.custom-select+.custom-select,.input-group>.custom-select+.form-control,.input-group>.form-control+.custom-file,.input-group>.form-control+.custom-select,.input-group>.form-control+.form-control{margin-left:-1px}.input-group>.custom-file .custom-file-input:focus~.custom-file-label,.input-group>.custom-select:focus,.input-group>.form-control:focus{z-index:3}.input-group>.custom-file .custom-file-input:focus{z-index:4}.input-group>.custom-select:not(:last-child),.input-group>.form-control:not(:last-child){border-top-right-radius:0;border-bottom-right-radius:0}.input-group>.custom-select:not(:first-child),.input-group>.form-control:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.input-group>.custom-file{display:-ms-flexbox;display:flex;-ms-flex-align:center;align-items:center}.input-group>.custom-file:not(:last-child) .custom-file-label,.input-group>.custom-file:not(:last-child) .custom-file-label::after{border-top-right-radius:0;border-bottom-right-radius:0}.input-group>.custom-file:not(:first-child) .custom-file-label{border-top-left-radius:0;border-bottom-left-radius:0}.input-group-append,.input-group-prepend{display:-ms-flexbox;display:flex}.input-group-append .btn,.input-group-prepend .btn{position:relative;z-index:2}.input-group-append .btn+.btn,.input-group-append .btn+.input-group-text,.input-group-append .input-group-text+.btn,.input-group-append .input-group-text+.input-group-text,.input-group-prepend .btn+.btn,.input-group-prepend .btn+.input-group-text,.input-group-prepend .input-group-text+.btn,.input-group-prepend .input-group-text+.input-group-text{margin-left:-1px}.input-group-prepend{margin-right:-1px}.input-group-append{margin-left:-1px}.input-group-text{display:-ms-flexbox;display:flex;-ms-flex-align:center;align-items:center;padding:.375rem .75rem;margin-bottom:0;font-size:1rem;font-weight:400;line-height:1.5;color:#495057;text-align:center;white-space:nowrap;background-color:#e9ecef;border:1px solid #ced4da;border-radius:.25rem}.input-group-text input[type=checkbox],.input-group-text input[type=radio]{margin-top:0}.input-group-lg>.form-control,.input-group-lg>.input-group-append>.btn,.input-group-lg>.input-group-append>.input-group-text,.input-group-lg>.input-group-prepend>.btn,.input-group-lg>.input-group-prepend>.input-group-text{height:calc(2.875rem + 2px);padding:.5rem 1rem;font-size:1.25rem;line-height:1.5;border-radius:.3rem}.input-group-sm>.form-control,.input-group-sm>.input-group-append>.btn,.input-group-sm>.input-group-append>.input-group-text,.input-group-sm>.input-group-prepend>.btn,.input-group-sm>.input-group-prepend>.input-group-text{height:calc(1.8125rem + 2px);padding:.25rem .5rem;font-size:.875rem;line-height:1.5;border-radius:.2rem}.input-group>.input-group-append:last-child>.btn:not(:last-child):not(.dropdown-toggle),.input-group>.input-group-append:last-child>.input-group-text:not(:last-child),.input-group>.input-group-append:not(:last-child)>.btn,.input-group>.input-group-append:not(:last-child)>.input-group-text,.input-group>.input-group-prepend>.btn,.input-group>.input-group-prepend>.input-group-text{border-top-right-radius:0;border-bottom-right-radius:0}.input-group>.input-group-append>.btn,.input-group>.input-group-append>.input-group-text,.input-group>.input-group-prepend:first-child>.btn:not(:first-child),.input-group>.input-group-prepend:first-child>.input-group-text:not(:first-child),.input-group>.input-group-prepend:not(:first-child)>.btn,.input-group>.input-group-prepend:not(:first-child)>.input-group-text{border-top-left-radius:0;border-bottom-left-radius:0}.custom-control{position:relative;display:block;min-height:1.5rem;padding-left:1.5rem}.custom-control-inline{display:-ms-inline-flexbox;display:inline-flex;margin-right:1rem}.custom-control-input{position:absolute;z-index:-1;opacity:0}.custom-control-input:checked~.custom-control-label::before{color:#fff;background-color:#007bff}.custom-control-input:focus~.custom-control-label::before{box-shadow:0 0 0 1px #fff,0 0 0 .2rem rgba(0,123,255,.25)}.custom-control-input:active~.custom-control-label::before{color:#fff;background-color:#b3d7ff}.custom-control-input:disabled~.custom-control-label{color:#6c757d}.custom-control-input:disabled~.custom-control-label::before{background-color:#e9ecef}.custom-control-label{position:relative;margin-bottom:0}.custom-control-label::before{position:absolute;top:.25rem;left:-1.5rem;display:block;width:1rem;height:1rem;pointer-events:none;content:"";-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-color:#dee2e6}.custom-control-label::after{position:absolute;top:.25rem;left:-1.5rem;display:block;width:1rem;height:1rem;content:"";background-repeat:no-repeat;background-position:center center;background-size:50% 50%}.custom-checkbox .custom-control-label::before{border-radius:.25rem}.custom-checkbox .custom-control-input:checked~.custom-control-label::before{background-color:#007bff}.custom-checkbox .custom-control-input:checked~.custom-control-label::after{background-image:url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath fill='%23fff' d='M6.564.75l-3.59 3.612-1.538-1.55L0 4.26 2.974 7.25 8 2.193z'/%3E%3C/svg%3E")}.custom-checkbox .custom-control-input:indeterminate~.custom-control-label::before{background-color:#007bff}.custom-checkbox .custom-control-input:indeterminate~.custom-control-label::after{background-image:url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 4'%3E%3Cpath stroke='%23fff' d='M0 2h4'/%3E%3C/svg%3E")}.custom-checkbox .custom-control-input:disabled:checked~.custom-control-label::before{background-color:rgba(0,123,255,.5)}.custom-checkbox .custom-control-input:disabled:indeterminate~.custom-control-label::before{background-color:rgba(0,123,255,.5)}.custom-radio .custom-control-label::before{border-radius:50%}.custom-radio .custom-control-input:checked~.custom-control-label::before{background-color:#007bff}.custom-radio .custom-control-input:checked~.custom-control-label::after{background-image:url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3E%3Ccircle r='3' fill='%23fff'/%3E%3C/svg%3E")}.custom-radio .custom-control-input:disabled:checked~.custom-control-label::before{background-color:rgba(0,123,255,.5)}.custom-select{display:inline-block;width:100%;height:calc(2.25rem + 2px);padding:.375rem 1.75rem .375rem .75rem;line-height:1.5;color:#495057;vertical-align:middle;background:#fff url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 5'%3E%3Cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3E%3C/svg%3E") no-repeat right .75rem center;background-size:8px 10px;border:1px solid #ced4da;border-radius:.25rem;-webkit-appearance:none;-moz-appearance:none;appearance:none}.custom-select:focus{border-color:#80bdff;outline:0;box-shadow:0 0 0 .2rem rgba(128,189,255,.5)}.custom-select:focus::-ms-value{color:#495057;background-color:#fff}.custom-select[multiple],.custom-select[size]:not([size="1"]){height:auto;padding-right:.75rem;background-image:none}.custom-select:disabled{color:#6c757d;background-color:#e9ecef}.custom-select::-ms-expand{opacity:0}.custom-select-sm{height:calc(1.8125rem + 2px);padding-top:.375rem;padding-bottom:.375rem;font-size:75%}.custom-select-lg{height:calc(2.875rem + 2px);padding-top:.375rem;padding-bottom:.375rem;font-size:125%}.custom-file{position:relative;display:inline-block;width:100%;height:calc(2.25rem + 2px);margin-bottom:0}.custom-file-input{position:relative;z-index:2;width:100%;height:calc(2.25rem + 2px);margin:0;opacity:0}.custom-file-input:focus~.custom-file-label{border-color:#80bdff;box-shadow:0 0 0 .2rem rgba(0,123,255,.25)}.custom-file-input:focus~.custom-file-label::after{border-color:#80bdff}.custom-file-input:disabled~.custom-file-label{background-color:#e9ecef}.custom-file-input:lang(en)~.custom-file-label::after{content:"Browse"}.custom-file-label{position:absolute;top:0;right:0;left:0;z-index:1;height:calc(2.25rem + 2px);padding:.375rem .75rem;line-height:1.5;color:#495057;background-color:#fff;border:1px solid #ced4da;border-radius:.25rem}.custom-file-label::after{position:absolute;top:0;right:0;bottom:0;z-index:3;display:block;height:2.25rem;padding:.375rem .75rem;line-height:1.5;color:#495057;content:"Browse";background-color:#e9ecef;border-left:1px solid #ced4da;border-radius:0 .25rem .25rem 0}.custom-range{width:100%;padding-left:0;background-color:transparent;-webkit-appearance:none;-moz-appearance:none;appearance:none}.custom-range:focus{outline:0}.custom-range:focus::-webkit-slider-thumb{box-shadow:0 0 0 1px #fff,0 0 0 .2rem rgba(0,123,255,.25)}.custom-range:focus::-moz-range-thumb{box-shadow:0 0 0 1px #fff,0 0 0 .2rem rgba(0,123,255,.25)}.custom-range:focus::-ms-thumb{box-shadow:0 0 0 1px #fff,0 0 0 .2rem rgba(0,123,255,.25)}.custom-range::-moz-focus-outer{border:0}.custom-range::-webkit-slider-thumb{width:1rem;height:1rem;margin-top:-.25rem;background-color:#007bff;border:0;border-radius:1rem;transition:background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;-webkit-appearance:none;appearance:none}@media screen and (prefers-reduced-motion:reduce){.custom-range::-webkit-slider-thumb{transition:none}}.custom-range::-webkit-slider-thumb:active{background-color:#b3d7ff}.custom-range::-webkit-slider-runnable-track{width:100%;height:.5rem;color:transparent;cursor:pointer;background-color:#dee2e6;border-color:transparent;border-radius:1rem}.custom-range::-moz-range-thumb{width:1rem;height:1rem;background-color:#007bff;border:0;border-radius:1rem;transition:background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;-moz-appearance:none;appearance:none}@media screen and (prefers-reduced-motion:reduce){.custom-range::-moz-range-thumb{transition:none}}.custom-range::-moz-range-thumb:active{background-color:#b3d7ff}.custom-range::-moz-range-track{width:100%;height:.5rem;color:transparent;cursor:pointer;background-color:#dee2e6;border-color:transparent;border-radius:1rem}.custom-range::-ms-thumb{width:1rem;height:1rem;margin-top:0;margin-right:.2rem;margin-left:.2rem;background-color:#007bff;border:0;border-radius:1rem;transition:background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;appearance:none}@media screen and (prefers-reduced-motion:reduce){.custom-range::-ms-thumb{transition:none}}.custom-range::-ms-thumb:active{background-color:#b3d7ff}.custom-range::-ms-track{width:100%;height:.5rem;color:transparent;cursor:pointer;background-color:transparent;border-color:transparent;border-width:.5rem}.custom-range::-ms-fill-lower{background-color:#dee2e6;border-radius:1rem}.custom-range::-ms-fill-upper{margin-right:15px;background-color:#dee2e6;border-radius:1rem}.custom-control-label::before,.custom-file-label,.custom-select{transition:background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out}@media screen and (prefers-reduced-motion:reduce){.custom-control-label::before,.custom-file-label,.custom-select{transition:none}}.nav{display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;padding-left:0;margin-bottom:0;list-style:none}.nav-link{display:block;padding:.5rem 1rem}.nav-link:focus,.nav-link:hover{text-decoration:none}.nav-link.disabled{color:#6c757d}.nav-tabs{border-bottom:1px solid #dee2e6}.nav-tabs .nav-item{margin-bottom:-1px}.nav-tabs .nav-link{border:1px solid transparent;border-top-left-radius:.25rem;border-top-right-radius:.25rem}.nav-tabs .nav-link:focus,.nav-tabs .nav-link:hover{border-color:#e9ecef #e9ecef #dee2e6}.nav-tabs .nav-link.disabled{color:#6c757d;background-color:transparent;border-color:transparent}.nav-tabs .nav-item.show .nav-link,.nav-tabs .nav-link.active{color:#495057;background-color:#fff;border-color:#dee2e6 #dee2e6 #fff}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-left-radius:0;border-top-right-radius:0}.nav-pills .nav-link{border-radius:.25rem}.nav-pills .nav-link.active,.nav-pills .show>.nav-link{color:#fff;background-color:#007bff}.nav-fill .nav-item{-ms-flex:1 1 auto;flex:1 1 auto;text-align:center}.nav-justified .nav-item{-ms-flex-preferred-size:0;flex-basis:0;-ms-flex-positive:1;flex-grow:1;text-align:center}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.navbar{position:relative;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;-ms-flex-align:center;align-items:center;-ms-flex-pack:justify;justify-content:space-between;padding:.5rem 1rem}.navbar>.container,.navbar>.container-fluid{display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;-ms-flex-align:center;align-items:center;-ms-flex-pack:justify;justify-content:space-between}.navbar-brand{display:inline-block;padding-top:.3125rem;padding-bottom:.3125rem;margin-right:1rem;font-size:1.25rem;line-height:inherit;white-space:nowrap}.navbar-brand:focus,.navbar-brand:hover{text-decoration:none}.navbar-nav{display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;padding-left:0;margin-bottom:0;list-style:none}.navbar-nav .nav-link{padding-right:0;padding-left:0}.navbar-nav .dropdown-menu{position:static;float:none}.navbar-text{display:inline-block;padding-top:.5rem;padding-bottom:.5rem}.navbar-collapse{-ms-flex-preferred-size:100%;flex-basis:100%;-ms-flex-positive:1;flex-grow:1;-ms-flex-align:center;align-items:center}.navbar-toggler{padding:.25rem .75rem;font-size:1.25rem;line-height:1;background-color:transparent;border:1px solid transparent;border-radius:.25rem}.navbar-toggler:focus,.navbar-toggler:hover{text-decoration:none}.navbar-toggler:not(:disabled):not(.disabled){cursor:pointer}.navbar-toggler-icon{display:inline-block;width:1.5em;height:1.5em;vertical-align:middle;content:"";background:no-repeat center center;background-size:100% 100%}@media (max-width:575.98px){.navbar-expand-sm>.container,.navbar-expand-sm>.container-fluid{padding-right:0;padding-left:0}}@media (min-width:576px){.navbar-expand-sm{-ms-flex-flow:row nowrap;flex-flow:row nowrap;-ms-flex-pack:start;justify-content:flex-start}.navbar-expand-sm .navbar-nav{-ms-flex-direction:row;flex-direction:row}.navbar-expand-sm .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-sm .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand-sm>.container,.navbar-expand-sm>.container-fluid{-ms-flex-wrap:nowrap;flex-wrap:nowrap}.navbar-expand-sm .navbar-collapse{display:-ms-flexbox!important;display:flex!important;-ms-flex-preferred-size:auto;flex-basis:auto}.navbar-expand-sm .navbar-toggler{display:none}}@media (max-width:767.98px){.navbar-expand-md>.container,.navbar-expand-md>.container-fluid{padding-right:0;padding-left:0}}@media (min-width:768px){.navbar-expand-md{-ms-flex-flow:row nowrap;flex-flow:row nowrap;-ms-flex-pack:start;justify-content:flex-start}.navbar-expand-md .navbar-nav{-ms-flex-direction:row;flex-direction:row}.navbar-expand-md .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-md .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand-md>.container,.navbar-expand-md>.container-fluid{-ms-flex-wrap:nowrap;flex-wrap:nowrap}.navbar-expand-md .navbar-collapse{display:-ms-flexbox!important;display:flex!important;-ms-flex-preferred-size:auto;flex-basis:auto}.navbar-expand-md .navbar-toggler{display:none}}@media (max-width:991.98px){.navbar-expand-lg>.container,.navbar-expand-lg>.container-fluid{padding-right:0;padding-left:0}}@media (min-width:992px){.navbar-expand-lg{-ms-flex-flow:row nowrap;flex-flow:row nowrap;-ms-flex-pack:start;justify-content:flex-start}.navbar-expand-lg .navbar-nav{-ms-flex-direction:row;flex-direction:row}.navbar-expand-lg .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-lg .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand-lg>.container,.navbar-expand-lg>.container-fluid{-ms-flex-wrap:nowrap;flex-wrap:nowrap}.navbar-expand-lg .navbar-collapse{display:-ms-flexbox!important;display:flex!important;-ms-flex-preferred-size:auto;flex-basis:auto}.navbar-expand-lg .navbar-toggler{display:none}}@media (max-width:1199.98px){.navbar-expand-xl>.container,.navbar-expand-xl>.container-fluid{padding-right:0;padding-left:0}}@media (min-width:1200px){.navbar-expand-xl{-ms-flex-flow:row nowrap;flex-flow:row nowrap;-ms-flex-pack:start;justify-content:flex-start}.navbar-expand-xl .navbar-nav{-ms-flex-direction:row;flex-direction:row}.navbar-expand-xl .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-xl .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand-xl>.container,.navbar-expand-xl>.container-fluid{-ms-flex-wrap:nowrap;flex-wrap:nowrap}.navbar-expand-xl .navbar-collapse{display:-ms-flexbox!important;display:flex!important;-ms-flex-preferred-size:auto;flex-basis:auto}.navbar-expand-xl .navbar-toggler{display:none}}.navbar-expand{-ms-flex-flow:row nowrap;flex-flow:row nowrap;-ms-flex-pack:start;justify-content:flex-start}.navbar-expand>.container,.navbar-expand>.container-fluid{padding-right:0;padding-left:0}.navbar-expand .navbar-nav{-ms-flex-direction:row;flex-direction:row}.navbar-expand .navbar-nav .dropdown-menu{position:absolute}.navbar-expand .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand>.container,.navbar-expand>.container-fluid{-ms-flex-wrap:nowrap;flex-wrap:nowrap}.navbar-expand .navbar-collapse{display:-ms-flexbox!important;display:flex!important;-ms-flex-preferred-size:auto;flex-basis:auto}.navbar-expand .navbar-toggler{display:none}.navbar-light .navbar-brand{color:rgba(0,0,0,.9)}.navbar-light .navbar-brand:focus,.navbar-light .navbar-brand:hover{color:rgba(0,0,0,.9)}.navbar-light .navbar-nav .nav-link{color:rgba(0,0,0,.5)}.navbar-light .navbar-nav .nav-link:focus,.navbar-light .navbar-nav .nav-link:hover{color:rgba(0,0,0,.7)}.navbar-light .navbar-nav .nav-link.disabled{color:rgba(0,0,0,.3)}.navbar-light .navbar-nav .active>.nav-link,.navbar-light .navbar-nav .nav-link.active,.navbar-light .navbar-nav .nav-link.show,.navbar-light .navbar-nav .show>.nav-link{color:rgba(0,0,0,.9)}.navbar-light .navbar-toggler{color:rgba(0,0,0,.5);border-color:rgba(0,0,0,.1)}.navbar-light .navbar-toggler-icon{background-image:url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 30 30' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='rgba(0, 0, 0, 0.5)' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 7h22M4 15h22M4 23h22'/%3E%3C/svg%3E")}.navbar-light .navbar-text{color:rgba(0,0,0,.5)}.navbar-light .navbar-text a{color:rgba(0,0,0,.9)}.navbar-light .navbar-text a:focus,.navbar-light .navbar-text a:hover{color:rgba(0,0,0,.9)}.navbar-dark .navbar-brand{color:#fff}.navbar-dark .navbar-brand:focus,.navbar-dark .navbar-brand:hover{color:#fff}.navbar-dark .navbar-nav .nav-link{color:rgba(255,255,255,.5)}.navbar-dark .navbar-nav .nav-link:focus,.navbar-dark .navbar-nav .nav-link:hover{color:rgba(255,255,255,.75)}.navbar-dark .navbar-nav .nav-link.disabled{color:rgba(255,255,255,.25)}.navbar-dark .navbar-nav .active>.nav-link,.navbar-dark .navbar-nav .nav-link.active,.navbar-dark .navbar-nav .nav-link.show,.navbar-dark .navbar-nav .show>.nav-link{color:#fff}.navbar-dark .navbar-toggler{color:rgba(255,255,255,.5);border-color:rgba(255,255,255,.1)}.navbar-dark .navbar-toggler-icon{background-image:url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 30 30' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='rgba(255, 255, 255, 0.5)' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 7h22M4 15h22M4 23h22'/%3E%3C/svg%3E")}.navbar-dark .navbar-text{color:rgba(255,255,255,.5)}.navbar-dark .navbar-text a{color:#fff}.navbar-dark .navbar-text a:focus,.navbar-dark .navbar-text a:hover{color:#fff}.card{position:relative;display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;min-width:0;word-wrap:break-word;background-color:#fff;background-clip:border-box;border:1px solid rgba(0,0,0,.125);border-radius:.25rem}.card>hr{margin-right:0;margin-left:0}.card>.list-group:first-child .list-group-item:first-child{border-top-left-radius:.25rem;border-top-right-radius:.25rem}.card>.list-group:last-child .list-group-item:last-child{border-bottom-right-radius:.25rem;border-bottom-left-radius:.25rem}.card-body{-ms-flex:1 1 auto;flex:1 1 auto;padding:1.25rem}.card-title{margin-bottom:.75rem}.card-subtitle{margin-top:-.375rem;margin-bottom:0}.card-text:last-child{margin-bottom:0}.card-link:hover{text-decoration:none}.card-link+.card-link{margin-left:1.25rem}.card-header{padding:.75rem 1.25rem;margin-bottom:0;background-color:rgba(0,0,0,.03);border-bottom:1px solid rgba(0,0,0,.125)}.card-header:first-child{border-radius:calc(.25rem - 1px) calc(.25rem - 1px) 0 0}.card-header+.list-group .list-group-item:first-child{border-top:0}.card-footer{padding:.75rem 1.25rem;background-color:rgba(0,0,0,.03);border-top:1px solid rgba(0,0,0,.125)}.card-footer:last-child{border-radius:0 0 calc(.25rem - 1px) calc(.25rem - 1px)}.card-header-tabs{margin-right:-.625rem;margin-bottom:-.75rem;margin-left:-.625rem;border-bottom:0}.card-header-pills{margin-right:-.625rem;margin-left:-.625rem}.card-img-overlay{position:absolute;top:0;right:0;bottom:0;left:0;padding:1.25rem}.card-img{width:100%;border-radius:calc(.25rem - 1px)}.card-img-top{width:100%;border-top-left-radius:calc(.25rem - 1px);border-top-right-radius:calc(.25rem - 1px)}.card-img-bottom{width:100%;border-bottom-right-radius:calc(.25rem - 1px);border-bottom-left-radius:calc(.25rem - 1px)}.card-deck{display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column}.card-deck .card{margin-bottom:15px}@media (min-width:576px){.card-deck{-ms-flex-flow:row wrap;flex-flow:row wrap;margin-right:-15px;margin-left:-15px}.card-deck .card{display:-ms-flexbox;display:flex;-ms-flex:1 0 0%;flex:1 0 0%;-ms-flex-direction:column;flex-direction:column;margin-right:15px;margin-bottom:0;margin-left:15px}}.card-group{display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column}.card-group>.card{margin-bottom:15px}@media (min-width:576px){.card-group{-ms-flex-flow:row wrap;flex-flow:row wrap}.card-group>.card{-ms-flex:1 0 0%;flex:1 0 0%;margin-bottom:0}.card-group>.card+.card{margin-left:0;border-left:0}.card-group>.card:first-child{border-top-right-radius:0;border-bottom-right-radius:0}.card-group>.card:first-child .card-header,.card-group>.card:first-child .card-img-top{border-top-right-radius:0}.card-group>.card:first-child .card-footer,.card-group>.card:first-child .card-img-bottom{border-bottom-right-radius:0}.card-group>.card:last-child{border-top-left-radius:0;border-bottom-left-radius:0}.card-group>.card:last-child .card-header,.card-group>.card:last-child .card-img-top{border-top-left-radius:0}.card-group>.card:last-child .card-footer,.card-group>.card:last-child .card-img-bottom{border-bottom-left-radius:0}.card-group>.card:only-child{border-radius:.25rem}.card-group>.card:only-child .card-header,.card-group>.card:only-child .card-img-top{border-top-left-radius:.25rem;border-top-right-radius:.25rem}.card-group>.card:only-child .card-footer,.card-group>.card:only-child .card-img-bottom{border-bottom-right-radius:.25rem;border-bottom-left-radius:.25rem}.card-group>.card:not(:first-child):not(:last-child):not(:only-child){border-radius:0}.card-group>.card:not(:first-child):not(:last-child):not(:only-child) .card-footer,.card-group>.card:not(:first-child):not(:last-child):not(:only-child) .card-header,.card-group>.card:not(:first-child):not(:last-child):not(:only-child) .card-img-bottom,.card-group>.card:not(:first-child):not(:last-child):not(:only-child) .card-img-top{border-radius:0}}.card-columns .card{margin-bottom:.75rem}@media (min-width:576px){.card-columns{-webkit-column-count:3;-moz-column-count:3;column-count:3;-webkit-column-gap:1.25rem;-moz-column-gap:1.25rem;column-gap:1.25rem;orphans:1;widows:1}.card-columns .card{display:inline-block;width:100%}}.accordion .card:not(:first-of-type):not(:last-of-type){border-bottom:0;border-radius:0}.accordion .card:not(:first-of-type) .card-header:first-child{border-radius:0}.accordion .card:first-of-type{border-bottom:0;border-bottom-right-radius:0;border-bottom-left-radius:0}.accordion .card:last-of-type{border-top-left-radius:0;border-top-right-radius:0}.breadcrumb{display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;padding:.75rem 1rem;margin-bottom:1rem;list-style:none;background-color:#e9ecef;border-radius:.25rem}.breadcrumb-item+.breadcrumb-item{padding-left:.5rem}.breadcrumb-item+.breadcrumb-item::before{display:inline-block;padding-right:.5rem;color:#6c757d;content:"/"}.breadcrumb-item+.breadcrumb-item:hover::before{text-decoration:underline}.breadcrumb-item+.breadcrumb-item:hover::before{text-decoration:none}.breadcrumb-item.active{color:#6c757d}.pagination{display:-ms-flexbox;display:flex;padding-left:0;list-style:none;border-radius:.25rem}.page-link{position:relative;display:block;padding:.5rem .75rem;margin-left:-1px;line-height:1.25;color:#007bff;background-color:#fff;border:1px solid #dee2e6}.page-link:hover{z-index:2;color:#0056b3;text-decoration:none;background-color:#e9ecef;border-color:#dee2e6}.page-link:focus{z-index:2;outline:0;box-shadow:0 0 0 .2rem rgba(0,123,255,.25)}.page-link:not(:disabled):not(.disabled){cursor:pointer}.page-item:first-child .page-link{margin-left:0;border-top-left-radius:.25rem;border-bottom-left-radius:.25rem}.page-item:last-child .page-link{border-top-right-radius:.25rem;border-bottom-right-radius:.25rem}.page-item.active .page-link{z-index:1;color:#fff;background-color:#007bff;border-color:#007bff}.page-item.disabled .page-link{color:#6c757d;pointer-events:none;cursor:auto;background-color:#fff;border-color:#dee2e6}.pagination-lg .page-link{padding:.75rem 1.5rem;font-size:1.25rem;line-height:1.5}.pagination-lg .page-item:first-child .page-link{border-top-left-radius:.3rem;border-bottom-left-radius:.3rem}.pagination-lg .page-item:last-child .page-link{border-top-right-radius:.3rem;border-bottom-right-radius:.3rem}.pagination-sm .page-link{padding:.25rem .5rem;font-size:.875rem;line-height:1.5}.pagination-sm .page-item:first-child .page-link{border-top-left-radius:.2rem;border-bottom-left-radius:.2rem}.pagination-sm .page-item:last-child .page-link{border-top-right-radius:.2rem;border-bottom-right-radius:.2rem}.badge{display:inline-block;padding:.25em .4em;font-size:75%;font-weight:700;line-height:1;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25rem}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.badge-pill{padding-right:.6em;padding-left:.6em;border-radius:10rem}.badge-primary{color:#fff;background-color:#007bff}.badge-primary[href]:focus,.badge-primary[href]:hover{color:#fff;text-decoration:none;background-color:#0062cc}.badge-secondary{color:#fff;background-color:#6c757d}.badge-secondary[href]:focus,.badge-secondary[href]:hover{color:#fff;text-decoration:none;background-color:#545b62}.badge-success{color:#fff;background-color:#28a745}.badge-success[href]:focus,.badge-success[href]:hover{color:#fff;text-decoration:none;background-color:#1e7e34}.badge-info{color:#fff;background-color:#17a2b8}.badge-info[href]:focus,.badge-info[href]:hover{color:#fff;text-decoration:none;background-color:#117a8b}.badge-warning{color:#212529;background-color:#ffc107}.badge-warning[href]:focus,.badge-warning[href]:hover{color:#212529;text-decoration:none;background-color:#d39e00}.badge-danger{color:#fff;background-color:#dc3545}.badge-danger[href]:focus,.badge-danger[href]:hover{color:#fff;text-decoration:none;background-color:#bd2130}.badge-light{color:#212529;background-color:#f8f9fa}.badge-light[href]:focus,.badge-light[href]:hover{color:#212529;text-decoration:none;background-color:#dae0e5}.badge-dark{color:#fff;background-color:#343a40}.badge-dark[href]:focus,.badge-dark[href]:hover{color:#fff;text-decoration:none;background-color:#1d2124}.jumbotron{padding:2rem 1rem;margin-bottom:2rem;background-color:#e9ecef;border-radius:.3rem}@media (min-width:576px){.jumbotron{padding:4rem 2rem}}.jumbotron-fluid{padding-right:0;padding-left:0;border-radius:0}.alert{position:relative;padding:.75rem 1.25rem;margin-bottom:1rem;border:1px solid transparent;border-radius:.25rem}.alert-heading{color:inherit}.alert-link{font-weight:700}.alert-dismissible{padding-right:4rem}.alert-dismissible .close{position:absolute;top:0;right:0;padding:.75rem 1.25rem;color:inherit}.alert-primary{color:#004085;background-color:#cce5ff;border-color:#b8daff}.alert-primary hr{border-top-color:#9fcdff}.alert-primary .alert-link{color:#002752}.alert-secondary{color:#383d41;background-color:#e2e3e5;border-color:#d6d8db}.alert-secondary hr{border-top-color:#c8cbcf}.alert-secondary .alert-link{color:#202326}.alert-success{color:#155724;background-color:#d4edda;border-color:#c3e6cb}.alert-success hr{border-top-color:#b1dfbb}.alert-success .alert-link{color:#0b2e13}.alert-info{color:#0c5460;background-color:#d1ecf1;border-color:#bee5eb}.alert-info hr{border-top-color:#abdde5}.alert-info .alert-link{color:#062c33}.alert-warning{color:#856404;background-color:#fff3cd;border-color:#ffeeba}.alert-warning hr{border-top-color:#ffe8a1}.alert-warning .alert-link{color:#533f03}.alert-danger{color:#721c24;background-color:#f8d7da;border-color:#f5c6cb}.alert-danger hr{border-top-color:#f1b0b7}.alert-danger .alert-link{color:#491217}.alert-light{color:#818182;background-color:#fefefe;border-color:#fdfdfe}.alert-light hr{border-top-color:#ececf6}.alert-light .alert-link{color:#686868}.alert-dark{color:#1b1e21;background-color:#d6d8d9;border-color:#c6c8ca}.alert-dark hr{border-top-color:#b9bbbe}.alert-dark .alert-link{color:#040505}@-webkit-keyframes progress-bar-stripes{from{background-position:1rem 0}to{background-position:0 0}}@keyframes progress-bar-stripes{from{background-position:1rem 0}to{background-position:0 0}}.progress{display:-ms-flexbox;display:flex;height:1rem;overflow:hidden;font-size:.75rem;background-color:#e9ecef;border-radius:.25rem}.progress-bar{display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;-ms-flex-pack:center;justify-content:center;color:#fff;text-align:center;white-space:nowrap;background-color:#007bff;transition:width .6s ease}@media screen and (prefers-reduced-motion:reduce){.progress-bar{transition:none}}.progress-bar-striped{background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-size:1rem 1rem}.progress-bar-animated{-webkit-animation:progress-bar-stripes 1s linear infinite;animation:progress-bar-stripes 1s linear infinite}.media{display:-ms-flexbox;display:flex;-ms-flex-align:start;align-items:flex-start}.media-body{-ms-flex:1;flex:1}.list-group{display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;padding-left:0;margin-bottom:0}.list-group-item-action{width:100%;color:#495057;text-align:inherit}.list-group-item-action:focus,.list-group-item-action:hover{color:#495057;text-decoration:none;background-color:#f8f9fa}.list-group-item-action:active{color:#212529;background-color:#e9ecef}.list-group-item{position:relative;display:block;padding:.75rem 1.25rem;margin-bottom:-1px;background-color:#fff;border:1px solid rgba(0,0,0,.125)}.list-group-item:first-child{border-top-left-radius:.25rem;border-top-right-radius:.25rem}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:.25rem;border-bottom-left-radius:.25rem}.list-group-item:focus,.list-group-item:hover{z-index:1;text-decoration:none}.list-group-item.disabled,.list-group-item:disabled{color:#6c757d;background-color:#fff}.list-group-item.active{z-index:2;color:#fff;background-color:#007bff;border-color:#007bff}.list-group-flush .list-group-item{border-right:0;border-left:0;border-radius:0}.list-group-flush:first-child .list-group-item:first-child{border-top:0}.list-group-flush:last-child .list-group-item:last-child{border-bottom:0}.list-group-item-primary{color:#004085;background-color:#b8daff}.list-group-item-primary.list-group-item-action:focus,.list-group-item-primary.list-group-item-action:hover{color:#004085;background-color:#9fcdff}.list-group-item-primary.list-group-item-action.active{color:#fff;background-color:#004085;border-color:#004085}.list-group-item-secondary{color:#383d41;background-color:#d6d8db}.list-group-item-secondary.list-group-item-action:focus,.list-group-item-secondary.list-group-item-action:hover{color:#383d41;background-color:#c8cbcf}.list-group-item-secondary.list-group-item-action.active{color:#fff;background-color:#383d41;border-color:#383d41}.list-group-item-success{color:#155724;background-color:#c3e6cb}.list-group-item-success.list-group-item-action:focus,.list-group-item-success.list-group-item-action:hover{color:#155724;background-color:#b1dfbb}.list-group-item-success.list-group-item-action.active{color:#fff;background-color:#155724;border-color:#155724}.list-group-item-info{color:#0c5460;background-color:#bee5eb}.list-group-item-info.list-group-item-action:focus,.list-group-item-info.list-group-item-action:hover{color:#0c5460;background-color:#abdde5}.list-group-item-info.list-group-item-action.active{color:#fff;background-color:#0c5460;border-color:#0c5460}.list-group-item-warning{color:#856404;background-color:#ffeeba}.list-group-item-warning.list-group-item-action:focus,.list-group-item-warning.list-group-item-action:hover{color:#856404;background-color:#ffe8a1}.list-group-item-warning.list-group-item-action.active{color:#fff;background-color:#856404;border-color:#856404}.list-group-item-danger{color:#721c24;background-color:#f5c6cb}.list-group-item-danger.list-group-item-action:focus,.list-group-item-danger.list-group-item-action:hover{color:#721c24;background-color:#f1b0b7}.list-group-item-danger.list-group-item-action.active{color:#fff;background-color:#721c24;border-color:#721c24}.list-group-item-light{color:#818182;background-color:#fdfdfe}.list-group-item-light.list-group-item-action:focus,.list-group-item-light.list-group-item-action:hover{color:#818182;background-color:#ececf6}.list-group-item-light.list-group-item-action.active{color:#fff;background-color:#818182;border-color:#818182}.list-group-item-dark{color:#1b1e21;background-color:#c6c8ca}.list-group-item-dark.list-group-item-action:focus,.list-group-item-dark.list-group-item-action:hover{color:#1b1e21;background-color:#b9bbbe}.list-group-item-dark.list-group-item-action.active{color:#fff;background-color:#1b1e21;border-color:#1b1e21}.close{float:right;font-size:1.5rem;font-weight:700;line-height:1;color:#000;text-shadow:0 1px 0 #fff;opacity:.5}.close:not(:disabled):not(.disabled){cursor:pointer}.close:not(:disabled):not(.disabled):focus,.close:not(:disabled):not(.disabled):hover{color:#000;text-decoration:none;opacity:.75}button.close{padding:0;background-color:transparent;border:0;-webkit-appearance:none}.modal-open{overflow:hidden}.modal-open .modal{overflow-x:hidden;overflow-y:auto}.modal{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1050;display:none;overflow:hidden;outline:0}.modal-dialog{position:relative;width:auto;margin:.5rem;pointer-events:none}.modal.fade .modal-dialog{transition:-webkit-transform .3s ease-out;transition:transform .3s ease-out;transition:transform .3s ease-out,-webkit-transform .3s ease-out;-webkit-transform:translate(0,-25%);transform:translate(0,-25%)}@media screen and (prefers-reduced-motion:reduce){.modal.fade .modal-dialog{transition:none}}.modal.show .modal-dialog{-webkit-transform:translate(0,0);transform:translate(0,0)}.modal-dialog-centered{display:-ms-flexbox;display:flex;-ms-flex-align:center;align-items:center;min-height:calc(100% - (.5rem * 2))}.modal-dialog-centered::before{display:block;height:calc(100vh - (.5rem * 2));content:""}.modal-content{position:relative;display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;width:100%;pointer-events:auto;background-color:#fff;background-clip:padding-box;border:1px solid rgba(0,0,0,.2);border-radius:.3rem;outline:0}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{opacity:0}.modal-backdrop.show{opacity:.5}.modal-header{display:-ms-flexbox;display:flex;-ms-flex-align:start;align-items:flex-start;-ms-flex-pack:justify;justify-content:space-between;padding:1rem;border-bottom:1px solid #e9ecef;border-top-left-radius:.3rem;border-top-right-radius:.3rem}.modal-header .close{padding:1rem;margin:-1rem -1rem -1rem auto}.modal-title{margin-bottom:0;line-height:1.5}.modal-body{position:relative;-ms-flex:1 1 auto;flex:1 1 auto;padding:1rem}.modal-footer{display:-ms-flexbox;display:flex;-ms-flex-align:center;align-items:center;-ms-flex-pack:end;justify-content:flex-end;padding:1rem;border-top:1px solid #e9ecef}.modal-footer>:not(:first-child){margin-left:.25rem}.modal-footer>:not(:last-child){margin-right:.25rem}.modal-scrollbar-measure{position:absolute;top:-9999px;width:50px;height:50px;overflow:scroll}@media (min-width:576px){.modal-dialog{max-width:500px;margin:1.75rem auto}.modal-dialog-centered{min-height:calc(100% - (1.75rem * 2))}.modal-dialog-centered::before{height:calc(100vh - (1.75rem * 2))}.modal-sm{max-width:300px}}@media (min-width:992px){.modal-lg{max-width:800px}}.tooltip{position:absolute;z-index:1070;display:block;margin:0;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";font-style:normal;font-weight:400;line-height:1.5;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;white-space:normal;line-break:auto;font-size:.875rem;word-wrap:break-word;opacity:0}.tooltip.show{opacity:.9}.tooltip .arrow{position:absolute;display:block;width:.8rem;height:.4rem}.tooltip .arrow::before{position:absolute;content:"";border-color:transparent;border-style:solid}.bs-tooltip-auto[x-placement^=top],.bs-tooltip-top{padding:.4rem 0}.bs-tooltip-auto[x-placement^=top] .arrow,.bs-tooltip-top .arrow{bottom:0}.bs-tooltip-auto[x-placement^=top] .arrow::before,.bs-tooltip-top .arrow::before{top:0;border-width:.4rem .4rem 0;border-top-color:#000}.bs-tooltip-auto[x-placement^=right],.bs-tooltip-right{padding:0 .4rem}.bs-tooltip-auto[x-placement^=right] .arrow,.bs-tooltip-right .arrow{left:0;width:.4rem;height:.8rem}.bs-tooltip-auto[x-placement^=right] .arrow::before,.bs-tooltip-right .arrow::before{right:0;border-width:.4rem .4rem .4rem 0;border-right-color:#000}.bs-tooltip-auto[x-placement^=bottom],.bs-tooltip-bottom{padding:.4rem 0}.bs-tooltip-auto[x-placement^=bottom] .arrow,.bs-tooltip-bottom .arrow{top:0}.bs-tooltip-auto[x-placement^=bottom] .arrow::before,.bs-tooltip-bottom .arrow::before{bottom:0;border-width:0 .4rem .4rem;border-bottom-color:#000}.bs-tooltip-auto[x-placement^=left],.bs-tooltip-left{padding:0 .4rem}.bs-tooltip-auto[x-placement^=left] .arrow,.bs-tooltip-left .arrow{right:0;width:.4rem;height:.8rem}.bs-tooltip-auto[x-placement^=left] .arrow::before,.bs-tooltip-left .arrow::before{left:0;border-width:.4rem 0 .4rem .4rem;border-left-color:#000}.tooltip-inner{max-width:200px;padding:.25rem .5rem;color:#fff;text-align:center;background-color:#000;border-radius:.25rem}.popover{position:absolute;top:0;left:0;z-index:1060;display:block;max-width:276px;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";font-style:normal;font-weight:400;line-height:1.5;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;white-space:normal;line-break:auto;font-size:.875rem;word-wrap:break-word;background-color:#fff;background-clip:padding-box;border:1px solid rgba(0,0,0,.2);border-radius:.3rem}.popover .arrow{position:absolute;display:block;width:1rem;height:.5rem;margin:0 .3rem}.popover .arrow::after,.popover .arrow::before{position:absolute;display:block;content:"";border-color:transparent;border-style:solid}.bs-popover-auto[x-placement^=top],.bs-popover-top{margin-bottom:.5rem}.bs-popover-auto[x-placement^=top] .arrow,.bs-popover-top .arrow{bottom:calc((.5rem + 1px) * -1)}.bs-popover-auto[x-placement^=top] .arrow::after,.bs-popover-auto[x-placement^=top] .arrow::before,.bs-popover-top .arrow::after,.bs-popover-top .arrow::before{border-width:.5rem .5rem 0}.bs-popover-auto[x-placement^=top] .arrow::before,.bs-popover-top .arrow::before{bottom:0;border-top-color:rgba(0,0,0,.25)}.bs-popover-auto[x-placement^=top] .arrow::after,.bs-popover-top .arrow::after{bottom:1px;border-top-color:#fff}.bs-popover-auto[x-placement^=right],.bs-popover-right{margin-left:.5rem}.bs-popover-auto[x-placement^=right] .arrow,.bs-popover-right .arrow{left:calc((.5rem + 1px) * -1);width:.5rem;height:1rem;margin:.3rem 0}.bs-popover-auto[x-placement^=right] .arrow::after,.bs-popover-auto[x-placement^=right] .arrow::before,.bs-popover-right .arrow::after,.bs-popover-right .arrow::before{border-width:.5rem .5rem .5rem 0}.bs-popover-auto[x-placement^=right] .arrow::before,.bs-popover-right .arrow::before{left:0;border-right-color:rgba(0,0,0,.25)}.bs-popover-auto[x-placement^=right] .arrow::after,.bs-popover-right .arrow::after{left:1px;border-right-color:#fff}.bs-popover-auto[x-placement^=bottom],.bs-popover-bottom{margin-top:.5rem}.bs-popover-auto[x-placement^=bottom] .arrow,.bs-popover-bottom .arrow{top:calc((.5rem + 1px) * -1)}.bs-popover-auto[x-placement^=bottom] .arrow::after,.bs-popover-auto[x-placement^=bottom] .arrow::before,.bs-popover-bottom .arrow::after,.bs-popover-bottom .arrow::before{border-width:0 .5rem .5rem .5rem}.bs-popover-auto[x-placement^=bottom] .arrow::before,.bs-popover-bottom .arrow::before{top:0;border-bottom-color:rgba(0,0,0,.25)}.bs-popover-auto[x-placement^=bottom] .arrow::after,.bs-popover-bottom .arrow::after{top:1px;border-bottom-color:#fff}.bs-popover-auto[x-placement^=bottom] .popover-header::before,.bs-popover-bottom .popover-header::before{position:absolute;top:0;left:50%;display:block;width:1rem;margin-left:-.5rem;content:"";border-bottom:1px solid #f7f7f7}.bs-popover-auto[x-placement^=left],.bs-popover-left{margin-right:.5rem}.bs-popover-auto[x-placement^=left] .arrow,.bs-popover-left .arrow{right:calc((.5rem + 1px) * -1);width:.5rem;height:1rem;margin:.3rem 0}.bs-popover-auto[x-placement^=left] .arrow::after,.bs-popover-auto[x-placement^=left] .arrow::before,.bs-popover-left .arrow::after,.bs-popover-left .arrow::before{border-width:.5rem 0 .5rem .5rem}.bs-popover-auto[x-placement^=left] .arrow::before,.bs-popover-left .arrow::before{right:0;border-left-color:rgba(0,0,0,.25)}.bs-popover-auto[x-placement^=left] .arrow::after,.bs-popover-left .arrow::after{right:1px;border-left-color:#fff}.popover-header{padding:.5rem .75rem;margin-bottom:0;font-size:1rem;color:inherit;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-top-left-radius:calc(.3rem - 1px);border-top-right-radius:calc(.3rem - 1px)}.popover-header:empty{display:none}.popover-body{padding:.5rem .75rem;color:#212529}.carousel{position:relative}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-item{position:relative;display:none;-ms-flex-align:center;align-items:center;width:100%;-webkit-backface-visibility:hidden;backface-visibility:hidden;-webkit-perspective:1000px;perspective:1000px}.carousel-item-next,.carousel-item-prev,.carousel-item.active{display:block;transition:-webkit-transform .6s ease;transition:transform .6s ease;transition:transform .6s ease,-webkit-transform .6s ease}@media screen and (prefers-reduced-motion:reduce){.carousel-item-next,.carousel-item-prev,.carousel-item.active{transition:none}}.carousel-item-next,.carousel-item-prev{position:absolute;top:0}.carousel-item-next.carousel-item-left,.carousel-item-prev.carousel-item-right{-webkit-transform:translateX(0);transform:translateX(0)}@supports ((-webkit-transform-style:preserve-3d) or (transform-style:preserve-3d)){.carousel-item-next.carousel-item-left,.carousel-item-prev.carousel-item-right{-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}}.active.carousel-item-right,.carousel-item-next{-webkit-transform:translateX(100%);transform:translateX(100%)}@supports ((-webkit-transform-style:preserve-3d) or (transform-style:preserve-3d)){.active.carousel-item-right,.carousel-item-next{-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}}.active.carousel-item-left,.carousel-item-prev{-webkit-transform:translateX(-100%);transform:translateX(-100%)}@supports ((-webkit-transform-style:preserve-3d) or (transform-style:preserve-3d)){.active.carousel-item-left,.carousel-item-prev{-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}}.carousel-fade .carousel-item{opacity:0;transition-duration:.6s;transition-property:opacity}.carousel-fade .carousel-item-next.carousel-item-left,.carousel-fade .carousel-item-prev.carousel-item-right,.carousel-fade .carousel-item.active{opacity:1}.carousel-fade .active.carousel-item-left,.carousel-fade .active.carousel-item-right{opacity:0}.carousel-fade .active.carousel-item-left,.carousel-fade .active.carousel-item-prev,.carousel-fade .carousel-item-next,.carousel-fade .carousel-item-prev,.carousel-fade .carousel-item.active{-webkit-transform:translateX(0);transform:translateX(0)}@supports ((-webkit-transform-style:preserve-3d) or (transform-style:preserve-3d)){.carousel-fade .active.carousel-item-left,.carousel-fade .active.carousel-item-prev,.carousel-fade .carousel-item-next,.carousel-fade .carousel-item-prev,.carousel-fade .carousel-item.active{-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}}.carousel-control-next,.carousel-control-prev{position:absolute;top:0;bottom:0;display:-ms-flexbox;display:flex;-ms-flex-align:center;align-items:center;-ms-flex-pack:center;justify-content:center;width:15%;color:#fff;text-align:center;opacity:.5}.carousel-control-next:focus,.carousel-control-next:hover,.carousel-control-prev:focus,.carousel-control-prev:hover{color:#fff;text-decoration:none;outline:0;opacity:.9}.carousel-control-prev{left:0}.carousel-control-next{right:0}.carousel-control-next-icon,.carousel-control-prev-icon{display:inline-block;width:20px;height:20px;background:transparent no-repeat center center;background-size:100% 100%}.carousel-control-prev-icon{background-image:url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='%23fff' viewBox='0 0 8 8'%3E%3Cpath d='M5.25 0l-4 4 4 4 1.5-1.5-2.5-2.5 2.5-2.5-1.5-1.5z'/%3E%3C/svg%3E")}.carousel-control-next-icon{background-image:url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='%23fff' viewBox='0 0 8 8'%3E%3Cpath d='M2.75 0l-1.5 1.5 2.5 2.5-2.5 2.5 1.5 1.5 4-4-4-4z'/%3E%3C/svg%3E")}.carousel-indicators{position:absolute;right:0;bottom:10px;left:0;z-index:15;display:-ms-flexbox;display:flex;-ms-flex-pack:center;justify-content:center;padding-left:0;margin-right:15%;margin-left:15%;list-style:none}.carousel-indicators li{position:relative;-ms-flex:0 1 auto;flex:0 1 auto;width:30px;height:3px;margin-right:3px;margin-left:3px;text-indent:-999px;cursor:pointer;background-color:rgba(255,255,255,.5)}.carousel-indicators li::before{position:absolute;top:-10px;left:0;display:inline-block;width:100%;height:10px;content:""}.carousel-indicators li::after{position:absolute;bottom:-10px;left:0;display:inline-block;width:100%;height:10px;content:""}.carousel-indicators .active{background-color:#fff}.carousel-caption{position:absolute;right:15%;bottom:20px;left:15%;z-index:10;padding-top:20px;padding-bottom:20px;color:#fff;text-align:center}.align-baseline{vertical-align:baseline!important}.align-top{vertical-align:top!important}.align-middle{vertical-align:middle!important}.align-bottom{vertical-align:bottom!important}.align-text-bottom{vertical-align:text-bottom!important}.align-text-top{vertical-align:text-top!important}.bg-primary{background-color:#007bff!important}a.bg-primary:focus,a.bg-primary:hover,button.bg-primary:focus,button.bg-primary:hover{background-color:#0062cc!important}.bg-secondary{background-color:#6c757d!important}a.bg-secondary:focus,a.bg-secondary:hover,button.bg-secondary:focus,button.bg-secondary:hover{background-color:#545b62!important}.bg-success{background-color:#28a745!important}a.bg-success:focus,a.bg-success:hover,button.bg-success:focus,button.bg-success:hover{background-color:#1e7e34!important}.bg-info{background-color:#17a2b8!important}a.bg-info:focus,a.bg-info:hover,button.bg-info:focus,button.bg-info:hover{background-color:#117a8b!important}.bg-warning{background-color:#ffc107!important}a.bg-warning:focus,a.bg-warning:hover,button.bg-warning:focus,button.bg-warning:hover{background-color:#d39e00!important}.bg-danger{background-color:#dc3545!important}a.bg-danger:focus,a.bg-danger:hover,button.bg-danger:focus,button.bg-danger:hover{background-color:#bd2130!important}.bg-light{background-color:#f8f9fa!important}a.bg-light:focus,a.bg-light:hover,button.bg-light:focus,button.bg-light:hover{background-color:#dae0e5!important}.bg-dark{background-color:#343a40!important}a.bg-dark:focus,a.bg-dark:hover,button.bg-dark:focus,button.bg-dark:hover{background-color:#1d2124!important}.bg-white{background-color:#fff!important}.bg-transparent{background-color:transparent!important}.border{border:1px solid #dee2e6!important}.border-top{border-top:1px solid #dee2e6!important}.border-right{border-right:1px solid #dee2e6!important}.border-bottom{border-bottom:1px solid #dee2e6!important}.border-left{border-left:1px solid #dee2e6!important}.border-0{border:0!important}.border-top-0{border-top:0!important}.border-right-0{border-right:0!important}.border-bottom-0{border-bottom:0!important}.border-left-0{border-left:0!important}.border-primary{border-color:#007bff!important}.border-secondary{border-color:#6c757d!important}.border-success{border-color:#28a745!important}.border-info{border-color:#17a2b8!important}.border-warning{border-color:#ffc107!important}.border-danger{border-color:#dc3545!important}.border-light{border-color:#f8f9fa!important}.border-dark{border-color:#343a40!important}.border-white{border-color:#fff!important}.rounded{border-radius:.25rem!important}.rounded-top{border-top-left-radius:.25rem!important;border-top-right-radius:.25rem!important}.rounded-right{border-top-right-radius:.25rem!important;border-bottom-right-radius:.25rem!important}.rounded-bottom{border-bottom-right-radius:.25rem!important;border-bottom-left-radius:.25rem!important}.rounded-left{border-top-left-radius:.25rem!important;border-bottom-left-radius:.25rem!important}.rounded-circle{border-radius:50%!important}.rounded-0{border-radius:0!important}.clearfix::after{display:block;clear:both;content:""}.d-none{display:none!important}.d-inline{display:inline!important}.d-inline-block{display:inline-block!important}.d-block{display:block!important}.d-table{display:table!important}.d-table-row{display:table-row!important}.d-table-cell{display:table-cell!important}.d-flex{display:-ms-flexbox!important;display:flex!important}.d-inline-flex{display:-ms-inline-flexbox!important;display:inline-flex!important}@media (min-width:576px){.d-sm-none{display:none!important}.d-sm-inline{display:inline!important}.d-sm-inline-block{display:inline-block!important}.d-sm-block{display:block!important}.d-sm-table{display:table!important}.d-sm-table-row{display:table-row!important}.d-sm-table-cell{display:table-cell!important}.d-sm-flex{display:-ms-flexbox!important;display:flex!important}.d-sm-inline-flex{display:-ms-inline-flexbox!important;display:inline-flex!important}}@media (min-width:768px){.d-md-none{display:none!important}.d-md-inline{display:inline!important}.d-md-inline-block{display:inline-block!important}.d-md-block{display:block!important}.d-md-table{display:table!important}.d-md-table-row{display:table-row!important}.d-md-table-cell{display:table-cell!important}.d-md-flex{display:-ms-flexbox!important;display:flex!important}.d-md-inline-flex{display:-ms-inline-flexbox!important;display:inline-flex!important}}@media (min-width:992px){.d-lg-none{display:none!important}.d-lg-inline{display:inline!important}.d-lg-inline-block{display:inline-block!important}.d-lg-block{display:block!important}.d-lg-table{display:table!important}.d-lg-table-row{display:table-row!important}.d-lg-table-cell{display:table-cell!important}.d-lg-flex{display:-ms-flexbox!important;display:flex!important}.d-lg-inline-flex{display:-ms-inline-flexbox!important;display:inline-flex!important}}@media (min-width:1200px){.d-xl-none{display:none!important}.d-xl-inline{display:inline!important}.d-xl-inline-block{display:inline-block!important}.d-xl-block{display:block!important}.d-xl-table{display:table!important}.d-xl-table-row{display:table-row!important}.d-xl-table-cell{display:table-cell!important}.d-xl-flex{display:-ms-flexbox!important;display:flex!important}.d-xl-inline-flex{display:-ms-inline-flexbox!important;display:inline-flex!important}}@media print{.d-print-none{display:none!important}.d-print-inline{display:inline!important}.d-print-inline-block{display:inline-block!important}.d-print-block{display:block!important}.d-print-table{display:table!important}.d-print-table-row{display:table-row!important}.d-print-table-cell{display:table-cell!important}.d-print-flex{display:-ms-flexbox!important;display:flex!important}.d-print-inline-flex{display:-ms-inline-flexbox!important;display:inline-flex!important}}.embed-responsive{position:relative;display:block;width:100%;padding:0;overflow:hidden}.embed-responsive::before{display:block;content:""}.embed-responsive .embed-responsive-item,.embed-responsive embed,.embed-responsive iframe,.embed-responsive object,.embed-responsive video{position:absolute;top:0;bottom:0;left:0;width:100%;height:100%;border:0}.embed-responsive-21by9::before{padding-top:42.857143%}.embed-responsive-16by9::before{padding-top:56.25%}.embed-responsive-4by3::before{padding-top:75%}.embed-responsive-1by1::before{padding-top:100%}.flex-row{-ms-flex-direction:row!important;flex-direction:row!important}.flex-column{-ms-flex-direction:column!important;flex-direction:column!important}.flex-row-reverse{-ms-flex-direction:row-reverse!important;flex-direction:row-reverse!important}.flex-column-reverse{-ms-flex-direction:column-reverse!important;flex-direction:column-reverse!important}.flex-wrap{-ms-flex-wrap:wrap!important;flex-wrap:wrap!important}.flex-nowrap{-ms-flex-wrap:nowrap!important;flex-wrap:nowrap!important}.flex-wrap-reverse{-ms-flex-wrap:wrap-reverse!important;flex-wrap:wrap-reverse!important}.flex-fill{-ms-flex:1 1 auto!important;flex:1 1 auto!important}.flex-grow-0{-ms-flex-positive:0!important;flex-grow:0!important}.flex-grow-1{-ms-flex-positive:1!important;flex-grow:1!important}.flex-shrink-0{-ms-flex-negative:0!important;flex-shrink:0!important}.flex-shrink-1{-ms-flex-negative:1!important;flex-shrink:1!important}.justify-content-start{-ms-flex-pack:start!important;justify-content:flex-start!important}.justify-content-end{-ms-flex-pack:end!important;justify-content:flex-end!important}.justify-content-center{-ms-flex-pack:center!important;justify-content:center!important}.justify-content-between{-ms-flex-pack:justify!important;justify-content:space-between!important}.justify-content-around{-ms-flex-pack:distribute!important;justify-content:space-around!important}.align-items-start{-ms-flex-align:start!important;align-items:flex-start!important}.align-items-end{-ms-flex-align:end!important;align-items:flex-end!important}.align-items-center{-ms-flex-align:center!important;align-items:center!important}.align-items-baseline{-ms-flex-align:baseline!important;align-items:baseline!important}.align-items-stretch{-ms-flex-align:stretch!important;align-items:stretch!important}.align-content-start{-ms-flex-line-pack:start!important;align-content:flex-start!important}.align-content-end{-ms-flex-line-pack:end!important;align-content:flex-end!important}.align-content-center{-ms-flex-line-pack:center!important;align-content:center!important}.align-content-between{-ms-flex-line-pack:justify!important;align-content:space-between!important}.align-content-around{-ms-flex-line-pack:distribute!important;align-content:space-around!important}.align-content-stretch{-ms-flex-line-pack:stretch!important;align-content:stretch!important}.align-self-auto{-ms-flex-item-align:auto!important;align-self:auto!important}.align-self-start{-ms-flex-item-align:start!important;align-self:flex-start!important}.align-self-end{-ms-flex-item-align:end!important;align-self:flex-end!important}.align-self-center{-ms-flex-item-align:center!important;align-self:center!important}.align-self-baseline{-ms-flex-item-align:baseline!important;align-self:baseline!important}.align-self-stretch{-ms-flex-item-align:stretch!important;align-self:stretch!important}@media (min-width:576px){.flex-sm-row{-ms-flex-direction:row!important;flex-direction:row!important}.flex-sm-column{-ms-flex-direction:column!important;flex-direction:column!important}.flex-sm-row-reverse{-ms-flex-direction:row-reverse!important;flex-direction:row-reverse!important}.flex-sm-column-reverse{-ms-flex-direction:column-reverse!important;flex-direction:column-reverse!important}.flex-sm-wrap{-ms-flex-wrap:wrap!important;flex-wrap:wrap!important}.flex-sm-nowrap{-ms-flex-wrap:nowrap!important;flex-wrap:nowrap!important}.flex-sm-wrap-reverse{-ms-flex-wrap:wrap-reverse!important;flex-wrap:wrap-reverse!important}.flex-sm-fill{-ms-flex:1 1 auto!important;flex:1 1 auto!important}.flex-sm-grow-0{-ms-flex-positive:0!important;flex-grow:0!important}.flex-sm-grow-1{-ms-flex-positive:1!important;flex-grow:1!important}.flex-sm-shrink-0{-ms-flex-negative:0!important;flex-shrink:0!important}.flex-sm-shrink-1{-ms-flex-negative:1!important;flex-shrink:1!important}.justify-content-sm-start{-ms-flex-pack:start!important;justify-content:flex-start!important}.justify-content-sm-end{-ms-flex-pack:end!important;justify-content:flex-end!important}.justify-content-sm-center{-ms-flex-pack:center!important;justify-content:center!important}.justify-content-sm-between{-ms-flex-pack:justify!important;justify-content:space-between!important}.justify-content-sm-around{-ms-flex-pack:distribute!important;justify-content:space-around!important}.align-items-sm-start{-ms-flex-align:start!important;align-items:flex-start!important}.align-items-sm-end{-ms-flex-align:end!important;align-items:flex-end!important}.align-items-sm-center{-ms-flex-align:center!important;align-items:center!important}.align-items-sm-baseline{-ms-flex-align:baseline!important;align-items:baseline!important}.align-items-sm-stretch{-ms-flex-align:stretch!important;align-items:stretch!important}.align-content-sm-start{-ms-flex-line-pack:start!important;align-content:flex-start!important}.align-content-sm-end{-ms-flex-line-pack:end!important;align-content:flex-end!important}.align-content-sm-center{-ms-flex-line-pack:center!important;align-content:center!important}.align-content-sm-between{-ms-flex-line-pack:justify!important;align-content:space-between!important}.align-content-sm-around{-ms-flex-line-pack:distribute!important;align-content:space-around!important}.align-content-sm-stretch{-ms-flex-line-pack:stretch!important;align-content:stretch!important}.align-self-sm-auto{-ms-flex-item-align:auto!important;align-self:auto!important}.align-self-sm-start{-ms-flex-item-align:start!important;align-self:flex-start!important}.align-self-sm-end{-ms-flex-item-align:end!important;align-self:flex-end!important}.align-self-sm-center{-ms-flex-item-align:center!important;align-self:center!important}.align-self-sm-baseline{-ms-flex-item-align:baseline!important;align-self:baseline!important}.align-self-sm-stretch{-ms-flex-item-align:stretch!important;align-self:stretch!important}}@media (min-width:768px){.flex-md-row{-ms-flex-direction:row!important;flex-direction:row!important}.flex-md-column{-ms-flex-direction:column!important;flex-direction:column!important}.flex-md-row-reverse{-ms-flex-direction:row-reverse!important;flex-direction:row-reverse!important}.flex-md-column-reverse{-ms-flex-direction:column-reverse!important;flex-direction:column-reverse!important}.flex-md-wrap{-ms-flex-wrap:wrap!important;flex-wrap:wrap!important}.flex-md-nowrap{-ms-flex-wrap:nowrap!important;flex-wrap:nowrap!important}.flex-md-wrap-reverse{-ms-flex-wrap:wrap-reverse!important;flex-wrap:wrap-reverse!important}.flex-md-fill{-ms-flex:1 1 auto!important;flex:1 1 auto!important}.flex-md-grow-0{-ms-flex-positive:0!important;flex-grow:0!important}.flex-md-grow-1{-ms-flex-positive:1!important;flex-grow:1!important}.flex-md-shrink-0{-ms-flex-negative:0!important;flex-shrink:0!important}.flex-md-shrink-1{-ms-flex-negative:1!important;flex-shrink:1!important}.justify-content-md-start{-ms-flex-pack:start!important;justify-content:flex-start!important}.justify-content-md-end{-ms-flex-pack:end!important;justify-content:flex-end!important}.justify-content-md-center{-ms-flex-pack:center!important;justify-content:center!important}.justify-content-md-between{-ms-flex-pack:justify!important;justify-content:space-between!important}.justify-content-md-around{-ms-flex-pack:distribute!important;justify-content:space-around!important}.align-items-md-start{-ms-flex-align:start!important;align-items:flex-start!important}.align-items-md-end{-ms-flex-align:end!important;align-items:flex-end!important}.align-items-md-center{-ms-flex-align:center!important;align-items:center!important}.align-items-md-baseline{-ms-flex-align:baseline!important;align-items:baseline!important}.align-items-md-stretch{-ms-flex-align:stretch!important;align-items:stretch!important}.align-content-md-start{-ms-flex-line-pack:start!important;align-content:flex-start!important}.align-content-md-end{-ms-flex-line-pack:end!important;align-content:flex-end!important}.align-content-md-center{-ms-flex-line-pack:center!important;align-content:center!important}.align-content-md-between{-ms-flex-line-pack:justify!important;align-content:space-between!important}.align-content-md-around{-ms-flex-line-pack:distribute!important;align-content:space-around!important}.align-content-md-stretch{-ms-flex-line-pack:stretch!important;align-content:stretch!important}.align-self-md-auto{-ms-flex-item-align:auto!important;align-self:auto!important}.align-self-md-start{-ms-flex-item-align:start!important;align-self:flex-start!important}.align-self-md-end{-ms-flex-item-align:end!important;align-self:flex-end!important}.align-self-md-center{-ms-flex-item-align:center!important;align-self:center!important}.align-self-md-baseline{-ms-flex-item-align:baseline!important;align-self:baseline!important}.align-self-md-stretch{-ms-flex-item-align:stretch!important;align-self:stretch!important}}@media (min-width:992px){.flex-lg-row{-ms-flex-direction:row!important;flex-direction:row!important}.flex-lg-column{-ms-flex-direction:column!important;flex-direction:column!important}.flex-lg-row-reverse{-ms-flex-direction:row-reverse!important;flex-direction:row-reverse!important}.flex-lg-column-reverse{-ms-flex-direction:column-reverse!important;flex-direction:column-reverse!important}.flex-lg-wrap{-ms-flex-wrap:wrap!important;flex-wrap:wrap!important}.flex-lg-nowrap{-ms-flex-wrap:nowrap!important;flex-wrap:nowrap!important}.flex-lg-wrap-reverse{-ms-flex-wrap:wrap-reverse!important;flex-wrap:wrap-reverse!important}.flex-lg-fill{-ms-flex:1 1 auto!important;flex:1 1 auto!important}.flex-lg-grow-0{-ms-flex-positive:0!important;flex-grow:0!important}.flex-lg-grow-1{-ms-flex-positive:1!important;flex-grow:1!important}.flex-lg-shrink-0{-ms-flex-negative:0!important;flex-shrink:0!important}.flex-lg-shrink-1{-ms-flex-negative:1!important;flex-shrink:1!important}.justify-content-lg-start{-ms-flex-pack:start!important;justify-content:flex-start!important}.justify-content-lg-end{-ms-flex-pack:end!important;justify-content:flex-end!important}.justify-content-lg-center{-ms-flex-pack:center!important;justify-content:center!important}.justify-content-lg-between{-ms-flex-pack:justify!important;justify-content:space-between!important}.justify-content-lg-around{-ms-flex-pack:distribute!important;justify-content:space-around!important}.align-items-lg-start{-ms-flex-align:start!important;align-items:flex-start!important}.align-items-lg-end{-ms-flex-align:end!important;align-items:flex-end!important}.align-items-lg-center{-ms-flex-align:center!important;align-items:center!important}.align-items-lg-baseline{-ms-flex-align:baseline!important;align-items:baseline!important}.align-items-lg-stretch{-ms-flex-align:stretch!important;align-items:stretch!important}.align-content-lg-start{-ms-flex-line-pack:start!important;align-content:flex-start!important}.align-content-lg-end{-ms-flex-line-pack:end!important;align-content:flex-end!important}.align-content-lg-center{-ms-flex-line-pack:center!important;align-content:center!important}.align-content-lg-between{-ms-flex-line-pack:justify!important;align-content:space-between!important}.align-content-lg-around{-ms-flex-line-pack:distribute!important;align-content:space-around!important}.align-content-lg-stretch{-ms-flex-line-pack:stretch!important;align-content:stretch!important}.align-self-lg-auto{-ms-flex-item-align:auto!important;align-self:auto!important}.align-self-lg-start{-ms-flex-item-align:start!important;align-self:flex-start!important}.align-self-lg-end{-ms-flex-item-align:end!important;align-self:flex-end!important}.align-self-lg-center{-ms-flex-item-align:center!important;align-self:center!important}.align-self-lg-baseline{-ms-flex-item-align:baseline!important;align-self:baseline!important}.align-self-lg-stretch{-ms-flex-item-align:stretch!important;align-self:stretch!important}}@media (min-width:1200px){.flex-xl-row{-ms-flex-direction:row!important;flex-direction:row!important}.flex-xl-column{-ms-flex-direction:column!important;flex-direction:column!important}.flex-xl-row-reverse{-ms-flex-direction:row-reverse!important;flex-direction:row-reverse!important}.flex-xl-column-reverse{-ms-flex-direction:column-reverse!important;flex-direction:column-reverse!important}.flex-xl-wrap{-ms-flex-wrap:wrap!important;flex-wrap:wrap!important}.flex-xl-nowrap{-ms-flex-wrap:nowrap!important;flex-wrap:nowrap!important}.flex-xl-wrap-reverse{-ms-flex-wrap:wrap-reverse!important;flex-wrap:wrap-reverse!important}.flex-xl-fill{-ms-flex:1 1 auto!important;flex:1 1 auto!important}.flex-xl-grow-0{-ms-flex-positive:0!important;flex-grow:0!important}.flex-xl-grow-1{-ms-flex-positive:1!important;flex-grow:1!important}.flex-xl-shrink-0{-ms-flex-negative:0!important;flex-shrink:0!important}.flex-xl-shrink-1{-ms-flex-negative:1!important;flex-shrink:1!important}.justify-content-xl-start{-ms-flex-pack:start!important;justify-content:flex-start!important}.justify-content-xl-end{-ms-flex-pack:end!important;justify-content:flex-end!important}.justify-content-xl-center{-ms-flex-pack:center!important;justify-content:center!important}.justify-content-xl-between{-ms-flex-pack:justify!important;justify-content:space-between!important}.justify-content-xl-around{-ms-flex-pack:distribute!important;justify-content:space-around!important}.align-items-xl-start{-ms-flex-align:start!important;align-items:flex-start!important}.align-items-xl-end{-ms-flex-align:end!important;align-items:flex-end!important}.align-items-xl-center{-ms-flex-align:center!important;align-items:center!important}.align-items-xl-baseline{-ms-flex-align:baseline!important;align-items:baseline!important}.align-items-xl-stretch{-ms-flex-align:stretch!important;align-items:stretch!important}.align-content-xl-start{-ms-flex-line-pack:start!important;align-content:flex-start!important}.align-content-xl-end{-ms-flex-line-pack:end!important;align-content:flex-end!important}.align-content-xl-center{-ms-flex-line-pack:center!important;align-content:center!important}.align-content-xl-between{-ms-flex-line-pack:justify!important;align-content:space-between!important}.align-content-xl-around{-ms-flex-line-pack:distribute!important;align-content:space-around!important}.align-content-xl-stretch{-ms-flex-line-pack:stretch!important;align-content:stretch!important}.align-self-xl-auto{-ms-flex-item-align:auto!important;align-self:auto!important}.align-self-xl-start{-ms-flex-item-align:start!important;align-self:flex-start!important}.align-self-xl-end{-ms-flex-item-align:end!important;align-self:flex-end!important}.align-self-xl-center{-ms-flex-item-align:center!important;align-self:center!important}.align-self-xl-baseline{-ms-flex-item-align:baseline!important;align-self:baseline!important}.align-self-xl-stretch{-ms-flex-item-align:stretch!important;align-self:stretch!important}}.float-left{float:left!important}.float-right{float:right!important}.float-none{float:none!important}@media (min-width:576px){.float-sm-left{float:left!important}.float-sm-right{float:right!important}.float-sm-none{float:none!important}}@media (min-width:768px){.float-md-left{float:left!important}.float-md-right{float:right!important}.float-md-none{float:none!important}}@media (min-width:992px){.float-lg-left{float:left!important}.float-lg-right{float:right!important}.float-lg-none{float:none!important}}@media (min-width:1200px){.float-xl-left{float:left!important}.float-xl-right{float:right!important}.float-xl-none{float:none!important}}.position-static{position:static!important}.position-relative{position:relative!important}.position-absolute{position:absolute!important}.position-fixed{position:fixed!important}.position-sticky{position:-webkit-sticky!important;position:sticky!important}.fixed-top{position:fixed;top:0;right:0;left:0;z-index:1030}.fixed-bottom{position:fixed;right:0;bottom:0;left:0;z-index:1030}@supports ((position:-webkit-sticky) or (position:sticky)){.sticky-top{position:-webkit-sticky;position:sticky;top:0;z-index:1020}}.sr-only{position:absolute;width:1px;height:1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);white-space:nowrap;border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;overflow:visible;clip:auto;white-space:normal}.shadow-sm{box-shadow:0 .125rem .25rem rgba(0,0,0,.075)!important}.shadow{box-shadow:0 .5rem 1rem rgba(0,0,0,.15)!important}.shadow-lg{box-shadow:0 1rem 3rem rgba(0,0,0,.175)!important}.shadow-none{box-shadow:none!important}.w-25{width:25%!important}.w-50{width:50%!important}.w-75{width:75%!important}.w-100{width:100%!important}.w-auto{width:auto!important}.h-25{height:25%!important}.h-50{height:50%!important}.h-75{height:75%!important}.h-100{height:100%!important}.h-auto{height:auto!important}.mw-100{max-width:100%!important}.mh-100{max-height:100%!important}.m-0{margin:0!important}.mt-0,.my-0{margin-top:0!important}.mr-0,.mx-0{margin-right:0!important}.mb-0,.my-0{margin-bottom:0!important}.ml-0,.mx-0{margin-left:0!important}.m-1{margin:.25rem!important}.mt-1,.my-1{margin-top:.25rem!important}.mr-1,.mx-1{margin-right:.25rem!important}.mb-1,.my-1{margin-bottom:.25rem!important}.ml-1,.mx-1{margin-left:.25rem!important}.m-2{margin:.5rem!important}.mt-2,.my-2{margin-top:.5rem!important}.mr-2,.mx-2{margin-right:.5rem!important}.mb-2,.my-2{margin-bottom:.5rem!important}.ml-2,.mx-2{margin-left:.5rem!important}.m-3{margin:1rem!important}.mt-3,.my-3{margin-top:1rem!important}.mr-3,.mx-3{margin-right:1rem!important}.mb-3,.my-3{margin-bottom:1rem!important}.ml-3,.mx-3{margin-left:1rem!important}.m-4{margin:1.5rem!important}.mt-4,.my-4{margin-top:1.5rem!important}.mr-4,.mx-4{margin-right:1.5rem!important}.mb-4,.my-4{margin-bottom:1.5rem!important}.ml-4,.mx-4{margin-left:1.5rem!important}.m-5{margin:3rem!important}.mt-5,.my-5{margin-top:3rem!important}.mr-5,.mx-5{margin-right:3rem!important}.mb-5,.my-5{margin-bottom:3rem!important}.ml-5,.mx-5{margin-left:3rem!important}.p-0{padding:0!important}.pt-0,.py-0{padding-top:0!important}.pr-0,.px-0{padding-right:0!important}.pb-0,.py-0{padding-bottom:0!important}.pl-0,.px-0{padding-left:0!important}.p-1{padding:.25rem!important}.pt-1,.py-1{padding-top:.25rem!important}.pr-1,.px-1{padding-right:.25rem!important}.pb-1,.py-1{padding-bottom:.25rem!important}.pl-1,.px-1{padding-left:.25rem!important}.p-2{padding:.5rem!important}.pt-2,.py-2{padding-top:.5rem!important}.pr-2,.px-2{padding-right:.5rem!important}.pb-2,.py-2{padding-bottom:.5rem!important}.pl-2,.px-2{padding-left:.5rem!important}.p-3{padding:1rem!important}.pt-3,.py-3{padding-top:1rem!important}.pr-3,.px-3{padding-right:1rem!important}.pb-3,.py-3{padding-bottom:1rem!important}.pl-3,.px-3{padding-left:1rem!important}.p-4{padding:1.5rem!important}.pt-4,.py-4{padding-top:1.5rem!important}.pr-4,.px-4{padding-right:1.5rem!important}.pb-4,.py-4{padding-bottom:1.5rem!important}.pl-4,.px-4{padding-left:1.5rem!important}.p-5{padding:3rem!important}.pt-5,.py-5{padding-top:3rem!important}.pr-5,.px-5{padding-right:3rem!important}.pb-5,.py-5{padding-bottom:3rem!important}.pl-5,.px-5{padding-left:3rem!important}.m-auto{margin:auto!important}.mt-auto,.my-auto{margin-top:auto!important}.mr-auto,.mx-auto{margin-right:auto!important}.mb-auto,.my-auto{margin-bottom:auto!important}.ml-auto,.mx-auto{margin-left:auto!important}@media (min-width:576px){.m-sm-0{margin:0!important}.mt-sm-0,.my-sm-0{margin-top:0!important}.mr-sm-0,.mx-sm-0{margin-right:0!important}.mb-sm-0,.my-sm-0{margin-bottom:0!important}.ml-sm-0,.mx-sm-0{margin-left:0!important}.m-sm-1{margin:.25rem!important}.mt-sm-1,.my-sm-1{margin-top:.25rem!important}.mr-sm-1,.mx-sm-1{margin-right:.25rem!important}.mb-sm-1,.my-sm-1{margin-bottom:.25rem!important}.ml-sm-1,.mx-sm-1{margin-left:.25rem!important}.m-sm-2{margin:.5rem!important}.mt-sm-2,.my-sm-2{margin-top:.5rem!important}.mr-sm-2,.mx-sm-2{margin-right:.5rem!important}.mb-sm-2,.my-sm-2{margin-bottom:.5rem!important}.ml-sm-2,.mx-sm-2{margin-left:.5rem!important}.m-sm-3{margin:1rem!important}.mt-sm-3,.my-sm-3{margin-top:1rem!important}.mr-sm-3,.mx-sm-3{margin-right:1rem!important}.mb-sm-3,.my-sm-3{margin-bottom:1rem!important}.ml-sm-3,.mx-sm-3{margin-left:1rem!important}.m-sm-4{margin:1.5rem!important}.mt-sm-4,.my-sm-4{margin-top:1.5rem!important}.mr-sm-4,.mx-sm-4{margin-right:1.5rem!important}.mb-sm-4,.my-sm-4{margin-bottom:1.5rem!important}.ml-sm-4,.mx-sm-4{margin-left:1.5rem!important}.m-sm-5{margin:3rem!important}.mt-sm-5,.my-sm-5{margin-top:3rem!important}.mr-sm-5,.mx-sm-5{margin-right:3rem!important}.mb-sm-5,.my-sm-5{margin-bottom:3rem!important}.ml-sm-5,.mx-sm-5{margin-left:3rem!important}.p-sm-0{padding:0!important}.pt-sm-0,.py-sm-0{padding-top:0!important}.pr-sm-0,.px-sm-0{padding-right:0!important}.pb-sm-0,.py-sm-0{padding-bottom:0!important}.pl-sm-0,.px-sm-0{padding-left:0!important}.p-sm-1{padding:.25rem!important}.pt-sm-1,.py-sm-1{padding-top:.25rem!important}.pr-sm-1,.px-sm-1{padding-right:.25rem!important}.pb-sm-1,.py-sm-1{padding-bottom:.25rem!important}.pl-sm-1,.px-sm-1{padding-left:.25rem!important}.p-sm-2{padding:.5rem!important}.pt-sm-2,.py-sm-2{padding-top:.5rem!important}.pr-sm-2,.px-sm-2{padding-right:.5rem!important}.pb-sm-2,.py-sm-2{padding-bottom:.5rem!important}.pl-sm-2,.px-sm-2{padding-left:.5rem!important}.p-sm-3{padding:1rem!important}.pt-sm-3,.py-sm-3{padding-top:1rem!important}.pr-sm-3,.px-sm-3{padding-right:1rem!important}.pb-sm-3,.py-sm-3{padding-bottom:1rem!important}.pl-sm-3,.px-sm-3{padding-left:1rem!important}.p-sm-4{padding:1.5rem!important}.pt-sm-4,.py-sm-4{padding-top:1.5rem!important}.pr-sm-4,.px-sm-4{padding-right:1.5rem!important}.pb-sm-4,.py-sm-4{padding-bottom:1.5rem!important}.pl-sm-4,.px-sm-4{padding-left:1.5rem!important}.p-sm-5{padding:3rem!important}.pt-sm-5,.py-sm-5{padding-top:3rem!important}.pr-sm-5,.px-sm-5{padding-right:3rem!important}.pb-sm-5,.py-sm-5{padding-bottom:3rem!important}.pl-sm-5,.px-sm-5{padding-left:3rem!important}.m-sm-auto{margin:auto!important}.mt-sm-auto,.my-sm-auto{margin-top:auto!important}.mr-sm-auto,.mx-sm-auto{margin-right:auto!important}.mb-sm-auto,.my-sm-auto{margin-bottom:auto!important}.ml-sm-auto,.mx-sm-auto{margin-left:auto!important}}@media (min-width:768px){.m-md-0{margin:0!important}.mt-md-0,.my-md-0{margin-top:0!important}.mr-md-0,.mx-md-0{margin-right:0!important}.mb-md-0,.my-md-0{margin-bottom:0!important}.ml-md-0,.mx-md-0{margin-left:0!important}.m-md-1{margin:.25rem!important}.mt-md-1,.my-md-1{margin-top:.25rem!important}.mr-md-1,.mx-md-1{margin-right:.25rem!important}.mb-md-1,.my-md-1{margin-bottom:.25rem!important}.ml-md-1,.mx-md-1{margin-left:.25rem!important}.m-md-2{margin:.5rem!important}.mt-md-2,.my-md-2{margin-top:.5rem!important}.mr-md-2,.mx-md-2{margin-right:.5rem!important}.mb-md-2,.my-md-2{margin-bottom:.5rem!important}.ml-md-2,.mx-md-2{margin-left:.5rem!important}.m-md-3{margin:1rem!important}.mt-md-3,.my-md-3{margin-top:1rem!important}.mr-md-3,.mx-md-3{margin-right:1rem!important}.mb-md-3,.my-md-3{margin-bottom:1rem!important}.ml-md-3,.mx-md-3{margin-left:1rem!important}.m-md-4{margin:1.5rem!important}.mt-md-4,.my-md-4{margin-top:1.5rem!important}.mr-md-4,.mx-md-4{margin-right:1.5rem!important}.mb-md-4,.my-md-4{margin-bottom:1.5rem!important}.ml-md-4,.mx-md-4{margin-left:1.5rem!important}.m-md-5{margin:3rem!important}.mt-md-5,.my-md-5{margin-top:3rem!important}.mr-md-5,.mx-md-5{margin-right:3rem!important}.mb-md-5,.my-md-5{margin-bottom:3rem!important}.ml-md-5,.mx-md-5{margin-left:3rem!important}.p-md-0{padding:0!important}.pt-md-0,.py-md-0{padding-top:0!important}.pr-md-0,.px-md-0{padding-right:0!important}.pb-md-0,.py-md-0{padding-bottom:0!important}.pl-md-0,.px-md-0{padding-left:0!important}.p-md-1{padding:.25rem!important}.pt-md-1,.py-md-1{padding-top:.25rem!important}.pr-md-1,.px-md-1{padding-right:.25rem!important}.pb-md-1,.py-md-1{padding-bottom:.25rem!important}.pl-md-1,.px-md-1{padding-left:.25rem!important}.p-md-2{padding:.5rem!important}.pt-md-2,.py-md-2{padding-top:.5rem!important}.pr-md-2,.px-md-2{padding-right:.5rem!important}.pb-md-2,.py-md-2{padding-bottom:.5rem!important}.pl-md-2,.px-md-2{padding-left:.5rem!important}.p-md-3{padding:1rem!important}.pt-md-3,.py-md-3{padding-top:1rem!important}.pr-md-3,.px-md-3{padding-right:1rem!important}.pb-md-3,.py-md-3{padding-bottom:1rem!important}.pl-md-3,.px-md-3{padding-left:1rem!important}.p-md-4{padding:1.5rem!important}.pt-md-4,.py-md-4{padding-top:1.5rem!important}.pr-md-4,.px-md-4{padding-right:1.5rem!important}.pb-md-4,.py-md-4{padding-bottom:1.5rem!important}.pl-md-4,.px-md-4{padding-left:1.5rem!important}.p-md-5{padding:3rem!important}.pt-md-5,.py-md-5{padding-top:3rem!important}.pr-md-5,.px-md-5{padding-right:3rem!important}.pb-md-5,.py-md-5{padding-bottom:3rem!important}.pl-md-5,.px-md-5{padding-left:3rem!important}.m-md-auto{margin:auto!important}.mt-md-auto,.my-md-auto{margin-top:auto!important}.mr-md-auto,.mx-md-auto{margin-right:auto!important}.mb-md-auto,.my-md-auto{margin-bottom:auto!important}.ml-md-auto,.mx-md-auto{margin-left:auto!important}}@media (min-width:992px){.m-lg-0{margin:0!important}.mt-lg-0,.my-lg-0{margin-top:0!important}.mr-lg-0,.mx-lg-0{margin-right:0!important}.mb-lg-0,.my-lg-0{margin-bottom:0!important}.ml-lg-0,.mx-lg-0{margin-left:0!important}.m-lg-1{margin:.25rem!important}.mt-lg-1,.my-lg-1{margin-top:.25rem!important}.mr-lg-1,.mx-lg-1{margin-right:.25rem!important}.mb-lg-1,.my-lg-1{margin-bottom:.25rem!important}.ml-lg-1,.mx-lg-1{margin-left:.25rem!important}.m-lg-2{margin:.5rem!important}.mt-lg-2,.my-lg-2{margin-top:.5rem!important}.mr-lg-2,.mx-lg-2{margin-right:.5rem!important}.mb-lg-2,.my-lg-2{margin-bottom:.5rem!important}.ml-lg-2,.mx-lg-2{margin-left:.5rem!important}.m-lg-3{margin:1rem!important}.mt-lg-3,.my-lg-3{margin-top:1rem!important}.mr-lg-3,.mx-lg-3{margin-right:1rem!important}.mb-lg-3,.my-lg-3{margin-bottom:1rem!important}.ml-lg-3,.mx-lg-3{margin-left:1rem!important}.m-lg-4{margin:1.5rem!important}.mt-lg-4,.my-lg-4{margin-top:1.5rem!important}.mr-lg-4,.mx-lg-4{margin-right:1.5rem!important}.mb-lg-4,.my-lg-4{margin-bottom:1.5rem!important}.ml-lg-4,.mx-lg-4{margin-left:1.5rem!important}.m-lg-5{margin:3rem!important}.mt-lg-5,.my-lg-5{margin-top:3rem!important}.mr-lg-5,.mx-lg-5{margin-right:3rem!important}.mb-lg-5,.my-lg-5{margin-bottom:3rem!important}.ml-lg-5,.mx-lg-5{margin-left:3rem!important}.p-lg-0{padding:0!important}.pt-lg-0,.py-lg-0{padding-top:0!important}.pr-lg-0,.px-lg-0{padding-right:0!important}.pb-lg-0,.py-lg-0{padding-bottom:0!important}.pl-lg-0,.px-lg-0{padding-left:0!important}.p-lg-1{padding:.25rem!important}.pt-lg-1,.py-lg-1{padding-top:.25rem!important}.pr-lg-1,.px-lg-1{padding-right:.25rem!important}.pb-lg-1,.py-lg-1{padding-bottom:.25rem!important}.pl-lg-1,.px-lg-1{padding-left:.25rem!important}.p-lg-2{padding:.5rem!important}.pt-lg-2,.py-lg-2{padding-top:.5rem!important}.pr-lg-2,.px-lg-2{padding-right:.5rem!important}.pb-lg-2,.py-lg-2{padding-bottom:.5rem!important}.pl-lg-2,.px-lg-2{padding-left:.5rem!important}.p-lg-3{padding:1rem!important}.pt-lg-3,.py-lg-3{padding-top:1rem!important}.pr-lg-3,.px-lg-3{padding-right:1rem!important}.pb-lg-3,.py-lg-3{padding-bottom:1rem!important}.pl-lg-3,.px-lg-3{padding-left:1rem!important}.p-lg-4{padding:1.5rem!important}.pt-lg-4,.py-lg-4{padding-top:1.5rem!important}.pr-lg-4,.px-lg-4{padding-right:1.5rem!important}.pb-lg-4,.py-lg-4{padding-bottom:1.5rem!important}.pl-lg-4,.px-lg-4{padding-left:1.5rem!important}.p-lg-5{padding:3rem!important}.pt-lg-5,.py-lg-5{padding-top:3rem!important}.pr-lg-5,.px-lg-5{padding-right:3rem!important}.pb-lg-5,.py-lg-5{padding-bottom:3rem!important}.pl-lg-5,.px-lg-5{padding-left:3rem!important}.m-lg-auto{margin:auto!important}.mt-lg-auto,.my-lg-auto{margin-top:auto!important}.mr-lg-auto,.mx-lg-auto{margin-right:auto!important}.mb-lg-auto,.my-lg-auto{margin-bottom:auto!important}.ml-lg-auto,.mx-lg-auto{margin-left:auto!important}}@media (min-width:1200px){.m-xl-0{margin:0!important}.mt-xl-0,.my-xl-0{margin-top:0!important}.mr-xl-0,.mx-xl-0{margin-right:0!important}.mb-xl-0,.my-xl-0{margin-bottom:0!important}.ml-xl-0,.mx-xl-0{margin-left:0!important}.m-xl-1{margin:.25rem!important}.mt-xl-1,.my-xl-1{margin-top:.25rem!important}.mr-xl-1,.mx-xl-1{margin-right:.25rem!important}.mb-xl-1,.my-xl-1{margin-bottom:.25rem!important}.ml-xl-1,.mx-xl-1{margin-left:.25rem!important}.m-xl-2{margin:.5rem!important}.mt-xl-2,.my-xl-2{margin-top:.5rem!important}.mr-xl-2,.mx-xl-2{margin-right:.5rem!important}.mb-xl-2,.my-xl-2{margin-bottom:.5rem!important}.ml-xl-2,.mx-xl-2{margin-left:.5rem!important}.m-xl-3{margin:1rem!important}.mt-xl-3,.my-xl-3{margin-top:1rem!important}.mr-xl-3,.mx-xl-3{margin-right:1rem!important}.mb-xl-3,.my-xl-3{margin-bottom:1rem!important}.ml-xl-3,.mx-xl-3{margin-left:1rem!important}.m-xl-4{margin:1.5rem!important}.mt-xl-4,.my-xl-4{margin-top:1.5rem!important}.mr-xl-4,.mx-xl-4{margin-right:1.5rem!important}.mb-xl-4,.my-xl-4{margin-bottom:1.5rem!important}.ml-xl-4,.mx-xl-4{margin-left:1.5rem!important}.m-xl-5{margin:3rem!important}.mt-xl-5,.my-xl-5{margin-top:3rem!important}.mr-xl-5,.mx-xl-5{margin-right:3rem!important}.mb-xl-5,.my-xl-5{margin-bottom:3rem!important}.ml-xl-5,.mx-xl-5{margin-left:3rem!important}.p-xl-0{padding:0!important}.pt-xl-0,.py-xl-0{padding-top:0!important}.pr-xl-0,.px-xl-0{padding-right:0!important}.pb-xl-0,.py-xl-0{padding-bottom:0!important}.pl-xl-0,.px-xl-0{padding-left:0!important}.p-xl-1{padding:.25rem!important}.pt-xl-1,.py-xl-1{padding-top:.25rem!important}.pr-xl-1,.px-xl-1{padding-right:.25rem!important}.pb-xl-1,.py-xl-1{padding-bottom:.25rem!important}.pl-xl-1,.px-xl-1{padding-left:.25rem!important}.p-xl-2{padding:.5rem!important}.pt-xl-2,.py-xl-2{padding-top:.5rem!important}.pr-xl-2,.px-xl-2{padding-right:.5rem!important}.pb-xl-2,.py-xl-2{padding-bottom:.5rem!important}.pl-xl-2,.px-xl-2{padding-left:.5rem!important}.p-xl-3{padding:1rem!important}.pt-xl-3,.py-xl-3{padding-top:1rem!important}.pr-xl-3,.px-xl-3{padding-right:1rem!important}.pb-xl-3,.py-xl-3{padding-bottom:1rem!important}.pl-xl-3,.px-xl-3{padding-left:1rem!important}.p-xl-4{padding:1.5rem!important}.pt-xl-4,.py-xl-4{padding-top:1.5rem!important}.pr-xl-4,.px-xl-4{padding-right:1.5rem!important}.pb-xl-4,.py-xl-4{padding-bottom:1.5rem!important}.pl-xl-4,.px-xl-4{padding-left:1.5rem!important}.p-xl-5{padding:3rem!important}.pt-xl-5,.py-xl-5{padding-top:3rem!important}.pr-xl-5,.px-xl-5{padding-right:3rem!important}.pb-xl-5,.py-xl-5{padding-bottom:3rem!important}.pl-xl-5,.px-xl-5{padding-left:3rem!important}.m-xl-auto{margin:auto!important}.mt-xl-auto,.my-xl-auto{margin-top:auto!important}.mr-xl-auto,.mx-xl-auto{margin-right:auto!important}.mb-xl-auto,.my-xl-auto{margin-bottom:auto!important}.ml-xl-auto,.mx-xl-auto{margin-left:auto!important}}.text-monospace{font-family:SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace}.text-justify{text-align:justify!important}.text-nowrap{white-space:nowrap!important}.text-truncate{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.text-left{text-align:left!important}.text-right{text-align:right!important}.text-center{text-align:center!important}@media (min-width:576px){.text-sm-left{text-align:left!important}.text-sm-right{text-align:right!important}.text-sm-center{text-align:center!important}}@media (min-width:768px){.text-md-left{text-align:left!important}.text-md-right{text-align:right!important}.text-md-center{text-align:center!important}}@media (min-width:992px){.text-lg-left{text-align:left!important}.text-lg-right{text-align:right!important}.text-lg-center{text-align:center!important}}@media (min-width:1200px){.text-xl-left{text-align:left!important}.text-xl-right{text-align:right!important}.text-xl-center{text-align:center!important}}.text-lowercase{text-transform:lowercase!important}.text-uppercase{text-transform:uppercase!important}.text-capitalize{text-transform:capitalize!important}.font-weight-light{font-weight:300!important}.font-weight-normal{font-weight:400!important}.font-weight-bold{font-weight:700!important}.font-italic{font-style:italic!important}.text-white{color:#fff!important}.text-primary{color:#007bff!important}a.text-primary:focus,a.text-primary:hover{color:#0062cc!important}.text-secondary{color:#6c757d!important}a.text-secondary:focus,a.text-secondary:hover{color:#545b62!important}.text-success{color:#28a745!important}a.text-success:focus,a.text-success:hover{color:#1e7e34!important}.text-info{color:#17a2b8!important}a.text-info:focus,a.text-info:hover{color:#117a8b!important}.text-warning{color:#ffc107!important}a.text-warning:focus,a.text-warning:hover{color:#d39e00!important}.text-danger{color:#dc3545!important}a.text-danger:focus,a.text-danger:hover{color:#bd2130!important}.text-light{color:#f8f9fa!important}a.text-light:focus,a.text-light:hover{color:#dae0e5!important}.text-dark{color:#343a40!important}a.text-dark:focus,a.text-dark:hover{color:#1d2124!important}.text-body{color:#212529!important}.text-muted{color:#6c757d!important}.text-black-50{color:rgba(0,0,0,.5)!important}.text-white-50{color:rgba(255,255,255,.5)!important}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.visible{visibility:visible!important}.invisible{visibility:hidden!important}@media print{*,::after,::before{text-shadow:none!important;box-shadow:none!important}a:not(.btn){text-decoration:underline}abbr[title]::after{content:" (" attr(title) ")"}pre{white-space:pre-wrap!important}blockquote,pre{border:1px solid #adb5bd;page-break-inside:avoid}thead{display:table-header-group}img,tr{page-break-inside:avoid}h2,h3,p{orphans:3;widows:3}h2,h3{page-break-after:avoid}@page{size:a3}body{min-width:992px!important}.container{min-width:992px!important}.navbar{display:none}.badge{border:1px solid #000}.table{border-collapse:collapse!important}.table td,.table th{background-color:#fff!important}.table-bordered td,.table-bordered th{border:1px solid #dee2e6!important}.table-dark{color:inherit}.table-dark tbody+tbody,.table-dark td,.table-dark th,.table-dark thead th{border-color:#dee2e6}.table .thead-dark th{color:inherit;border-color:#dee2e6}}
+/*# sourceMappingURL=bootstrap.min.css.map */
\ No newline at end of file
diff --git a/qpysdk/src/main/assets/stylesheets/css/sticky-footer.css b/qpysdk/src/main/assets/stylesheets/css/sticky-footer.css
new file mode 100644
index 00000000..ebe29104
--- /dev/null
+++ b/qpysdk/src/main/assets/stylesheets/css/sticky-footer.css
@@ -0,0 +1,28 @@
+/* Sticky footer styles
+-------------------------------------------------- */
+html {
+  position: relative;
+  min-height: 100%;
+}
+body {
+  margin-bottom: 60px; /* Margin bottom by footer height */
+}
+.footer {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  height: 60px; /* Set the fixed height of the footer here */
+  line-height: 60px; /* Vertically center the text there */
+  background-color: #f5f5f5;
+}
+
+
+/* Custom page CSS
+-------------------------------------------------- */
+/* Not required for template or sticky footer method. */
+
+.container {
+  width: auto;
+  max-width: 680px;
+  padding: 0 15px;
+}
diff --git a/qpysdk/src/main/assets/stylesheets/css/style.css b/qpysdk/src/main/assets/stylesheets/css/style.css
new file mode 100644
index 00000000..e3d543bb
--- /dev/null
+++ b/qpysdk/src/main/assets/stylesheets/css/style.css
@@ -0,0 +1,141 @@
+body,ul,li {
+    padding:0;
+    margin:0;
+    border:0;
+}
+body {
+    font-size:12px;
+    -webkit-user-select:none;
+    -webkit-text-size-adjust:none;
+    font-family:helvetica;
+}
+#header { }
+#header a {
+    color:#f3f3f3;
+    text-decoration:none;
+    font-weight:bold;
+    text-shadow:0 -1px 0 rgba(0,0,0,0.5);
+}
+#footer { }
+#wrapper {
+    /*position:absolute; z-index:1;*/
+    top:45px; bottom:48px;
+    text-align:center;
+    width:100%;
+    min-height:100px;
+    overflow:auto;
+}
+/* ============================================================================= */
+
+#scroller {
+    position:absolute; z-index:1;
+/*  -webkit-touch-callout:none;*/
+    -webkit-tap-highlight-color:rgba(0,0,0,0);
+    width:100%;
+    padding:0;
+}
+
+#scroller ul {
+    list-style:none;
+    padding:0;
+    margin:0;
+    width:100%;
+    text-align:left;
+}
+
+#scroller li {
+    padding:0 10px;
+    height:40px;
+    line-height:40px;
+    border-bottom:1px solid #ccc;
+    border-top:1px solid #fff;
+    background-color:#fafafa;
+    font-size:14px;
+}
+
+#myFrame {
+    position:absolute;
+    top:0; left:0;
+}
+.w30p { width:30% }
+/* ============================================================================= */
+
+#outer {
+    width:100%;
+    margin:auto;
+    text-align:center;
+}
+.inner {
+    display: table-cell;
+    vertical-align:middle;
+    text-align:center;
+    
+    width:90px;
+    height:136px;
+    margin:5px; 
+    border:1px solid #1f1f1f;
+}
+.inner_img {
+    vertical-align:middle;
+    max-width:90px;
+    max-height:90px;
+}
+.inner_title {
+    position:relative;
+    float:left;
+    width:90px;
+    overflow:hidden;
+    background:#1f1f1f;
+    color:#fff;
+    height:40px;
+    padding:3px 0px;
+}
+* html .inner {display:inline}                      /* for ie*/
+html>body #outer {display:table}                    /*for mozilla */
+html>body .inner {display:table;float:left}         /*for mozilla */
+@media all and (min-width: 0px) {                   /* opera 7 styles */
+    html>body .inner {display:inline-block;float:none;}
+}
+/* ============================================================================= */
+
+.table { width:100% }
+.nowrap { overflow:hidden;white-space:nowrap }
+.tbl_title { font-size:16px;color:white;text-align:center;background:#1f1f1f; }
+.tpl_title_pre { height:38px;width:20px; background:#D70377;float:left;margin:-10px; }
+.title,a.title { font-size:16px;clolor:black }
+.desc { font-size:14px;color:grey }
+.pl15 { padding-left:15px }
+
+a {
+}
+
+a:link {
+color: black;
+text-decoration: none;
+}
+a:visited {
+color: black;
+text-decoration: none;
+}
+a:hover {
+color: black;
+text-decoration: none;
+}
+a:active {
+color: black;
+text-decoration: none;
+}
+
+/* ============================================================================= */
+
+.fl_left { float:left }
+.fl_right { float:right }
+.pl10 {padding-left:10px}
+.pl20 {padding-left:20px}
+.pt20 {padding-top:10px}
+.clear { clear:both }
+.act { font-size:20px;text-align:center }
+.btn_act { padding:10px 20px;width:120px;background-color:#1f1f1f;color:white;border:1px solid }
+#loading { margin:0 auto;padding:50px 10px 10px;font-size:16px;text-align:center;color:grey }
+.load_img { height:30px }
+.more_div { background:white;color:grey }
diff --git a/qpysdk/src/main/assets/stylesheets/js/bootstrap.min.js b/qpysdk/src/main/assets/stylesheets/js/bootstrap.min.js
new file mode 100644
index 00000000..00c895f0
--- /dev/null
+++ b/qpysdk/src/main/assets/stylesheets/js/bootstrap.min.js
@@ -0,0 +1,7 @@
+/*!
+  * Bootstrap v4.1.3 (https://getbootstrap.com/)
+  * Copyright 2011-2018 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
+  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+  */
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports,require("jquery"),require("popper.js")):"function"==typeof define&&define.amd?define(["exports","jquery","popper.js"],e):e(t.bootstrap={},t.jQuery,t.Popper)}(this,function(t,e,h){"use strict";function i(t,e){for(var n=0;n<e.length;n++){var i=e[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(t,i.key,i)}}function s(t,e,n){return e&&i(t.prototype,e),n&&i(t,n),t}function l(r){for(var t=1;t<arguments.length;t++){var o=null!=arguments[t]?arguments[t]:{},e=Object.keys(o);"function"==typeof Object.getOwnPropertySymbols&&(e=e.concat(Object.getOwnPropertySymbols(o).filter(function(t){return Object.getOwnPropertyDescriptor(o,t).enumerable}))),e.forEach(function(t){var e,n,i;e=r,i=o[n=t],n in e?Object.defineProperty(e,n,{value:i,enumerable:!0,configurable:!0,writable:!0}):e[n]=i})}return r}e=e&&e.hasOwnProperty("default")?e.default:e,h=h&&h.hasOwnProperty("default")?h.default:h;var r,n,o,a,c,u,f,d,g,_,m,p,v,y,E,C,T,b,S,I,A,D,w,N,O,k,P,j,H,L,R,x,W,U,q,F,K,M,Q,B,V,Y,z,J,Z,G,$,X,tt,et,nt,it,rt,ot,st,at,lt,ct,ht,ut,ft,dt,gt,_t,mt,pt,vt,yt,Et,Ct,Tt,bt,St,It,At,Dt,wt,Nt,Ot,kt,Pt,jt,Ht,Lt,Rt,xt,Wt,Ut,qt,Ft,Kt,Mt,Qt,Bt,Vt,Yt,zt,Jt,Zt,Gt,$t,Xt,te,ee,ne,ie,re,oe,se,ae,le,ce,he,ue,fe,de,ge,_e,me,pe,ve,ye,Ee,Ce,Te,be,Se,Ie,Ae,De,we,Ne,Oe,ke,Pe,je,He,Le,Re,xe,We,Ue,qe,Fe,Ke,Me,Qe,Be,Ve,Ye,ze,Je,Ze,Ge,$e,Xe,tn,en,nn,rn,on,sn,an,ln,cn,hn,un,fn,dn,gn,_n,mn,pn,vn,yn,En,Cn,Tn,bn,Sn,In,An,Dn,wn,Nn,On,kn,Pn,jn,Hn,Ln,Rn,xn,Wn,Un,qn,Fn=function(i){var e="transitionend";function t(t){var e=this,n=!1;return i(this).one(l.TRANSITION_END,function(){n=!0}),setTimeout(function(){n||l.triggerTransitionEnd(e)},t),this}var l={TRANSITION_END:"bsTransitionEnd",getUID:function(t){for(;t+=~~(1e6*Math.random()),document.getElementById(t););return t},getSelectorFromElement:function(t){var e=t.getAttribute("data-target");e&&"#"!==e||(e=t.getAttribute("href")||"");try{return document.querySelector(e)?e:null}catch(t){return null}},getTransitionDurationFromElement:function(t){if(!t)return 0;var e=i(t).css("transition-duration");return parseFloat(e)?(e=e.split(",")[0],1e3*parseFloat(e)):0},reflow:function(t){return t.offsetHeight},triggerTransitionEnd:function(t){i(t).trigger(e)},supportsTransitionEnd:function(){return Boolean(e)},isElement:function(t){return(t[0]||t).nodeType},typeCheckConfig:function(t,e,n){for(var i in n)if(Object.prototype.hasOwnProperty.call(n,i)){var r=n[i],o=e[i],s=o&&l.isElement(o)?"element":(a=o,{}.toString.call(a).match(/\s([a-z]+)/i)[1].toLowerCase());if(!new RegExp(r).test(s))throw new Error(t.toUpperCase()+': Option "'+i+'" provided type "'+s+'" but expected type "'+r+'".')}var a}};return i.fn.emulateTransitionEnd=t,i.event.special[l.TRANSITION_END]={bindType:e,delegateType:e,handle:function(t){if(i(t.target).is(this))return t.handleObj.handler.apply(this,arguments)}},l}(e),Kn=(n="alert",a="."+(o="bs.alert"),c=(r=e).fn[n],u={CLOSE:"close"+a,CLOSED:"closed"+a,CLICK_DATA_API:"click"+a+".data-api"},f="alert",d="fade",g="show",_=function(){function i(t){this._element=t}var t=i.prototype;return t.close=function(t){var e=this._element;t&&(e=this._getRootElement(t)),this._triggerCloseEvent(e).isDefaultPrevented()||this._removeElement(e)},t.dispose=function(){r.removeData(this._element,o),this._element=null},t._getRootElement=function(t){var e=Fn.getSelectorFromElement(t),n=!1;return e&&(n=document.querySelector(e)),n||(n=r(t).closest("."+f)[0]),n},t._triggerCloseEvent=function(t){var e=r.Event(u.CLOSE);return r(t).trigger(e),e},t._removeElement=function(e){var n=this;if(r(e).removeClass(g),r(e).hasClass(d)){var t=Fn.getTransitionDurationFromElement(e);r(e).one(Fn.TRANSITION_END,function(t){return n._destroyElement(e,t)}).emulateTransitionEnd(t)}else this._destroyElement(e)},t._destroyElement=function(t){r(t).detach().trigger(u.CLOSED).remove()},i._jQueryInterface=function(n){return this.each(function(){var t=r(this),e=t.data(o);e||(e=new i(this),t.data(o,e)),"close"===n&&e[n](this)})},i._handleDismiss=function(e){return function(t){t&&t.preventDefault(),e.close(this)}},s(i,null,[{key:"VERSION",get:function(){return"4.1.3"}}]),i}(),r(document).on(u.CLICK_DATA_API,'[data-dismiss="alert"]',_._handleDismiss(new _)),r.fn[n]=_._jQueryInterface,r.fn[n].Constructor=_,r.fn[n].noConflict=function(){return r.fn[n]=c,_._jQueryInterface},_),Mn=(p="button",y="."+(v="bs.button"),E=".data-api",C=(m=e).fn[p],T="active",b="btn",I='[data-toggle^="button"]',A='[data-toggle="buttons"]',D="input",w=".active",N=".btn",O={CLICK_DATA_API:"click"+y+E,FOCUS_BLUR_DATA_API:(S="focus")+y+E+" blur"+y+E},k=function(){function n(t){this._element=t}var t=n.prototype;return t.toggle=function(){var t=!0,e=!0,n=m(this._element).closest(A)[0];if(n){var i=this._element.querySelector(D);if(i){if("radio"===i.type)if(i.checked&&this._element.classList.contains(T))t=!1;else{var r=n.querySelector(w);r&&m(r).removeClass(T)}if(t){if(i.hasAttribute("disabled")||n.hasAttribute("disabled")||i.classList.contains("disabled")||n.classList.contains("disabled"))return;i.checked=!this._element.classList.contains(T),m(i).trigger("change")}i.focus(),e=!1}}e&&this._element.setAttribute("aria-pressed",!this._element.classList.contains(T)),t&&m(this._element).toggleClass(T)},t.dispose=function(){m.removeData(this._element,v),this._element=null},n._jQueryInterface=function(e){return this.each(function(){var t=m(this).data(v);t||(t=new n(this),m(this).data(v,t)),"toggle"===e&&t[e]()})},s(n,null,[{key:"VERSION",get:function(){return"4.1.3"}}]),n}(),m(document).on(O.CLICK_DATA_API,I,function(t){t.preventDefault();var e=t.target;m(e).hasClass(b)||(e=m(e).closest(N)),k._jQueryInterface.call(m(e),"toggle")}).on(O.FOCUS_BLUR_DATA_API,I,function(t){var e=m(t.target).closest(N)[0];m(e).toggleClass(S,/^focus(in)?$/.test(t.type))}),m.fn[p]=k._jQueryInterface,m.fn[p].Constructor=k,m.fn[p].noConflict=function(){return m.fn[p]=C,k._jQueryInterface},k),Qn=(j="carousel",L="."+(H="bs.carousel"),R=".data-api",x=(P=e).fn[j],W={interval:5e3,keyboard:!0,slide:!1,pause:"hover",wrap:!0},U={interval:"(number|boolean)",keyboard:"boolean",slide:"(boolean|string)",pause:"(string|boolean)",wrap:"boolean"},q="next",F="prev",K="left",M="right",Q={SLIDE:"slide"+L,SLID:"slid"+L,KEYDOWN:"keydown"+L,MOUSEENTER:"mouseenter"+L,MOUSELEAVE:"mouseleave"+L,TOUCHEND:"touchend"+L,LOAD_DATA_API:"load"+L+R,CLICK_DATA_API:"click"+L+R},B="carousel",V="active",Y="slide",z="carousel-item-right",J="carousel-item-left",Z="carousel-item-next",G="carousel-item-prev",$=".active",X=".active.carousel-item",tt=".carousel-item",et=".carousel-item-next, .carousel-item-prev",nt=".carousel-indicators",it="[data-slide], [data-slide-to]",rt='[data-ride="carousel"]',ot=function(){function o(t,e){this._items=null,this._interval=null,this._activeElement=null,this._isPaused=!1,this._isSliding=!1,this.touchTimeout=null,this._config=this._getConfig(e),this._element=P(t)[0],this._indicatorsElement=this._element.querySelector(nt),this._addEventListeners()}var t=o.prototype;return t.next=function(){this._isSliding||this._slide(q)},t.nextWhenVisible=function(){!document.hidden&&P(this._element).is(":visible")&&"hidden"!==P(this._element).css("visibility")&&this.next()},t.prev=function(){this._isSliding||this._slide(F)},t.pause=function(t){t||(this._isPaused=!0),this._element.querySelector(et)&&(Fn.triggerTransitionEnd(this._element),this.cycle(!0)),clearInterval(this._interval),this._interval=null},t.cycle=function(t){t||(this._isPaused=!1),this._interval&&(clearInterval(this._interval),this._interval=null),this._config.interval&&!this._isPaused&&(this._interval=setInterval((document.visibilityState?this.nextWhenVisible:this.next).bind(this),this._config.interval))},t.to=function(t){var e=this;this._activeElement=this._element.querySelector(X);var n=this._getItemIndex(this._activeElement);if(!(t>this._items.length-1||t<0))if(this._isSliding)P(this._element).one(Q.SLID,function(){return e.to(t)});else{if(n===t)return this.pause(),void this.cycle();var i=n<t?q:F;this._slide(i,this._items[t])}},t.dispose=function(){P(this._element).off(L),P.removeData(this._element,H),this._items=null,this._config=null,this._element=null,this._interval=null,this._isPaused=null,this._isSliding=null,this._activeElement=null,this._indicatorsElement=null},t._getConfig=function(t){return t=l({},W,t),Fn.typeCheckConfig(j,t,U),t},t._addEventListeners=function(){var e=this;this._config.keyboard&&P(this._element).on(Q.KEYDOWN,function(t){return e._keydown(t)}),"hover"===this._config.pause&&(P(this._element).on(Q.MOUSEENTER,function(t){return e.pause(t)}).on(Q.MOUSELEAVE,function(t){return e.cycle(t)}),"ontouchstart"in document.documentElement&&P(this._element).on(Q.TOUCHEND,function(){e.pause(),e.touchTimeout&&clearTimeout(e.touchTimeout),e.touchTimeout=setTimeout(function(t){return e.cycle(t)},500+e._config.interval)}))},t._keydown=function(t){if(!/input|textarea/i.test(t.target.tagName))switch(t.which){case 37:t.preventDefault(),this.prev();break;case 39:t.preventDefault(),this.next()}},t._getItemIndex=function(t){return this._items=t&&t.parentNode?[].slice.call(t.parentNode.querySelectorAll(tt)):[],this._items.indexOf(t)},t._getItemByDirection=function(t,e){var n=t===q,i=t===F,r=this._getItemIndex(e),o=this._items.length-1;if((i&&0===r||n&&r===o)&&!this._config.wrap)return e;var s=(r+(t===F?-1:1))%this._items.length;return-1===s?this._items[this._items.length-1]:this._items[s]},t._triggerSlideEvent=function(t,e){var n=this._getItemIndex(t),i=this._getItemIndex(this._element.querySelector(X)),r=P.Event(Q.SLIDE,{relatedTarget:t,direction:e,from:i,to:n});return P(this._element).trigger(r),r},t._setActiveIndicatorElement=function(t){if(this._indicatorsElement){var e=[].slice.call(this._indicatorsElement.querySelectorAll($));P(e).removeClass(V);var n=this._indicatorsElement.children[this._getItemIndex(t)];n&&P(n).addClass(V)}},t._slide=function(t,e){var n,i,r,o=this,s=this._element.querySelector(X),a=this._getItemIndex(s),l=e||s&&this._getItemByDirection(t,s),c=this._getItemIndex(l),h=Boolean(this._interval);if(t===q?(n=J,i=Z,r=K):(n=z,i=G,r=M),l&&P(l).hasClass(V))this._isSliding=!1;else if(!this._triggerSlideEvent(l,r).isDefaultPrevented()&&s&&l){this._isSliding=!0,h&&this.pause(),this._setActiveIndicatorElement(l);var u=P.Event(Q.SLID,{relatedTarget:l,direction:r,from:a,to:c});if(P(this._element).hasClass(Y)){P(l).addClass(i),Fn.reflow(l),P(s).addClass(n),P(l).addClass(n);var f=Fn.getTransitionDurationFromElement(s);P(s).one(Fn.TRANSITION_END,function(){P(l).removeClass(n+" "+i).addClass(V),P(s).removeClass(V+" "+i+" "+n),o._isSliding=!1,setTimeout(function(){return P(o._element).trigger(u)},0)}).emulateTransitionEnd(f)}else P(s).removeClass(V),P(l).addClass(V),this._isSliding=!1,P(this._element).trigger(u);h&&this.cycle()}},o._jQueryInterface=function(i){return this.each(function(){var t=P(this).data(H),e=l({},W,P(this).data());"object"==typeof i&&(e=l({},e,i));var n="string"==typeof i?i:e.slide;if(t||(t=new o(this,e),P(this).data(H,t)),"number"==typeof i)t.to(i);else if("string"==typeof n){if("undefined"==typeof t[n])throw new TypeError('No method named "'+n+'"');t[n]()}else e.interval&&(t.pause(),t.cycle())})},o._dataApiClickHandler=function(t){var e=Fn.getSelectorFromElement(this);if(e){var n=P(e)[0];if(n&&P(n).hasClass(B)){var i=l({},P(n).data(),P(this).data()),r=this.getAttribute("data-slide-to");r&&(i.interval=!1),o._jQueryInterface.call(P(n),i),r&&P(n).data(H).to(r),t.preventDefault()}}},s(o,null,[{key:"VERSION",get:function(){return"4.1.3"}},{key:"Default",get:function(){return W}}]),o}(),P(document).on(Q.CLICK_DATA_API,it,ot._dataApiClickHandler),P(window).on(Q.LOAD_DATA_API,function(){for(var t=[].slice.call(document.querySelectorAll(rt)),e=0,n=t.length;e<n;e++){var i=P(t[e]);ot._jQueryInterface.call(i,i.data())}}),P.fn[j]=ot._jQueryInterface,P.fn[j].Constructor=ot,P.fn[j].noConflict=function(){return P.fn[j]=x,ot._jQueryInterface},ot),Bn=(at="collapse",ct="."+(lt="bs.collapse"),ht=(st=e).fn[at],ut={toggle:!0,parent:""},ft={toggle:"boolean",parent:"(string|element)"},dt={SHOW:"show"+ct,SHOWN:"shown"+ct,HIDE:"hide"+ct,HIDDEN:"hidden"+ct,CLICK_DATA_API:"click"+ct+".data-api"},gt="show",_t="collapse",mt="collapsing",pt="collapsed",vt="width",yt="height",Et=".show, .collapsing",Ct='[data-toggle="collapse"]',Tt=function(){function a(e,t){this._isTransitioning=!1,this._element=e,this._config=this._getConfig(t),this._triggerArray=st.makeArray(document.querySelectorAll('[data-toggle="collapse"][href="#'+e.id+'"],[data-toggle="collapse"][data-target="#'+e.id+'"]'));for(var n=[].slice.call(document.querySelectorAll(Ct)),i=0,r=n.length;i<r;i++){var o=n[i],s=Fn.getSelectorFromElement(o),a=[].slice.call(document.querySelectorAll(s)).filter(function(t){return t===e});null!==s&&0<a.length&&(this._selector=s,this._triggerArray.push(o))}this._parent=this._config.parent?this._getParent():null,this._config.parent||this._addAriaAndCollapsedClass(this._element,this._triggerArray),this._config.toggle&&this.toggle()}var t=a.prototype;return t.toggle=function(){st(this._element).hasClass(gt)?this.hide():this.show()},t.show=function(){var t,e,n=this;if(!this._isTransitioning&&!st(this._element).hasClass(gt)&&(this._parent&&0===(t=[].slice.call(this._parent.querySelectorAll(Et)).filter(function(t){return t.getAttribute("data-parent")===n._config.parent})).length&&(t=null),!(t&&(e=st(t).not(this._selector).data(lt))&&e._isTransitioning))){var i=st.Event(dt.SHOW);if(st(this._element).trigger(i),!i.isDefaultPrevented()){t&&(a._jQueryInterface.call(st(t).not(this._selector),"hide"),e||st(t).data(lt,null));var r=this._getDimension();st(this._element).removeClass(_t).addClass(mt),this._element.style[r]=0,this._triggerArray.length&&st(this._triggerArray).removeClass(pt).attr("aria-expanded",!0),this.setTransitioning(!0);var o="scroll"+(r[0].toUpperCase()+r.slice(1)),s=Fn.getTransitionDurationFromElement(this._element);st(this._element).one(Fn.TRANSITION_END,function(){st(n._element).removeClass(mt).addClass(_t).addClass(gt),n._element.style[r]="",n.setTransitioning(!1),st(n._element).trigger(dt.SHOWN)}).emulateTransitionEnd(s),this._element.style[r]=this._element[o]+"px"}}},t.hide=function(){var t=this;if(!this._isTransitioning&&st(this._element).hasClass(gt)){var e=st.Event(dt.HIDE);if(st(this._element).trigger(e),!e.isDefaultPrevented()){var n=this._getDimension();this._element.style[n]=this._element.getBoundingClientRect()[n]+"px",Fn.reflow(this._element),st(this._element).addClass(mt).removeClass(_t).removeClass(gt);var i=this._triggerArray.length;if(0<i)for(var r=0;r<i;r++){var o=this._triggerArray[r],s=Fn.getSelectorFromElement(o);if(null!==s)st([].slice.call(document.querySelectorAll(s))).hasClass(gt)||st(o).addClass(pt).attr("aria-expanded",!1)}this.setTransitioning(!0);this._element.style[n]="";var a=Fn.getTransitionDurationFromElement(this._element);st(this._element).one(Fn.TRANSITION_END,function(){t.setTransitioning(!1),st(t._element).removeClass(mt).addClass(_t).trigger(dt.HIDDEN)}).emulateTransitionEnd(a)}}},t.setTransitioning=function(t){this._isTransitioning=t},t.dispose=function(){st.removeData(this._element,lt),this._config=null,this._parent=null,this._element=null,this._triggerArray=null,this._isTransitioning=null},t._getConfig=function(t){return(t=l({},ut,t)).toggle=Boolean(t.toggle),Fn.typeCheckConfig(at,t,ft),t},t._getDimension=function(){return st(this._element).hasClass(vt)?vt:yt},t._getParent=function(){var n=this,t=null;Fn.isElement(this._config.parent)?(t=this._config.parent,"undefined"!=typeof this._config.parent.jquery&&(t=this._config.parent[0])):t=document.querySelector(this._config.parent);var e='[data-toggle="collapse"][data-parent="'+this._config.parent+'"]',i=[].slice.call(t.querySelectorAll(e));return st(i).each(function(t,e){n._addAriaAndCollapsedClass(a._getTargetFromElement(e),[e])}),t},t._addAriaAndCollapsedClass=function(t,e){if(t){var n=st(t).hasClass(gt);e.length&&st(e).toggleClass(pt,!n).attr("aria-expanded",n)}},a._getTargetFromElement=function(t){var e=Fn.getSelectorFromElement(t);return e?document.querySelector(e):null},a._jQueryInterface=function(i){return this.each(function(){var t=st(this),e=t.data(lt),n=l({},ut,t.data(),"object"==typeof i&&i?i:{});if(!e&&n.toggle&&/show|hide/.test(i)&&(n.toggle=!1),e||(e=new a(this,n),t.data(lt,e)),"string"==typeof i){if("undefined"==typeof e[i])throw new TypeError('No method named "'+i+'"');e[i]()}})},s(a,null,[{key:"VERSION",get:function(){return"4.1.3"}},{key:"Default",get:function(){return ut}}]),a}(),st(document).on(dt.CLICK_DATA_API,Ct,function(t){"A"===t.currentTarget.tagName&&t.preventDefault();var n=st(this),e=Fn.getSelectorFromElement(this),i=[].slice.call(document.querySelectorAll(e));st(i).each(function(){var t=st(this),e=t.data(lt)?"toggle":n.data();Tt._jQueryInterface.call(t,e)})}),st.fn[at]=Tt._jQueryInterface,st.fn[at].Constructor=Tt,st.fn[at].noConflict=function(){return st.fn[at]=ht,Tt._jQueryInterface},Tt),Vn=(St="dropdown",At="."+(It="bs.dropdown"),Dt=".data-api",wt=(bt=e).fn[St],Nt=new RegExp("38|40|27"),Ot={HIDE:"hide"+At,HIDDEN:"hidden"+At,SHOW:"show"+At,SHOWN:"shown"+At,CLICK:"click"+At,CLICK_DATA_API:"click"+At+Dt,KEYDOWN_DATA_API:"keydown"+At+Dt,KEYUP_DATA_API:"keyup"+At+Dt},kt="disabled",Pt="show",jt="dropup",Ht="dropright",Lt="dropleft",Rt="dropdown-menu-right",xt="position-static",Wt='[data-toggle="dropdown"]',Ut=".dropdown form",qt=".dropdown-menu",Ft=".navbar-nav",Kt=".dropdown-menu .dropdown-item:not(.disabled):not(:disabled)",Mt="top-start",Qt="top-end",Bt="bottom-start",Vt="bottom-end",Yt="right-start",zt="left-start",Jt={offset:0,flip:!0,boundary:"scrollParent",reference:"toggle",display:"dynamic"},Zt={offset:"(number|string|function)",flip:"boolean",boundary:"(string|element)",reference:"(string|element)",display:"string"},Gt=function(){function c(t,e){this._element=t,this._popper=null,this._config=this._getConfig(e),this._menu=this._getMenuElement(),this._inNavbar=this._detectNavbar(),this._addEventListeners()}var t=c.prototype;return t.toggle=function(){if(!this._element.disabled&&!bt(this._element).hasClass(kt)){var t=c._getParentFromElement(this._element),e=bt(this._menu).hasClass(Pt);if(c._clearMenus(),!e){var n={relatedTarget:this._element},i=bt.Event(Ot.SHOW,n);if(bt(t).trigger(i),!i.isDefaultPrevented()){if(!this._inNavbar){if("undefined"==typeof h)throw new TypeError("Bootstrap dropdown require Popper.js (https://popper.js.org)");var r=this._element;"parent"===this._config.reference?r=t:Fn.isElement(this._config.reference)&&(r=this._config.reference,"undefined"!=typeof this._config.reference.jquery&&(r=this._config.reference[0])),"scrollParent"!==this._config.boundary&&bt(t).addClass(xt),this._popper=new h(r,this._menu,this._getPopperConfig())}"ontouchstart"in document.documentElement&&0===bt(t).closest(Ft).length&&bt(document.body).children().on("mouseover",null,bt.noop),this._element.focus(),this._element.setAttribute("aria-expanded",!0),bt(this._menu).toggleClass(Pt),bt(t).toggleClass(Pt).trigger(bt.Event(Ot.SHOWN,n))}}}},t.dispose=function(){bt.removeData(this._element,It),bt(this._element).off(At),this._element=null,(this._menu=null)!==this._popper&&(this._popper.destroy(),this._popper=null)},t.update=function(){this._inNavbar=this._detectNavbar(),null!==this._popper&&this._popper.scheduleUpdate()},t._addEventListeners=function(){var e=this;bt(this._element).on(Ot.CLICK,function(t){t.preventDefault(),t.stopPropagation(),e.toggle()})},t._getConfig=function(t){return t=l({},this.constructor.Default,bt(this._element).data(),t),Fn.typeCheckConfig(St,t,this.constructor.DefaultType),t},t._getMenuElement=function(){if(!this._menu){var t=c._getParentFromElement(this._element);t&&(this._menu=t.querySelector(qt))}return this._menu},t._getPlacement=function(){var t=bt(this._element.parentNode),e=Bt;return t.hasClass(jt)?(e=Mt,bt(this._menu).hasClass(Rt)&&(e=Qt)):t.hasClass(Ht)?e=Yt:t.hasClass(Lt)?e=zt:bt(this._menu).hasClass(Rt)&&(e=Vt),e},t._detectNavbar=function(){return 0<bt(this._element).closest(".navbar").length},t._getPopperConfig=function(){var e=this,t={};"function"==typeof this._config.offset?t.fn=function(t){return t.offsets=l({},t.offsets,e._config.offset(t.offsets)||{}),t}:t.offset=this._config.offset;var n={placement:this._getPlacement(),modifiers:{offset:t,flip:{enabled:this._config.flip},preventOverflow:{boundariesElement:this._config.boundary}}};return"static"===this._config.display&&(n.modifiers.applyStyle={enabled:!1}),n},c._jQueryInterface=function(e){return this.each(function(){var t=bt(this).data(It);if(t||(t=new c(this,"object"==typeof e?e:null),bt(this).data(It,t)),"string"==typeof e){if("undefined"==typeof t[e])throw new TypeError('No method named "'+e+'"');t[e]()}})},c._clearMenus=function(t){if(!t||3!==t.which&&("keyup"!==t.type||9===t.which))for(var e=[].slice.call(document.querySelectorAll(Wt)),n=0,i=e.length;n<i;n++){var r=c._getParentFromElement(e[n]),o=bt(e[n]).data(It),s={relatedTarget:e[n]};if(t&&"click"===t.type&&(s.clickEvent=t),o){var a=o._menu;if(bt(r).hasClass(Pt)&&!(t&&("click"===t.type&&/input|textarea/i.test(t.target.tagName)||"keyup"===t.type&&9===t.which)&&bt.contains(r,t.target))){var l=bt.Event(Ot.HIDE,s);bt(r).trigger(l),l.isDefaultPrevented()||("ontouchstart"in document.documentElement&&bt(document.body).children().off("mouseover",null,bt.noop),e[n].setAttribute("aria-expanded","false"),bt(a).removeClass(Pt),bt(r).removeClass(Pt).trigger(bt.Event(Ot.HIDDEN,s)))}}}},c._getParentFromElement=function(t){var e,n=Fn.getSelectorFromElement(t);return n&&(e=document.querySelector(n)),e||t.parentNode},c._dataApiKeydownHandler=function(t){if((/input|textarea/i.test(t.target.tagName)?!(32===t.which||27!==t.which&&(40!==t.which&&38!==t.which||bt(t.target).closest(qt).length)):Nt.test(t.which))&&(t.preventDefault(),t.stopPropagation(),!this.disabled&&!bt(this).hasClass(kt))){var e=c._getParentFromElement(this),n=bt(e).hasClass(Pt);if((n||27===t.which&&32===t.which)&&(!n||27!==t.which&&32!==t.which)){var i=[].slice.call(e.querySelectorAll(Kt));if(0!==i.length){var r=i.indexOf(t.target);38===t.which&&0<r&&r--,40===t.which&&r<i.length-1&&r++,r<0&&(r=0),i[r].focus()}}else{if(27===t.which){var o=e.querySelector(Wt);bt(o).trigger("focus")}bt(this).trigger("click")}}},s(c,null,[{key:"VERSION",get:function(){return"4.1.3"}},{key:"Default",get:function(){return Jt}},{key:"DefaultType",get:function(){return Zt}}]),c}(),bt(document).on(Ot.KEYDOWN_DATA_API,Wt,Gt._dataApiKeydownHandler).on(Ot.KEYDOWN_DATA_API,qt,Gt._dataApiKeydownHandler).on(Ot.CLICK_DATA_API+" "+Ot.KEYUP_DATA_API,Gt._clearMenus).on(Ot.CLICK_DATA_API,Wt,function(t){t.preventDefault(),t.stopPropagation(),Gt._jQueryInterface.call(bt(this),"toggle")}).on(Ot.CLICK_DATA_API,Ut,function(t){t.stopPropagation()}),bt.fn[St]=Gt._jQueryInterface,bt.fn[St].Constructor=Gt,bt.fn[St].noConflict=function(){return bt.fn[St]=wt,Gt._jQueryInterface},Gt),Yn=(Xt="modal",ee="."+(te="bs.modal"),ne=($t=e).fn[Xt],ie={backdrop:!0,keyboard:!0,focus:!0,show:!0},re={backdrop:"(boolean|string)",keyboard:"boolean",focus:"boolean",show:"boolean"},oe={HIDE:"hide"+ee,HIDDEN:"hidden"+ee,SHOW:"show"+ee,SHOWN:"shown"+ee,FOCUSIN:"focusin"+ee,RESIZE:"resize"+ee,CLICK_DISMISS:"click.dismiss"+ee,KEYDOWN_DISMISS:"keydown.dismiss"+ee,MOUSEUP_DISMISS:"mouseup.dismiss"+ee,MOUSEDOWN_DISMISS:"mousedown.dismiss"+ee,CLICK_DATA_API:"click"+ee+".data-api"},se="modal-scrollbar-measure",ae="modal-backdrop",le="modal-open",ce="fade",he="show",ue=".modal-dialog",fe='[data-toggle="modal"]',de='[data-dismiss="modal"]',ge=".fixed-top, .fixed-bottom, .is-fixed, .sticky-top",_e=".sticky-top",me=function(){function r(t,e){this._config=this._getConfig(e),this._element=t,this._dialog=t.querySelector(ue),this._backdrop=null,this._isShown=!1,this._isBodyOverflowing=!1,this._ignoreBackdropClick=!1,this._scrollbarWidth=0}var t=r.prototype;return t.toggle=function(t){return this._isShown?this.hide():this.show(t)},t.show=function(t){var e=this;if(!this._isTransitioning&&!this._isShown){$t(this._element).hasClass(ce)&&(this._isTransitioning=!0);var n=$t.Event(oe.SHOW,{relatedTarget:t});$t(this._element).trigger(n),this._isShown||n.isDefaultPrevented()||(this._isShown=!0,this._checkScrollbar(),this._setScrollbar(),this._adjustDialog(),$t(document.body).addClass(le),this._setEscapeEvent(),this._setResizeEvent(),$t(this._element).on(oe.CLICK_DISMISS,de,function(t){return e.hide(t)}),$t(this._dialog).on(oe.MOUSEDOWN_DISMISS,function(){$t(e._element).one(oe.MOUSEUP_DISMISS,function(t){$t(t.target).is(e._element)&&(e._ignoreBackdropClick=!0)})}),this._showBackdrop(function(){return e._showElement(t)}))}},t.hide=function(t){var e=this;if(t&&t.preventDefault(),!this._isTransitioning&&this._isShown){var n=$t.Event(oe.HIDE);if($t(this._element).trigger(n),this._isShown&&!n.isDefaultPrevented()){this._isShown=!1;var i=$t(this._element).hasClass(ce);if(i&&(this._isTransitioning=!0),this._setEscapeEvent(),this._setResizeEvent(),$t(document).off(oe.FOCUSIN),$t(this._element).removeClass(he),$t(this._element).off(oe.CLICK_DISMISS),$t(this._dialog).off(oe.MOUSEDOWN_DISMISS),i){var r=Fn.getTransitionDurationFromElement(this._element);$t(this._element).one(Fn.TRANSITION_END,function(t){return e._hideModal(t)}).emulateTransitionEnd(r)}else this._hideModal()}}},t.dispose=function(){$t.removeData(this._element,te),$t(window,document,this._element,this._backdrop).off(ee),this._config=null,this._element=null,this._dialog=null,this._backdrop=null,this._isShown=null,this._isBodyOverflowing=null,this._ignoreBackdropClick=null,this._scrollbarWidth=null},t.handleUpdate=function(){this._adjustDialog()},t._getConfig=function(t){return t=l({},ie,t),Fn.typeCheckConfig(Xt,t,re),t},t._showElement=function(t){var e=this,n=$t(this._element).hasClass(ce);this._element.parentNode&&this._element.parentNode.nodeType===Node.ELEMENT_NODE||document.body.appendChild(this._element),this._element.style.display="block",this._element.removeAttribute("aria-hidden"),this._element.scrollTop=0,n&&Fn.reflow(this._element),$t(this._element).addClass(he),this._config.focus&&this._enforceFocus();var i=$t.Event(oe.SHOWN,{relatedTarget:t}),r=function(){e._config.focus&&e._element.focus(),e._isTransitioning=!1,$t(e._element).trigger(i)};if(n){var o=Fn.getTransitionDurationFromElement(this._element);$t(this._dialog).one(Fn.TRANSITION_END,r).emulateTransitionEnd(o)}else r()},t._enforceFocus=function(){var e=this;$t(document).off(oe.FOCUSIN).on(oe.FOCUSIN,function(t){document!==t.target&&e._element!==t.target&&0===$t(e._element).has(t.target).length&&e._element.focus()})},t._setEscapeEvent=function(){var e=this;this._isShown&&this._config.keyboard?$t(this._element).on(oe.KEYDOWN_DISMISS,function(t){27===t.which&&(t.preventDefault(),e.hide())}):this._isShown||$t(this._element).off(oe.KEYDOWN_DISMISS)},t._setResizeEvent=function(){var e=this;this._isShown?$t(window).on(oe.RESIZE,function(t){return e.handleUpdate(t)}):$t(window).off(oe.RESIZE)},t._hideModal=function(){var t=this;this._element.style.display="none",this._element.setAttribute("aria-hidden",!0),this._isTransitioning=!1,this._showBackdrop(function(){$t(document.body).removeClass(le),t._resetAdjustments(),t._resetScrollbar(),$t(t._element).trigger(oe.HIDDEN)})},t._removeBackdrop=function(){this._backdrop&&($t(this._backdrop).remove(),this._backdrop=null)},t._showBackdrop=function(t){var e=this,n=$t(this._element).hasClass(ce)?ce:"";if(this._isShown&&this._config.backdrop){if(this._backdrop=document.createElement("div"),this._backdrop.className=ae,n&&this._backdrop.classList.add(n),$t(this._backdrop).appendTo(document.body),$t(this._element).on(oe.CLICK_DISMISS,function(t){e._ignoreBackdropClick?e._ignoreBackdropClick=!1:t.target===t.currentTarget&&("static"===e._config.backdrop?e._element.focus():e.hide())}),n&&Fn.reflow(this._backdrop),$t(this._backdrop).addClass(he),!t)return;if(!n)return void t();var i=Fn.getTransitionDurationFromElement(this._backdrop);$t(this._backdrop).one(Fn.TRANSITION_END,t).emulateTransitionEnd(i)}else if(!this._isShown&&this._backdrop){$t(this._backdrop).removeClass(he);var r=function(){e._removeBackdrop(),t&&t()};if($t(this._element).hasClass(ce)){var o=Fn.getTransitionDurationFromElement(this._backdrop);$t(this._backdrop).one(Fn.TRANSITION_END,r).emulateTransitionEnd(o)}else r()}else t&&t()},t._adjustDialog=function(){var t=this._element.scrollHeight>document.documentElement.clientHeight;!this._isBodyOverflowing&&t&&(this._element.style.paddingLeft=this._scrollbarWidth+"px"),this._isBodyOverflowing&&!t&&(this._element.style.paddingRight=this._scrollbarWidth+"px")},t._resetAdjustments=function(){this._element.style.paddingLeft="",this._element.style.paddingRight=""},t._checkScrollbar=function(){var t=document.body.getBoundingClientRect();this._isBodyOverflowing=t.left+t.right<window.innerWidth,this._scrollbarWidth=this._getScrollbarWidth()},t._setScrollbar=function(){var r=this;if(this._isBodyOverflowing){var t=[].slice.call(document.querySelectorAll(ge)),e=[].slice.call(document.querySelectorAll(_e));$t(t).each(function(t,e){var n=e.style.paddingRight,i=$t(e).css("padding-right");$t(e).data("padding-right",n).css("padding-right",parseFloat(i)+r._scrollbarWidth+"px")}),$t(e).each(function(t,e){var n=e.style.marginRight,i=$t(e).css("margin-right");$t(e).data("margin-right",n).css("margin-right",parseFloat(i)-r._scrollbarWidth+"px")});var n=document.body.style.paddingRight,i=$t(document.body).css("padding-right");$t(document.body).data("padding-right",n).css("padding-right",parseFloat(i)+this._scrollbarWidth+"px")}},t._resetScrollbar=function(){var t=[].slice.call(document.querySelectorAll(ge));$t(t).each(function(t,e){var n=$t(e).data("padding-right");$t(e).removeData("padding-right"),e.style.paddingRight=n||""});var e=[].slice.call(document.querySelectorAll(""+_e));$t(e).each(function(t,e){var n=$t(e).data("margin-right");"undefined"!=typeof n&&$t(e).css("margin-right",n).removeData("margin-right")});var n=$t(document.body).data("padding-right");$t(document.body).removeData("padding-right"),document.body.style.paddingRight=n||""},t._getScrollbarWidth=function(){var t=document.createElement("div");t.className=se,document.body.appendChild(t);var e=t.getBoundingClientRect().width-t.clientWidth;return document.body.removeChild(t),e},r._jQueryInterface=function(n,i){return this.each(function(){var t=$t(this).data(te),e=l({},ie,$t(this).data(),"object"==typeof n&&n?n:{});if(t||(t=new r(this,e),$t(this).data(te,t)),"string"==typeof n){if("undefined"==typeof t[n])throw new TypeError('No method named "'+n+'"');t[n](i)}else e.show&&t.show(i)})},s(r,null,[{key:"VERSION",get:function(){return"4.1.3"}},{key:"Default",get:function(){return ie}}]),r}(),$t(document).on(oe.CLICK_DATA_API,fe,function(t){var e,n=this,i=Fn.getSelectorFromElement(this);i&&(e=document.querySelector(i));var r=$t(e).data(te)?"toggle":l({},$t(e).data(),$t(this).data());"A"!==this.tagName&&"AREA"!==this.tagName||t.preventDefault();var o=$t(e).one(oe.SHOW,function(t){t.isDefaultPrevented()||o.one(oe.HIDDEN,function(){$t(n).is(":visible")&&n.focus()})});me._jQueryInterface.call($t(e),r,this)}),$t.fn[Xt]=me._jQueryInterface,$t.fn[Xt].Constructor=me,$t.fn[Xt].noConflict=function(){return $t.fn[Xt]=ne,me._jQueryInterface},me),zn=(ve="tooltip",Ee="."+(ye="bs.tooltip"),Ce=(pe=e).fn[ve],Te="bs-tooltip",be=new RegExp("(^|\\s)"+Te+"\\S+","g"),Ae={animation:!0,template:'<div class="tooltip" role="tooltip"><div class="arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover focus",title:"",delay:0,html:!(Ie={AUTO:"auto",TOP:"top",RIGHT:"right",BOTTOM:"bottom",LEFT:"left"}),selector:!(Se={animation:"boolean",template:"string",title:"(string|element|function)",trigger:"string",delay:"(number|object)",html:"boolean",selector:"(string|boolean)",placement:"(string|function)",offset:"(number|string)",container:"(string|element|boolean)",fallbackPlacement:"(string|array)",boundary:"(string|element)"}),placement:"top",offset:0,container:!1,fallbackPlacement:"flip",boundary:"scrollParent"},we="out",Ne={HIDE:"hide"+Ee,HIDDEN:"hidden"+Ee,SHOW:(De="show")+Ee,SHOWN:"shown"+Ee,INSERTED:"inserted"+Ee,CLICK:"click"+Ee,FOCUSIN:"focusin"+Ee,FOCUSOUT:"focusout"+Ee,MOUSEENTER:"mouseenter"+Ee,MOUSELEAVE:"mouseleave"+Ee},Oe="fade",ke="show",Pe=".tooltip-inner",je=".arrow",He="hover",Le="focus",Re="click",xe="manual",We=function(){function i(t,e){if("undefined"==typeof h)throw new TypeError("Bootstrap tooltips require Popper.js (https://popper.js.org)");this._isEnabled=!0,this._timeout=0,this._hoverState="",this._activeTrigger={},this._popper=null,this.element=t,this.config=this._getConfig(e),this.tip=null,this._setListeners()}var t=i.prototype;return t.enable=function(){this._isEnabled=!0},t.disable=function(){this._isEnabled=!1},t.toggleEnabled=function(){this._isEnabled=!this._isEnabled},t.toggle=function(t){if(this._isEnabled)if(t){var e=this.constructor.DATA_KEY,n=pe(t.currentTarget).data(e);n||(n=new this.constructor(t.currentTarget,this._getDelegateConfig()),pe(t.currentTarget).data(e,n)),n._activeTrigger.click=!n._activeTrigger.click,n._isWithActiveTrigger()?n._enter(null,n):n._leave(null,n)}else{if(pe(this.getTipElement()).hasClass(ke))return void this._leave(null,this);this._enter(null,this)}},t.dispose=function(){clearTimeout(this._timeout),pe.removeData(this.element,this.constructor.DATA_KEY),pe(this.element).off(this.constructor.EVENT_KEY),pe(this.element).closest(".modal").off("hide.bs.modal"),this.tip&&pe(this.tip).remove(),this._isEnabled=null,this._timeout=null,this._hoverState=null,(this._activeTrigger=null)!==this._popper&&this._popper.destroy(),this._popper=null,this.element=null,this.config=null,this.tip=null},t.show=function(){var e=this;if("none"===pe(this.element).css("display"))throw new Error("Please use show on visible elements");var t=pe.Event(this.constructor.Event.SHOW);if(this.isWithContent()&&this._isEnabled){pe(this.element).trigger(t);var n=pe.contains(this.element.ownerDocument.documentElement,this.element);if(t.isDefaultPrevented()||!n)return;var i=this.getTipElement(),r=Fn.getUID(this.constructor.NAME);i.setAttribute("id",r),this.element.setAttribute("aria-describedby",r),this.setContent(),this.config.animation&&pe(i).addClass(Oe);var o="function"==typeof this.config.placement?this.config.placement.call(this,i,this.element):this.config.placement,s=this._getAttachment(o);this.addAttachmentClass(s);var a=!1===this.config.container?document.body:pe(document).find(this.config.container);pe(i).data(this.constructor.DATA_KEY,this),pe.contains(this.element.ownerDocument.documentElement,this.tip)||pe(i).appendTo(a),pe(this.element).trigger(this.constructor.Event.INSERTED),this._popper=new h(this.element,i,{placement:s,modifiers:{offset:{offset:this.config.offset},flip:{behavior:this.config.fallbackPlacement},arrow:{element:je},preventOverflow:{boundariesElement:this.config.boundary}},onCreate:function(t){t.originalPlacement!==t.placement&&e._handlePopperPlacementChange(t)},onUpdate:function(t){e._handlePopperPlacementChange(t)}}),pe(i).addClass(ke),"ontouchstart"in document.documentElement&&pe(document.body).children().on("mouseover",null,pe.noop);var l=function(){e.config.animation&&e._fixTransition();var t=e._hoverState;e._hoverState=null,pe(e.element).trigger(e.constructor.Event.SHOWN),t===we&&e._leave(null,e)};if(pe(this.tip).hasClass(Oe)){var c=Fn.getTransitionDurationFromElement(this.tip);pe(this.tip).one(Fn.TRANSITION_END,l).emulateTransitionEnd(c)}else l()}},t.hide=function(t){var e=this,n=this.getTipElement(),i=pe.Event(this.constructor.Event.HIDE),r=function(){e._hoverState!==De&&n.parentNode&&n.parentNode.removeChild(n),e._cleanTipClass(),e.element.removeAttribute("aria-describedby"),pe(e.element).trigger(e.constructor.Event.HIDDEN),null!==e._popper&&e._popper.destroy(),t&&t()};if(pe(this.element).trigger(i),!i.isDefaultPrevented()){if(pe(n).removeClass(ke),"ontouchstart"in document.documentElement&&pe(document.body).children().off("mouseover",null,pe.noop),this._activeTrigger[Re]=!1,this._activeTrigger[Le]=!1,this._activeTrigger[He]=!1,pe(this.tip).hasClass(Oe)){var o=Fn.getTransitionDurationFromElement(n);pe(n).one(Fn.TRANSITION_END,r).emulateTransitionEnd(o)}else r();this._hoverState=""}},t.update=function(){null!==this._popper&&this._popper.scheduleUpdate()},t.isWithContent=function(){return Boolean(this.getTitle())},t.addAttachmentClass=function(t){pe(this.getTipElement()).addClass(Te+"-"+t)},t.getTipElement=function(){return this.tip=this.tip||pe(this.config.template)[0],this.tip},t.setContent=function(){var t=this.getTipElement();this.setElementContent(pe(t.querySelectorAll(Pe)),this.getTitle()),pe(t).removeClass(Oe+" "+ke)},t.setElementContent=function(t,e){var n=this.config.html;"object"==typeof e&&(e.nodeType||e.jquery)?n?pe(e).parent().is(t)||t.empty().append(e):t.text(pe(e).text()):t[n?"html":"text"](e)},t.getTitle=function(){var t=this.element.getAttribute("data-original-title");return t||(t="function"==typeof this.config.title?this.config.title.call(this.element):this.config.title),t},t._getAttachment=function(t){return Ie[t.toUpperCase()]},t._setListeners=function(){var i=this;this.config.trigger.split(" ").forEach(function(t){if("click"===t)pe(i.element).on(i.constructor.Event.CLICK,i.config.selector,function(t){return i.toggle(t)});else if(t!==xe){var e=t===He?i.constructor.Event.MOUSEENTER:i.constructor.Event.FOCUSIN,n=t===He?i.constructor.Event.MOUSELEAVE:i.constructor.Event.FOCUSOUT;pe(i.element).on(e,i.config.selector,function(t){return i._enter(t)}).on(n,i.config.selector,function(t){return i._leave(t)})}pe(i.element).closest(".modal").on("hide.bs.modal",function(){return i.hide()})}),this.config.selector?this.config=l({},this.config,{trigger:"manual",selector:""}):this._fixTitle()},t._fixTitle=function(){var t=typeof this.element.getAttribute("data-original-title");(this.element.getAttribute("title")||"string"!==t)&&(this.element.setAttribute("data-original-title",this.element.getAttribute("title")||""),this.element.setAttribute("title",""))},t._enter=function(t,e){var n=this.constructor.DATA_KEY;(e=e||pe(t.currentTarget).data(n))||(e=new this.constructor(t.currentTarget,this._getDelegateConfig()),pe(t.currentTarget).data(n,e)),t&&(e._activeTrigger["focusin"===t.type?Le:He]=!0),pe(e.getTipElement()).hasClass(ke)||e._hoverState===De?e._hoverState=De:(clearTimeout(e._timeout),e._hoverState=De,e.config.delay&&e.config.delay.show?e._timeout=setTimeout(function(){e._hoverState===De&&e.show()},e.config.delay.show):e.show())},t._leave=function(t,e){var n=this.constructor.DATA_KEY;(e=e||pe(t.currentTarget).data(n))||(e=new this.constructor(t.currentTarget,this._getDelegateConfig()),pe(t.currentTarget).data(n,e)),t&&(e._activeTrigger["focusout"===t.type?Le:He]=!1),e._isWithActiveTrigger()||(clearTimeout(e._timeout),e._hoverState=we,e.config.delay&&e.config.delay.hide?e._timeout=setTimeout(function(){e._hoverState===we&&e.hide()},e.config.delay.hide):e.hide())},t._isWithActiveTrigger=function(){for(var t in this._activeTrigger)if(this._activeTrigger[t])return!0;return!1},t._getConfig=function(t){return"number"==typeof(t=l({},this.constructor.Default,pe(this.element).data(),"object"==typeof t&&t?t:{})).delay&&(t.delay={show:t.delay,hide:t.delay}),"number"==typeof t.title&&(t.title=t.title.toString()),"number"==typeof t.content&&(t.content=t.content.toString()),Fn.typeCheckConfig(ve,t,this.constructor.DefaultType),t},t._getDelegateConfig=function(){var t={};if(this.config)for(var e in this.config)this.constructor.Default[e]!==this.config[e]&&(t[e]=this.config[e]);return t},t._cleanTipClass=function(){var t=pe(this.getTipElement()),e=t.attr("class").match(be);null!==e&&e.length&&t.removeClass(e.join(""))},t._handlePopperPlacementChange=function(t){var e=t.instance;this.tip=e.popper,this._cleanTipClass(),this.addAttachmentClass(this._getAttachment(t.placement))},t._fixTransition=function(){var t=this.getTipElement(),e=this.config.animation;null===t.getAttribute("x-placement")&&(pe(t).removeClass(Oe),this.config.animation=!1,this.hide(),this.show(),this.config.animation=e)},i._jQueryInterface=function(n){return this.each(function(){var t=pe(this).data(ye),e="object"==typeof n&&n;if((t||!/dispose|hide/.test(n))&&(t||(t=new i(this,e),pe(this).data(ye,t)),"string"==typeof n)){if("undefined"==typeof t[n])throw new TypeError('No method named "'+n+'"');t[n]()}})},s(i,null,[{key:"VERSION",get:function(){return"4.1.3"}},{key:"Default",get:function(){return Ae}},{key:"NAME",get:function(){return ve}},{key:"DATA_KEY",get:function(){return ye}},{key:"Event",get:function(){return Ne}},{key:"EVENT_KEY",get:function(){return Ee}},{key:"DefaultType",get:function(){return Se}}]),i}(),pe.fn[ve]=We._jQueryInterface,pe.fn[ve].Constructor=We,pe.fn[ve].noConflict=function(){return pe.fn[ve]=Ce,We._jQueryInterface},We),Jn=(qe="popover",Ke="."+(Fe="bs.popover"),Me=(Ue=e).fn[qe],Qe="bs-popover",Be=new RegExp("(^|\\s)"+Qe+"\\S+","g"),Ve=l({},zn.Default,{placement:"right",trigger:"click",content:"",template:'<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-header"></h3><div class="popover-body"></div></div>'}),Ye=l({},zn.DefaultType,{content:"(string|element|function)"}),ze="fade",Ze=".popover-header",Ge=".popover-body",$e={HIDE:"hide"+Ke,HIDDEN:"hidden"+Ke,SHOW:(Je="show")+Ke,SHOWN:"shown"+Ke,INSERTED:"inserted"+Ke,CLICK:"click"+Ke,FOCUSIN:"focusin"+Ke,FOCUSOUT:"focusout"+Ke,MOUSEENTER:"mouseenter"+Ke,MOUSELEAVE:"mouseleave"+Ke},Xe=function(t){var e,n;function i(){return t.apply(this,arguments)||this}n=t,(e=i).prototype=Object.create(n.prototype),(e.prototype.constructor=e).__proto__=n;var r=i.prototype;return r.isWithContent=function(){return this.getTitle()||this._getContent()},r.addAttachmentClass=function(t){Ue(this.getTipElement()).addClass(Qe+"-"+t)},r.getTipElement=function(){return this.tip=this.tip||Ue(this.config.template)[0],this.tip},r.setContent=function(){var t=Ue(this.getTipElement());this.setElementContent(t.find(Ze),this.getTitle());var e=this._getContent();"function"==typeof e&&(e=e.call(this.element)),this.setElementContent(t.find(Ge),e),t.removeClass(ze+" "+Je)},r._getContent=function(){return this.element.getAttribute("data-content")||this.config.content},r._cleanTipClass=function(){var t=Ue(this.getTipElement()),e=t.attr("class").match(Be);null!==e&&0<e.length&&t.removeClass(e.join(""))},i._jQueryInterface=function(n){return this.each(function(){var t=Ue(this).data(Fe),e="object"==typeof n?n:null;if((t||!/destroy|hide/.test(n))&&(t||(t=new i(this,e),Ue(this).data(Fe,t)),"string"==typeof n)){if("undefined"==typeof t[n])throw new TypeError('No method named "'+n+'"');t[n]()}})},s(i,null,[{key:"VERSION",get:function(){return"4.1.3"}},{key:"Default",get:function(){return Ve}},{key:"NAME",get:function(){return qe}},{key:"DATA_KEY",get:function(){return Fe}},{key:"Event",get:function(){return $e}},{key:"EVENT_KEY",get:function(){return Ke}},{key:"DefaultType",get:function(){return Ye}}]),i}(zn),Ue.fn[qe]=Xe._jQueryInterface,Ue.fn[qe].Constructor=Xe,Ue.fn[qe].noConflict=function(){return Ue.fn[qe]=Me,Xe._jQueryInterface},Xe),Zn=(en="scrollspy",rn="."+(nn="bs.scrollspy"),on=(tn=e).fn[en],sn={offset:10,method:"auto",target:""},an={offset:"number",method:"string",target:"(string|element)"},ln={ACTIVATE:"activate"+rn,SCROLL:"scroll"+rn,LOAD_DATA_API:"load"+rn+".data-api"},cn="dropdown-item",hn="active",un='[data-spy="scroll"]',fn=".active",dn=".nav, .list-group",gn=".nav-link",_n=".nav-item",mn=".list-group-item",pn=".dropdown",vn=".dropdown-item",yn=".dropdown-toggle",En="offset",Cn="position",Tn=function(){function n(t,e){var n=this;this._element=t,this._scrollElement="BODY"===t.tagName?window:t,this._config=this._getConfig(e),this._selector=this._config.target+" "+gn+","+this._config.target+" "+mn+","+this._config.target+" "+vn,this._offsets=[],this._targets=[],this._activeTarget=null,this._scrollHeight=0,tn(this._scrollElement).on(ln.SCROLL,function(t){return n._process(t)}),this.refresh(),this._process()}var t=n.prototype;return t.refresh=function(){var e=this,t=this._scrollElement===this._scrollElement.window?En:Cn,r="auto"===this._config.method?t:this._config.method,o=r===Cn?this._getScrollTop():0;this._offsets=[],this._targets=[],this._scrollHeight=this._getScrollHeight(),[].slice.call(document.querySelectorAll(this._selector)).map(function(t){var e,n=Fn.getSelectorFromElement(t);if(n&&(e=document.querySelector(n)),e){var i=e.getBoundingClientRect();if(i.width||i.height)return[tn(e)[r]().top+o,n]}return null}).filter(function(t){return t}).sort(function(t,e){return t[0]-e[0]}).forEach(function(t){e._offsets.push(t[0]),e._targets.push(t[1])})},t.dispose=function(){tn.removeData(this._element,nn),tn(this._scrollElement).off(rn),this._element=null,this._scrollElement=null,this._config=null,this._selector=null,this._offsets=null,this._targets=null,this._activeTarget=null,this._scrollHeight=null},t._getConfig=function(t){if("string"!=typeof(t=l({},sn,"object"==typeof t&&t?t:{})).target){var e=tn(t.target).attr("id");e||(e=Fn.getUID(en),tn(t.target).attr("id",e)),t.target="#"+e}return Fn.typeCheckConfig(en,t,an),t},t._getScrollTop=function(){return this._scrollElement===window?this._scrollElement.pageYOffset:this._scrollElement.scrollTop},t._getScrollHeight=function(){return this._scrollElement.scrollHeight||Math.max(document.body.scrollHeight,document.documentElement.scrollHeight)},t._getOffsetHeight=function(){return this._scrollElement===window?window.innerHeight:this._scrollElement.getBoundingClientRect().height},t._process=function(){var t=this._getScrollTop()+this._config.offset,e=this._getScrollHeight(),n=this._config.offset+e-this._getOffsetHeight();if(this._scrollHeight!==e&&this.refresh(),n<=t){var i=this._targets[this._targets.length-1];this._activeTarget!==i&&this._activate(i)}else{if(this._activeTarget&&t<this._offsets[0]&&0<this._offsets[0])return this._activeTarget=null,void this._clear();for(var r=this._offsets.length;r--;){this._activeTarget!==this._targets[r]&&t>=this._offsets[r]&&("undefined"==typeof this._offsets[r+1]||t<this._offsets[r+1])&&this._activate(this._targets[r])}}},t._activate=function(e){this._activeTarget=e,this._clear();var t=this._selector.split(",");t=t.map(function(t){return t+'[data-target="'+e+'"],'+t+'[href="'+e+'"]'});var n=tn([].slice.call(document.querySelectorAll(t.join(","))));n.hasClass(cn)?(n.closest(pn).find(yn).addClass(hn),n.addClass(hn)):(n.addClass(hn),n.parents(dn).prev(gn+", "+mn).addClass(hn),n.parents(dn).prev(_n).children(gn).addClass(hn)),tn(this._scrollElement).trigger(ln.ACTIVATE,{relatedTarget:e})},t._clear=function(){var t=[].slice.call(document.querySelectorAll(this._selector));tn(t).filter(fn).removeClass(hn)},n._jQueryInterface=function(e){return this.each(function(){var t=tn(this).data(nn);if(t||(t=new n(this,"object"==typeof e&&e),tn(this).data(nn,t)),"string"==typeof e){if("undefined"==typeof t[e])throw new TypeError('No method named "'+e+'"');t[e]()}})},s(n,null,[{key:"VERSION",get:function(){return"4.1.3"}},{key:"Default",get:function(){return sn}}]),n}(),tn(window).on(ln.LOAD_DATA_API,function(){for(var t=[].slice.call(document.querySelectorAll(un)),e=t.length;e--;){var n=tn(t[e]);Tn._jQueryInterface.call(n,n.data())}}),tn.fn[en]=Tn._jQueryInterface,tn.fn[en].Constructor=Tn,tn.fn[en].noConflict=function(){return tn.fn[en]=on,Tn._jQueryInterface},Tn),Gn=(In="."+(Sn="bs.tab"),An=(bn=e).fn.tab,Dn={HIDE:"hide"+In,HIDDEN:"hidden"+In,SHOW:"show"+In,SHOWN:"shown"+In,CLICK_DATA_API:"click"+In+".data-api"},wn="dropdown-menu",Nn="active",On="disabled",kn="fade",Pn="show",jn=".dropdown",Hn=".nav, .list-group",Ln=".active",Rn="> li > .active",xn='[data-toggle="tab"], [data-toggle="pill"], [data-toggle="list"]',Wn=".dropdown-toggle",Un="> .dropdown-menu .active",qn=function(){function i(t){this._element=t}var t=i.prototype;return t.show=function(){var n=this;if(!(this._element.parentNode&&this._element.parentNode.nodeType===Node.ELEMENT_NODE&&bn(this._element).hasClass(Nn)||bn(this._element).hasClass(On))){var t,i,e=bn(this._element).closest(Hn)[0],r=Fn.getSelectorFromElement(this._element);if(e){var o="UL"===e.nodeName?Rn:Ln;i=(i=bn.makeArray(bn(e).find(o)))[i.length-1]}var s=bn.Event(Dn.HIDE,{relatedTarget:this._element}),a=bn.Event(Dn.SHOW,{relatedTarget:i});if(i&&bn(i).trigger(s),bn(this._element).trigger(a),!a.isDefaultPrevented()&&!s.isDefaultPrevented()){r&&(t=document.querySelector(r)),this._activate(this._element,e);var l=function(){var t=bn.Event(Dn.HIDDEN,{relatedTarget:n._element}),e=bn.Event(Dn.SHOWN,{relatedTarget:i});bn(i).trigger(t),bn(n._element).trigger(e)};t?this._activate(t,t.parentNode,l):l()}}},t.dispose=function(){bn.removeData(this._element,Sn),this._element=null},t._activate=function(t,e,n){var i=this,r=("UL"===e.nodeName?bn(e).find(Rn):bn(e).children(Ln))[0],o=n&&r&&bn(r).hasClass(kn),s=function(){return i._transitionComplete(t,r,n)};if(r&&o){var a=Fn.getTransitionDurationFromElement(r);bn(r).one(Fn.TRANSITION_END,s).emulateTransitionEnd(a)}else s()},t._transitionComplete=function(t,e,n){if(e){bn(e).removeClass(Pn+" "+Nn);var i=bn(e.parentNode).find(Un)[0];i&&bn(i).removeClass(Nn),"tab"===e.getAttribute("role")&&e.setAttribute("aria-selected",!1)}if(bn(t).addClass(Nn),"tab"===t.getAttribute("role")&&t.setAttribute("aria-selected",!0),Fn.reflow(t),bn(t).addClass(Pn),t.parentNode&&bn(t.parentNode).hasClass(wn)){var r=bn(t).closest(jn)[0];if(r){var o=[].slice.call(r.querySelectorAll(Wn));bn(o).addClass(Nn)}t.setAttribute("aria-expanded",!0)}n&&n()},i._jQueryInterface=function(n){return this.each(function(){var t=bn(this),e=t.data(Sn);if(e||(e=new i(this),t.data(Sn,e)),"string"==typeof n){if("undefined"==typeof e[n])throw new TypeError('No method named "'+n+'"');e[n]()}})},s(i,null,[{key:"VERSION",get:function(){return"4.1.3"}}]),i}(),bn(document).on(Dn.CLICK_DATA_API,xn,function(t){t.preventDefault(),qn._jQueryInterface.call(bn(this),"show")}),bn.fn.tab=qn._jQueryInterface,bn.fn.tab.Constructor=qn,bn.fn.tab.noConflict=function(){return bn.fn.tab=An,qn._jQueryInterface},qn);!function(t){if("undefined"==typeof t)throw new TypeError("Bootstrap's JavaScript requires jQuery. jQuery must be included before Bootstrap's JavaScript.");var e=t.fn.jquery.split(" ")[0].split(".");if(e[0]<2&&e[1]<9||1===e[0]&&9===e[1]&&e[2]<1||4<=e[0])throw new Error("Bootstrap's JavaScript requires at least jQuery v1.9.1 but less than v4.0.0")}(e),t.Util=Fn,t.Alert=Kn,t.Button=Mn,t.Carousel=Qn,t.Collapse=Bn,t.Dropdown=Vn,t.Modal=Yn,t.Popover=Jn,t.Scrollspy=Zn,t.Tab=Gn,t.Tooltip=zn,Object.defineProperty(t,"__esModule",{value:!0})});
+//# sourceMappingURL=bootstrap.min.js.map
\ No newline at end of file
diff --git a/qpysdk/src/main/assets/stylesheets/js/jquery.min.js b/qpysdk/src/main/assets/stylesheets/js/jquery.min.js
new file mode 100644
index 00000000..a1c07fd8
--- /dev/null
+++ b/qpysdk/src/main/assets/stylesheets/js/jquery.min.js
@@ -0,0 +1,2 @@
+/*! jQuery v3.4.1 | (c) JS Foundation and other contributors | jquery.org/license */
+!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],E=C.document,r=Object.getPrototypeOf,s=t.slice,g=t.concat,u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType},x=function(e){return null!=e&&e===e.window},c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.4.1",k=function(e,t){return new k.fn.init(e,t)},p=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;function d(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0<t&&t-1 in e)}k.fn=k.prototype={jquery:f,constructor:k,length:0,toArray:function(){return s.call(this)},get:function(e){return null==e?s.call(this):e<0?this[e+this.length]:this[e]},pushStack:function(e){var t=k.merge(this.constructor(),e);return t.prevObject=this,t},each:function(e){return k.each(this,e)},map:function(n){return this.pushStack(k.map(this,function(e,t){return n.call(e,t,e)}))},slice:function(){return this.pushStack(s.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(0<=n&&n<t?[this[n]]:[])},end:function(){return this.prevObject||this.constructor()},push:u,sort:t.sort,splice:t.splice},k.extend=k.fn.extend=function(){var e,t,n,r,i,o,a=arguments[0]||{},s=1,u=arguments.length,l=!1;for("boolean"==typeof a&&(l=a,a=arguments[s]||{},s++),"object"==typeof a||m(a)||(a={}),s===u&&(a=this,s--);s<u;s++)if(null!=(e=arguments[s]))for(t in e)r=e[t],"__proto__"!==t&&a!==r&&(l&&r&&(k.isPlainObject(r)||(i=Array.isArray(r)))?(n=a[t],o=i&&!Array.isArray(n)?[]:i||k.isPlainObject(n)?n:{},i=!1,a[t]=k.extend(l,o,r)):void 0!==r&&(a[t]=r));return a},k.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),isReady:!0,error:function(e){throw new Error(e)},noop:function(){},isPlainObject:function(e){var t,n;return!(!e||"[object Object]"!==o.call(e))&&(!(t=r(e))||"function"==typeof(n=v.call(t,"constructor")&&t.constructor)&&a.call(n)===l)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},globalEval:function(e,t){b(e,{nonce:t&&t.nonce})},each:function(e,t){var n,r=0;if(d(e)){for(n=e.length;r<n;r++)if(!1===t.call(e[r],r,e[r]))break}else for(r in e)if(!1===t.call(e[r],r,e[r]))break;return e},trim:function(e){return null==e?"":(e+"").replace(p,"")},makeArray:function(e,t){var n=t||[];return null!=e&&(d(Object(e))?k.merge(n,"string"==typeof e?[e]:e):u.call(n,e)),n},inArray:function(e,t,n){return null==t?-1:i.call(t,e,n)},merge:function(e,t){for(var n=+t.length,r=0,i=e.length;r<n;r++)e[i++]=t[r];return e.length=i,e},grep:function(e,t,n){for(var r=[],i=0,o=e.length,a=!n;i<o;i++)!t(e[i],i)!==a&&r.push(e[i]);return r},map:function(e,t,n){var r,i,o=0,a=[];if(d(e))for(r=e.length;o<r;o++)null!=(i=t(e[o],o,n))&&a.push(i);else for(o in e)null!=(i=t(e[o],o,n))&&a.push(i);return g.apply([],a)},guid:1,support:y}),"function"==typeof Symbol&&(k.fn[Symbol.iterator]=t[Symbol.iterator]),k.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(e,t){n["[object "+t+"]"]=t.toLowerCase()});var h=function(n){var e,d,b,o,i,h,f,g,w,u,l,T,C,a,E,v,s,c,y,k="sizzle"+1*new Date,m=n.document,S=0,r=0,p=ue(),x=ue(),N=ue(),A=ue(),D=function(e,t){return e===t&&(l=!0),0},j={}.hasOwnProperty,t=[],q=t.pop,L=t.push,H=t.push,O=t.slice,P=function(e,t){for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1},R="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",I="(?:\\\\.|[\\w-]|[^\0-\\xa0])+",W="\\["+M+"*("+I+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+I+"))|)"+M+"*\\]",$=":("+I+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+W+")*)|.*)\\)|)",F=new RegExp(M+"+","g"),B=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),_=new RegExp("^"+M+"*,"+M+"*"),z=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp($),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+$),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),ne=function(e,t,n){var r="0x"+t-65536;return r!=r||n?t:r<0?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,1023&r|56320)},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(m.childNodes),m.childNodes),t[m.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&((e?e.ownerDocument||e:m)!==C&&T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&y(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!A[t+" "]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&U.test(t)){(s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=k),o=(l=h(t)).length;while(o--)l[o]="#"+s+" "+xe(l[o]);c=l.join(","),f=ee.test(t)&&ye(e.parentNode)||e}try{return H.apply(n,f.querySelectorAll(c)),n}catch(e){A(t,!0)}finally{s===k&&e.removeAttribute("id")}}}return g(t.replace(B,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[k]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ve(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e.namespaceURI,n=(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:m;return r!==C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),m!==C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=k,!C.getElementsByName||!C.getElementsByName(k).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],v=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){a.appendChild(e).innerHTML="<a id='"+k+"'></a><select id='"+k+"-\r\\' msallowcapture=''><option selected=''></option></select>",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+k+"-]").length||v.push("~="),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+k+"+*").length||v.push(".#.+[+~]")}),ce(function(e){e.innerHTML="<a href='' disabled='disabled'></a><select disabled='disabled'><option/></select>";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",$)}),v=v.length&&new RegExp(v.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),y=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},D=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e===C||e.ownerDocument===m&&y(m,e)?-1:t===C||t.ownerDocument===m&&y(m,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e===C?-1:t===C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]===m?-1:s[r]===m?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if((e.ownerDocument||e)!==C&&T(e),d.matchesSelector&&E&&!A[t+" "]&&(!s||!s.test(t))&&(!v||!v.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){A(t,!0)}return 0<se(t,C,null,[e]).length},se.contains=function(e,t){return(e.ownerDocument||e)!==C&&T(e),y(e,t)},se.attr=function(e,t){(e.ownerDocument||e)!==C&&T(e);var n=b.attrHandle[t.toLowerCase()],r=n&&j.call(b.attrHandle,t.toLowerCase())?n(e,t,!E):void 0;return void 0!==r?r:d.attributes||!E?e.getAttribute(t):(r=e.getAttributeNode(t))&&r.specified?r.value:null},se.escape=function(e){return(e+"").replace(re,ie)},se.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},se.uniqueSort=function(e){var t,n=[],r=0,i=0;if(l=!d.detectDuplicates,u=!d.sortStable&&e.slice(0),e.sort(D),l){while(t=e[i++])t===e[i]&&(r=n.push(i));while(r--)e.splice(n[r],1)}return u=null,e},o=se.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=o(e)}else if(3===i||4===i)return e.nodeValue}else while(t=e[r++])n+=o(t);return n},(b=se.selectors={cacheLength:50,createPseudo:le,match:G,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=p[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&p(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1<t.indexOf(i):"$="===r?i&&t.slice(-i.length)===i:"~="===r?-1<(" "+t.replace(F," ")+" ").indexOf(i):"|="===r&&(t===i||t.slice(0,i.length+1)===i+"-"))}},CHILD:function(h,e,t,g,v){var y="nth"!==h.slice(0,3),m="last"!==h.slice(-4),x="of-type"===e;return 1===g&&0===v?function(e){return!!e.parentNode}:function(e,t,n){var r,i,o,a,s,u,l=y!==m?"nextSibling":"previousSibling",c=e.parentNode,f=x&&e.nodeName.toLowerCase(),p=!n&&!x,d=!1;if(c){if(y){while(l){a=e;while(a=a[l])if(x?a.nodeName.toLowerCase()===f:1===a.nodeType)return!1;u=l="only"===h&&!u&&"nextSibling"}return!0}if(u=[m?c.firstChild:c.lastChild],m&&p){d=(s=(r=(i=(o=(a=c)[k]||(a[k]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===S&&r[1])&&r[2],a=s&&c.childNodes[s];while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if(1===a.nodeType&&++d&&a===e){i[h]=[S,s,d];break}}else if(p&&(d=s=(r=(i=(o=(a=e)[k]||(a[k]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===S&&r[1]),!1===d)while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if((x?a.nodeName.toLowerCase()===f:1===a.nodeType)&&++d&&(p&&((i=(o=a[k]||(a[k]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]=[S,d]),a===e))break;return(d-=v)===g||d%g==0&&0<=d/g}}},PSEUDO:function(e,o){var t,a=b.pseudos[e]||b.setFilters[e.toLowerCase()]||se.error("unsupported pseudo: "+e);return a[k]?a(o):1<a.length?(t=[e,e,"",o],b.setFilters.hasOwnProperty(e.toLowerCase())?le(function(e,t){var n,r=a(e,o),i=r.length;while(i--)e[n=P(e,r[i])]=!(t[n]=r[i])}):function(e){return a(e,0,t)}):a}},pseudos:{not:le(function(e){var r=[],i=[],s=f(e.replace(B,"$1"));return s[k]?le(function(e,t,n,r){var i,o=s(e,null,r,[]),a=e.length;while(a--)(i=o[a])&&(e[a]=!(t[a]=i))}):function(e,t,n){return r[0]=e,s(r,null,n,i),r[0]=null,!i.pop()}}),has:le(function(t){return function(e){return 0<se(t,e).length}}),contains:le(function(t){return t=t.replace(te,ne),function(e){return-1<(e.textContent||o(e)).indexOf(t)}}),lang:le(function(n){return V.test(n||"")||se.error("unsupported lang: "+n),n=n.replace(te,ne).toLowerCase(),function(e){var t;do{if(t=E?e.lang:e.getAttribute("xml:lang")||e.getAttribute("lang"))return(t=t.toLowerCase())===n||0===t.indexOf(n+"-")}while((e=e.parentNode)&&1===e.nodeType);return!1}}),target:function(e){var t=n.location&&n.location.hash;return t&&t.slice(1)===e.id},root:function(e){return e===a},focus:function(e){return e===C.activeElement&&(!C.hasFocus||C.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:ge(!1),disabled:ge(!0),checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!b.pseudos.empty(e)},header:function(e){return J.test(e.nodeName)},input:function(e){return Q.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:ve(function(){return[0]}),last:ve(function(e,t){return[t-1]}),eq:ve(function(e,t,n){return[n<0?n+t:n]}),even:ve(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:ve(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:ve(function(e,t,n){for(var r=n<0?n+t:t<n?t:n;0<=--r;)e.push(r);return e}),gt:ve(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}}).pseudos.nth=b.pseudos.eq,{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})b.pseudos[e]=de(e);for(e in{submit:!0,reset:!0})b.pseudos[e]=he(e);function me(){}function xe(e){for(var t=0,n=e.length,r="";t<n;t++)r+=e[t].value;return r}function be(s,e,t){var u=e.dir,l=e.next,c=l||u,f=t&&"parentNode"===c,p=r++;return e.first?function(e,t,n){while(e=e[u])if(1===e.nodeType||f)return s(e,t,n);return!1}:function(e,t,n){var r,i,o,a=[S,p];if(n){while(e=e[u])if((1===e.nodeType||f)&&s(e,t,n))return!0}else while(e=e[u])if(1===e.nodeType||f)if(i=(o=e[k]||(e[k]={}))[e.uniqueID]||(o[e.uniqueID]={}),l&&l===e.nodeName.toLowerCase())e=e[u]||e;else{if((r=i[c])&&r[0]===S&&r[1]===p)return a[2]=r[2];if((i[c]=a)[2]=s(e,t,n))return!0}return!1}}function we(i){return 1<i.length?function(e,t,n){var r=i.length;while(r--)if(!i[r](e,t,n))return!1;return!0}:i[0]}function Te(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;s<u;s++)(o=e[s])&&(n&&!n(o,r,i)||(a.push(o),l&&t.push(s)));return a}function Ce(d,h,g,v,y,e){return v&&!v[k]&&(v=Ce(v)),y&&!y[k]&&(y=Ce(y,e)),le(function(e,t,n,r){var i,o,a,s=[],u=[],l=t.length,c=e||function(e,t,n){for(var r=0,i=t.length;r<i;r++)se(e,t[r],n);return n}(h||"*",n.nodeType?[n]:n,[]),f=!d||!e&&h?c:Te(c,s,d,n,r),p=g?y||(e?d:l||v)?[]:t:f;if(g&&g(f,p,n,r),v){i=Te(p,u),v(i,[],n,r),o=i.length;while(o--)(a=i[o])&&(p[u[o]]=!(f[u[o]]=a))}if(e){if(y||d){if(y){i=[],o=p.length;while(o--)(a=p[o])&&i.push(f[o]=a);y(null,p=[],i,r)}o=p.length;while(o--)(a=p[o])&&-1<(i=y?P(e,a):s[o])&&(e[i]=!(t[i]=a))}}else p=Te(p===t?p.splice(l,p.length):p),y?y(null,t,p,r):H.apply(t,p)})}function Ee(e){for(var i,t,n,r=e.length,o=b.relative[e[0].type],a=o||b.relative[" "],s=o?1:0,u=be(function(e){return e===i},a,!0),l=be(function(e){return-1<P(i,e)},a,!0),c=[function(e,t,n){var r=!o&&(n||t!==w)||((i=t).nodeType?u(e,t,n):l(e,t,n));return i=null,r}];s<r;s++)if(t=b.relative[e[s].type])c=[be(we(c),t)];else{if((t=b.filter[e[s].type].apply(null,e[s].matches))[k]){for(n=++s;n<r;n++)if(b.relative[e[n].type])break;return Ce(1<s&&we(c),1<s&&xe(e.slice(0,s-1).concat({value:" "===e[s-2].type?"*":""})).replace(B,"$1"),t,s<n&&Ee(e.slice(s,n)),n<r&&Ee(e=e.slice(n)),n<r&&xe(e))}c.push(t)}return we(c)}return me.prototype=b.filters=b.pseudos,b.setFilters=new me,h=se.tokenize=function(e,t){var n,r,i,o,a,s,u,l=x[e+" "];if(l)return t?0:l.slice(0);a=e,s=[],u=b.preFilter;while(a){for(o in n&&!(r=_.exec(a))||(r&&(a=a.slice(r[0].length)||a),s.push(i=[])),n=!1,(r=z.exec(a))&&(n=r.shift(),i.push({value:n,type:r[0].replace(B," ")}),a=a.slice(n.length)),b.filter)!(r=G[o].exec(a))||u[o]&&!(r=u[o](r))||(n=r.shift(),i.push({value:n,type:o,matches:r}),a=a.slice(n.length));if(!n)break}return t?a.length:a?se.error(e):x(e,s).slice(0)},f=se.compile=function(e,t){var n,v,y,m,x,r,i=[],o=[],a=N[e+" "];if(!a){t||(t=h(e)),n=t.length;while(n--)(a=Ee(t[n]))[k]?i.push(a):o.push(a);(a=N(e,(v=o,m=0<(y=i).length,x=0<v.length,r=function(e,t,n,r,i){var o,a,s,u=0,l="0",c=e&&[],f=[],p=w,d=e||x&&b.find.TAG("*",i),h=S+=null==p?1:Math.random()||.1,g=d.length;for(i&&(w=t===C||t||i);l!==g&&null!=(o=d[l]);l++){if(x&&o){a=0,t||o.ownerDocument===C||(T(o),n=!E);while(s=v[a++])if(s(o,t||C,n)){r.push(o);break}i&&(S=h)}m&&((o=!s&&o)&&u--,e&&c.push(o))}if(u+=l,m&&l!==u){a=0;while(s=y[a++])s(c,f,t,n);if(e){if(0<u)while(l--)c[l]||f[l]||(f[l]=q.call(r));f=Te(f)}H.apply(r,f),i&&!e&&0<f.length&&1<u+y.length&&se.uniqueSort(r)}return i&&(S=h,w=p),c},m?le(r):r))).selector=e}return a},g=se.select=function(e,t,n,r){var i,o,a,s,u,l="function"==typeof e&&e,c=!r&&h(e=l.selector||e);if(n=n||[],1===c.length){if(2<(o=c[0]=c[0].slice(0)).length&&"ID"===(a=o[0]).type&&9===t.nodeType&&E&&b.relative[o[1].type]){if(!(t=(b.find.ID(a.matches[0].replace(te,ne),t)||[])[0]))return n;l&&(t=t.parentNode),e=e.slice(o.shift().value.length)}i=G.needsContext.test(e)?0:o.length;while(i--){if(a=o[i],b.relative[s=a.type])break;if((u=b.find[s])&&(r=u(a.matches[0].replace(te,ne),ee.test(o[0].type)&&ye(t.parentNode)||t))){if(o.splice(i,1),!(e=r.length&&xe(o)))return H.apply(n,r),n;break}}}return(l||f(e,c))(r,t,!E,n,!t||ee.test(e)&&ye(t.parentNode)||t),n},d.sortStable=k.split("").sort(D).join("")===k,d.detectDuplicates=!!l,T(),d.sortDetached=ce(function(e){return 1&e.compareDocumentPosition(C.createElement("fieldset"))}),ce(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||fe("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),d.attributes&&ce(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||fe("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),ce(function(e){return null==e.getAttribute("disabled")})||fe(R,function(e,t,n){var r;if(!n)return!0===e[t]?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),se}(C);k.find=h,k.expr=h.selectors,k.expr[":"]=k.expr.pseudos,k.uniqueSort=k.unique=h.uniqueSort,k.text=h.getText,k.isXMLDoc=h.isXML,k.contains=h.contains,k.escapeSelector=h.escape;var T=function(e,t,n){var r=[],i=void 0!==n;while((e=e[t])&&9!==e.nodeType)if(1===e.nodeType){if(i&&k(e).is(n))break;r.push(e)}return r},S=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},N=k.expr.match.needsContext;function A(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()}var D=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function j(e,n,r){return m(n)?k.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?k.grep(e,function(e){return e===n!==r}):"string"!=typeof n?k.grep(e,function(e){return-1<i.call(n,e)!==r}):k.filter(n,e,r)}k.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?k.find.matchesSelector(r,e)?[r]:[]:k.find.matches(e,k.grep(t,function(e){return 1===e.nodeType}))},k.fn.extend({find:function(e){var t,n,r=this.length,i=this;if("string"!=typeof e)return this.pushStack(k(e).filter(function(){for(t=0;t<r;t++)if(k.contains(i[t],this))return!0}));for(n=this.pushStack([]),t=0;t<r;t++)k.find(e,i[t],n);return 1<r?k.uniqueSort(n):n},filter:function(e){return this.pushStack(j(this,e||[],!1))},not:function(e){return this.pushStack(j(this,e||[],!0))},is:function(e){return!!j(this,"string"==typeof e&&N.test(e)?k(e):e||[],!1).length}});var q,L=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(k.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||q,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:L.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof k?t[0]:t,k.merge(this,k.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),D.test(r[1])&&k.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=E.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(k):k.makeArray(e,this)}).prototype=k.fn,q=k(E);var H=/^(?:parents|prev(?:Until|All))/,O={children:!0,contents:!0,next:!0,prev:!0};function P(e,t){while((e=e[t])&&1!==e.nodeType);return e}k.fn.extend({has:function(e){var t=k(e,this),n=t.length;return this.filter(function(){for(var e=0;e<n;e++)if(k.contains(this,t[e]))return!0})},closest:function(e,t){var n,r=0,i=this.length,o=[],a="string"!=typeof e&&k(e);if(!N.test(e))for(;r<i;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(n.nodeType<11&&(a?-1<a.index(n):1===n.nodeType&&k.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(1<o.length?k.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?i.call(k(e),this[0]):i.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(k.uniqueSort(k.merge(this.get(),k(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),k.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return T(e,"parentNode")},parentsUntil:function(e,t,n){return T(e,"parentNode",n)},next:function(e){return P(e,"nextSibling")},prev:function(e){return P(e,"previousSibling")},nextAll:function(e){return T(e,"nextSibling")},prevAll:function(e){return T(e,"previousSibling")},nextUntil:function(e,t,n){return T(e,"nextSibling",n)},prevUntil:function(e,t,n){return T(e,"previousSibling",n)},siblings:function(e){return S((e.parentNode||{}).firstChild,e)},children:function(e){return S(e.firstChild)},contents:function(e){return"undefined"!=typeof e.contentDocument?e.contentDocument:(A(e,"template")&&(e=e.content||e),k.merge([],e.childNodes))}},function(r,i){k.fn[r]=function(e,t){var n=k.map(this,i,e);return"Until"!==r.slice(-5)&&(t=e),t&&"string"==typeof t&&(n=k.filter(t,n)),1<this.length&&(O[r]||k.uniqueSort(n),H.test(r)&&n.reverse()),this.pushStack(n)}});var R=/[^\x20\t\r\n\f]+/g;function M(e){return e}function I(e){throw e}function W(e,t,n,r){var i;try{e&&m(i=e.promise)?i.call(e).done(t).fail(n):e&&m(i=e.then)?i.call(e,t,n):t.apply(void 0,[e].slice(r))}catch(e){n.apply(void 0,[e])}}k.Callbacks=function(r){var e,n;r="string"==typeof r?(e=r,n={},k.each(e.match(R)||[],function(e,t){n[t]=!0}),n):k.extend({},r);var i,t,o,a,s=[],u=[],l=-1,c=function(){for(a=a||r.once,o=i=!0;u.length;l=-1){t=u.shift();while(++l<s.length)!1===s[l].apply(t[0],t[1])&&r.stopOnFalse&&(l=s.length,t=!1)}r.memory||(t=!1),i=!1,a&&(s=t?[]:"")},f={add:function(){return s&&(t&&!i&&(l=s.length-1,u.push(t)),function n(e){k.each(e,function(e,t){m(t)?r.unique&&f.has(t)||s.push(t):t&&t.length&&"string"!==w(t)&&n(t)})}(arguments),t&&!i&&c()),this},remove:function(){return k.each(arguments,function(e,t){var n;while(-1<(n=k.inArray(t,s,n)))s.splice(n,1),n<=l&&l--}),this},has:function(e){return e?-1<k.inArray(e,s):0<s.length},empty:function(){return s&&(s=[]),this},disable:function(){return a=u=[],s=t="",this},disabled:function(){return!s},lock:function(){return a=u=[],t||i||(s=t=""),this},locked:function(){return!!a},fireWith:function(e,t){return a||(t=[e,(t=t||[]).slice?t.slice():t],u.push(t),i||c()),this},fire:function(){return f.fireWith(this,arguments),this},fired:function(){return!!o}};return f},k.extend({Deferred:function(e){var o=[["notify","progress",k.Callbacks("memory"),k.Callbacks("memory"),2],["resolve","done",k.Callbacks("once memory"),k.Callbacks("once memory"),0,"resolved"],["reject","fail",k.Callbacks("once memory"),k.Callbacks("once memory"),1,"rejected"]],i="pending",a={state:function(){return i},always:function(){return s.done(arguments).fail(arguments),this},"catch":function(e){return a.then(null,e)},pipe:function(){var i=arguments;return k.Deferred(function(r){k.each(o,function(e,t){var n=m(i[t[4]])&&i[t[4]];s[t[1]](function(){var e=n&&n.apply(this,arguments);e&&m(e.promise)?e.promise().progress(r.notify).done(r.resolve).fail(r.reject):r[t[0]+"With"](this,n?[e]:arguments)})}),i=null}).promise()},then:function(t,n,r){var u=0;function l(i,o,a,s){return function(){var n=this,r=arguments,e=function(){var e,t;if(!(i<u)){if((e=a.apply(n,r))===o.promise())throw new TypeError("Thenable self-resolution");t=e&&("object"==typeof e||"function"==typeof e)&&e.then,m(t)?s?t.call(e,l(u,o,M,s),l(u,o,I,s)):(u++,t.call(e,l(u,o,M,s),l(u,o,I,s),l(u,o,M,o.notifyWith))):(a!==M&&(n=void 0,r=[e]),(s||o.resolveWith)(n,r))}},t=s?e:function(){try{e()}catch(e){k.Deferred.exceptionHook&&k.Deferred.exceptionHook(e,t.stackTrace),u<=i+1&&(a!==I&&(n=void 0,r=[e]),o.rejectWith(n,r))}};i?t():(k.Deferred.getStackHook&&(t.stackTrace=k.Deferred.getStackHook()),C.setTimeout(t))}}return k.Deferred(function(e){o[0][3].add(l(0,e,m(r)?r:M,e.notifyWith)),o[1][3].add(l(0,e,m(t)?t:M)),o[2][3].add(l(0,e,m(n)?n:I))}).promise()},promise:function(e){return null!=e?k.extend(e,a):a}},s={};return k.each(o,function(e,t){var n=t[2],r=t[5];a[t[1]]=n.add,r&&n.add(function(){i=r},o[3-e][2].disable,o[3-e][3].disable,o[0][2].lock,o[0][3].lock),n.add(t[3].fire),s[t[0]]=function(){return s[t[0]+"With"](this===s?void 0:this,arguments),this},s[t[0]+"With"]=n.fireWith}),a.promise(s),e&&e.call(s,s),s},when:function(e){var n=arguments.length,t=n,r=Array(t),i=s.call(arguments),o=k.Deferred(),a=function(t){return function(e){r[t]=this,i[t]=1<arguments.length?s.call(arguments):e,--n||o.resolveWith(r,i)}};if(n<=1&&(W(e,o.done(a(t)).resolve,o.reject,!n),"pending"===o.state()||m(i[t]&&i[t].then)))return o.then();while(t--)W(i[t],a(t),o.reject);return o.promise()}});var $=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;k.Deferred.exceptionHook=function(e,t){C.console&&C.console.warn&&e&&$.test(e.name)&&C.console.warn("jQuery.Deferred exception: "+e.message,e.stack,t)},k.readyException=function(e){C.setTimeout(function(){throw e})};var F=k.Deferred();function B(){E.removeEventListener("DOMContentLoaded",B),C.removeEventListener("load",B),k.ready()}k.fn.ready=function(e){return F.then(e)["catch"](function(e){k.readyException(e)}),this},k.extend({isReady:!1,readyWait:1,ready:function(e){(!0===e?--k.readyWait:k.isReady)||(k.isReady=!0)!==e&&0<--k.readyWait||F.resolveWith(E,[k])}}),k.ready.then=F.then,"complete"===E.readyState||"loading"!==E.readyState&&!E.documentElement.doScroll?C.setTimeout(k.ready):(E.addEventListener("DOMContentLoaded",B),C.addEventListener("load",B));var _=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===w(n))for(s in i=!0,n)_(e,t,s,n[s],!0,o,a);else if(void 0!==r&&(i=!0,m(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(k(e),n)})),t))for(;s<u;s++)t(e[s],n,a?r:r.call(e[s],s,t(e[s],n)));return i?e:l?t.call(e):u?t(e[0],n):o},z=/^-ms-/,U=/-([a-z])/g;function X(e,t){return t.toUpperCase()}function V(e){return e.replace(z,"ms-").replace(U,X)}var G=function(e){return 1===e.nodeType||9===e.nodeType||!+e.nodeType};function Y(){this.expando=k.expando+Y.uid++}Y.uid=1,Y.prototype={cache:function(e){var t=e[this.expando];return t||(t={},G(e)&&(e.nodeType?e[this.expando]=t:Object.defineProperty(e,this.expando,{value:t,configurable:!0}))),t},set:function(e,t,n){var r,i=this.cache(e);if("string"==typeof t)i[V(t)]=n;else for(r in t)i[V(r)]=t[r];return i},get:function(e,t){return void 0===t?this.cache(e):e[this.expando]&&e[this.expando][V(t)]},access:function(e,t,n){return void 0===t||t&&"string"==typeof t&&void 0===n?this.get(e,t):(this.set(e,t,n),void 0!==n?n:t)},remove:function(e,t){var n,r=e[this.expando];if(void 0!==r){if(void 0!==t){n=(t=Array.isArray(t)?t.map(V):(t=V(t))in r?[t]:t.match(R)||[]).length;while(n--)delete r[t[n]]}(void 0===t||k.isEmptyObject(r))&&(e.nodeType?e[this.expando]=void 0:delete e[this.expando])}},hasData:function(e){var t=e[this.expando];return void 0!==t&&!k.isEmptyObject(t)}};var Q=new Y,J=new Y,K=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,Z=/[A-Z]/g;function ee(e,t,n){var r,i;if(void 0===n&&1===e.nodeType)if(r="data-"+t.replace(Z,"-$&").toLowerCase(),"string"==typeof(n=e.getAttribute(r))){try{n="true"===(i=n)||"false"!==i&&("null"===i?null:i===+i+""?+i:K.test(i)?JSON.parse(i):i)}catch(e){}J.set(e,t,n)}else n=void 0;return n}k.extend({hasData:function(e){return J.hasData(e)||Q.hasData(e)},data:function(e,t,n){return J.access(e,t,n)},removeData:function(e,t){J.remove(e,t)},_data:function(e,t,n){return Q.access(e,t,n)},_removeData:function(e,t){Q.remove(e,t)}}),k.fn.extend({data:function(n,e){var t,r,i,o=this[0],a=o&&o.attributes;if(void 0===n){if(this.length&&(i=J.get(o),1===o.nodeType&&!Q.get(o,"hasDataAttrs"))){t=a.length;while(t--)a[t]&&0===(r=a[t].name).indexOf("data-")&&(r=V(r.slice(5)),ee(o,r,i[r]));Q.set(o,"hasDataAttrs",!0)}return i}return"object"==typeof n?this.each(function(){J.set(this,n)}):_(this,function(e){var t;if(o&&void 0===e)return void 0!==(t=J.get(o,n))?t:void 0!==(t=ee(o,n))?t:void 0;this.each(function(){J.set(this,n,e)})},null,e,1<arguments.length,null,!0)},removeData:function(e){return this.each(function(){J.remove(this,e)})}}),k.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=Q.get(e,t),n&&(!r||Array.isArray(n)?r=Q.access(e,t,k.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=k.queue(e,t),r=n.length,i=n.shift(),o=k._queueHooks(e,t);"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,function(){k.dequeue(e,t)},o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return Q.get(e,n)||Q.access(e,n,{empty:k.Callbacks("once memory").add(function(){Q.remove(e,[t+"queue",n])})})}}),k.fn.extend({queue:function(t,n){var e=2;return"string"!=typeof t&&(n=t,t="fx",e--),arguments.length<e?k.queue(this[0],t):void 0===n?this:this.each(function(){var e=k.queue(this,t,n);k._queueHooks(this,t),"fx"===t&&"inprogress"!==e[0]&&k.dequeue(this,t)})},dequeue:function(e){return this.each(function(){k.dequeue(this,e)})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=k.Deferred(),o=this,a=this.length,s=function(){--r||i.resolveWith(o,[o])};"string"!=typeof e&&(t=e,e=void 0),e=e||"fx";while(a--)(n=Q.get(o[a],e+"queueHooks"))&&n.empty&&(r++,n.empty.add(s));return s(),i.promise(t)}});var te=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,ne=new RegExp("^(?:([+-])=|)("+te+")([a-z%]*)$","i"),re=["Top","Right","Bottom","Left"],ie=E.documentElement,oe=function(e){return k.contains(e.ownerDocument,e)},ae={composed:!0};ie.getRootNode&&(oe=function(e){return k.contains(e.ownerDocument,e)||e.getRootNode(ae)===e.ownerDocument});var se=function(e,t){return"none"===(e=t||e).style.display||""===e.style.display&&oe(e)&&"none"===k.css(e,"display")},ue=function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];for(o in i=n.apply(e,r||[]),t)e.style[o]=a[o];return i};function le(e,t,n,r){var i,o,a=20,s=r?function(){return r.cur()}:function(){return k.css(e,t,"")},u=s(),l=n&&n[3]||(k.cssNumber[t]?"":"px"),c=e.nodeType&&(k.cssNumber[t]||"px"!==l&&+u)&&ne.exec(k.css(e,t));if(c&&c[3]!==l){u/=2,l=l||c[3],c=+u||1;while(a--)k.style(e,t,c+l),(1-o)*(1-(o=s()/u||.5))<=0&&(a=0),c/=o;c*=2,k.style(e,t,c+l),n=n||[]}return n&&(c=+c||+u||0,i=n[1]?c+(n[1]+1)*n[2]:+n[2],r&&(r.unit=l,r.start=c,r.end=i)),i}var ce={};function fe(e,t){for(var n,r,i,o,a,s,u,l=[],c=0,f=e.length;c<f;c++)(r=e[c]).style&&(n=r.style.display,t?("none"===n&&(l[c]=Q.get(r,"display")||null,l[c]||(r.style.display="")),""===r.style.display&&se(r)&&(l[c]=(u=a=o=void 0,a=(i=r).ownerDocument,s=i.nodeName,(u=ce[s])||(o=a.body.appendChild(a.createElement(s)),u=k.css(o,"display"),o.parentNode.removeChild(o),"none"===u&&(u="block"),ce[s]=u)))):"none"!==n&&(l[c]="none",Q.set(r,"display",n)));for(c=0;c<f;c++)null!=l[c]&&(e[c].style.display=l[c]);return e}k.fn.extend({show:function(){return fe(this,!0)},hide:function(){return fe(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){se(this)?k(this).show():k(this).hide()})}});var pe=/^(?:checkbox|radio)$/i,de=/<([a-z][^\/\0>\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i,ge={option:[1,"<select multiple='multiple'>","</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};function ve(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?k.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;n<r;n++)Q.set(e[n],"globalEval",!t||Q.get(t[n],"globalEval"))}ge.optgroup=ge.option,ge.tbody=ge.tfoot=ge.colgroup=ge.caption=ge.thead,ge.th=ge.td;var me,xe,be=/<|&#?\w+;/;function we(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d<h;d++)if((o=e[d])||0===o)if("object"===w(o))k.merge(p,o.nodeType?[o]:o);else if(be.test(o)){a=a||f.appendChild(t.createElement("div")),s=(de.exec(o)||["",""])[1].toLowerCase(),u=ge[s]||ge._default,a.innerHTML=u[1]+k.htmlPrefilter(o)+u[2],c=u[0];while(c--)a=a.lastChild;k.merge(p,a.childNodes),(a=f.firstChild).textContent=""}else p.push(t.createTextNode(o));f.textContent="",d=0;while(o=p[d++])if(r&&-1<k.inArray(o,r))i&&i.push(o);else if(l=oe(o),a=ve(f.appendChild(o),"script"),l&&ye(a),n){c=0;while(o=a[c++])he.test(o.type||"")&&n.push(o)}return f}me=E.createDocumentFragment().appendChild(E.createElement("div")),(xe=E.createElement("input")).setAttribute("type","radio"),xe.setAttribute("checked","checked"),xe.setAttribute("name","t"),me.appendChild(xe),y.checkClone=me.cloneNode(!0).cloneNode(!0).lastChild.checked,me.innerHTML="<textarea>x</textarea>",y.noCloneChecked=!!me.cloneNode(!0).lastChild.defaultValue;var Te=/^key/,Ce=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,Ee=/^([^.]*)(?:\.(.+)|)/;function ke(){return!0}function Se(){return!1}function Ne(e,t){return e===function(){try{return E.activeElement}catch(e){}}()==("focus"===t)}function Ae(e,t,n,r,i,o){var a,s;if("object"==typeof t){for(s in"string"!=typeof n&&(r=r||n,n=void 0),t)Ae(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=Se;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return k().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=k.guid++)),e.each(function(){k.event.add(this,t,i,r,n)})}function De(e,i,o){o?(Q.set(e,i,!1),k.event.add(e,i,{namespace:!1,handler:function(e){var t,n,r=Q.get(this,i);if(1&e.isTrigger&&this[i]){if(r.length)(k.event.special[i]||{}).delegateType&&e.stopPropagation();else if(r=s.call(arguments),Q.set(this,i,r),t=o(this,i),this[i](),r!==(n=Q.get(this,i))||t?Q.set(this,i,!1):n={},r!==n)return e.stopImmediatePropagation(),e.preventDefault(),n.value}else r.length&&(Q.set(this,i,{value:k.event.trigger(k.extend(r[0],k.Event.prototype),r.slice(1),this)}),e.stopImmediatePropagation())}})):void 0===Q.get(e,i)&&k.event.add(e,i,ke)}k.event={global:{},add:function(t,e,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Q.get(t);if(v){n.handler&&(n=(o=n).handler,i=o.selector),i&&k.find.matchesSelector(ie,i),n.guid||(n.guid=k.guid++),(u=v.events)||(u=v.events={}),(a=v.handle)||(a=v.handle=function(e){return"undefined"!=typeof k&&k.event.triggered!==e.type?k.event.dispatch.apply(t,arguments):void 0}),l=(e=(e||"").match(R)||[""]).length;while(l--)d=g=(s=Ee.exec(e[l])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=k.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=k.event.special[d]||{},c=k.extend({type:d,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&k.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(t,r,h,a)||t.addEventListener&&t.addEventListener(d,a)),f.add&&(f.add.call(t,c),c.handler.guid||(c.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,c):p.push(c),k.event.global[d]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Q.hasData(e)&&Q.get(e);if(v&&(u=v.events)){l=(t=(t||"").match(R)||[""]).length;while(l--)if(d=g=(s=Ee.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),d){f=k.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;while(o--)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(e,h,v.handle)||k.removeEvent(e,d,v.handle),delete u[d])}else for(d in u)k.event.remove(e,d+t[l],n,r,!0);k.isEmptyObject(u)&&Q.remove(e,"handle events")}},dispatch:function(e){var t,n,r,i,o,a,s=k.event.fix(e),u=new Array(arguments.length),l=(Q.get(this,"events")||{})[s.type]||[],c=k.event.special[s.type]||{};for(u[0]=s,t=1;t<arguments.length;t++)u[t]=arguments[t];if(s.delegateTarget=this,!c.preDispatch||!1!==c.preDispatch.call(this,s)){a=k.event.handlers.call(this,s,l),t=0;while((i=a[t++])&&!s.isPropagationStopped()){s.currentTarget=i.elem,n=0;while((o=i.handlers[n++])&&!s.isImmediatePropagationStopped())s.rnamespace&&!1!==o.namespace&&!s.rnamespace.test(o.namespace)||(s.handleObj=o,s.data=o.data,void 0!==(r=((k.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,u))&&!1===(s.result=r)&&(s.preventDefault(),s.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,s),s.result}},handlers:function(e,t){var n,r,i,o,a,s=[],u=t.delegateCount,l=e.target;if(u&&l.nodeType&&!("click"===e.type&&1<=e.button))for(;l!==this;l=l.parentNode||this)if(1===l.nodeType&&("click"!==e.type||!0!==l.disabled)){for(o=[],a={},n=0;n<u;n++)void 0===a[i=(r=t[n]).selector+" "]&&(a[i]=r.needsContext?-1<k(i,this).index(l):k.find(i,this,null,[l]).length),a[i]&&o.push(r);o.length&&s.push({elem:l,handlers:o})}return l=this,u<t.length&&s.push({elem:l,handlers:t.slice(u)}),s},addProp:function(t,e){Object.defineProperty(k.Event.prototype,t,{enumerable:!0,configurable:!0,get:m(e)?function(){if(this.originalEvent)return e(this.originalEvent)}:function(){if(this.originalEvent)return this.originalEvent[t]},set:function(e){Object.defineProperty(this,t,{enumerable:!0,configurable:!0,writable:!0,value:e})}})},fix:function(e){return e[k.expando]?e:new k.Event(e)},special:{load:{noBubble:!0},click:{setup:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&De(t,"click",ke),!1},trigger:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&De(t,"click"),!0},_default:function(e){var t=e.target;return pe.test(t.type)&&t.click&&A(t,"input")&&Q.get(t,"click")||A(t,"a")}},beforeunload:{postDispatch:function(e){void 0!==e.result&&e.originalEvent&&(e.originalEvent.returnValue=e.result)}}}},k.removeEvent=function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n)},k.Event=function(e,t){if(!(this instanceof k.Event))return new k.Event(e,t);e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||void 0===e.defaultPrevented&&!1===e.returnValue?ke:Se,this.target=e.target&&3===e.target.nodeType?e.target.parentNode:e.target,this.currentTarget=e.currentTarget,this.relatedTarget=e.relatedTarget):this.type=e,t&&k.extend(this,t),this.timeStamp=e&&e.timeStamp||Date.now(),this[k.expando]=!0},k.Event.prototype={constructor:k.Event,isDefaultPrevented:Se,isPropagationStopped:Se,isImmediatePropagationStopped:Se,isSimulated:!1,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=ke,e&&!this.isSimulated&&e.preventDefault()},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=ke,e&&!this.isSimulated&&e.stopPropagation()},stopImmediatePropagation:function(){var e=this.originalEvent;this.isImmediatePropagationStopped=ke,e&&!this.isSimulated&&e.stopImmediatePropagation(),this.stopPropagation()}},k.each({altKey:!0,bubbles:!0,cancelable:!0,changedTouches:!0,ctrlKey:!0,detail:!0,eventPhase:!0,metaKey:!0,pageX:!0,pageY:!0,shiftKey:!0,view:!0,"char":!0,code:!0,charCode:!0,key:!0,keyCode:!0,button:!0,buttons:!0,clientX:!0,clientY:!0,offsetX:!0,offsetY:!0,pointerId:!0,pointerType:!0,screenX:!0,screenY:!0,targetTouches:!0,toElement:!0,touches:!0,which:function(e){var t=e.button;return null==e.which&&Te.test(e.type)?null!=e.charCode?e.charCode:e.keyCode:!e.which&&void 0!==t&&Ce.test(e.type)?1&t?1:2&t?3:4&t?2:0:e.which}},k.event.addProp),k.each({focus:"focusin",blur:"focusout"},function(e,t){k.event.special[e]={setup:function(){return De(this,e,Ne),!1},trigger:function(){return De(this,e),!0},delegateType:t}}),k.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(e,i){k.event.special[e]={delegateType:i,bindType:i,handle:function(e){var t,n=e.relatedTarget,r=e.handleObj;return n&&(n===this||k.contains(this,n))||(e.type=r.origType,t=r.handler.apply(this,arguments),e.type=i),t}}}),k.fn.extend({on:function(e,t,n,r){return Ae(this,e,t,n,r)},one:function(e,t,n,r){return Ae(this,e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,k(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return!1!==t&&"function"!=typeof t||(n=t,t=void 0),!1===n&&(n=Se),this.each(function(){k.event.remove(this,e,n,t)})}});var je=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([a-z][^\/\0>\x20\t\r\n\f]*)[^>]*)\/>/gi,qe=/<script|<style|<link/i,Le=/checked\s*(?:[^=]|=\s*.checked.)/i,He=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function Oe(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&k(e).children("tbody")[0]||e}function Pe(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function Re(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Me(e,t){var n,r,i,o,a,s,u,l;if(1===t.nodeType){if(Q.hasData(e)&&(o=Q.access(e),a=Q.set(t,o),l=o.events))for(i in delete a.handle,a.events={},l)for(n=0,r=l[i].length;n<r;n++)k.event.add(t,i,l[i][n]);J.hasData(e)&&(s=J.access(e),u=k.extend({},s),J.set(t,u))}}function Ie(n,r,i,o){r=g.apply([],r);var e,t,a,s,u,l,c=0,f=n.length,p=f-1,d=r[0],h=m(d);if(h||1<f&&"string"==typeof d&&!y.checkClone&&Le.test(d))return n.each(function(e){var t=n.eq(e);h&&(r[0]=d.call(this,e,t.html())),Ie(t,r,i,o)});if(f&&(t=(e=we(r,n[0].ownerDocument,!1,n,o)).firstChild,1===e.childNodes.length&&(e=t),t||o)){for(s=(a=k.map(ve(e,"script"),Pe)).length;c<f;c++)u=e,c!==p&&(u=k.clone(u,!0,!0),s&&k.merge(a,ve(u,"script"))),i.call(n[c],u,c);if(s)for(l=a[a.length-1].ownerDocument,k.map(a,Re),c=0;c<s;c++)u=a[c],he.test(u.type||"")&&!Q.access(u,"globalEval")&&k.contains(l,u)&&(u.src&&"module"!==(u.type||"").toLowerCase()?k._evalUrl&&!u.noModule&&k._evalUrl(u.src,{nonce:u.nonce||u.getAttribute("nonce")}):b(u.textContent.replace(He,""),u,l))}return n}function We(e,t,n){for(var r,i=t?k.filter(t,e):e,o=0;null!=(r=i[o]);o++)n||1!==r.nodeType||k.cleanData(ve(r)),r.parentNode&&(n&&oe(r)&&ye(ve(r,"script")),r.parentNode.removeChild(r));return e}k.extend({htmlPrefilter:function(e){return e.replace(je,"<$1></$2>")},clone:function(e,t,n){var r,i,o,a,s,u,l,c=e.cloneNode(!0),f=oe(e);if(!(y.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||k.isXMLDoc(e)))for(a=ve(c),r=0,i=(o=ve(e)).length;r<i;r++)s=o[r],u=a[r],void 0,"input"===(l=u.nodeName.toLowerCase())&&pe.test(s.type)?u.checked=s.checked:"input"!==l&&"textarea"!==l||(u.defaultValue=s.defaultValue);if(t)if(n)for(o=o||ve(e),a=a||ve(c),r=0,i=o.length;r<i;r++)Me(o[r],a[r]);else Me(e,c);return 0<(a=ve(c,"script")).length&&ye(a,!f&&ve(e,"script")),c},cleanData:function(e){for(var t,n,r,i=k.event.special,o=0;void 0!==(n=e[o]);o++)if(G(n)){if(t=n[Q.expando]){if(t.events)for(r in t.events)i[r]?k.event.remove(n,r):k.removeEvent(n,r,t.handle);n[Q.expando]=void 0}n[J.expando]&&(n[J.expando]=void 0)}}}),k.fn.extend({detach:function(e){return We(this,e,!0)},remove:function(e){return We(this,e)},text:function(e){return _(this,function(e){return void 0===e?k.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=e)})},null,e,arguments.length)},append:function(){return Ie(this,arguments,function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||Oe(this,e).appendChild(e)})},prepend:function(){return Ie(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Oe(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return Ie(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return Ie(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++)1===e.nodeType&&(k.cleanData(ve(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return k.clone(this,e,t)})},html:function(e){return _(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!qe.test(e)&&!ge[(de.exec(e)||["",""])[1].toLowerCase()]){e=k.htmlPrefilter(e);try{for(;n<r;n++)1===(t=this[n]||{}).nodeType&&(k.cleanData(ve(t,!1)),t.innerHTML=e);t=0}catch(e){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var n=[];return Ie(this,arguments,function(e){var t=this.parentNode;k.inArray(this,n)<0&&(k.cleanData(ve(this)),t&&t.replaceChild(e,this))},n)}}),k.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,a){k.fn[e]=function(e){for(var t,n=[],r=k(e),i=r.length-1,o=0;o<=i;o++)t=o===i?this:this.clone(!0),k(r[o])[a](t),u.apply(n,t.get());return this.pushStack(n)}});var $e=new RegExp("^("+te+")(?!px)[a-z%]+$","i"),Fe=function(e){var t=e.ownerDocument.defaultView;return t&&t.opener||(t=C),t.getComputedStyle(e)},Be=new RegExp(re.join("|"),"i");function _e(e,t,n){var r,i,o,a,s=e.style;return(n=n||Fe(e))&&(""!==(a=n.getPropertyValue(t)||n[t])||oe(e)||(a=k.style(e,t)),!y.pixelBoxStyles()&&$e.test(a)&&Be.test(t)&&(r=s.width,i=s.minWidth,o=s.maxWidth,s.minWidth=s.maxWidth=s.width=a,a=n.width,s.width=r,s.minWidth=i,s.maxWidth=o)),void 0!==a?a+"":a}function ze(e,t){return{get:function(){if(!e())return(this.get=t).apply(this,arguments);delete this.get}}}!function(){function e(){if(u){s.style.cssText="position:absolute;left:-11111px;width:60px;margin-top:1px;padding:0;border:0",u.style.cssText="position:relative;display:block;box-sizing:border-box;overflow:scroll;margin:auto;border:1px;padding:1px;width:60%;top:1%",ie.appendChild(s).appendChild(u);var e=C.getComputedStyle(u);n="1%"!==e.top,a=12===t(e.marginLeft),u.style.right="60%",o=36===t(e.right),r=36===t(e.width),u.style.position="absolute",i=12===t(u.offsetWidth/3),ie.removeChild(s),u=null}}function t(e){return Math.round(parseFloat(e))}var n,r,i,o,a,s=E.createElement("div"),u=E.createElement("div");u.style&&(u.style.backgroundClip="content-box",u.cloneNode(!0).style.backgroundClip="",y.clearCloneStyle="content-box"===u.style.backgroundClip,k.extend(y,{boxSizingReliable:function(){return e(),r},pixelBoxStyles:function(){return e(),o},pixelPosition:function(){return e(),n},reliableMarginLeft:function(){return e(),a},scrollboxSize:function(){return e(),i}}))}();var Ue=["Webkit","Moz","ms"],Xe=E.createElement("div").style,Ve={};function Ge(e){var t=k.cssProps[e]||Ve[e];return t||(e in Xe?e:Ve[e]=function(e){var t=e[0].toUpperCase()+e.slice(1),n=Ue.length;while(n--)if((e=Ue[n]+t)in Xe)return e}(e)||e)}var Ye=/^(none|table(?!-c[ea]).+)/,Qe=/^--/,Je={position:"absolute",visibility:"hidden",display:"block"},Ke={letterSpacing:"0",fontWeight:"400"};function Ze(e,t,n){var r=ne.exec(t);return r?Math.max(0,r[2]-(n||0))+(r[3]||"px"):t}function et(e,t,n,r,i,o){var a="width"===t?1:0,s=0,u=0;if(n===(r?"border":"content"))return 0;for(;a<4;a+=2)"margin"===n&&(u+=k.css(e,n+re[a],!0,i)),r?("content"===n&&(u-=k.css(e,"padding"+re[a],!0,i)),"margin"!==n&&(u-=k.css(e,"border"+re[a]+"Width",!0,i))):(u+=k.css(e,"padding"+re[a],!0,i),"padding"!==n?u+=k.css(e,"border"+re[a]+"Width",!0,i):s+=k.css(e,"border"+re[a]+"Width",!0,i));return!r&&0<=o&&(u+=Math.max(0,Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-o-u-s-.5))||0),u}function tt(e,t,n){var r=Fe(e),i=(!y.boxSizingReliable()||n)&&"border-box"===k.css(e,"boxSizing",!1,r),o=i,a=_e(e,t,r),s="offset"+t[0].toUpperCase()+t.slice(1);if($e.test(a)){if(!n)return a;a="auto"}return(!y.boxSizingReliable()&&i||"auto"===a||!parseFloat(a)&&"inline"===k.css(e,"display",!1,r))&&e.getClientRects().length&&(i="border-box"===k.css(e,"boxSizing",!1,r),(o=s in e)&&(a=e[s])),(a=parseFloat(a)||0)+et(e,t,n||(i?"border":"content"),o,r,a)+"px"}function nt(e,t,n,r,i){return new nt.prototype.init(e,t,n,r,i)}k.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=_e(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,gridArea:!0,gridColumn:!0,gridColumnEnd:!0,gridColumnStart:!0,gridRow:!0,gridRowEnd:!0,gridRowStart:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=V(t),u=Qe.test(t),l=e.style;if(u||(t=Ge(s)),a=k.cssHooks[t]||k.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:l[t];"string"===(o=typeof n)&&(i=ne.exec(n))&&i[1]&&(n=le(e,t,i),o="number"),null!=n&&n==n&&("number"!==o||u||(n+=i&&i[3]||(k.cssNumber[s]?"":"px")),y.clearCloneStyle||""!==n||0!==t.indexOf("background")||(l[t]="inherit"),a&&"set"in a&&void 0===(n=a.set(e,n,r))||(u?l.setProperty(t,n):l[t]=n))}},css:function(e,t,n,r){var i,o,a,s=V(t);return Qe.test(t)||(t=Ge(s)),(a=k.cssHooks[t]||k.cssHooks[s])&&"get"in a&&(i=a.get(e,!0,n)),void 0===i&&(i=_e(e,t,r)),"normal"===i&&t in Ke&&(i=Ke[t]),""===n||n?(o=parseFloat(i),!0===n||isFinite(o)?o||0:i):i}}),k.each(["height","width"],function(e,u){k.cssHooks[u]={get:function(e,t,n){if(t)return!Ye.test(k.css(e,"display"))||e.getClientRects().length&&e.getBoundingClientRect().width?tt(e,u,n):ue(e,Je,function(){return tt(e,u,n)})},set:function(e,t,n){var r,i=Fe(e),o=!y.scrollboxSize()&&"absolute"===i.position,a=(o||n)&&"border-box"===k.css(e,"boxSizing",!1,i),s=n?et(e,u,n,a,i):0;return a&&o&&(s-=Math.ceil(e["offset"+u[0].toUpperCase()+u.slice(1)]-parseFloat(i[u])-et(e,u,"border",!1,i)-.5)),s&&(r=ne.exec(t))&&"px"!==(r[3]||"px")&&(e.style[u]=t,t=k.css(e,u)),Ze(0,t,s)}}}),k.cssHooks.marginLeft=ze(y.reliableMarginLeft,function(e,t){if(t)return(parseFloat(_e(e,"marginLeft"))||e.getBoundingClientRect().left-ue(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}))+"px"}),k.each({margin:"",padding:"",border:"Width"},function(i,o){k.cssHooks[i+o]={expand:function(e){for(var t=0,n={},r="string"==typeof e?e.split(" "):[e];t<4;t++)n[i+re[t]+o]=r[t]||r[t-2]||r[0];return n}},"margin"!==i&&(k.cssHooks[i+o].set=Ze)}),k.fn.extend({css:function(e,t){return _(this,function(e,t,n){var r,i,o={},a=0;if(Array.isArray(t)){for(r=Fe(e),i=t.length;a<i;a++)o[t[a]]=k.css(e,t[a],!1,r);return o}return void 0!==n?k.style(e,t,n):k.css(e,t)},e,t,1<arguments.length)}}),((k.Tween=nt).prototype={constructor:nt,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||k.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(k.cssNumber[n]?"":"px")},cur:function(){var e=nt.propHooks[this.prop];return e&&e.get?e.get(this):nt.propHooks._default.get(this)},run:function(e){var t,n=nt.propHooks[this.prop];return this.options.duration?this.pos=t=k.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):nt.propHooks._default.set(this),this}}).init.prototype=nt.prototype,(nt.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=k.css(e.elem,e.prop,""))&&"auto"!==t?t:0},set:function(e){k.fx.step[e.prop]?k.fx.step[e.prop](e):1!==e.elem.nodeType||!k.cssHooks[e.prop]&&null==e.elem.style[Ge(e.prop)]?e.elem[e.prop]=e.now:k.style(e.elem,e.prop,e.now+e.unit)}}}).scrollTop=nt.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},k.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},k.fx=nt.prototype.init,k.fx.step={};var rt,it,ot,at,st=/^(?:toggle|show|hide)$/,ut=/queueHooks$/;function lt(){it&&(!1===E.hidden&&C.requestAnimationFrame?C.requestAnimationFrame(lt):C.setTimeout(lt,k.fx.interval),k.fx.tick())}function ct(){return C.setTimeout(function(){rt=void 0}),rt=Date.now()}function ft(e,t){var n,r=0,i={height:e};for(t=t?1:0;r<4;r+=2-t)i["margin"+(n=re[r])]=i["padding"+n]=e;return t&&(i.opacity=i.width=e),i}function pt(e,t,n){for(var r,i=(dt.tweeners[t]||[]).concat(dt.tweeners["*"]),o=0,a=i.length;o<a;o++)if(r=i[o].call(n,t,e))return r}function dt(o,e,t){var n,a,r=0,i=dt.prefilters.length,s=k.Deferred().always(function(){delete u.elem}),u=function(){if(a)return!1;for(var e=rt||ct(),t=Math.max(0,l.startTime+l.duration-e),n=1-(t/l.duration||0),r=0,i=l.tweens.length;r<i;r++)l.tweens[r].run(n);return s.notifyWith(o,[l,n,t]),n<1&&i?t:(i||s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l]),!1)},l=s.promise({elem:o,props:k.extend({},e),opts:k.extend(!0,{specialEasing:{},easing:k.easing._default},t),originalProperties:e,originalOptions:t,startTime:rt||ct(),duration:t.duration,tweens:[],createTween:function(e,t){var n=k.Tween(o,l.opts,e,t,l.opts.specialEasing[e]||l.opts.easing);return l.tweens.push(n),n},stop:function(e){var t=0,n=e?l.tweens.length:0;if(a)return this;for(a=!0;t<n;t++)l.tweens[t].run(1);return e?(s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l,e])):s.rejectWith(o,[l,e]),this}}),c=l.props;for(!function(e,t){var n,r,i,o,a;for(n in e)if(i=t[r=V(n)],o=e[n],Array.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),(a=k.cssHooks[r])&&"expand"in a)for(n in o=a.expand(o),delete e[r],o)n in e||(e[n]=o[n],t[n]=i);else t[r]=i}(c,l.opts.specialEasing);r<i;r++)if(n=dt.prefilters[r].call(l,o,c,l.opts))return m(n.stop)&&(k._queueHooks(l.elem,l.opts.queue).stop=n.stop.bind(n)),n;return k.map(c,pt,l),m(l.opts.start)&&l.opts.start.call(o,l),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always),k.fx.timer(k.extend(u,{elem:o,anim:l,queue:l.opts.queue})),l}k.Animation=k.extend(dt,{tweeners:{"*":[function(e,t){var n=this.createTween(e,t);return le(n.elem,e,ne.exec(t),n),n}]},tweener:function(e,t){m(e)?(t=e,e=["*"]):e=e.match(R);for(var n,r=0,i=e.length;r<i;r++)n=e[r],dt.tweeners[n]=dt.tweeners[n]||[],dt.tweeners[n].unshift(t)},prefilters:[function(e,t,n){var r,i,o,a,s,u,l,c,f="width"in t||"height"in t,p=this,d={},h=e.style,g=e.nodeType&&se(e),v=Q.get(e,"fxshow");for(r in n.queue||(null==(a=k._queueHooks(e,"fx")).unqueued&&(a.unqueued=0,s=a.empty.fire,a.empty.fire=function(){a.unqueued||s()}),a.unqueued++,p.always(function(){p.always(function(){a.unqueued--,k.queue(e,"fx").length||a.empty.fire()})})),t)if(i=t[r],st.test(i)){if(delete t[r],o=o||"toggle"===i,i===(g?"hide":"show")){if("show"!==i||!v||void 0===v[r])continue;g=!0}d[r]=v&&v[r]||k.style(e,r)}if((u=!k.isEmptyObject(t))||!k.isEmptyObject(d))for(r in f&&1===e.nodeType&&(n.overflow=[h.overflow,h.overflowX,h.overflowY],null==(l=v&&v.display)&&(l=Q.get(e,"display")),"none"===(c=k.css(e,"display"))&&(l?c=l:(fe([e],!0),l=e.style.display||l,c=k.css(e,"display"),fe([e]))),("inline"===c||"inline-block"===c&&null!=l)&&"none"===k.css(e,"float")&&(u||(p.done(function(){h.display=l}),null==l&&(c=h.display,l="none"===c?"":c)),h.display="inline-block")),n.overflow&&(h.overflow="hidden",p.always(function(){h.overflow=n.overflow[0],h.overflowX=n.overflow[1],h.overflowY=n.overflow[2]})),u=!1,d)u||(v?"hidden"in v&&(g=v.hidden):v=Q.access(e,"fxshow",{display:l}),o&&(v.hidden=!g),g&&fe([e],!0),p.done(function(){for(r in g||fe([e]),Q.remove(e,"fxshow"),d)k.style(e,r,d[r])})),u=pt(g?v[r]:0,r,p),r in v||(v[r]=u.start,g&&(u.end=u.start,u.start=0))}],prefilter:function(e,t){t?dt.prefilters.unshift(e):dt.prefilters.push(e)}}),k.speed=function(e,t,n){var r=e&&"object"==typeof e?k.extend({},e):{complete:n||!n&&t||m(e)&&e,duration:e,easing:n&&t||t&&!m(t)&&t};return k.fx.off?r.duration=0:"number"!=typeof r.duration&&(r.duration in k.fx.speeds?r.duration=k.fx.speeds[r.duration]:r.duration=k.fx.speeds._default),null!=r.queue&&!0!==r.queue||(r.queue="fx"),r.old=r.complete,r.complete=function(){m(r.old)&&r.old.call(this),r.queue&&k.dequeue(this,r.queue)},r},k.fn.extend({fadeTo:function(e,t,n,r){return this.filter(se).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(t,e,n,r){var i=k.isEmptyObject(t),o=k.speed(e,n,r),a=function(){var e=dt(this,k.extend({},t),o);(i||Q.get(this,"finish"))&&e.stop(!0)};return a.finish=a,i||!1===o.queue?this.each(a):this.queue(o.queue,a)},stop:function(i,e,o){var a=function(e){var t=e.stop;delete e.stop,t(o)};return"string"!=typeof i&&(o=e,e=i,i=void 0),e&&!1!==i&&this.queue(i||"fx",[]),this.each(function(){var e=!0,t=null!=i&&i+"queueHooks",n=k.timers,r=Q.get(this);if(t)r[t]&&r[t].stop&&a(r[t]);else for(t in r)r[t]&&r[t].stop&&ut.test(t)&&a(r[t]);for(t=n.length;t--;)n[t].elem!==this||null!=i&&n[t].queue!==i||(n[t].anim.stop(o),e=!1,n.splice(t,1));!e&&o||k.dequeue(this,i)})},finish:function(a){return!1!==a&&(a=a||"fx"),this.each(function(){var e,t=Q.get(this),n=t[a+"queue"],r=t[a+"queueHooks"],i=k.timers,o=n?n.length:0;for(t.finish=!0,k.queue(this,a,[]),r&&r.stop&&r.stop.call(this,!0),e=i.length;e--;)i[e].elem===this&&i[e].queue===a&&(i[e].anim.stop(!0),i.splice(e,1));for(e=0;e<o;e++)n[e]&&n[e].finish&&n[e].finish.call(this);delete t.finish})}}),k.each(["toggle","show","hide"],function(e,r){var i=k.fn[r];k.fn[r]=function(e,t,n){return null==e||"boolean"==typeof e?i.apply(this,arguments):this.animate(ft(r,!0),e,t,n)}}),k.each({slideDown:ft("show"),slideUp:ft("hide"),slideToggle:ft("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,r){k.fn[e]=function(e,t,n){return this.animate(r,e,t,n)}}),k.timers=[],k.fx.tick=function(){var e,t=0,n=k.timers;for(rt=Date.now();t<n.length;t++)(e=n[t])()||n[t]!==e||n.splice(t--,1);n.length||k.fx.stop(),rt=void 0},k.fx.timer=function(e){k.timers.push(e),k.fx.start()},k.fx.interval=13,k.fx.start=function(){it||(it=!0,lt())},k.fx.stop=function(){it=null},k.fx.speeds={slow:600,fast:200,_default:400},k.fn.delay=function(r,e){return r=k.fx&&k.fx.speeds[r]||r,e=e||"fx",this.queue(e,function(e,t){var n=C.setTimeout(e,r);t.stop=function(){C.clearTimeout(n)}})},ot=E.createElement("input"),at=E.createElement("select").appendChild(E.createElement("option")),ot.type="checkbox",y.checkOn=""!==ot.value,y.optSelected=at.selected,(ot=E.createElement("input")).value="t",ot.type="radio",y.radioValue="t"===ot.value;var ht,gt=k.expr.attrHandle;k.fn.extend({attr:function(e,t){return _(this,k.attr,e,t,1<arguments.length)},removeAttr:function(e){return this.each(function(){k.removeAttr(this,e)})}}),k.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?k.prop(e,t,n):(1===o&&k.isXMLDoc(e)||(i=k.attrHooks[t.toLowerCase()]||(k.expr.match.bool.test(t)?ht:void 0)),void 0!==n?null===n?void k.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:null==(r=k.find.attr(e,t))?void 0:r)},attrHooks:{type:{set:function(e,t){if(!y.radioValue&&"radio"===t&&A(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r=0,i=t&&t.match(R);if(i&&1===e.nodeType)while(n=i[r++])e.removeAttribute(n)}}),ht={set:function(e,t,n){return!1===t?k.removeAttr(e,n):e.setAttribute(n,n),n}},k.each(k.expr.match.bool.source.match(/\w+/g),function(e,t){var a=gt[t]||k.find.attr;gt[t]=function(e,t,n){var r,i,o=t.toLowerCase();return n||(i=gt[o],gt[o]=r,r=null!=a(e,t,n)?o:null,gt[o]=i),r}});var vt=/^(?:input|select|textarea|button)$/i,yt=/^(?:a|area)$/i;function mt(e){return(e.match(R)||[]).join(" ")}function xt(e){return e.getAttribute&&e.getAttribute("class")||""}function bt(e){return Array.isArray(e)?e:"string"==typeof e&&e.match(R)||[]}k.fn.extend({prop:function(e,t){return _(this,k.prop,e,t,1<arguments.length)},removeProp:function(e){return this.each(function(){delete this[k.propFix[e]||e]})}}),k.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&k.isXMLDoc(e)||(t=k.propFix[t]||t,i=k.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=k.find.attr(e,"tabindex");return t?parseInt(t,10):vt.test(e.nodeName)||yt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),y.optSelected||(k.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),k.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){k.propFix[this.toLowerCase()]=this}),k.fn.extend({addClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){k(this).addClass(t.call(this,e,xt(this)))});if((e=bt(t)).length)while(n=this[u++])if(i=xt(n),r=1===n.nodeType&&" "+mt(i)+" "){a=0;while(o=e[a++])r.indexOf(" "+o+" ")<0&&(r+=o+" ");i!==(s=mt(r))&&n.setAttribute("class",s)}return this},removeClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){k(this).removeClass(t.call(this,e,xt(this)))});if(!arguments.length)return this.attr("class","");if((e=bt(t)).length)while(n=this[u++])if(i=xt(n),r=1===n.nodeType&&" "+mt(i)+" "){a=0;while(o=e[a++])while(-1<r.indexOf(" "+o+" "))r=r.replace(" "+o+" "," ");i!==(s=mt(r))&&n.setAttribute("class",s)}return this},toggleClass:function(i,t){var o=typeof i,a="string"===o||Array.isArray(i);return"boolean"==typeof t&&a?t?this.addClass(i):this.removeClass(i):m(i)?this.each(function(e){k(this).toggleClass(i.call(this,e,xt(this),t),t)}):this.each(function(){var e,t,n,r;if(a){t=0,n=k(this),r=bt(i);while(e=r[t++])n.hasClass(e)?n.removeClass(e):n.addClass(e)}else void 0!==i&&"boolean"!==o||((e=xt(this))&&Q.set(this,"__className__",e),this.setAttribute&&this.setAttribute("class",e||!1===i?"":Q.get(this,"__className__")||""))})},hasClass:function(e){var t,n,r=0;t=" "+e+" ";while(n=this[r++])if(1===n.nodeType&&-1<(" "+mt(xt(n))+" ").indexOf(t))return!0;return!1}});var wt=/\r/g;k.fn.extend({val:function(n){var r,e,i,t=this[0];return arguments.length?(i=m(n),this.each(function(e){var t;1===this.nodeType&&(null==(t=i?n.call(this,e,k(this).val()):n)?t="":"number"==typeof t?t+="":Array.isArray(t)&&(t=k.map(t,function(e){return null==e?"":e+""})),(r=k.valHooks[this.type]||k.valHooks[this.nodeName.toLowerCase()])&&"set"in r&&void 0!==r.set(this,t,"value")||(this.value=t))})):t?(r=k.valHooks[t.type]||k.valHooks[t.nodeName.toLowerCase()])&&"get"in r&&void 0!==(e=r.get(t,"value"))?e:"string"==typeof(e=t.value)?e.replace(wt,""):null==e?"":e:void 0}}),k.extend({valHooks:{option:{get:function(e){var t=k.find.attr(e,"value");return null!=t?t:mt(k.text(e))}},select:{get:function(e){var t,n,r,i=e.options,o=e.selectedIndex,a="select-one"===e.type,s=a?null:[],u=a?o+1:i.length;for(r=o<0?u:a?o:0;r<u;r++)if(((n=i[r]).selected||r===o)&&!n.disabled&&(!n.parentNode.disabled||!A(n.parentNode,"optgroup"))){if(t=k(n).val(),a)return t;s.push(t)}return s},set:function(e,t){var n,r,i=e.options,o=k.makeArray(t),a=i.length;while(a--)((r=i[a]).selected=-1<k.inArray(k.valHooks.option.get(r),o))&&(n=!0);return n||(e.selectedIndex=-1),o}}}}),k.each(["radio","checkbox"],function(){k.valHooks[this]={set:function(e,t){if(Array.isArray(t))return e.checked=-1<k.inArray(k(e).val(),t)}},y.checkOn||(k.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})}),y.focusin="onfocusin"in C;var Tt=/^(?:focusinfocus|focusoutblur)$/,Ct=function(e){e.stopPropagation()};k.extend(k.event,{trigger:function(e,t,n,r){var i,o,a,s,u,l,c,f,p=[n||E],d=v.call(e,"type")?e.type:e,h=v.call(e,"namespace")?e.namespace.split("."):[];if(o=f=a=n=n||E,3!==n.nodeType&&8!==n.nodeType&&!Tt.test(d+k.event.triggered)&&(-1<d.indexOf(".")&&(d=(h=d.split(".")).shift(),h.sort()),u=d.indexOf(":")<0&&"on"+d,(e=e[k.expando]?e:new k.Event(d,"object"==typeof e&&e)).isTrigger=r?2:3,e.namespace=h.join("."),e.rnamespace=e.namespace?new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,e.result=void 0,e.target||(e.target=n),t=null==t?[e]:k.makeArray(t,[e]),c=k.event.special[d]||{},r||!c.trigger||!1!==c.trigger.apply(n,t))){if(!r&&!c.noBubble&&!x(n)){for(s=c.delegateType||d,Tt.test(s+d)||(o=o.parentNode);o;o=o.parentNode)p.push(o),a=o;a===(n.ownerDocument||E)&&p.push(a.defaultView||a.parentWindow||C)}i=0;while((o=p[i++])&&!e.isPropagationStopped())f=o,e.type=1<i?s:c.bindType||d,(l=(Q.get(o,"events")||{})[e.type]&&Q.get(o,"handle"))&&l.apply(o,t),(l=u&&o[u])&&l.apply&&G(o)&&(e.result=l.apply(o,t),!1===e.result&&e.preventDefault());return e.type=d,r||e.isDefaultPrevented()||c._default&&!1!==c._default.apply(p.pop(),t)||!G(n)||u&&m(n[d])&&!x(n)&&((a=n[u])&&(n[u]=null),k.event.triggered=d,e.isPropagationStopped()&&f.addEventListener(d,Ct),n[d](),e.isPropagationStopped()&&f.removeEventListener(d,Ct),k.event.triggered=void 0,a&&(n[u]=a)),e.result}},simulate:function(e,t,n){var r=k.extend(new k.Event,n,{type:e,isSimulated:!0});k.event.trigger(r,null,t)}}),k.fn.extend({trigger:function(e,t){return this.each(function(){k.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return k.event.trigger(e,t,n,!0)}}),y.focusin||k.each({focus:"focusin",blur:"focusout"},function(n,r){var i=function(e){k.event.simulate(r,e.target,k.event.fix(e))};k.event.special[r]={setup:function(){var e=this.ownerDocument||this,t=Q.access(e,r);t||e.addEventListener(n,i,!0),Q.access(e,r,(t||0)+1)},teardown:function(){var e=this.ownerDocument||this,t=Q.access(e,r)-1;t?Q.access(e,r,t):(e.removeEventListener(n,i,!0),Q.remove(e,r))}}});var Et=C.location,kt=Date.now(),St=/\?/;k.parseXML=function(e){var t;if(!e||"string"!=typeof e)return null;try{t=(new C.DOMParser).parseFromString(e,"text/xml")}catch(e){t=void 0}return t&&!t.getElementsByTagName("parsererror").length||k.error("Invalid XML: "+e),t};var Nt=/\[\]$/,At=/\r?\n/g,Dt=/^(?:submit|button|image|reset|file)$/i,jt=/^(?:input|select|textarea|keygen)/i;function qt(n,e,r,i){var t;if(Array.isArray(e))k.each(e,function(e,t){r||Nt.test(n)?i(n,t):qt(n+"["+("object"==typeof t&&null!=t?e:"")+"]",t,r,i)});else if(r||"object"!==w(e))i(n,e);else for(t in e)qt(n+"["+t+"]",e[t],r,i)}k.param=function(e,t){var n,r=[],i=function(e,t){var n=m(t)?t():t;r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(null==n?"":n)};if(null==e)return"";if(Array.isArray(e)||e.jquery&&!k.isPlainObject(e))k.each(e,function(){i(this.name,this.value)});else for(n in e)qt(n,e[n],t,i);return r.join("&")},k.fn.extend({serialize:function(){return k.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=k.prop(this,"elements");return e?k.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!k(this).is(":disabled")&&jt.test(this.nodeName)&&!Dt.test(e)&&(this.checked||!pe.test(e))}).map(function(e,t){var n=k(this).val();return null==n?null:Array.isArray(n)?k.map(n,function(e){return{name:t.name,value:e.replace(At,"\r\n")}}):{name:t.name,value:n.replace(At,"\r\n")}}).get()}});var Lt=/%20/g,Ht=/#.*$/,Ot=/([?&])_=[^&]*/,Pt=/^(.*?):[ \t]*([^\r\n]*)$/gm,Rt=/^(?:GET|HEAD)$/,Mt=/^\/\//,It={},Wt={},$t="*/".concat("*"),Ft=E.createElement("a");function Bt(o){return function(e,t){"string"!=typeof e&&(t=e,e="*");var n,r=0,i=e.toLowerCase().match(R)||[];if(m(t))while(n=i[r++])"+"===n[0]?(n=n.slice(1)||"*",(o[n]=o[n]||[]).unshift(t)):(o[n]=o[n]||[]).push(t)}}function _t(t,i,o,a){var s={},u=t===Wt;function l(e){var r;return s[e]=!0,k.each(t[e]||[],function(e,t){var n=t(i,o,a);return"string"!=typeof n||u||s[n]?u?!(r=n):void 0:(i.dataTypes.unshift(n),l(n),!1)}),r}return l(i.dataTypes[0])||!s["*"]&&l("*")}function zt(e,t){var n,r,i=k.ajaxSettings.flatOptions||{};for(n in t)void 0!==t[n]&&((i[n]?e:r||(r={}))[n]=t[n]);return r&&k.extend(!0,e,r),e}Ft.href=Et.href,k.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Et.href,type:"GET",isLocal:/^(?:about|app|app-storage|.+-extension|file|res|widget):$/.test(Et.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":$t,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":k.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?zt(zt(e,k.ajaxSettings),t):zt(k.ajaxSettings,e)},ajaxPrefilter:Bt(It),ajaxTransport:Bt(Wt),ajax:function(e,t){"object"==typeof e&&(t=e,e=void 0),t=t||{};var c,f,p,n,d,r,h,g,i,o,v=k.ajaxSetup({},t),y=v.context||v,m=v.context&&(y.nodeType||y.jquery)?k(y):k.event,x=k.Deferred(),b=k.Callbacks("once memory"),w=v.statusCode||{},a={},s={},u="canceled",T={readyState:0,getResponseHeader:function(e){var t;if(h){if(!n){n={};while(t=Pt.exec(p))n[t[1].toLowerCase()+" "]=(n[t[1].toLowerCase()+" "]||[]).concat(t[2])}t=n[e.toLowerCase()+" "]}return null==t?null:t.join(", ")},getAllResponseHeaders:function(){return h?p:null},setRequestHeader:function(e,t){return null==h&&(e=s[e.toLowerCase()]=s[e.toLowerCase()]||e,a[e]=t),this},overrideMimeType:function(e){return null==h&&(v.mimeType=e),this},statusCode:function(e){var t;if(e)if(h)T.always(e[T.status]);else for(t in e)w[t]=[w[t],e[t]];return this},abort:function(e){var t=e||u;return c&&c.abort(t),l(0,t),this}};if(x.promise(T),v.url=((e||v.url||Et.href)+"").replace(Mt,Et.protocol+"//"),v.type=t.method||t.type||v.method||v.type,v.dataTypes=(v.dataType||"*").toLowerCase().match(R)||[""],null==v.crossDomain){r=E.createElement("a");try{r.href=v.url,r.href=r.href,v.crossDomain=Ft.protocol+"//"+Ft.host!=r.protocol+"//"+r.host}catch(e){v.crossDomain=!0}}if(v.data&&v.processData&&"string"!=typeof v.data&&(v.data=k.param(v.data,v.traditional)),_t(It,v,t,T),h)return T;for(i in(g=k.event&&v.global)&&0==k.active++&&k.event.trigger("ajaxStart"),v.type=v.type.toUpperCase(),v.hasContent=!Rt.test(v.type),f=v.url.replace(Ht,""),v.hasContent?v.data&&v.processData&&0===(v.contentType||"").indexOf("application/x-www-form-urlencoded")&&(v.data=v.data.replace(Lt,"+")):(o=v.url.slice(f.length),v.data&&(v.processData||"string"==typeof v.data)&&(f+=(St.test(f)?"&":"?")+v.data,delete v.data),!1===v.cache&&(f=f.replace(Ot,"$1"),o=(St.test(f)?"&":"?")+"_="+kt+++o),v.url=f+o),v.ifModified&&(k.lastModified[f]&&T.setRequestHeader("If-Modified-Since",k.lastModified[f]),k.etag[f]&&T.setRequestHeader("If-None-Match",k.etag[f])),(v.data&&v.hasContent&&!1!==v.contentType||t.contentType)&&T.setRequestHeader("Content-Type",v.contentType),T.setRequestHeader("Accept",v.dataTypes[0]&&v.accepts[v.dataTypes[0]]?v.accepts[v.dataTypes[0]]+("*"!==v.dataTypes[0]?", "+$t+"; q=0.01":""):v.accepts["*"]),v.headers)T.setRequestHeader(i,v.headers[i]);if(v.beforeSend&&(!1===v.beforeSend.call(y,T,v)||h))return T.abort();if(u="abort",b.add(v.complete),T.done(v.success),T.fail(v.error),c=_t(Wt,v,t,T)){if(T.readyState=1,g&&m.trigger("ajaxSend",[T,v]),h)return T;v.async&&0<v.timeout&&(d=C.setTimeout(function(){T.abort("timeout")},v.timeout));try{h=!1,c.send(a,l)}catch(e){if(h)throw e;l(-1,e)}}else l(-1,"No Transport");function l(e,t,n,r){var i,o,a,s,u,l=t;h||(h=!0,d&&C.clearTimeout(d),c=void 0,p=r||"",T.readyState=0<e?4:0,i=200<=e&&e<300||304===e,n&&(s=function(e,t,n){var r,i,o,a,s=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),void 0===r&&(r=e.mimeType||t.getResponseHeader("Content-Type"));if(r)for(i in s)if(s[i]&&s[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||e.converters[i+" "+u[0]]){o=i;break}a||(a=i)}o=o||a}if(o)return o!==u[0]&&u.unshift(o),n[o]}(v,T,n)),s=function(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(!(a=l[u+" "+o]||l["* "+o]))for(i in l)if((s=i.split(" "))[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){!0===a?a=l[i]:!0!==l[i]&&(o=s[0],c.unshift(s[1]));break}if(!0!==a)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(e){return{state:"parsererror",error:a?e:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}(v,s,T,i),i?(v.ifModified&&((u=T.getResponseHeader("Last-Modified"))&&(k.lastModified[f]=u),(u=T.getResponseHeader("etag"))&&(k.etag[f]=u)),204===e||"HEAD"===v.type?l="nocontent":304===e?l="notmodified":(l=s.state,o=s.data,i=!(a=s.error))):(a=l,!e&&l||(l="error",e<0&&(e=0))),T.status=e,T.statusText=(t||l)+"",i?x.resolveWith(y,[o,l,T]):x.rejectWith(y,[T,l,a]),T.statusCode(w),w=void 0,g&&m.trigger(i?"ajaxSuccess":"ajaxError",[T,v,i?o:a]),b.fireWith(y,[T,l]),g&&(m.trigger("ajaxComplete",[T,v]),--k.active||k.event.trigger("ajaxStop")))}return T},getJSON:function(e,t,n){return k.get(e,t,n,"json")},getScript:function(e,t){return k.get(e,void 0,t,"script")}}),k.each(["get","post"],function(e,i){k[i]=function(e,t,n,r){return m(t)&&(r=r||n,n=t,t=void 0),k.ajax(k.extend({url:e,type:i,dataType:r,data:t,success:n},k.isPlainObject(e)&&e))}}),k._evalUrl=function(e,t){return k.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,converters:{"text script":function(){}},dataFilter:function(e){k.globalEval(e,t)}})},k.fn.extend({wrapAll:function(e){var t;return this[0]&&(m(e)&&(e=e.call(this[0])),t=k(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstElementChild)e=e.firstElementChild;return e}).append(this)),this},wrapInner:function(n){return m(n)?this.each(function(e){k(this).wrapInner(n.call(this,e))}):this.each(function(){var e=k(this),t=e.contents();t.length?t.wrapAll(n):e.append(n)})},wrap:function(t){var n=m(t);return this.each(function(e){k(this).wrapAll(n?t.call(this,e):t)})},unwrap:function(e){return this.parent(e).not("body").each(function(){k(this).replaceWith(this.childNodes)}),this}}),k.expr.pseudos.hidden=function(e){return!k.expr.pseudos.visible(e)},k.expr.pseudos.visible=function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)},k.ajaxSettings.xhr=function(){try{return new C.XMLHttpRequest}catch(e){}};var Ut={0:200,1223:204},Xt=k.ajaxSettings.xhr();y.cors=!!Xt&&"withCredentials"in Xt,y.ajax=Xt=!!Xt,k.ajaxTransport(function(i){var o,a;if(y.cors||Xt&&!i.crossDomain)return{send:function(e,t){var n,r=i.xhr();if(r.open(i.type,i.url,i.async,i.username,i.password),i.xhrFields)for(n in i.xhrFields)r[n]=i.xhrFields[n];for(n in i.mimeType&&r.overrideMimeType&&r.overrideMimeType(i.mimeType),i.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest"),e)r.setRequestHeader(n,e[n]);o=function(e){return function(){o&&(o=a=r.onload=r.onerror=r.onabort=r.ontimeout=r.onreadystatechange=null,"abort"===e?r.abort():"error"===e?"number"!=typeof r.status?t(0,"error"):t(r.status,r.statusText):t(Ut[r.status]||r.status,r.statusText,"text"!==(r.responseType||"text")||"string"!=typeof r.responseText?{binary:r.response}:{text:r.responseText},r.getAllResponseHeaders()))}},r.onload=o(),a=r.onerror=r.ontimeout=o("error"),void 0!==r.onabort?r.onabort=a:r.onreadystatechange=function(){4===r.readyState&&C.setTimeout(function(){o&&a()})},o=o("abort");try{r.send(i.hasContent&&i.data||null)}catch(e){if(o)throw e}},abort:function(){o&&o()}}}),k.ajaxPrefilter(function(e){e.crossDomain&&(e.contents.script=!1)}),k.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return k.globalEval(e),e}}}),k.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET")}),k.ajaxTransport("script",function(n){var r,i;if(n.crossDomain||n.scriptAttrs)return{send:function(e,t){r=k("<script>").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),E.head.appendChild(r[0])},abort:function(){i&&i()}}});var Vt,Gt=[],Yt=/(=)\?(?=&|$)|\?\?/;k.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Gt.pop()||k.expando+"_"+kt++;return this[e]=!0,e}}),k.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Yt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Yt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Yt,"$1"+r):!1!==e.jsonp&&(e.url+=(St.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||k.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?k(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Gt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),y.createHTMLDocument=((Vt=E.implementation.createHTMLDocument("").body).innerHTML="<form></form><form></form>",2===Vt.childNodes.length),k.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(y.createHTMLDocument?((r=(t=E.implementation.createHTMLDocument("")).createElement("base")).href=E.location.href,t.head.appendChild(r)):t=E),o=!n&&[],(i=D.exec(e))?[t.createElement(i[1])]:(i=we([e],t,o),o&&o.length&&k(o).remove(),k.merge([],i.childNodes)));var r,i,o},k.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1<s&&(r=mt(e.slice(s)),e=e.slice(0,s)),m(t)?(n=t,t=void 0):t&&"object"==typeof t&&(i="POST"),0<a.length&&k.ajax({url:e,type:i||"GET",dataType:"html",data:t}).done(function(e){o=arguments,a.html(r?k("<div>").append(k.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},k.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){k.fn[t]=function(e){return this.on(t,e)}}),k.expr.pseudos.animated=function(t){return k.grep(k.timers,function(e){return t===e.elem}).length},k.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=k.css(e,"position"),c=k(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=k.css(e,"top"),u=k.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,k.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):c.css(f)}},k.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){k.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===k.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===k.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=k(e).offset()).top+=k.css(e,"borderTopWidth",!0),i.left+=k.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-k.css(r,"marginTop",!0),left:t.left-i.left-k.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===k.css(e,"position"))e=e.offsetParent;return e||ie})}}),k.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;k.fn[t]=function(e){return _(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),k.each(["top","left"],function(e,n){k.cssHooks[n]=ze(y.pixelPosition,function(e,t){if(t)return t=_e(e,n),$e.test(t)?k(e).position()[n]+"px":t})}),k.each({Height:"height",Width:"width"},function(a,s){k.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){k.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return _(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?k.css(e,t,i):k.style(e,t,n,i)},s,n?e:void 0,n)}})}),k.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){k.fn[n]=function(e,t){return 0<arguments.length?this.on(n,null,e,t):this.trigger(n)}}),k.fn.extend({hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),k.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)}}),k.proxy=function(e,t){var n,r,i;if("string"==typeof t&&(n=e[t],t=e,e=n),m(e))return r=s.call(arguments,2),(i=function(){return e.apply(t||this,r.concat(s.call(arguments)))}).guid=e.guid=e.guid||k.guid++,i},k.holdReady=function(e){e?k.readyWait++:k.ready(!0)},k.isArray=Array.isArray,k.parseJSON=JSON.parse,k.nodeName=A,k.isFunction=m,k.isWindow=x,k.camelCase=V,k.type=w,k.now=Date.now,k.isNumeric=function(e){var t=k.type(e);return("number"===t||"string"===t)&&!isNaN(e-parseFloat(e))},"function"==typeof define&&define.amd&&define("jquery",[],function(){return k});var Qt=C.jQuery,Jt=C.$;return k.noConflict=function(e){return C.$===k&&(C.$=Jt),e&&C.jQuery===k&&(C.jQuery=Qt),k},e||(C.jQuery=C.$=k),k});
diff --git a/qpysdk/src/main/assets/webapp.html b/qpysdk/src/main/assets/webapp.html
new file mode 100644
index 00000000..b1119779
--- /dev/null
+++ b/qpysdk/src/main/assets/webapp.html
@@ -0,0 +1,43 @@
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <meta name="description" content="">
+    <meta name="author" content="">
+    <title>QPY WEBAPP</title>
+    <link href="file:///android_asset/stylesheets/css/bootstrap.min.css" rel="stylesheet">
+    <link href="file:///android_asset/stylesheets/css/sticky-footer.css" rel="stylesheet">
+    <script src="file:///android_asset/stylesheets/js/jquery.min.js"></script>
+    <script src="file:///android_asset/stylesheets/js/bootstrap.min.js"></script>
+    {{QPYBUILTIN}}
+    <script>
+        function appExit() {
+            var android = new AndroidHelper();
+            android.dismiss();
+        }
+    </script>
+</head>
+<body>
+
+<div class="d-flex flex-column flex-md-row align-items-center p-3 px-md-4 mb-3 bg-white border-bottom shadow-sm">
+    <h5 class="my-0 mr-md-auto font-weight-normal" id="app-name">QPY WEBAPP</h5>
+    <nav class="my-2 my-md-0 mr-md-3" id="app-nav">
+        <a class="p-2 text-dark" href="#">NAV1</a>
+        <a class="p-2 text-dark" href="#">NAV2</a>
+    </nav>
+    <a class="btn btn-outline-primary" id="app-exit" href="javascript:appExit()">Exit</a>
+</div>
+
+<!-- Begin page content -->
+<main role="main" class="container">
+    {{WEBAPPCONTENT}}
+</main>
+
+<footer class="footer">
+    <div class="container">
+        <a href="javascript:appExit()" class="text-muted">Exit</a>
+        <span class="text-muted float-right">Powered by QPY</span>
+    </div>
+</footer>
+</body>
+</html>
\ No newline at end of file
diff --git a/qpysdk/src/main/java/com/android/vending/billing/IInAppBillingService.aidl b/qpysdk/src/main/java/com/android/vending/billing/IInAppBillingService.aidl
new file mode 100644
index 00000000..2a492f78
--- /dev/null
+++ b/qpysdk/src/main/java/com/android/vending/billing/IInAppBillingService.aidl
@@ -0,0 +1,144 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.vending.billing;
+
+import android.os.Bundle;
+
+/**
+ * InAppBillingService is the service that provides in-app billing version 3 and beyond.
+ * This service provides the following features:
+ * 1. Provides a new API to get details of in-app items published for the app including
+ *    price, type, title and description.
+ * 2. The purchase flow is synchronous and purchase information is available immediately
+ *    after it completes.
+ * 3. Purchase information of in-app purchases is maintained within the Google Play system
+ *    till the purchase is consumed.
+ * 4. An API to consume a purchase of an inapp item. All purchases of one-time
+ *    in-app items are consumable and thereafter can be purchased again.
+ * 5. An API to get current purchases of the user immediately. This will not contain any
+ *    consumed purchases.
+ *
+ * All calls will give a response code with the following possible values
+ * RESULT_OK = 0 - success
+ * RESULT_USER_CANCELED = 1 - user pressed back or canceled a dialog
+ * RESULT_BILLING_UNAVAILABLE = 3 - this billing API version is not supported for the type requested
+ * RESULT_ITEM_UNAVAILABLE = 4 - requested SKU is not available for purchase
+ * RESULT_DEVELOPER_ERROR = 5 - invalid arguments provided to the API
+ * RESULT_ERROR = 6 - Fatal error during the API action
+ * RESULT_ITEM_ALREADY_OWNED = 7 - Failure to purchase since item is already owned
+ * RESULT_ITEM_NOT_OWNED = 8 - Failure to consume since item is not owned
+ */
+interface IInAppBillingService {
+    /**
+     * Checks support for the requested billing API version, package and in-app type.
+     * Minimum API version supported by this interface is 3.
+     * @param apiVersion the billing version which the app is using
+     * @param packageName the package name of the calling app
+     * @param type type of the in-app item being purchased "inapp" for one-time purchases
+     *        and "subs" for subscription.
+     * @return RESULT_OK(0) on success, corresponding result code on failures
+     */
+    int isBillingSupported(int apiVersion, String packageName, String type);
+
+    /**
+     * Provides details of a list of SKUs
+     * Given a list of SKUs of a valid type in the skusBundle, this returns a bundle
+     * with a list JSON strings containing the productId, price, title and description.
+     * This API can be called with a maximum of 20 SKUs.
+     * @param apiVersion billing API version that the Third-party is using
+     * @param packageName the package name of the calling app
+     * @param skusBundle bundle containing a StringArrayList of SKUs with key "ITEM_ID_LIST"
+     * @return Bundle containing the following key-value pairs
+     *         "RESPONSE_CODE" with int value, RESULT_OK(0) if success, other response codes on
+     *              failure as listed above.
+     *         "DETAILS_LIST" with a StringArrayList containing purchase information
+     *              in JSON format similar to:
+     *              '{ "productId" : "exampleSku", "type" : "inapp", "price" : "$5.00",
+     *                 "title : "Example Title", "description" : "This is an example description" }'
+     */
+    Bundle getSkuDetails(int apiVersion, String packageName, String type, in Bundle skusBundle);
+
+    /**
+     * Returns a pending intent to launch the purchase flow for an in-app item by providing a SKU,
+     * the type, a unique purchase token and an optional developer payload.
+     * @param apiVersion billing API version that the app is using
+     * @param packageName package name of the calling app
+     * @param sku the SKU of the in-app item as published in the developer console
+     * @param type the type of the in-app item ("inapp" for one-time purchases
+     *        and "subs" for subscription).
+     * @param developerPayload optional argument to be sent back with the purchase information
+     * @return Bundle containing the following key-value pairs
+     *         "RESPONSE_CODE" with int value, RESULT_OK(0) if success, other response codes on
+     *              failure as listed above.
+     *         "BUY_INTENT" - PendingIntent to start the purchase flow
+     *
+     * The Pending intent should be launched with startIntentSenderForResult. When purchase flow
+     * has completed, the onActivityResult() will give a resultCode of OK or CANCELED.
+     * If the purchase is successful, the result data will contain the following key-value pairs
+     *         "RESPONSE_CODE" with int value, RESULT_OK(0) if success, other response codes on
+     *              failure as listed above.
+     *         "INAPP_PURCHASE_DATA" - String in JSON format similar to
+     *              '{"orderId":"12999763169054705758.1371079406387615",
+     *                "packageName":"com.example.app",
+     *                "productId":"exampleSku",
+     *                "purchaseTime":1345678900000,
+     *                "purchaseToken" : "122333444455555",
+     *                "developerPayload":"example developer payload" }'
+     *         "INAPP_DATA_SIGNATURE" - String containing the signature of the purchase data that
+     *                                  was signed with the private key of the developer
+     *                                  TODO: change this to app-specific keys.
+     */
+    Bundle getBuyIntent(int apiVersion, String packageName, String sku, String type,
+        String developerPayload);
+
+    /**
+     * Returns the current SKUs owned by the user of the type and package name specified along with
+     * purchase information and a signature of the data to be validated.
+     * This will return all SKUs that have been purchased in V3 and managed items purchased using
+     * V1 and V2 that have not been consumed.
+     * @param apiVersion billing API version that the app is using
+     * @param packageName package name of the calling app
+     * @param type the type of the in-app items being requested
+     *        ("inapp" for one-time purchases and "subs" for subscription).
+     * @param continuationToken to be set as null for the first call, if the number of owned
+     *        skus are too many, a continuationToken is returned in the response bundle.
+     *        This method can be called again with the continuation token to get the next set of
+     *        owned skus.
+     * @return Bundle containing the following key-value pairs
+     *         "RESPONSE_CODE" with int value, RESULT_OK(0) if success, other response codes on
+     *              failure as listed above.
+     *         "INAPP_PURCHASE_ITEM_LIST" - StringArrayList containing the list of SKUs
+     *         "INAPP_PURCHASE_DATA_LIST" - StringArrayList containing the purchase information
+     *         "INAPP_DATA_SIGNATURE_LIST"- StringArrayList containing the signatures
+     *                                      of the purchase information
+     *         "INAPP_CONTINUATION_TOKEN" - String containing a continuation token for the
+     *                                      next set of in-app purchases. Only set if the
+     *                                      user has more owned skus than the current list.
+     */
+    Bundle getPurchases(int apiVersion, String packageName, String type, String continuationToken);
+
+    /**
+     * Consume the last purchase of the given SKU. This will result in this item being removed
+     * from all subsequent responses to getPurchases() and allow re-purchase of this item.
+     * @param apiVersion billing API version that the app is using
+     * @param packageName package name of the calling app
+     * @param purchaseToken token in the purchase information JSON that identifies the purchase
+     *        to be consumed
+     * @return 0 if consumption succeeded. Appropriate error values for failures.
+     */
+    int consumePurchase(int apiVersion, String packageName, String purchaseToken);
+}
diff --git a/qpysdk/src/main/java/org/audiostream/AudioIn.java b/qpysdk/src/main/java/org/audiostream/AudioIn.java
new file mode 100644
index 00000000..6823aec7
--- /dev/null
+++ b/qpysdk/src/main/java/org/audiostream/AudioIn.java
@@ -0,0 +1,100 @@
+/*
+ * Audio microphone thread.
+ */
+
+package org.audiostream;
+
+import java.lang.Thread;
+import android.os.Process;
+import android.media.AudioRecord;
+import android.util.Log;
+import java.nio.ByteBuffer;
+
+class AudioIn extends Thread {
+	private static String TAG = "AudioIn";
+	private boolean stopped = false;
+	static AudioIn instance = null;
+
+	int rate;
+	int channel;
+	int encoding;
+	int bufsize;
+	int source;
+
+	public AudioIn(int source, int bufsize, int rate, int channel, int encoding) {
+		this.source = source;
+		this.rate = rate;
+		this.channel = channel;
+		this.encoding = encoding;
+		this.bufsize = bufsize;
+	}
+
+	static public boolean check_configuration(int bufsize, int rate, int channel, int encoding) {
+		int minbufsize = AudioRecord.getMinBufferSize(rate, channel, encoding);
+		Log.d(TAG, String.format("check_configuration() min buffer size is %d", minbufsize));
+		if ( minbufsize < 0 )
+			return false;
+		if ( bufsize > 0 && bufsize < minbufsize )
+			return false;
+		return true;
+	}
+
+	@Override
+	public void run() {
+		AudioRecord recorder = null;
+		ByteBuffer buffer = null;
+		int N = 0;
+
+		Log.d(TAG, "Starting audio recording thread");
+
+		Process.setThreadPriority(Process.THREAD_PRIORITY_URGENT_AUDIO);
+
+		try {
+			// ... initialize
+			int bufsize = AudioRecord.getMinBufferSize(this.rate, this.channel, this.encoding);
+			if ( this.bufsize <= bufsize )
+				this.bufsize = bufsize;
+			Log.d(TAG, String.format("Audio bufsize is %d bytes", bufsize));
+
+			buffer = ByteBuffer.allocateDirect(bufsize);
+			recorder = new AudioRecord(this.source,
+					this.rate, this.channel, this.encoding, this.bufsize);
+
+			Log.d(TAG, "Recording started");
+			recorder.startRecording();
+
+			// ... loop
+
+			while (!stopped) {
+				N = recorder.read(buffer, bufsize);
+				nativeAudioCallback(buffer, N);
+			}
+
+		} catch(Throwable x) {
+			Log.w(TAG, "Error reading voice audio", x);
+		} finally {
+			if ( recorder != null )
+				recorder.stop();
+			recorder = null;
+		}
+	}
+
+	public void close() {
+		stopped = true;
+	}
+
+	static public void start_recording(int source, int bufsize, int rate, int channel, int encoding) {
+		instance = new AudioIn(source, bufsize, rate, channel, encoding);
+		instance.start();
+	}
+
+	static public void stop_recording() {
+		if ( instance != null ) {
+			instance.close();
+			instance = null;
+		}
+	}
+
+	public native void nativeAudioCallback(ByteBuffer buffer, int bufsize);
+
+}
diff --git a/qpysdk/src/main/java/org/jnius/NativeInvocationHandler.java b/qpysdk/src/main/java/org/jnius/NativeInvocationHandler.java
new file mode 100644
index 00000000..ed5ba669
--- /dev/null
+++ b/qpysdk/src/main/java/org/jnius/NativeInvocationHandler.java
@@ -0,0 +1,37 @@
+package org.jnius;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+
+public class NativeInvocationHandler implements InvocationHandler {
+    static boolean DEBUG = false;
+    private long ptr;
+
+    public NativeInvocationHandler(long ptr) {
+        this.ptr = ptr;
+    }
+
+    public Object invoke(Object proxy, Method method, Object[] args) {
+        if ( DEBUG ) {
+            System.out.print("+ java:invoke(<proxy>, ");
+            // don't call it, or recursive lookup/proxy will go!
+            //System.out.print(proxy);
+            //System.out.print(", ");
+            System.out.print(method);
+            System.out.print(", ");
+            System.out.print(args);
+            System.out.println(")");
+            System.out.flush();
+        }
+
+        Object ret = invoke0(proxy, method, args);
+
+        if ( DEBUG ) {
+            System.out.print("+ java:invoke returned: ");
+            System.out.println(ret);
+        }
+
+        return ret;
+    }
+
+    native Object invoke0(Object proxy, Method method, Object[] args);
+}
diff --git a/qpysdk/src/main/java/org/libsdl/app/SDLActivity.java b/qpysdk/src/main/java/org/libsdl/app/SDLActivity.java
new file mode 100644
index 00000000..6d683b6e
--- /dev/null
+++ b/qpysdk/src/main/java/org/libsdl/app/SDLActivity.java
@@ -0,0 +1,1668 @@
+package org.libsdl.app;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.lang.reflect.Method;
+
+import android.app.*;
+import android.content.*;
+import android.content.res.Configuration;
+import android.view.*;
+import android.view.inputmethod.BaseInputConnection;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputConnection;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.AbsoluteLayout;
+import android.widget.Button;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import android.os.*;
+import android.util.Log;
+import android.util.SparseArray;
+import android.graphics.*;
+import android.graphics.drawable.Drawable;
+import android.media.*;
+import android.hardware.*;
+import android.content.pm.ActivityInfo;
+
+/**
+    SDL Activity
+*/
+public class SDLActivity extends Activity {
+    private static final String TAG = "SDL";
+
+    // Keep track of the paused state
+    public static boolean mIsPaused, mIsSurfaceReady, mHasFocus;
+    public static boolean mExitCalledFromJava;
+
+    /** If shared libraries (e.g. SDL or the native application) could not be loaded. */
+    public static boolean mBrokenLibraries;
+
+    // If we want to separate mouse and touch events.
+    //  This is only toggled in native code when a hint is set!
+    public static boolean mSeparateMouseAndTouch;
+
+    // Main components
+    protected static SDLActivity mSingleton;
+    protected static SDLSurface mSurface;
+    protected static View mTextEdit;
+    protected static ViewGroup mLayout;
+    protected static SDLJoystickHandler mJoystickHandler;
+
+    // This is what SDL runs in. It invokes SDL_main(), eventually
+    protected static Thread mSDLThread;
+
+    // Audio
+    protected static AudioTrack mAudioTrack;
+
+    /**
+     * This method is called by SDL before loading the native shared libraries.
+     * It can be overridden to provide names of shared libraries to be loaded.
+     * The default implementation returns the defaults. It never returns null.
+     * An array returned by a new implementation must at least contain "SDL2".
+     * Also keep in mind that the order the libraries are loaded may matter.
+     * @return names of shared libraries to be loaded (e.g. "SDL2", "main").
+     */
+    protected String[] getLibraries() {
+        return new String[] {
+            "SDL2",
+            // "SDL2_image",
+            // "SDL2_mixer",
+            // "SDL2_net",
+            // "SDL2_ttf",
+            "main"
+        };
+    }
+
+    // Load the .so
+    public void loadLibraries() {
+       for (String lib : getLibraries()) {
+          System.loadLibrary(lib);
+       }
+    }
+
+    /**
+     * This method is called by SDL before starting the native application thread.
+     * It can be overridden to provide the arguments after the application name.
+     * The default implementation returns an empty array. It never returns null.
+     * @return arguments for the native application.
+     */
+    protected String[] getArguments() {
+        return new String[0];
+    }
+
+    public static void initialize() {
+        // The static nature of the singleton and Android quirkyness force us to initialize everything here
+        // Otherwise, when exiting the app and returning to it, these variables *keep* their pre exit values
+        mSingleton = null;
+        mSurface = null;
+        mTextEdit = null;
+        mLayout = null;
+        mJoystickHandler = null;
+        mSDLThread = null;
+        mAudioTrack = null;
+        mExitCalledFromJava = false;
+        mBrokenLibraries = false;
+        mIsPaused = false;
+        mIsSurfaceReady = false;
+        mHasFocus = true;
+    }
+
+    // Setup
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        Log.v(TAG, "Device: " + android.os.Build.DEVICE);
+        Log.v(TAG, "Model: " + android.os.Build.MODEL);
+        Log.v(TAG, "onCreate(): " + mSingleton);
+        super.onCreate(savedInstanceState);
+
+        SDLActivity.initialize();
+        // So we can call stuff from static callbacks
+        mSingleton = this;
+
+        // Load shared libraries
+        String errorMsgBrokenLib = "";
+        try {
+            loadLibraries();
+        } catch(UnsatisfiedLinkError e) {
+            System.err.println(e.getMessage());
+            mBrokenLibraries = true;
+            errorMsgBrokenLib = e.getMessage();
+        } catch(Exception e) {
+            System.err.println(e.getMessage());
+            mBrokenLibraries = true;
+            errorMsgBrokenLib = e.getMessage();
+        }
+
+        if (mBrokenLibraries)
+        {
+            AlertDialog.Builder dlgAlert  = new AlertDialog.Builder(this);
+            dlgAlert.setMessage("An error occurred while trying to start the application. Please try again and/or reinstall."
+                  + System.getProperty("line.separator")
+                  + System.getProperty("line.separator")
+                  + "Error: " + errorMsgBrokenLib);
+            dlgAlert.setTitle("SDL Error");
+            dlgAlert.setPositiveButton("Exit",
+                new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog,int id) {
+                        // if this button is clicked, close current activity
+                        SDLActivity.mSingleton.finish();
+                    }
+                });
+           dlgAlert.setCancelable(false);
+           dlgAlert.create().show();
+
+           return;
+        }
+
+        // Set up the surface
+        mSurface = new SDLSurface(getApplication());
+
+        if(Build.VERSION.SDK_INT >= 12) {
+            mJoystickHandler = new SDLJoystickHandler_API12();
+        }
+        else {
+            mJoystickHandler = new SDLJoystickHandler();
+        }
+
+        mLayout = new AbsoluteLayout(this);
+        mLayout.addView(mSurface);
+
+        setContentView(mLayout);
+
+        // Get filename from "Open with" of another application
+        Intent intent = getIntent();
+
+        if (intent != null && intent.getData() != null) {
+            String filename = intent.getData().getPath();
+            if (filename != null) {
+                Log.v(TAG, "Got filename: " + filename);
+                SDLActivity.onNativeDropFile(filename);
+            }
+        }
+    }
+
+    // Events
+    @Override
+    protected void onPause() {
+        Log.v(TAG, "onPause()");
+        super.onPause();
+
+        if (SDLActivity.mBrokenLibraries) {
+           return;
+        }
+
+        SDLActivity.handlePause();
+    }
+
+    @Override
+    protected void onResume() {
+        Log.v(TAG, "onResume()");
+        super.onResume();
+
+        if (SDLActivity.mBrokenLibraries) {
+           return;
+        }
+
+        SDLActivity.handleResume();
+    }
+
+
+    @Override
+    public void onWindowFocusChanged(boolean hasFocus) {
+        super.onWindowFocusChanged(hasFocus);
+        Log.v(TAG, "onWindowFocusChanged(): " + hasFocus);
+
+        if (SDLActivity.mBrokenLibraries) {
+           return;
+        }
+
+        SDLActivity.mHasFocus = hasFocus;
+        if (hasFocus) {
+            SDLActivity.handleResume();
+        }
+    }
+
+    @Override
+    public void onLowMemory() {
+        Log.v(TAG, "onLowMemory()");
+        super.onLowMemory();
+
+        if (SDLActivity.mBrokenLibraries) {
+           return;
+        }
+
+        SDLActivity.nativeLowMemory();
+    }
+
+    @Override
+    protected void onDestroy() {
+        Log.v(TAG, "onDestroy()");
+
+        if (SDLActivity.mBrokenLibraries) {
+           super.onDestroy();
+           // Reset everything in case the user re opens the app
+           SDLActivity.initialize();
+           return;
+        }
+
+        // Send a quit message to the application
+        SDLActivity.mExitCalledFromJava = true;
+        SDLActivity.nativeQuit();
+
+        // Now wait for the SDL thread to quit
+        if (SDLActivity.mSDLThread != null) {
+            try {
+                SDLActivity.mSDLThread.join();
+            } catch(Exception e) {
+                Log.v(TAG, "Problem stopping thread: " + e);
+            }
+            SDLActivity.mSDLThread = null;
+
+            //LogUtil.v(TAG, "Finished waiting for SDL thread");
+        }
+
+        super.onDestroy();
+        // Reset everything in case the user re opens the app
+        SDLActivity.initialize();
+    }
+
+    @Override
+    public boolean dispatchKeyEvent(KeyEvent event) {
+
+        if (SDLActivity.mBrokenLibraries) {
+           return false;
+        }
+
+        int keyCode = event.getKeyCode();
+        Log.d(TAG, "dispatchKeyEvent:"+keyCode);
+        // Ignore certain special keys so they're handled by Android
+        if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN ||
+            keyCode == KeyEvent.KEYCODE_VOLUME_UP ||
+            keyCode == KeyEvent.KEYCODE_CAMERA ||
+            //keyCode == KeyEvent.KEYCODE_BACK ||
+            keyCode == 168 || /* API 11: KeyEvent.KEYCODE_ZOOM_IN */
+            keyCode == 169 /* API 11: KeyEvent.KEYCODE_ZOOM_OUT */
+
+            ) {
+            return false;
+        }
+        if (keyCode == KeyEvent.KEYCODE_BACK) {
+            handleNativeExit();
+            return false;
+        }
+        return super.dispatchKeyEvent(event);
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        // TODO Auto-generated method stub
+        super.onConfigurationChanged(newConfig);
+        if (newConfig.orientation==Configuration.ORIENTATION_LANDSCAPE) {
+            // Nothing need to be done here
+
+        } else {
+            // Nothing need to be done here
+        }
+
+    }
+
+    /** Called by onPause or surfaceDestroyed. Even if surfaceDestroyed
+     *  is the first to be called, mIsSurfaceReady should still be set
+     *  to 'true' during the call to onPause (in a usual scenario).
+     */
+    public static void handlePause() {
+        if (!SDLActivity.mIsPaused && SDLActivity.mIsSurfaceReady) {
+            SDLActivity.mIsPaused = true;
+            SDLActivity.nativePause();
+            mSurface.enableSensor(Sensor.TYPE_ACCELEROMETER, false);
+        }
+    }
+
+    /** Called by onResume or surfaceCreated. An actual resume should be done only when the surface is ready.
+     * Note: Some Android variants may send multiple surfaceChanged events, so we don't need to resume
+     * every time we get one of those events, only if it comes after surfaceDestroyed
+     */
+    public static void handleResume() {
+        if (SDLActivity.mIsPaused && SDLActivity.mIsSurfaceReady && SDLActivity.mHasFocus) {
+            SDLActivity.mIsPaused = false;
+            SDLActivity.nativeResume();
+            mSurface.handleResume();
+        }
+    }
+
+    /* The native thread has finished */
+    public static void handleNativeExit() {
+    	System.exit(0);
+//    	SDLActivity.mSDLThread = null;
+//        mSingleton.finish();
+    }
+
+
+    // Messages from the SDLMain thread
+    static final int COMMAND_CHANGE_TITLE = 1;
+    static final int COMMAND_UNUSED = 2;
+    static final int COMMAND_TEXTEDIT_HIDE = 3;
+    static final int COMMAND_SET_KEEP_SCREEN_ON = 5;
+
+    protected static final int COMMAND_USER = 0x8000;
+
+    /**
+     * This method is called by SDL if SDL did not handle a message itself.
+     * This happens if a received message contains an unsupported command.
+     * Method can be overwritten to handle Messages in a different class.
+     * @param command the command of the message.
+     * @param param the parameter of the message. May be null.
+     * @return if the message was handled in overridden method.
+     */
+    protected boolean onUnhandledMessage(int command, Object param) {
+        return false;
+    }
+
+    /**
+     * A Handler class for Messages from native SDL applications.
+     * It uses current Activities as target (e.g. for the title).
+     * static to prevent implicit references to enclosing object.
+     */
+    protected static class SDLCommandHandler extends Handler {
+        @Override
+        public void handleMessage(Message msg) {
+            Context context = getContext();
+            if (context == null) {
+                Log.e(TAG, "error handling message, getContext() returned null");
+                return;
+            }
+            switch (msg.arg1) {
+            case COMMAND_CHANGE_TITLE:
+                if (context instanceof Activity) {
+                    ((Activity) context).setTitle((String)msg.obj);
+                } else {
+                    Log.e(TAG, "error handling message, getContext() returned no Activity");
+                }
+                break;
+            case COMMAND_TEXTEDIT_HIDE:
+                if (mTextEdit != null) {
+                    mTextEdit.setVisibility(View.GONE);
+
+                    InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
+                    imm.hideSoftInputFromWindow(mTextEdit.getWindowToken(), 0);
+                }
+                break;
+            case COMMAND_SET_KEEP_SCREEN_ON:
+            {
+                Window window = ((Activity) context).getWindow();
+                if (window != null) {
+                    if ((msg.obj instanceof Integer) && (((Integer) msg.obj).intValue() != 0)) {
+                        window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+                    } else {
+                        window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+                    }
+                }
+                break;
+            }
+            default:
+                if ((context instanceof SDLActivity) && !((SDLActivity) context).onUnhandledMessage(msg.arg1, msg.obj)) {
+                    Log.e(TAG, "error handling message, command is " + msg.arg1);
+                }
+            }
+        }
+    }
+
+    // Handler for the messages
+    Handler commandHandler = new SDLCommandHandler();
+
+    // Send a message from the SDLMain thread
+    boolean sendCommand(int command, Object data) {
+        Message msg = commandHandler.obtainMessage();
+        msg.arg1 = command;
+        msg.obj = data;
+        return commandHandler.sendMessage(msg);
+    }
+
+    // C functions we call
+    public static native int nativeInit(Object arguments);
+    public static native void nativeLowMemory();
+    public static native void nativeQuit();
+    public static native void nativePause();
+    public static native void nativeResume();
+    public static native void onNativeDropFile(String filename);
+    public static native void onNativeResize(int x, int y, int format, float rate);
+    public static native int onNativePadDown(int device_id, int keycode);
+    public static native int onNativePadUp(int device_id, int keycode);
+    public static native void onNativeJoy(int device_id, int axis,
+                                          float value);
+    public static native void onNativeHat(int device_id, int hat_id,
+                                          int x, int y);
+    public static native void onNativeKeyDown(int keycode);
+    public static native void onNativeKeyUp(int keycode);
+    public static native void onNativeKeyboardFocusLost();
+    public static native void onNativeMouse(int button, int action, float x, float y);
+    public static native void onNativeTouch(int touchDevId, int pointerFingerId,
+                                            int action, float x,
+                                            float y, float p);
+    public static native void onNativeAccel(float x, float y, float z);
+    public static native void onNativeSurfaceChanged();
+    public static native void onNativeSurfaceDestroyed();
+    public static native void nativeFlipBuffers();
+    public static native int nativeAddJoystick(int device_id, String name,
+                                               int is_accelerometer, int nbuttons,
+                                               int naxes, int nhats, int nballs);
+    public static native int nativeRemoveJoystick(int device_id);
+    public static native String nativeGetHint(String name);
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static void flipBuffers() {
+        SDLActivity.nativeFlipBuffers();
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static boolean setActivityTitle(String title) {
+        // Called from SDLMain() thread and can't directly affect the view
+        return mSingleton.sendCommand(COMMAND_CHANGE_TITLE, title);
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static boolean sendMessage(int command, int param) {
+        return mSingleton.sendCommand(command, Integer.valueOf(param));
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static Context getContext() {
+        return mSingleton;
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     * @return result of getSystemService(name) but executed on UI thread.
+     */
+    public Object getSystemServiceFromUiThread(final String name) {
+        final Object lock = new Object();
+        final Object[] results = new Object[2]; // array for writable variables
+        synchronized (lock) {
+            runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    synchronized (lock) {
+                        results[0] = getSystemService(name);
+                        results[1] = Boolean.TRUE;
+                        lock.notify();
+                    }
+                }
+            });
+            if (results[1] == null) {
+                try {
+                    lock.wait();
+                } catch (InterruptedException ex) {
+                    ex.printStackTrace();
+                }
+            }
+        }
+        return results[0];
+    }
+
+    static class ShowTextInputTask implements Runnable {
+        /*
+         * This is used to regulate the pan&scan method to have some offset from
+         * the bottom edge of the input region and the top edge of an input
+         * method (soft keyboard)
+         */
+        static final int HEIGHT_PADDING = 15;
+
+        public int x, y, w, h;
+
+        public ShowTextInputTask(int x, int y, int w, int h) {
+            this.x = x;
+            this.y = y;
+            this.w = w;
+            this.h = h;
+        }
+
+        @Override
+        public void run() {
+            AbsoluteLayout.LayoutParams params = new AbsoluteLayout.LayoutParams(
+                    w, h + HEIGHT_PADDING, x, y);
+
+            if (mTextEdit == null) {
+                mTextEdit = new DummyEdit(getContext());
+
+                mLayout.addView(mTextEdit, params);
+            } else {
+                mTextEdit.setLayoutParams(params);
+            }
+
+            mTextEdit.setVisibility(View.VISIBLE);
+            mTextEdit.requestFocus();
+
+            InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+            imm.showSoftInput(mTextEdit, 0);
+        }
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static boolean showTextInput(int x, int y, int w, int h) {
+        // Transfer the task to the main thread as a Runnable
+        return mSingleton.commandHandler.post(new ShowTextInputTask(x, y, w, h));
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static Surface getNativeSurface() {
+        return SDLActivity.mSurface.getNativeSurface();
+    }
+
+    // Audio
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static int audioInit(int sampleRate, boolean is16Bit, boolean isStereo, int desiredFrames) {
+        int channelConfig = isStereo ? AudioFormat.CHANNEL_CONFIGURATION_STEREO : AudioFormat.CHANNEL_CONFIGURATION_MONO;
+        int audioFormat = is16Bit ? AudioFormat.ENCODING_PCM_16BIT : AudioFormat.ENCODING_PCM_8BIT;
+        int frameSize = (isStereo ? 2 : 1) * (is16Bit ? 2 : 1);
+
+        Log.v(TAG, "SDL audio: wanted " + (isStereo ? "stereo" : "mono") + " " + (is16Bit ? "16-bit" : "8-bit") + " " + (sampleRate / 1000f) + "kHz, " + desiredFrames + " frames buffer");
+
+        // Let the user pick a larger buffer if they really want -- but ye
+        // gods they probably shouldn't, the minimums are horrifyingly high
+        // latency already
+        desiredFrames = Math.max(desiredFrames, (AudioTrack.getMinBufferSize(sampleRate, channelConfig, audioFormat) + frameSize - 1) / frameSize);
+
+        if (mAudioTrack == null) {
+            mAudioTrack = new AudioTrack(AudioManager.STREAM_MUSIC, sampleRate,
+                    channelConfig, audioFormat, desiredFrames * frameSize, AudioTrack.MODE_STREAM);
+
+            // Instantiating AudioTrack can "succeed" without an exception and the track may still be invalid
+            // Ref: https://android.googlesource.com/platform/frameworks/base/+/refs/heads/master/media/java/android/media/AudioTrack.java
+            // Ref: http://developer.android.com/reference/android/media/AudioTrack.html#getState()
+
+            if (mAudioTrack.getState() != AudioTrack.STATE_INITIALIZED) {
+                Log.e(TAG, "Failed during initialization of Audio Track");
+                mAudioTrack = null;
+                return -1;
+            }
+
+            mAudioTrack.play();
+        }
+
+        Log.v(TAG, "SDL audio: got " + ((mAudioTrack.getChannelCount() >= 2) ? "stereo" : "mono") + " " + ((mAudioTrack.getAudioFormat() == AudioFormat.ENCODING_PCM_16BIT) ? "16-bit" : "8-bit") + " " + (mAudioTrack.getSampleRate() / 1000f) + "kHz, " + desiredFrames + " frames buffer");
+
+        return 0;
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static void audioWriteShortBuffer(short[] buffer) {
+        for (int i = 0; i < buffer.length; ) {
+            int result = mAudioTrack.write(buffer, i, buffer.length - i);
+            if (result > 0) {
+                i += result;
+            } else if (result == 0) {
+                try {
+                    Thread.sleep(1);
+                } catch(InterruptedException e) {
+                    // Nom nom
+                }
+            } else {
+                Log.w(TAG, "SDL audio: error return from write(short)");
+                return;
+            }
+        }
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static void audioWriteByteBuffer(byte[] buffer) {
+        for (int i = 0; i < buffer.length; ) {
+            int result = mAudioTrack.write(buffer, i, buffer.length - i);
+            if (result > 0) {
+                i += result;
+            } else if (result == 0) {
+                try {
+                    Thread.sleep(1);
+                } catch(InterruptedException e) {
+                    // Nom nom
+                }
+            } else {
+                Log.w(TAG, "SDL audio: error return from write(byte)");
+                return;
+            }
+        }
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static void audioQuit() {
+        if (mAudioTrack != null) {
+            mAudioTrack.stop();
+            mAudioTrack = null;
+        }
+    }
+
+    // Input
+
+    /**
+     * This method is called by SDL using JNI.
+     * @return an array which may be empty but is never null.
+     */
+    public static int[] inputGetInputDeviceIds(int sources) {
+        int[] ids = InputDevice.getDeviceIds();
+        int[] filtered = new int[ids.length];
+        int used = 0;
+        for (int i = 0; i < ids.length; ++i) {
+            InputDevice device = InputDevice.getDevice(ids[i]);
+            if ((device != null) && ((device.getSources() & sources) != 0)) {
+                filtered[used++] = device.getId();
+            }
+        }
+        return Arrays.copyOf(filtered, used);
+    }
+
+    // Joystick glue code, just a series of stubs that redirect to the SDLJoystickHandler instance
+    public static boolean handleJoystickMotionEvent(MotionEvent event) {
+        return mJoystickHandler.handleMotionEvent(event);
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static void pollInputDevices() {
+        if (SDLActivity.mSDLThread != null) {
+            mJoystickHandler.pollInputDevices();
+        }
+    }
+
+    // APK extension files support
+
+    /** com.android.vending.expansion.zipfile.ZipResourceFile object or null. */
+    private Object expansionFile;
+
+    /** com.android.vending.expansion.zipfile.ZipResourceFile's getInputStream() or null. */
+    private Method expansionFileMethod;
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public InputStream openAPKExtensionInputStream(String fileName) throws IOException {
+        // Get a ZipResourceFile representing a merger of both the main and patch files
+        if (expansionFile == null) {
+            Integer mainVersion = Integer.valueOf(nativeGetHint("SDL_ANDROID_APK_EXPANSION_MAIN_FILE_VERSION"));
+            Integer patchVersion = Integer.valueOf(nativeGetHint("SDL_ANDROID_APK_EXPANSION_PATCH_FILE_VERSION"));
+
+            try {
+                // To avoid direct dependency on Google APK extension library that is
+                // not a part of Android SDK we access it using reflection
+                expansionFile = Class.forName("com.android.vending.expansion.zipfile.APKExpansionSupport")
+                    .getMethod("getAPKExpansionZipFile", Context.class, int.class, int.class)
+                    .invoke(null, this, mainVersion, patchVersion);
+
+                expansionFileMethod = expansionFile.getClass()
+                    .getMethod("getInputStream", String.class);
+            } catch (Exception ex) {
+                ex.printStackTrace();
+                expansionFile = null;
+                expansionFileMethod = null;
+            }
+        }
+
+        // Get an input stream for a known file inside the expansion file ZIPs
+        InputStream fileStream;
+        try {
+            fileStream = (InputStream)expansionFileMethod.invoke(expansionFile, fileName);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            fileStream = null;
+        }
+
+        if (fileStream == null) {
+            throw new IOException();
+        }
+
+        return fileStream;
+    }
+
+    // Messagebox
+
+    /** Result of current messagebox. Also used for blocking the calling thread. */
+    protected final int[] messageboxSelection = new int[1];
+
+    /** Id of current dialog. */
+    protected int dialogs = 0;
+
+    /**
+     * This method is called by SDL using JNI.
+     * Shows the messagebox from UI thread and block calling thread.
+     * buttonFlags, buttonIds and buttonTexts must have same length.
+     * @param buttonFlags array containing flags for every button.
+     * @param buttonIds array containing id for every button.
+     * @param buttonTexts array containing text for every button.
+     * @param colors null for default or array of length 5 containing colors.
+     * @return button id or -1.
+     */
+    public int messageboxShowMessageBox(
+            final int flags,
+            final String title,
+            final String message,
+            final int[] buttonFlags,
+            final int[] buttonIds,
+            final String[] buttonTexts,
+            final int[] colors) {
+
+        messageboxSelection[0] = -1;
+
+        // sanity checks
+
+        if ((buttonFlags.length != buttonIds.length) && (buttonIds.length != buttonTexts.length)) {
+            return -1; // implementation broken
+        }
+
+        // collect arguments for Dialog
+
+        final Bundle args = new Bundle();
+        args.putInt("flags", flags);
+        args.putString("title", title);
+        args.putString("message", message);
+        args.putIntArray("buttonFlags", buttonFlags);
+        args.putIntArray("buttonIds", buttonIds);
+        args.putStringArray("buttonTexts", buttonTexts);
+        args.putIntArray("colors", colors);
+
+        // trigger Dialog creation on UI thread
+
+        runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                showDialog(dialogs++, args);
+            }
+        });
+
+        // block the calling thread
+
+        synchronized (messageboxSelection) {
+            try {
+                messageboxSelection.wait();
+            } catch (InterruptedException ex) {
+                ex.printStackTrace();
+                return -1;
+            }
+        }
+
+        // return selected value
+
+        return messageboxSelection[0];
+    }
+
+    @Override
+    protected Dialog onCreateDialog(int ignore, Bundle args) {
+
+        // TODO set values from "flags" to messagebox dialog
+
+        // get colors
+
+        int[] colors = args.getIntArray("colors");
+        int backgroundColor;
+        int textColor;
+        int buttonBorderColor;
+        int buttonBackgroundColor;
+        int buttonSelectedColor;
+        if (colors != null) {
+            int i = -1;
+            backgroundColor = colors[++i];
+            textColor = colors[++i];
+            buttonBorderColor = colors[++i];
+            buttonBackgroundColor = colors[++i];
+            buttonSelectedColor = colors[++i];
+        } else {
+            backgroundColor = Color.TRANSPARENT;
+            textColor = Color.TRANSPARENT;
+            buttonBorderColor = Color.TRANSPARENT;
+            buttonBackgroundColor = Color.TRANSPARENT;
+            buttonSelectedColor = Color.TRANSPARENT;
+        }
+
+        // create dialog with title and a listener to wake up calling thread
+
+        final Dialog dialog = new Dialog(this);
+        dialog.setTitle(args.getString("title"));
+        dialog.setCancelable(false);
+        dialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
+            @Override
+            public void onDismiss(DialogInterface unused) {
+                synchronized (messageboxSelection) {
+                    messageboxSelection.notify();
+                }
+            }
+        });
+
+        // create text
+
+        TextView message = new TextView(this);
+        message.setGravity(Gravity.CENTER);
+        message.setText(args.getString("message"));
+        if (textColor != Color.TRANSPARENT) {
+            message.setTextColor(textColor);
+        }
+
+        // create buttons
+
+        int[] buttonFlags = args.getIntArray("buttonFlags");
+        int[] buttonIds = args.getIntArray("buttonIds");
+        String[] buttonTexts = args.getStringArray("buttonTexts");
+
+        final SparseArray<Button> mapping = new SparseArray<Button>();
+
+        LinearLayout buttons = new LinearLayout(this);
+        buttons.setOrientation(LinearLayout.HORIZONTAL);
+        buttons.setGravity(Gravity.CENTER);
+        for (int i = 0; i < buttonTexts.length; ++i) {
+            Button button = new Button(this);
+            final int id = buttonIds[i];
+            button.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    messageboxSelection[0] = id;
+                    dialog.dismiss();
+                }
+            });
+            if (buttonFlags[i] != 0) {
+                // see SDL_messagebox.h
+                if ((buttonFlags[i] & 0x00000001) != 0) {
+                    mapping.put(KeyEvent.KEYCODE_ENTER, button);
+                }
+                if ((buttonFlags[i] & 0x00000002) != 0) {
+                    mapping.put(111, button); /* API 11: KeyEvent.KEYCODE_ESCAPE */
+                }
+            }
+            button.setText(buttonTexts[i]);
+            if (textColor != Color.TRANSPARENT) {
+                button.setTextColor(textColor);
+            }
+            if (buttonBorderColor != Color.TRANSPARENT) {
+                // TODO set color for border of messagebox button
+            }
+            if (buttonBackgroundColor != Color.TRANSPARENT) {
+                Drawable drawable = button.getBackground();
+                if (drawable == null) {
+                    // setting the color this way removes the style
+                    button.setBackgroundColor(buttonBackgroundColor);
+                } else {
+                    // setting the color this way keeps the style (gradient, padding, etc.)
+                    drawable.setColorFilter(buttonBackgroundColor, PorterDuff.Mode.MULTIPLY);
+                }
+            }
+            if (buttonSelectedColor != Color.TRANSPARENT) {
+                // TODO set color for selected messagebox button
+            }
+            buttons.addView(button);
+        }
+
+        // create content
+
+        LinearLayout content = new LinearLayout(this);
+        content.setOrientation(LinearLayout.VERTICAL);
+        content.addView(message);
+        content.addView(buttons);
+        if (backgroundColor != Color.TRANSPARENT) {
+            content.setBackgroundColor(backgroundColor);
+        }
+
+        // add content to dialog and return
+
+        dialog.setContentView(content);
+        dialog.setOnKeyListener(new Dialog.OnKeyListener() {
+            @Override
+            public boolean onKey(DialogInterface d, int keyCode, KeyEvent event) {
+                Button button = mapping.get(keyCode);
+                if (button != null) {
+                    if (event.getAction() == KeyEvent.ACTION_UP) {
+                        button.performClick();
+                    }
+                    return true; // also for ignored actions
+                }
+                return false;
+            }
+        });
+
+        return dialog;
+    }
+}
+
+/**
+    Simple nativeInit() runnable
+*/
+class SDLMain implements Runnable {
+    @Override
+    public void run() {
+        // Runs SDL_main()
+        SDLActivity.nativeInit(SDLActivity.mSingleton.getArguments());
+
+        //LogUtil.v("SDL", "SDL thread terminated");
+    }
+}
+
+
+/**
+    SDLSurface. This is what we draw on, so we need to know when it's created
+    in order to do anything useful.
+
+    Because of this, that's where we set up the SDL thread
+*/
+class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
+    View.OnKeyListener, View.OnTouchListener, SensorEventListener  {
+
+    // Sensors
+    protected static SensorManager mSensorManager;
+    protected static Display mDisplay;
+
+    // Keep track of the surface size to normalize touch events
+    protected static float mWidth, mHeight;
+
+    // Startup
+    public SDLSurface(Context context) {
+        super(context);
+        getHolder().addCallback(this);
+
+        setFocusable(true);
+        setFocusableInTouchMode(true);
+        requestFocus();
+        setOnKeyListener(this);
+        setOnTouchListener(this);
+
+        mDisplay = ((WindowManager)context.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
+        mSensorManager = (SensorManager)context.getSystemService(Context.SENSOR_SERVICE);
+
+        if(Build.VERSION.SDK_INT >= 12) {
+            setOnGenericMotionListener(new SDLGenericMotionListener_API12());
+        }
+
+        // Some arbitrary defaults to avoid a potential division by zero
+        mWidth = 1.0f;
+        mHeight = 1.0f;
+    }
+
+    public void handleResume() {
+        setFocusable(true);
+        setFocusableInTouchMode(true);
+        requestFocus();
+        setOnKeyListener(this);
+        setOnTouchListener(this);
+        enableSensor(Sensor.TYPE_ACCELEROMETER, true);
+    }
+
+    public Surface getNativeSurface() {
+        return getHolder().getSurface();
+    }
+
+    // Called when we have a valid drawing surface
+    @Override
+    public void surfaceCreated(SurfaceHolder holder) {
+        Log.v("SDL", "surfaceCreated()");
+        holder.setType(SurfaceHolder.SURFACE_TYPE_GPU);
+    }
+
+    // Called when we lose the surface
+    @Override
+    public void surfaceDestroyed(SurfaceHolder holder) {
+        Log.v("SDL", "surfaceDestroyed()");
+        // Call this *before* setting mIsSurfaceReady to 'false'
+        SDLActivity.handlePause();
+        SDLActivity.mIsSurfaceReady = false;
+        SDLActivity.onNativeSurfaceDestroyed();
+    }
+
+    // Called when the surface is resized
+    @Override
+    public void surfaceChanged(SurfaceHolder holder,
+                               int format, int width, int height) {
+        Log.v("SDL", "surfaceChanged()");
+
+        int sdlFormat = 0x15151002; // SDL_PIXELFORMAT_RGB565 by default
+        switch (format) {
+        case PixelFormat.A_8:
+            Log.v("SDL", "pixel format A_8");
+            break;
+        case PixelFormat.LA_88:
+            Log.v("SDL", "pixel format LA_88");
+            break;
+        case PixelFormat.L_8:
+            Log.v("SDL", "pixel format L_8");
+            break;
+        case PixelFormat.RGBA_4444:
+            Log.v("SDL", "pixel format RGBA_4444");
+            sdlFormat = 0x15421002; // SDL_PIXELFORMAT_RGBA4444
+            break;
+        case PixelFormat.RGBA_5551:
+            Log.v("SDL", "pixel format RGBA_5551");
+            sdlFormat = 0x15441002; // SDL_PIXELFORMAT_RGBA5551
+            break;
+        case PixelFormat.RGBA_8888:
+            Log.v("SDL", "pixel format RGBA_8888");
+            sdlFormat = 0x16462004; // SDL_PIXELFORMAT_RGBA8888
+            break;
+        case PixelFormat.RGBX_8888:
+            Log.v("SDL", "pixel format RGBX_8888");
+            sdlFormat = 0x16261804; // SDL_PIXELFORMAT_RGBX8888
+            break;
+        case PixelFormat.RGB_332:
+            Log.v("SDL", "pixel format RGB_332");
+            sdlFormat = 0x14110801; // SDL_PIXELFORMAT_RGB332
+            break;
+        case PixelFormat.RGB_565:
+            Log.v("SDL", "pixel format RGB_565");
+            sdlFormat = 0x15151002; // SDL_PIXELFORMAT_RGB565
+            break;
+        case PixelFormat.RGB_888:
+            Log.v("SDL", "pixel format RGB_888");
+            // Not sure this is right, maybe SDL_PIXELFORMAT_RGB24 instead?
+            sdlFormat = 0x16161804; // SDL_PIXELFORMAT_RGB888
+            break;
+        default:
+            Log.v("SDL", "pixel format unknown " + format);
+            break;
+        }
+
+        mWidth = width;
+        mHeight = height;
+        SDLActivity.onNativeResize(width, height, sdlFormat, mDisplay.getRefreshRate());
+        Log.v("SDL", "Window size: " + width + "x" + height);
+
+
+        boolean skip = false;
+        int requestedOrientation = SDLActivity.mSingleton.getRequestedOrientation();
+
+        if (requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED)
+        {
+            // Accept any
+        }
+        else if (requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT)
+        {
+            if (mWidth > mHeight) {
+               skip = true;
+            }
+        } else if (requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE) {
+            if (mWidth < mHeight) {
+               skip = true;
+            }
+        }
+
+        // Special Patch for Square Resolution: Black Berry Passport
+        if (skip) {
+           double min = Math.min(mWidth, mHeight);
+           double max = Math.max(mWidth, mHeight);
+
+           if (max / min < 1.20) {
+              Log.v("SDL", "Don't skip on such aspect-ratio. Could be a square resolution.");
+              skip = false;
+           }
+        }
+
+        if (skip) {
+           Log.v("SDL", "Skip .. Surface is not ready.");
+           return;
+        }
+
+
+        // Set mIsSurfaceReady to 'true' *before* making a call to handleResume
+        SDLActivity.mIsSurfaceReady = true;
+        SDLActivity.onNativeSurfaceChanged();
+
+
+        if (SDLActivity.mSDLThread == null) {
+            // This is the entry point to the C app.
+            // Start up the C app thread and enable sensor input for the first time
+
+            final Thread sdlThread = new Thread(new SDLMain(), "SDLThread");
+            enableSensor(Sensor.TYPE_ACCELEROMETER, true);
+            sdlThread.start();
+
+            // Set up a listener thread to catch when the native thread ends
+            SDLActivity.mSDLThread = new Thread(new Runnable(){
+                @Override
+                public void run(){
+                    try {
+                        sdlThread.join();
+                    }
+                    catch(Exception e){}
+                    finally{
+                        // Native thread has finished
+                        if (! SDLActivity.mExitCalledFromJava) {
+                            SDLActivity.handleNativeExit();
+                        }
+                    }
+                }
+            }, "SDLThreadListener");
+            SDLActivity.mSDLThread.start();
+        }
+
+        if (SDLActivity.mHasFocus) {
+            SDLActivity.handleResume();
+        }
+    }
+
+    // unused
+    @Override
+    public void onDraw(Canvas canvas) {}
+
+
+    // Key events
+    @Override
+    public boolean onKey(View  v, int keyCode, KeyEvent event) {
+        // Dispatch the different events depending on where they come from
+        // Some SOURCE_DPAD or SOURCE_GAMEPAD are also SOURCE_KEYBOARD
+        // So, we try to process them as DPAD or GAMEPAD events first, if that fails we try them as KEYBOARD
+
+        if ( (event.getSource() & InputDevice.SOURCE_GAMEPAD) != 0 ||
+                   (event.getSource() & InputDevice.SOURCE_DPAD) != 0 ) {
+            if (event.getAction() == KeyEvent.ACTION_DOWN) {
+                if (SDLActivity.onNativePadDown(event.getDeviceId(), keyCode) == 0) {
+                    return true;
+                }
+            } else if (event.getAction() == KeyEvent.ACTION_UP) {
+                if (SDLActivity.onNativePadUp(event.getDeviceId(), keyCode) == 0) {
+                    return true;
+                }
+            }
+        }
+
+        if( (event.getSource() & InputDevice.SOURCE_KEYBOARD) != 0) {
+            if (event.getAction() == KeyEvent.ACTION_DOWN) {
+                //LogUtil.v("SDL", "key down: " + keyCode);
+                SDLActivity.onNativeKeyDown(keyCode);
+                return true;
+            }
+            else if (event.getAction() == KeyEvent.ACTION_UP) {
+                //LogUtil.v("SDL", "key up: " + keyCode);
+                SDLActivity.onNativeKeyUp(keyCode);
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    // Touch events
+    @Override
+    public boolean onTouch(View v, MotionEvent event) {
+        /* Ref: http://developer.android.com/training/gestures/multi.html */
+        final int touchDevId = event.getDeviceId();
+        final int pointerCount = event.getPointerCount();
+        int action = event.getActionMasked();
+        int pointerFingerId;
+        int mouseButton;
+        int i = -1;
+        float x,y,p;
+
+        // !!! FIXME: dump this SDK check after 2.0.4 ships and require API14.
+
+        // RAPT: Got rid of the mSeparateMouseAndTouch check. We want mouse events (since we'd like
+        // to know about the right mouse button), but we also want to generate mouse events for
+        // touches, so we can't use the hint.
+
+        if (event.getSource() == InputDevice.SOURCE_MOUSE) {
+            if (Build.VERSION.SDK_INT < 14) {
+                mouseButton = 1;    // For Android==12 all mouse buttons are the left button
+            } else {
+                try {
+                    mouseButton = (Integer) event.getClass().getMethod("getButtonState").invoke(event);
+                } catch(Exception e) {
+                    mouseButton = 1;    // oh well.
+                }
+            }
+            SDLActivity.onNativeMouse(mouseButton, action, event.getX(0), event.getY(0));
+        } else {
+            switch(action) {
+                case MotionEvent.ACTION_MOVE:
+                    for (i = 0; i < pointerCount; i++) {
+                        pointerFingerId = event.getPointerId(i);
+                        x = event.getX(i) / mWidth;
+                        y = event.getY(i) / mHeight;
+                        p = event.getPressure(i);
+                        if (p > 1.0f) {
+                            // may be larger than 1.0f on some devices
+                            // see the documentation of getPressure(i)
+                            p = 1.0f;
+                        }
+                        SDLActivity.onNativeTouch(touchDevId, pointerFingerId, action, x, y, p);
+                    }
+                    break;
+
+                case MotionEvent.ACTION_UP:
+                case MotionEvent.ACTION_DOWN:
+                    // Primary pointer up/down, the index is always zero
+                    i = 0;
+                case MotionEvent.ACTION_POINTER_UP:
+                case MotionEvent.ACTION_POINTER_DOWN:
+                    // Non primary pointer up/down
+                    if (i == -1) {
+                        i = event.getActionIndex();
+                    }
+
+                    pointerFingerId = event.getPointerId(i);
+                    x = event.getX(i) / mWidth;
+                    y = event.getY(i) / mHeight;
+                    p = event.getPressure(i);
+                    if (p > 1.0f) {
+                        // may be larger than 1.0f on some devices
+                        // see the documentation of getPressure(i)
+                        p = 1.0f;
+                    }
+                    SDLActivity.onNativeTouch(touchDevId, pointerFingerId, action, x, y, p);
+                    break;
+
+                case MotionEvent.ACTION_CANCEL:
+                    for (i = 0; i < pointerCount; i++) {
+                        pointerFingerId = event.getPointerId(i);
+                        x = event.getX(i) / mWidth;
+                        y = event.getY(i) / mHeight;
+                        p = event.getPressure(i);
+                        if (p > 1.0f) {
+                            // may be larger than 1.0f on some devices
+                            // see the documentation of getPressure(i)
+                            p = 1.0f;
+                        }
+                        SDLActivity.onNativeTouch(touchDevId, pointerFingerId, MotionEvent.ACTION_UP, x, y, p);
+                    }
+                    break;
+
+                default:
+                    break;
+            }
+        }
+
+        return true;
+   }
+
+    // Sensor events
+    public void enableSensor(int sensortype, boolean enabled) {
+        // TODO: This uses getDefaultSensor - what if we have >1 accels?
+        if (enabled) {
+            mSensorManager.registerListener(this,
+                            mSensorManager.getDefaultSensor(sensortype),
+                            SensorManager.SENSOR_DELAY_GAME, null);
+        } else {
+            mSensorManager.unregisterListener(this,
+                            mSensorManager.getDefaultSensor(sensortype));
+        }
+    }
+
+    @Override
+    public void onAccuracyChanged(Sensor sensor, int accuracy) {
+        // TODO
+    }
+
+    @Override
+    public void onSensorChanged(SensorEvent event) {
+        if (event.sensor.getType() == Sensor.TYPE_ACCELEROMETER) {
+            float x, y;
+            switch (mDisplay.getRotation()) {
+                case Surface.ROTATION_90:
+                    x = -event.values[1];
+                    y = event.values[0];
+                    break;
+                case Surface.ROTATION_270:
+                    x = event.values[1];
+                    y = -event.values[0];
+                    break;
+                case Surface.ROTATION_180:
+                    x = -event.values[1];
+                    y = -event.values[0];
+                    break;
+                default:
+                    x = event.values[0];
+                    y = event.values[1];
+                    break;
+            }
+            SDLActivity.onNativeAccel(-x / SensorManager.GRAVITY_EARTH,
+                                      y / SensorManager.GRAVITY_EARTH,
+                                      event.values[2] / SensorManager.GRAVITY_EARTH - 1);
+        }
+    }
+}
+
+/* This is a fake invisible editor view that receives the input and defines the
+ * pan&scan region
+ */
+class DummyEdit extends View implements View.OnKeyListener {
+    InputConnection ic;
+
+    public DummyEdit(Context context) {
+        super(context);
+        setFocusableInTouchMode(true);
+        setFocusable(true);
+        setOnKeyListener(this);
+    }
+
+    @Override
+    public boolean onCheckIsTextEditor() {
+        return true;
+    }
+
+    @Override
+    public boolean onKey(View v, int keyCode, KeyEvent event) {
+
+        // This handles the hardware keyboard input
+        if (event.isPrintingKey()) {
+            if (event.getAction() == KeyEvent.ACTION_DOWN) {
+                ic.commitText(String.valueOf((char) event.getUnicodeChar()), 1);
+            }
+            return true;
+        }
+
+        if (event.getAction() == KeyEvent.ACTION_DOWN) {
+            SDLActivity.onNativeKeyDown(keyCode);
+            return true;
+        } else if (event.getAction() == KeyEvent.ACTION_UP) {
+            SDLActivity.onNativeKeyUp(keyCode);
+            return true;
+        }
+
+        return false;
+    }
+
+    //
+    @Override
+    public boolean onKeyPreIme (int keyCode, KeyEvent event) {
+        // As seen on StackOverflow: http://stackoverflow.com/questions/7634346/keyboard-hide-event
+        // FIXME: Discussion at http://bugzilla.libsdl.org/show_bug.cgi?id=1639
+        // FIXME: This is not a 100% effective solution to the problem of detecting if the keyboard is showing or not
+        // FIXME: A more effective solution would be to change our Layout from AbsoluteLayout to Relative or Linear
+        // FIXME: And determine the keyboard presence doing this: http://stackoverflow.com/questions/2150078/how-to-check-visibility-of-software-keyboard-in-android
+        // FIXME: An even more effective way would be if Android provided this out of the box, but where would the fun be in that :)
+        if (event.getAction()==KeyEvent.ACTION_UP && keyCode == KeyEvent.KEYCODE_BACK) {
+            if (SDLActivity.mTextEdit != null && SDLActivity.mTextEdit.getVisibility() == View.VISIBLE) {
+                SDLActivity.onNativeKeyboardFocusLost();
+            }
+        }
+        return super.onKeyPreIme(keyCode, event);
+    }
+
+    @Override
+    public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
+        ic = new SDLInputConnection(this, true);
+
+        outAttrs.imeOptions = EditorInfo.IME_FLAG_NO_EXTRACT_UI
+                | 33554432 /* API 11: EditorInfo.IME_FLAG_NO_FULLSCREEN */;
+
+        return ic;
+    }
+}
+
+class SDLInputConnection extends BaseInputConnection {
+
+    public SDLInputConnection(View targetView, boolean fullEditor) {
+        super(targetView, fullEditor);
+
+    }
+
+    @Override
+    public boolean sendKeyEvent(KeyEvent event) {
+
+        /*
+         * This handles the keycodes from soft keyboard (and IME-translated
+         * input from hardkeyboard)
+         */
+        int keyCode = event.getKeyCode();
+        if (event.getAction() == KeyEvent.ACTION_DOWN) {
+
+            if (event.getUnicodeChar() != 0) {
+                commitText(String.valueOf((char) event.getUnicodeChar()), 1);
+            }
+
+            SDLActivity.onNativeKeyDown(keyCode);
+
+            return true;
+        } else if (event.getAction() == KeyEvent.ACTION_UP) {
+
+            SDLActivity.onNativeKeyUp(keyCode);
+            return true;
+        }
+        return super.sendKeyEvent(event);
+    }
+
+    @Override
+    public boolean commitText(CharSequence text, int newCursorPosition) {
+
+        nativeCommitText(text.toString(), newCursorPosition);
+
+        return super.commitText(text, newCursorPosition);
+    }
+
+    @Override
+    public boolean setComposingText(CharSequence text, int newCursorPosition) {
+
+        nativeSetComposingText(text.toString(), newCursorPosition);
+
+        return super.setComposingText(text, newCursorPosition);
+    }
+
+    public native void nativeCommitText(String text, int newCursorPosition);
+
+    public native void nativeSetComposingText(String text, int newCursorPosition);
+
+    @Override
+    public boolean deleteSurroundingText(int beforeLength, int afterLength) {
+        // Workaround to capture backspace key. Ref: http://stackoverflow.com/questions/14560344/android-backspace-in-webview-baseinputconnection
+        if (beforeLength == 1 && afterLength == 0) {
+            // backspace
+            return super.sendKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DEL))
+                && super.sendKeyEvent(new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_DEL));
+        }
+
+        return super.deleteSurroundingText(beforeLength, afterLength);
+    }
+}
+
+/* A null joystick handler for API level < 12 devices (the accelerometer is handled separately) */
+class SDLJoystickHandler {
+
+    /**
+     * Handles given MotionEvent.
+     * @param event the event to be handled.
+     * @return if given event was processed.
+     */
+    public boolean handleMotionEvent(MotionEvent event) {
+        return false;
+    }
+
+    /**
+     * Handles adding and removing of input devices.
+     */
+    public void pollInputDevices() {
+    }
+}
+
+/* Actual joystick functionality available for API >= 12 devices */
+class SDLJoystickHandler_API12 extends SDLJoystickHandler {
+
+    static class SDLJoystick {
+        public int device_id;
+        public String name;
+        public ArrayList<InputDevice.MotionRange> axes;
+        public ArrayList<InputDevice.MotionRange> hats;
+    }
+    static class RangeComparator implements Comparator<InputDevice.MotionRange> {
+        @Override
+        public int compare(InputDevice.MotionRange arg0, InputDevice.MotionRange arg1) {
+            return arg0.getAxis() - arg1.getAxis();
+        }
+    }
+
+    private ArrayList<SDLJoystick> mJoysticks;
+
+    public SDLJoystickHandler_API12() {
+
+        mJoysticks = new ArrayList<SDLJoystick>();
+    }
+
+    @Override
+    public void pollInputDevices() {
+        int[] deviceIds = InputDevice.getDeviceIds();
+        // It helps processing the device ids in reverse order
+        // For example, in the case of the XBox 360 wireless dongle,
+        // so the first controller seen by SDL matches what the receiver
+        // considers to be the first controller
+
+        for(int i=deviceIds.length-1; i>-1; i--) {
+            SDLJoystick joystick = getJoystick(deviceIds[i]);
+            if (joystick == null) {
+                joystick = new SDLJoystick();
+                InputDevice joystickDevice = InputDevice.getDevice(deviceIds[i]);
+
+                if (
+                      (joystickDevice.getSources() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0
+                   ||
+                      (joystickDevice.getSources() & InputDevice.SOURCE_CLASS_BUTTON) != 0
+                  )
+                {
+                    joystick.device_id = deviceIds[i];
+                    joystick.name = joystickDevice.getName();
+                    joystick.axes = new ArrayList<InputDevice.MotionRange>();
+                    joystick.hats = new ArrayList<InputDevice.MotionRange>();
+
+                    List<InputDevice.MotionRange> ranges = joystickDevice.getMotionRanges();
+                    Collections.sort(ranges, new RangeComparator());
+                    for (InputDevice.MotionRange range : ranges ) {
+                        if ((range.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0 ) {
+                            if (range.getAxis() == MotionEvent.AXIS_HAT_X ||
+                                range.getAxis() == MotionEvent.AXIS_HAT_Y) {
+                                joystick.hats.add(range);
+                            }
+                            else {
+                                joystick.axes.add(range);
+                            }
+                        }
+                    }
+
+                    mJoysticks.add(joystick);
+                    SDLActivity.nativeAddJoystick(joystick.device_id, joystick.name, 0, -1,
+                                                  joystick.axes.size(), joystick.hats.size()/2, 0);
+                }
+            }
+        }
+
+        /* Check removed devices */
+        ArrayList<Integer> removedDevices = new ArrayList<Integer>();
+        for(int i=0; i < mJoysticks.size(); i++) {
+            int device_id = mJoysticks.get(i).device_id;
+            int j;
+            for (j=0; j < deviceIds.length; j++) {
+                if (device_id == deviceIds[j]) break;
+            }
+            if (j == deviceIds.length) {
+                removedDevices.add(Integer.valueOf(device_id));
+            }
+        }
+
+        for(int i=0; i < removedDevices.size(); i++) {
+            int device_id = removedDevices.get(i).intValue();
+            SDLActivity.nativeRemoveJoystick(device_id);
+            for (int j=0; j < mJoysticks.size(); j++) {
+                if (mJoysticks.get(j).device_id == device_id) {
+                    mJoysticks.remove(j);
+                    break;
+                }
+            }
+        }
+    }
+
+    protected SDLJoystick getJoystick(int device_id) {
+        for(int i=0; i < mJoysticks.size(); i++) {
+            if (mJoysticks.get(i).device_id == device_id) {
+                return mJoysticks.get(i);
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public boolean handleMotionEvent(MotionEvent event) {
+        if ( (event.getSource() & InputDevice.SOURCE_JOYSTICK) != 0) {
+            int actionPointerIndex = event.getActionIndex();
+            int action = event.getActionMasked();
+            switch(action) {
+                case MotionEvent.ACTION_MOVE:
+                    SDLJoystick joystick = getJoystick(event.getDeviceId());
+                    if ( joystick != null ) {
+                        for (int i = 0; i < joystick.axes.size(); i++) {
+                            InputDevice.MotionRange range = joystick.axes.get(i);
+                            /* Normalize the value to -1...1 */
+                            float value = ( event.getAxisValue( range.getAxis(), actionPointerIndex) - range.getMin() ) / range.getRange() * 2.0f - 1.0f;
+                            SDLActivity.onNativeJoy(joystick.device_id, i, value );
+                        }
+                        for (int i = 0; i < joystick.hats.size(); i+=2) {
+                            int hatX = Math.round(event.getAxisValue( joystick.hats.get(i).getAxis(), actionPointerIndex ) );
+                            int hatY = Math.round(event.getAxisValue( joystick.hats.get(i+1).getAxis(), actionPointerIndex ) );
+                            SDLActivity.onNativeHat(joystick.device_id, i/2, hatX, hatY );
+                        }
+                    }
+                    break;
+                default:
+                    break;
+            }
+        }
+        return true;
+    }
+}
+
+class SDLGenericMotionListener_API12 implements View.OnGenericMotionListener {
+    // Generic Motion (mouse hover, joystick...) events go here
+    @Override
+    public boolean onGenericMotion(View v, MotionEvent event) {
+        float x, y;
+        int mouseButton;
+        int action;
+
+        switch ( event.getSource() ) {
+            case InputDevice.SOURCE_JOYSTICK:
+            case InputDevice.SOURCE_GAMEPAD:
+            case InputDevice.SOURCE_DPAD:
+                SDLActivity.handleJoystickMotionEvent(event);
+                return true;
+
+            case InputDevice.SOURCE_MOUSE:
+                action = event.getActionMasked();
+                switch (action) {
+                    case MotionEvent.ACTION_SCROLL:
+                        x = event.getAxisValue(MotionEvent.AXIS_HSCROLL, 0);
+                        y = event.getAxisValue(MotionEvent.AXIS_VSCROLL, 0);
+                        SDLActivity.onNativeMouse(0, action, x, y);
+                        return true;
+
+                    case MotionEvent.ACTION_HOVER_MOVE:
+                        x = event.getX(0);
+                        y = event.getY(0);
+
+                        SDLActivity.onNativeMouse(0, action, x, y);
+                        return true;
+
+                    default:
+                        break;
+                }
+
+            default:
+                break;
+        }
+
+        // Event was not managed
+        return false;
+    }
+}
diff --git a/qpysdk/src/main/java/org/qpython/qpysdk/Exec.java b/qpysdk/src/main/java/org/qpython/qpysdk/Exec.java
new file mode 100644
index 00000000..e1a98307
--- /dev/null
+++ b/qpysdk/src/main/java/org/qpython/qpysdk/Exec.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.qpython.qpysdk;
+
+import java.io.FileDescriptor;
+
+/**
+ * Tools for executing commands.
+ */
+public class Exec {
+  /**
+   * @param command
+   *          The command to execute
+   * @param arguments
+   *          The first argument to the command, may be null
+   * @param environmentVariables
+   *          the second argument to the command, may be null
+   * @param workingDirectory
+   * @return the file descriptor of the started process.
+   * 
+   */
+  public static FileDescriptor createSubprocess(String command, String[] arguments,
+      String[] environmentVariables, String workingDirectory) {
+    return createSubprocess(command, arguments, environmentVariables, workingDirectory, null);
+  }
+
+  /**
+   * @param command
+   *          The command to execute
+   * @param arguments
+   *          Array of arguments, may be null
+   * @param environmentVariables
+   *          Array of environment variables, may be null
+   * @param processId
+   *          A one-element array to which the process ID of the started process will be written.
+   * @return the file descriptor of the opened process's psuedo-terminal.
+   * 
+   */
+  public static native FileDescriptor createSubprocess(String command, String[] arguments,
+      String[] environmentVariables, String workingDirectory, int[] processId);
+
+  public static native void setPtyWindowSize(FileDescriptor fd, int row, int col, int xpixel,
+      int ypixel);
+
+  /**
+   * Causes the calling thread to wait for the process associated with the receiver to finish
+   * executing.
+   * 
+   * @return The exit value of the Process being waited on
+   * 
+   */
+  public static native int waitFor(int processId);
+  public static native void nativeSetEnv(String name, String value);
+  public static native void nativeInit();
+
+  static {
+    System.loadLibrary("qpysdk");
+  }
+}
diff --git a/qpysdk/src/main/java/org/qpython/qpysdk/QPyConstants.java b/qpysdk/src/main/java/org/qpython/qpysdk/QPyConstants.java
new file mode 100644
index 00000000..bf9ebd1d
--- /dev/null
+++ b/qpysdk/src/main/java/org/qpython/qpysdk/QPyConstants.java
@@ -0,0 +1,46 @@
+package org.qpython.qpysdk;
+
+import android.os.Environment;
+
+import com.quseit.config.BASE_CONF;
+
+public interface QPyConstants extends BASE_CONF {
+
+    final String WEB_PROJECT     = "web";
+    final String CONSOLE_PROJECT = "console";
+    final String KIVY_PROJECT    = "kivy";
+    final String PYGAME_PROJECT    = "pygame";
+    final String QUIET_PROJECT    = "quiet";
+    final String QSL4A_PROJECT    = "qsl4a";
+
+    String BASE_PATH         = "qpython";
+    String AD_URL            = "https://apu2.quseit.com/ad/";
+
+    String UPDATE_URL  = "https://apu2.quseit.com/conf/update/";
+    String LOG_URL     = "https://apu2.quseit.com/conf/log/";
+    String IAP_LOG_URL = "https://apu2.quseit.com/conf/iaplog/";
+
+    String DFROM_RUN   = ".runtime";
+    String PY_CACHE    = ".qpyc";
+
+    String DFROM_QPY2 = "scripts";
+    String DFROM_QPY3 = "scripts3";
+    String DFROM_PRJ2 = "projects";
+    String DFROM_PRJ3 = "projects3";
+
+    final String KEY_PY3_RES = "setting.py3resource.path";
+    final String KEY_NOTEBOOK_RES = "setting.notebook3sresource.path";
+    final String KEY_NOTEBOOK2_RES = "setting.notebook2resource.path";
+
+
+    String ABSOLUTE_PATH = Environment.getExternalStorageDirectory().getPath() + "/" + BASE_PATH;
+    String PY_CACHE_PATH = ABSOLUTE_PATH+"/"+PY_CACHE;
+    String ABSOLUTE_LOG = ABSOLUTE_PATH + "/log/last.log";
+
+    String PYTHON_2 = "2.x";
+
+    String QPYC3 = "https://dl.qpy.io/py3.json";
+    String QPYC2COMPATIBLE = "https://dl.qpy.io/py2compatible.json";
+    String QPYC3_VER_KEY= "setting.py3resource.ver";
+    String QPYC2COMPATIBLE_VER_KEY="setting.py2compatibleresource.ver";
+}
diff --git a/qpysdk/src/main/java/org/qpython/qpysdk/QPySDK.java b/qpysdk/src/main/java/org/qpython/qpysdk/QPySDK.java
new file mode 100644
index 00000000..516f523e
--- /dev/null
+++ b/qpysdk/src/main/java/org/qpython/qpysdk/QPySDK.java
@@ -0,0 +1,360 @@
+package org.qpython.qpysdk;
+
+import android.app.Activity;
+import android.content.Context;
+import android.os.Build;
+import android.os.Environment;
+import android.os.Message;
+import android.util.Log;
+import android.widget.Toast;
+
+import org.qpython.qpysdk.utils.AssetExtract;
+import org.qpython.qpysdk.utils.FileExtract;
+import org.qpython.qpysdk.utils.FileUtils;
+import org.qpython.qpysdk.utils.ResourceManager;
+import org.qpython.qpysdk.utils.StreamGobbler;
+
+import java.io.File;
+import java.io.FileDescriptor;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * Created by yhc on 16/2/22.
+ */
+public class QPySDK {
+
+    private static final int    PID_INIT_VALUE      = -1;
+    private static final int    DEFAULT_BUFFER_SIZE = 8192;
+    private final        String TAG                 = "QPySDK";
+    Context  context;
+    Activity activity;
+    ArrayList<String> mArguments = new ArrayList<String>();
+    InputStream    mIn;
+    OutputStream   mOut;
+    FileDescriptor mFd;
+    private ResourceManager resourceManager;
+
+    public QPySDK(Context con, Activity act) {
+        resourceManager = new ResourceManager(act);
+        activity = act;
+        context = con;
+    }
+
+    public static void  recursiveDelete(String path) {
+        _recursiveDelete(new File(path));
+    }
+    static void _recursiveDelete(File f) {
+        if (f.exists()) {
+            if (f.isDirectory()) {
+                if (f.listFiles() != null) {
+                    for (File r : f.listFiles()) {
+                        if (!f.getName().equals(".") && !f.getName().equals("..")) {
+                            _recursiveDelete(r);
+                        }
+                    }
+                }
+            }
+            f.delete();
+        }
+    }
+
+
+    public void runPyService() {
+        Log.d(TAG, "runPyService");
+        String launchScript = this.context.getFilesDir() + "/main.py";
+        playQScript(launchScript);
+    }
+
+    public void playQScript(final String script) {
+        Log.d(TAG, "playQScript:" + script);
+        String binaryPath = "";
+
+        File f = new File(script);
+
+        if (Build.VERSION.SDK_INT >= 20) {
+            binaryPath = this.context.getFilesDir() + "/bin/python-android5";
+            ;
+        } else {
+            binaryPath = this.context.getFilesDir() + "/bin/python";
+            ;
+        }
+
+
+        int[] pid = new int[1];
+
+        mArguments.add(script);
+        String[] argumentsArray = mArguments.toArray(new String[mArguments.size()]);
+
+        final File mLog = new File(String.format("%s", QPyConstants.ABSOLUTE_LOG));
+        File logDir = mLog.getParentFile();
+
+        mFd = Exec.createSubprocess(binaryPath, argumentsArray, getEnvironmentArray(f.getParentFile() + ""), Environment.getExternalStorageDirectory() + "/", pid);
+        final AtomicInteger mPid = new AtomicInteger(PID_INIT_VALUE);
+
+        mPid.set(pid[0]);
+        mOut = new FileOutputStream(mFd);
+        mIn = new StreamGobbler(new FileInputStream(mFd), mLog, DEFAULT_BUFFER_SIZE);
+        long mStartTime = System.currentTimeMillis();
+
+
+        new Thread(new Runnable() {
+            public void run() {
+                int returnValue = Exec.waitFor(mPid.get());
+                //long mEndTime = System.currentTimeMillis();
+                int pid = mPid.getAndSet(PID_INIT_VALUE);
+                Log.d("", "out:" + mFd.out.toString());
+
+                Message msg = new Message();
+                msg.what = returnValue;
+                msg.obj = mArguments.get(0);
+
+                Log.d(TAG, "Process " + pid + " exited with result code " + returnValue + ".");
+
+                try {
+                    mIn.close();
+                } catch (IOException e) {
+                    Log.e(TAG, e.getMessage());
+                }
+
+                try {
+                    mOut.close();
+                } catch (IOException e) {
+                    Log.e(TAG, e.getMessage());
+                }
+
+                //context.updateNotify(msg);
+
+            }
+        }).start();
+    }
+
+    private String[] getEnvironmentArray(String pyPath) {
+        String path = System.getenv("PATH");
+
+        File filesDir = this.context.getFilesDir();
+
+        List<String> environmentVariables = new ArrayList<String>();
+
+        environmentVariables.add("PATH=" + filesDir + "/bin" + ":" + path);
+        environmentVariables.add("LD_LIBRARY_PATH=" + ".:" + filesDir + "/lib/" + ":" + filesDir + "/:" + filesDir.getParentFile() + "/lib/");
+        environmentVariables.add("PYTHONHOME=" + filesDir);
+        environmentVariables.add("ANDROID_PRIVATE=" + filesDir);
+
+        File externalStorage = new File(Environment.getExternalStorageDirectory(), "org.qpython.qpy");
+
+        environmentVariables.add("PYTHONPATH=" + externalStorage + "/lib/python2.7/site-packages/:"
+                + filesDir + "/lib/python2.7/site-packages/:"
+                + filesDir + "/lib/python2.7/:"
+                + filesDir + "/lib/python27.zip:"
+                + filesDir + "/lib/python2.7/lib-dynload/:"
+                + pyPath);
+
+        //environmentVariables.add("PYTHONSTARTUP=" + externalStorage + "/lib/python2.7/site-packages/qpythoninit.py");
+        environmentVariables.add("PYTHONOPTIMIZE=2");
+
+        environmentVariables.add("TMPDIR=" + externalStorage + "/cache");
+        environmentVariables.add("TEMP=" + externalStorage + "/cache");
+
+        File td = new File(externalStorage + "/cache");
+        if (!td.exists()) {
+            td.mkdirs();
+        }
+
+        environmentVariables.add("ANDROID_PUBLIC=" + externalStorage);
+        environmentVariables.add("ANDROID_PRIVATE=" + this.context.getFilesDir().getAbsolutePath());
+        environmentVariables.add("ANDROID_ARGUMENT=" + pyPath);
+        environmentVariables.add("PYTHONDONTWRITEBYTECODE=1");
+
+        for (Map.Entry<String, String> entry : System.getenv().entrySet()) {
+            environmentVariables.add(entry.getKey() + "=" + entry.getValue());
+        }
+        String[] environment = environmentVariables.toArray(new String[environmentVariables.size()]);
+        return environment;
+    }
+
+    public void extractRes(File file, File target, boolean forceExtrac) {
+        String fileName = file.getName().startsWith(".") ? file.getName().substring(1, file.getName().length()) : file.getName();
+        fileName = fileName.substring(0, !file.getName().contains(".") ? file.getName().length() : file.getName().indexOf("."));
+
+        String data_version = resourceManager.getString(fileName + "_version");
+        if (data_version==null) {
+            data_version = "0";
+        }
+        String disk_version = "0";
+
+        Log.d(TAG, "extractRes:"+fileName+"["+data_version+"]"+"["+disk_version+"]");
+
+        String disk_version_fn = target.getAbsolutePath() + "/" + fileName + ".version";
+        try {
+            byte buf[] = new byte[64];
+            InputStream is = new FileInputStream(disk_version_fn);
+            int len = is.read(buf);
+            disk_version = new String(buf, 0, len);
+            is.close();
+        } catch (FileNotFoundException e) {
+            disk_version = "0";
+        } catch (IOException e) {
+            disk_version = "0";
+        }
+
+        if ((int) (Double.parseDouble(data_version) - Double.parseDouble(disk_version)) > 0 || disk_version.equals("0") || forceExtrac) {
+            target.mkdirs();
+            if (!new FileExtract().extractTar(file, target.getAbsolutePath())) {
+                Log.d(TAG,"Could not extract " + fileName + " data.");
+            }
+        }
+
+        chmodX();
+    }
+
+    public void extractRes(final String resource, File target, boolean force) {
+        // The version of data in memory and on disk.
+        String data_version = resourceManager.getString(resource + "_version");
+        String disk_version = "0";
+
+        //LogUtil.d(TAG, "data_version:"+data_version+"-"+resource + "_version"+"-"+resourceManager);
+        // If no version, no unpacking is necessary.
+        if (data_version == null) {
+            return;
+        }
+
+        // Check the current disk version, if any.
+        String filesDir = target.getAbsolutePath();
+        String disk_version_fn = filesDir + "/" + resource + ".version";
+
+        try {
+            byte buf[] = new byte[64];
+            InputStream is = new FileInputStream(disk_version_fn);
+            int len = is.read(buf);
+            disk_version = new String(buf, 0, len);
+            is.close();
+        } catch (Exception e) {
+            disk_version = "0";
+        }
+
+
+        //LogUtil.d(TAG, "data_version:"+Math.round(Double.parseDouble(data_version))+"-disk_version:"+Math.round(Double.parseDouble(disk_version))+"-RET:"+(int)(Double.parseDouble(data_version)-Double.parseDouble(disk_version)));
+        if (((int) (Double.parseDouble(data_version) - Double.parseDouble(disk_version)) > 0 || disk_version.equals("0"))
+                || force) {
+            Log.v(TAG, "Extracting " + resource + " assets.");
+
+            //recursiveDelete(target);
+            target.mkdirs();
+
+            AssetExtract ae = new AssetExtract(this.activity);
+            boolean ret = ae.extractTar(resource + ".mp3", target.getAbsolutePath());
+            if (!ret) {
+                //Toast.makeText(this.context, "Could not extract " + resource + " data, please reinstall and make sure your device have enough space", Toast.LENGTH_SHORT).show();
+            } else {
+
+                try {
+                /*if (resource.equals("private")) {
+                    Toast.makeText(getApplicationContext(), R.string.first_load, Toast.LENGTH_SHORT).show();
+            	}*/
+                    // Write .nomedia.
+                    new File(target, ".nomedia").createNewFile();
+
+                    // Write version file.
+                    FileOutputStream os = new FileOutputStream(disk_version_fn);
+                    os.write(data_version.getBytes());
+                    os.close();
+                } catch (Exception e) {
+                    Log.w("python", e);
+                    Toast.makeText(this.context, "Could not extract " + resource + " data, make sure your device have enough space.", Toast.LENGTH_LONG);
+                }
+            }
+        } else {
+            Log.d(TAG, "NO EXTRACT");
+
+        }
+        if (resource.startsWith("private") || resource.startsWith("notebook")) {
+            chmodX();
+        }
+    }
+
+    public void extractRes(final String resource, File target) {
+        extractRes( resource, target, false);
+    }
+
+
+    public void extractRes2(final String resource, File target) {
+        Log.d(TAG, "extractRes:" + target);
+        // The version of data in memory and on disk.
+        String data_version = resourceManager.getString(resource + "_version");
+        String disk_version;
+
+        // If no version, no unpacking is necessary.
+        if (data_version == null) {
+            return;
+        }
+
+        // Check the current disk version, if any.
+        String filesDir = target.getAbsolutePath();
+        String disk_version_fn = filesDir + "/" + resource + ".version";
+
+        try {
+            byte buf[] = new byte[64];
+            InputStream is = new FileInputStream(disk_version_fn);
+            int len = is.read(buf);
+            disk_version = new String(buf, 0, len);
+            is.close();
+        } catch (Exception e) {
+            disk_version = "";
+        }
+
+        // If the disk data is out of date, extract it and write the
+        // version file.
+        if (!data_version.equals(disk_version)) {
+            Log.v("python", "Extracting " + resource + " assets.");
+
+            //_recursiveDelete(target);
+            target.mkdirs();
+
+            AssetExtract ae = new AssetExtract(activity);
+            if (!ae.extractTar(resource + ".mp3", target.getAbsolutePath())) {
+                //toastError("Could not extract " + resource + " data.");
+//            if (!ae.copyFromAssetsToInternalStorage(resource + ".zip")) {
+            } else {
+
+                try {
+                    new File(target, ".nomedia").createNewFile();
+
+                    // Write version file.
+                    FileOutputStream os = new FileOutputStream(disk_version_fn);
+                    os.write(data_version.getBytes());
+                    os.close();
+                } catch (Exception e) {
+                    Log.w("unpackData", e);
+                }
+            }
+        }
+
+        if (resource.startsWith("private") || resource.startsWith("notebook")) {
+            chmodX();
+        }
+    }
+
+    private void chmodX () {
+        File bind = new File(this.context.getFilesDir() + "/bin");
+        if (bind.listFiles() != null) {
+            for (File bin : bind.listFiles()) {
+                try {
+                    //LogUtil.d(TAG, "chmod:"+bin.getAbsolutePath());
+
+                    FileUtils.chmod(bin, 0755);
+                } catch (Exception e1) {
+                    e1.printStackTrace();
+                }
+            }
+        }
+    }
+}
diff --git a/qpysdk/src/main/java/org/qpython/qpysdk/utils/AndroidCompat.java b/qpysdk/src/main/java/org/qpython/qpysdk/utils/AndroidCompat.java
new file mode 100644
index 00000000..7eaab89e
--- /dev/null
+++ b/qpysdk/src/main/java/org/qpython/qpysdk/utils/AndroidCompat.java
@@ -0,0 +1,47 @@
+package org.qpython.qpysdk.utils;
+
+/**
+ * The classes in this package take advantage of the fact that the VM does
+ * not attempt to load a class until it's accessed, and the verifier
+ * does not run until a class is loaded.  By keeping the methods which
+ * are unavailable on older platforms in subclasses which are only ever
+ * accessed on platforms where they are available, we can preserve
+ * compatibility with older platforms without resorting to reflection.
+ * <p>
+ * See http://developer.android.com/resources/articles/backward-compatibility.html
+ * and http://android-developers.blogspot.com/2010/07/how-to-have-your-cupcake-and-eat-it-too.html
+ * for further discussion of this technique.
+ */
+
+public class AndroidCompat {
+     public final static int SDK = getSDK();
+
+    // The era of Holo Design
+    public final static boolean V11ToV20;
+
+    static {
+        V11ToV20 = (SDK >= 11) && (SDK <= 20);
+    }
+
+    private final static int getSDK() {
+        int result;
+        try {
+            result = AndroidLevel4PlusCompat.getSDKInt();
+        } catch (VerifyError e) {
+            // We must be at an SDK level less than 4.
+            try {
+                result = Integer.valueOf(android.os.Build.VERSION.SDK);
+            } catch (NumberFormatException e2) {
+                // Couldn't parse string, assume the worst.
+                result = 1;
+            }
+        }
+        return result;
+    }
+}
+
+class AndroidLevel4PlusCompat {
+    static int getSDKInt() {
+        return android.os.Build.VERSION.SDK_INT;
+    }
+}
diff --git a/qpysdk/src/main/java/org/qpython/qpysdk/utils/AssetExtract.java b/qpysdk/src/main/java/org/qpython/qpysdk/utils/AssetExtract.java
new file mode 100644
index 00000000..340f8365
--- /dev/null
+++ b/qpysdk/src/main/java/org/qpython/qpysdk/utils/AssetExtract.java
@@ -0,0 +1,129 @@
+package org.qpython.qpysdk.utils;
+
+import java.io.*;
+
+import android.app.Activity;
+import android.util.Log;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.FileOutputStream;
+import java.io.File;
+
+import java.util.zip.GZIPInputStream;
+
+import android.content.res.AssetManager;
+
+import com.quseit.common.jtar.TarEntry;
+import com.quseit.common.jtar.TarInputStream;
+
+
+public class AssetExtract {
+
+    private AssetManager mAssetManager = null;
+    //private Activity mActivity = null;
+
+    public AssetExtract(Activity act) {
+        //mActivity = act;
+        mAssetManager = act.getAssets();
+    }
+
+    public boolean extractTar(String asset, String target) {
+
+        byte buf[] = new byte[1024 * 1024];
+
+        InputStream assetStream = null;
+        TarInputStream tis = null;
+
+        try {
+            assetStream = mAssetManager.open(asset, AssetManager.ACCESS_STREAMING);
+            tis = new TarInputStream(new BufferedInputStream(new GZIPInputStream(new BufferedInputStream(assetStream, 8192)), 8192));
+        } catch (IOException e) {
+            Log.e("python", "opening up extract tar", e);
+            return false;
+        }
+
+        while (true) {
+            TarEntry entry = null;
+
+            try {
+                entry = tis.getNextEntry();
+            } catch ( java.io.IOException e ) {
+                Log.e("python", "extracting tar", e);
+                return false;
+            }
+
+            if ( entry == null ) {
+                break;
+            }
+
+            Log.i("python", "extracting ["+entry.getName()+"]");
+
+//            if (entry.getName()!=null && entry.getName().trim().equals("")) {
+//                LogUtil.i("python", "extracting none");
+//
+//                continue;
+//            }
+
+            if (entry.isDirectory()) {
+
+                try {
+                    new File(target +"/" + entry.getName()).mkdirs();
+                } catch ( SecurityException e ) {
+                    Log.e("python", "could not open SecurityException" + e);
+
+                };
+
+                continue;
+            }
+
+            OutputStream out = null;
+            String path = target + "/" + entry.getName().trim();
+
+            try {
+                out = new BufferedOutputStream(new FileOutputStream(path), 8192);
+            } catch ( FileNotFoundException e ) {
+                Log.e("python", "could not open FileNotFoundException:" + e);
+
+            } catch ( SecurityException e ) {
+                Log.e("python", "could not open SecurityException:" + e);
+            };
+
+            if ( out == null ) {
+                Log.e("python", "could not open " + path);
+                return false;
+            }
+
+            try {
+                while (true) {
+                    int len = tis.read(buf);
+
+                    if (len == -1) {
+                        break;
+                    }
+
+                    out.write(buf, 0, len);
+                }
+
+                out.flush();
+                out.close();
+            } catch ( java.io.IOException e ) {
+                Log.e("python", "extracting zip：", e);
+                return false;
+            }
+        }
+
+        try {
+            tis.close();
+            assetStream.close();
+        } catch (IOException e) {
+            Log.e("python", "extracting zip IOException：", e);
+
+            // pass
+        }
+
+        return true;
+    }
+}
diff --git a/qpysdk/src/main/java/org/qpython/qpysdk/utils/DateTimeHelper.java b/qpysdk/src/main/java/org/qpython/qpysdk/utils/DateTimeHelper.java
new file mode 100644
index 00000000..6da7ccb2
--- /dev/null
+++ b/qpysdk/src/main/java/org/qpython/qpysdk/utils/DateTimeHelper.java
@@ -0,0 +1,300 @@
+package org.qpython.qpysdk.utils;
+
+import android.util.Log;
+
+import java.sql.Timestamp;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Locale;
+
+public class DateTimeHelper {
+    // Wed Dec 15 02:53:36 +0000 2010
+    public static final DateFormat TWITTER_DATE_FORMATTER = new SimpleDateFormat(
+            "E MMM d HH:mm:ss Z yyyy", Locale.US);
+    public static final DateFormat TWITTER_SEARCH_API_DATE_FORMATTER = new SimpleDateFormat(
+            "E, d MMM yyyy HH:mm:ss Z", Locale.US);
+    public static final DateFormat AGO_FULL_DATE_FORMATTER = new SimpleDateFormat(
+            "yyyy-MM-dd HH:mm");
+    private static final String TAG = "DateTimeHelper";
+
+    public static String converTime(long timestamp, String[] timeLabels) {
+        long currentSeconds = System.currentTimeMillis() / 1000;
+        long timeGap = currentSeconds - timestamp;//与现在时间相差秒数
+        //LogUtil.d(TAG, "converTime:"+currentSeconds+"-"+timestamp);
+        String timeStr = null;
+        if (timeGap > 24 * 60 * 60) {//1天以上
+            timeStr = timeGap / (24 * 60 * 60) + timeLabels[0];
+        } else if (timeGap > 60 * 60) {//1小时-24小时
+            timeStr = timeGap / (60 * 60) + timeLabels[1];
+        } else if (timeGap > 60) {//1分钟-59分钟
+            timeStr = timeGap / 60 + timeLabels[2];
+        } else {//1秒钟-59秒钟
+            timeStr = timeLabels[3];
+        }
+        return timeStr;
+    }
+
+    public static String getStandardTime(long timestamp) {
+        SimpleDateFormat sdf = new SimpleDateFormat("MM月dd日 HH:mm");
+        Date date = new Date(timestamp * 1000);
+        sdf.format(date);
+        return sdf.format(date);
+    }
+
+    public static final String getDateAsDirName() {
+        Calendar cal = Calendar.getInstance();
+        java.text.SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        String cdate = sdf.format(cal.getTime());
+        return cdate;
+    }
+
+    public static final String getDateAss() {
+        Calendar cal = Calendar.getInstance();
+        java.text.SimpleDateFormat sdf = new SimpleDateFormat("MM-dd-HH-mm");
+        String cdate = sdf.format(cal.getTime());
+        return cdate;
+    }
+
+    public static final String getDate() {
+        Calendar cal = Calendar.getInstance();
+        java.text.SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String cdate = sdf.format(cal.getTime());
+        return cdate;
+    }
+
+    public static final String getDateMin() {
+        Calendar cal = Calendar.getInstance();
+        java.text.SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+        String cdate = sdf.format(cal.getTime());
+        return cdate;
+    }
+
+    public static final String getTodayFull() {
+        Calendar cal = Calendar.getInstance();
+        java.text.SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd 00:00:00");
+        String cdate = sdf.format(cal.getTime());
+        //LogUtil.d(TAG, "getTodayFull:"+cdate);
+        return cdate;
+    }
+
+    public static final int getTimeAsInt() {
+        Calendar cal = Calendar.getInstance();
+        java.text.SimpleDateFormat sdf = new SimpleDateFormat("HHmmss");
+        String cdate = sdf.format(cal.getTime());
+        return Integer.parseInt(cdate);
+    }
+
+    public static final String getDateAsF() {
+        Calendar cal = Calendar.getInstance();
+        java.text.SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
+        String cdate = sdf.format(cal.getTime());
+        return cdate;
+    }
+
+    public static final Date parseDateTime(String dateString) {
+        try {
+            Log.v(TAG, String.format("in parseDateTime, dateString=%s",
+                    dateString));
+            return TWITTER_DATE_FORMATTER.parse(dateString);
+        } catch (ParseException e) {
+            Log.w(TAG, "Could not parse Twitter date string: " + dateString);
+            return null;
+        }
+    }
+
+    public static final Date parseSearchApiDateTime(String dateString) {
+        try {
+            return TWITTER_SEARCH_API_DATE_FORMATTER.parse(dateString);
+        } catch (ParseException e) {
+            Log.w(TAG, "Could not parse Twitter search date string: "
+                    + dateString);
+            return null;
+        }
+    }
+
+	/*public static String getRelativeDate(Date date) {
+        Date now = new Date();
+
+		String prefix = PassingerApp.mContext
+				.getString(R.string.tweet_created_at_beautify_prefix);
+		String sec = PassingerApp.mContext
+				.getString(R.string.tweet_created_at_beautify_sec);
+		String min = PassingerApp.mContext
+				.getString(R.string.tweet_created_at_beautify_min);
+		String hour = PassingerApp.mContext
+				.getString(R.string.tweet_created_at_beautify_hour);
+		String day = PassingerApp.mContext
+				.getString(R.string.tweet_created_at_beautify_day);
+		String suffix = PassingerApp.mContext
+				.getString(R.string.tweet_created_at_beautify_suffix);
+
+		// Seconds.
+		long diff = (now.getTime() - date.getTime()) / 1000;
+
+		if (diff < 0) {
+			diff = 0;
+		}
+
+		if (diff < 60) {
+			return diff + sec + suffix;
+		}
+
+		// Minutes.
+		diff /= 60;
+
+		if (diff < 60) {
+			return prefix + diff + min + suffix;
+		}
+
+		// Hours.
+		diff /= 60;
+
+		if (diff < 24) {
+			return prefix + diff + hour + suffix;
+		}
+
+		return AGO_FULL_DATE_FORMATTER.format(date);
+	}*/
+
+    public static long getNowTime() {
+        return Calendar.getInstance().getTime().getTime();
+    }
+
+    public static long getDiffMin(String date1, String date2) {
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        //java.util.Date now;
+        java.util.Date begin;
+        try {
+            begin = df.parse(date1);
+            java.util.Date end = df.parse(date2);
+            //LogUtil.d(TAG, date1+"-"+date2);
+            long between = (end.getTime() - begin.getTime()) / 1000;//除以1000是为了转换成秒
+
+            long minute1 = between % 3600 / 60;
+
+            return minute1;
+        } catch (ParseException e) {
+            e.printStackTrace();
+
+            return 0;
+        }
+
+    }
+
+    public static String getDiff(Date begin, Date end) {
+        //long between=(end.getTime()-begin.getTime())/1000;//除以1000是为了转换成秒
+
+        //long day1=between/(24*3600);
+        int day2 = (end.getMonth() * 100 + end.getDate()) - (begin.getMonth() * 100 + begin.getDate());
+
+        //long hour1=between%(24*3600)/3600;
+        //long minute1=between%3600/60;
+        //long second1=between%60/60;
+        //String dateAt = String.valueOf(begin.getYear())+BASE_CONF.T_Y+String.valueOf(begin.getMonth())+BASE_CONF.T_M+String.valueOf(begin.getDay())+BASE_CONF.T_D;
+        String x1 = String.valueOf(begin.getHours());
+        if (x1.length() == 1) {
+            x1 = "0" + x1;
+        }
+        String x2 = String.valueOf(begin.getMinutes());
+        if (x2.length() == 1) {
+            x2 = "0" + x2;
+        }
+        String timeAt = x1 + ":" + x2;
+        //String ret = "";
+        //LogUtil.d(TAG, "getDiff:"+date1+"-"+date2+"-"+(end.getMonth()*100+end.getDate())+"-"+(begin.getMonth()*100+begin.getDate()));
+
+        SimpleDateFormat ymformatter = new SimpleDateFormat("yyyyMM");
+        String bYm = ymformatter.format(begin);
+        String eYm = ymformatter.format(end);
+
+        if (bYm.equals(eYm)) {
+            if (day2 > 1) {
+                SimpleDateFormat formatter = new SimpleDateFormat("MM-dd");
+                return formatter.format(begin) + " " + timeAt;
+            }
+
+            if (day2 == 1) {
+                return "Yesterday " + timeAt;
+            }
+            /*if (day2==2) {
+				return CONF.T_BS+" "+timeAt;
+			} */
+
+            return "Today " + timeAt;
+
+
+        } else {
+            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+            return formatter.format(begin) + " " + timeAt;
+        }
+
+    }
+
+    public static String getDiff(String date1, String date2) {
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        //java.util.Date now;
+        try {
+            java.util.Date begin = df.parse(date1);
+            java.util.Date end = df.parse(date2);
+            return DateTimeHelper.getDiff(begin, end);
+
+        } catch (ParseException e) {
+            e.printStackTrace();
+            return "unknow";
+        }
+
+    }
+
+    public static String longTimeToString(int i) {
+        StringBuilder sb = new StringBuilder();
+        i = i / 1000;
+        int m = i / 60;
+        int s = i % 60;
+        if (i >= 60) {
+            if (m < 10) {
+                sb.append("0");
+                sb.append(String.valueOf(m));
+            } else {
+                sb.append(String.valueOf(m));
+            }
+            sb.append(":");
+            if (s > 9) {
+                sb.append(String.valueOf(s));
+            } else {
+                sb.append("0");
+                sb.append(String.valueOf(s));
+            }
+        } else {
+            sb.append("00:");
+            if (s > 9) {
+                sb.append(String.valueOf(s));
+            } else {
+                sb.append("0");
+                sb.append(String.valueOf(s));
+            }
+        }
+        return sb.toString();
+    }
+
+    /**
+     * @return Is the first time later than the second time
+     */
+    public static boolean isLater(String timeOne, String timeTwo) {
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss.SSS");
+        Date parsedDateOne, parsedDateTwo;
+        if (timeTwo.equals("")) {
+            return true;
+        }
+        try {
+            parsedDateOne = dateFormat.parse(timeOne);
+            parsedDateTwo = dateFormat.parse(timeTwo);
+            return parsedDateOne.after(parsedDateTwo);
+        } catch (ParseException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+}
diff --git a/qpysdk/src/main/java/org/qpython/qpysdk/utils/FileExtract.java b/qpysdk/src/main/java/org/qpython/qpysdk/utils/FileExtract.java
new file mode 100644
index 00000000..14905714
--- /dev/null
+++ b/qpysdk/src/main/java/org/qpython/qpysdk/utils/FileExtract.java
@@ -0,0 +1,97 @@
+package org.qpython.qpysdk.utils;
+
+import android.util.Log;
+
+import com.quseit.common.jtar.TarEntry;
+import com.quseit.common.jtar.TarInputStream;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.zip.GZIPInputStream;
+
+
+public class FileExtract {
+    public boolean extractTar(File tar, String target) {
+
+        byte buf[] = new byte[8 * 1024];
+
+        InputStream assetStream;
+        TarInputStream tis;
+
+        try {
+            assetStream = new FileInputStream(tar);
+            tis = new TarInputStream(new BufferedInputStream(new GZIPInputStream(new BufferedInputStream(assetStream, 8192)), 8192));
+        } catch (IOException e) {
+            return false;
+        }
+
+        while (true) {
+            TarEntry entry;
+
+            try {
+                entry = tis.getNextEntry();
+            } catch (java.io.IOException e) {
+                return false;
+            }
+
+            if (entry == null) {
+                Log.d("FileExtract","ENCOUNTER NULL WHEN extractTarS");
+                break;
+            }
+            if (entry.isDirectory()) {
+
+                try {
+                    new File(target + "/" + entry.getName()).mkdirs();
+                } catch (SecurityException ignore) {
+                }
+                continue;
+            }
+
+            OutputStream out = null;
+            String path = target + "/" + entry.getName().trim();
+
+            try {
+                Log.d("FileExtract","FILE:"+path);
+                out = new BufferedOutputStream(new FileOutputStream(path), 8192);
+            } catch (FileNotFoundException ignore) {
+            } catch (SecurityException ignore) {
+            }
+
+            if (out == null) {
+                return false;
+            }
+
+            try {
+                while (true) {
+                    int len = tis.read(buf);
+
+                    if (len == -1) {
+                        break;
+                    }
+
+                    out.write(buf, 0, len);
+                }
+
+                out.flush();
+                out.close();
+            } catch (java.io.IOException e) {
+                return false;
+            }
+        }
+
+        try {
+            tis.close();
+            assetStream.close();
+        } catch (IOException ignore) {
+        }
+
+        return true;
+    }
+}
diff --git a/qpysdk/src/main/java/org/qpython/qpysdk/utils/FileHelper.java b/qpysdk/src/main/java/org/qpython/qpysdk/utils/FileHelper.java
new file mode 100644
index 00000000..90ffe237
--- /dev/null
+++ b/qpysdk/src/main/java/org/qpython/qpysdk/utils/FileHelper.java
@@ -0,0 +1,384 @@
+package org.qpython.qpysdk.utils;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Environment;
+import android.webkit.MimeTypeMap;
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
+
+/**
+ * 对SD卡文件的管理
+ * 
+ * @author ch.linghu
+ * 
+ */
+public class FileHelper {
+	@SuppressWarnings("unused")
+	private static final String TAG = "FileHelper";
+
+	public static final void createDirIfNExists(String dirname) {
+		File yy = new File(dirname);
+		if (!yy.exists()) {
+			yy.mkdirs();
+		}
+	}
+
+	public static final void createFileFromAssetsIfNExists(Context con, String filename, String dst) {
+		File yy = new File(dst);
+		if (!yy.exists()) {
+			String content = FileHelper.LoadDataFromAssets(con, filename);
+			FileHelper.writeToFile(dst, content, false);
+		}
+	}
+	public static void openFile(Context context, String filePath, String fileExtension) {
+        Intent intent = new Intent();
+        intent.setAction(android.content.Intent.ACTION_VIEW);
+        File file = new File(filePath);
+        MimeTypeMap mime = MimeTypeMap.getSingleton();
+        String type = mime.getMimeTypeFromExtension(fileExtension);
+        intent.setDataAndType(Uri.fromFile(file), type);
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        try {
+            context.startActivity(intent);
+        } catch (android.content.ActivityNotFoundException e) {
+        }
+}
+
+	public static String getFileNameFromUrl(String urlFile) {
+		try {
+			URL url = new URL(urlFile);
+			File f = new File(url.getPath());
+			return f.getName();
+
+		} catch (MalformedURLException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+
+			return "unname.dat";
+		}
+	}
+	public static String getTypeByMimeType(String mType) {
+		if (mType.equals("application/vnd.android.package-archive")) {
+			return "apk";
+		} else {
+			String[] xx = mType.split("/");
+			if (xx.length>1) {
+				return xx[0];
+			}
+		}
+		return "other";
+	}
+
+	public static String LoadDataFromAssets(Context context, String inFile) {
+		String tContents = "";
+
+		try {
+			InputStream stream = context.getAssets().open(inFile);
+			int size = stream.available();
+			byte[] buffer = new byte[size];
+			stream.read(buffer);
+			stream.close();
+			tContents = new String(buffer);
+		} catch (IOException e) {
+		}
+		return tContents;
+	}
+
+	public static void putFileContents(Context context, String filename, String content) {
+		try {
+			File fileCache = new File(filename);
+			byte[] data = content.getBytes();
+			FileOutputStream outStream;
+			outStream = new FileOutputStream(fileCache);
+			outStream.write(data);
+			outStream.close();
+		} catch (FileNotFoundException e) {
+			e.printStackTrace();
+		} catch (IOException e) {
+			e.printStackTrace();
+
+		}
+	}
+
+	public static void writeToFile(String filePath, String data, boolean append) {
+		try {
+			FileOutputStream fOut = new FileOutputStream(filePath, append);
+            fOut.write(data.getBytes());
+            fOut.flush();
+            fOut.close();
+		} catch (IOException iox) {
+			iox.printStackTrace();
+		}
+
+	}
+
+
+	public static String getFileContentsFromAssets(Context context, String filename) {
+		String content=""; //结果字符串
+		try{
+			java.io.InputStream is= context.getResources().getAssets().open(filename); //打开文件
+			int ch=0;  
+			ByteArrayOutputStream baos = new ByteArrayOutputStream(); //实现了一个输出流
+			while((ch=is.read())!=-1){  
+				baos.write(ch); //将指定的字节写入此 byte 数组输出流  
+			}
+			byte[] buff=baos.toByteArray();//以byte 数组的形式返回此输出流的当前内容  
+			baos.close(); //关闭流  
+			is.close(); //关闭流  
+			content=new String(buff,"UTF-8"); //设置字符串编码
+		
+		} catch(Exception e) {
+			e.printStackTrace();
+			//LogUtil.d(TAG, "getFileContentsFromAssets:"+e.getMessage());
+		}  
+		return content; 
+	}
+	public static String getFileContents(String filename) {
+
+        File scriptFile = new File( filename );
+        String tContent = "";
+        if (scriptFile.exists()) {
+        	BufferedReader in;
+			try {
+				in = new BufferedReader(new FileReader(scriptFile));
+            	String line;
+
+				while ((line = in.readLine())!=null) {
+					tContent += line+"\n";
+				}
+				in.close();
+			} catch (FileNotFoundException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			} catch (IOException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+
+        }
+		return tContent;
+	}
+
+	public static String getFileContents(String filename, int pos) {
+
+		File scriptFile = new File( filename );
+		String tContent = "";
+		if (scriptFile.exists()) {
+			BufferedReader in;
+			try {
+				in = new BufferedReader(new FileReader(scriptFile));
+				String line;
+
+				while ((line = in.readLine())!=null) {
+					tContent += line+"\n";
+					if (tContent.length()>=pos) {
+						in.close();
+						return tContent;
+					}
+				}
+				in.close();
+			} catch (FileNotFoundException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			} catch (IOException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+
+		}
+		return tContent;
+	}
+
+	public static void clearDir(String dir, int level, boolean deleteS) {
+		//LogUtil.d(TAG, "clearDir:"+dir);
+		File basePath = new File(dir);
+		if (basePath.exists() && basePath.isDirectory()) {
+			for (File item : basePath.listFiles()) {
+				if (item.isFile()) {
+					//LogUtil.d(TAG, "deleteItem:"+item.getAbsolutePath());
+					item.delete();
+
+				} else if (item.isDirectory()){
+					clearDir(item.getAbsolutePath(), level+1, deleteS);
+				}
+			}
+			if (level>0 || deleteS) {
+				basePath.delete();
+			}
+		}
+	}
+
+	public static File getBasePath(String parDir, String subdir) throws IOException {
+		try {
+		File basePath = new File(Environment.getExternalStorageDirectory(),
+				parDir);
+
+		if (!basePath.exists()) {
+			if (!basePath.mkdirs()) {
+				throw new IOException(String.format("%s cannot be created!",
+						basePath.toString()));
+			}
+		}
+		File subPath = null;
+		if (!subdir.equals("")) {
+			subPath = new File(Environment.getExternalStorageDirectory(),
+					parDir+"/"+subdir);
+			if (!subPath.exists()) {
+				if (!subPath.mkdirs()) {
+					throw new IOException(String.format("%s cannot be created!",
+							subPath.toString()));
+				}
+			}
+		}
+
+		if (!basePath.isDirectory()) {
+			throw new IOException(String.format("%s is not a directory!",
+					basePath.toString()));
+		}
+		if (subdir.equals(""))
+			return basePath;
+		else
+			return subPath;
+		} catch (Exception e) {
+			e.printStackTrace();
+			return null;
+		}
+	}
+	
+	/*public static File getBasePath(String subdir) throws IOException {
+		File basePath = new File(Environment.getExternalStorageDirectory(),
+				BASE_CONF.BASE_PATH);
+
+		if (!basePath.exists()) {
+			if (!basePath.mkdirs()) {
+				throw new IOException(String.format("%s cannot be created!",
+						basePath.toString()));
+			}
+		}
+		File subPath = null;
+		if (!subdir.equals("")) {
+			subPath = new File(Environment.getExternalStorageDirectory(),
+					BASE_CONF.BASE_PATH+"/"+subdir);
+			if (!subPath.exists()) {
+				if (!subPath.mkdirs()) {
+					throw new IOException(String.format("%s cannot be created!",
+							subPath.toString()));
+				}
+			}
+		}
+
+		if (!basePath.isDirectory()) {
+			throw new IOException(String.format("%s is not a directory!",
+					basePath.toString()));
+		}
+		if (subdir.equals(""))
+			return basePath;
+		else
+			return subPath;
+	}
+	*/
+	public static File getABSPath(String subdir) throws IOException {
+		File basePath = new File(subdir);
+
+		if (!basePath.exists()) {
+			if (!basePath.mkdirs()) {
+				throw new IOException(String.format("%s cannot be created!",
+						basePath.toString()));
+			}
+		}
+		File subPath = null;
+		if (!subdir.equals("")) {
+			subPath = new File(subdir);
+			if (!subPath.exists()) {
+				if (!subPath.mkdirs()) {
+					throw new IOException(String.format("%s cannot be created!",
+							subPath.toString()));
+				}
+			}
+		}
+
+		if (!basePath.isDirectory()) {
+			throw new IOException(String.format("%s is not a directory!",
+					basePath.toString()));
+		}
+		if (subdir.equals(""))
+			return basePath;
+		else
+			return subPath;
+	}
+	
+	public static String getFileName(String filename) {
+		File f = new File(filename);
+		return f.getName();
+	}
+	
+    public static String getExt(String filename, String def) {
+    	String[] yy = filename.split("\\?");
+        String[] xx = yy[0].split("\\.");
+        //LogUtil.d(TAG, "filename:"+filename+"-size:"+xx.length);
+    
+        if (xx.length<2) {
+            return def; 
+        } else {
+            String ext = xx[xx.length-1];
+            //LogUtil.d(TAG, "ext:"+ext);
+            return ext;
+        }   
+    } 
+    
+    public static boolean getUrlAsFile(String link, String fileName) {
+		try {
+			// get URL content
+			URL url = new URL(link);
+			URLConnection conn = url.openConnection();
+ 
+			// open the stream and put it into BufferedReader
+			BufferedReader br = new BufferedReader(
+                               new InputStreamReader(conn.getInputStream()));
+ 
+			String inputLine;
+ 
+			//save to this filename
+			File file = new File(fileName);
+ 
+			if (!file.exists()) {
+				file.createNewFile();
+			}
+ 
+			//use FileWriter to write file
+			FileWriter fw = new FileWriter(file.getAbsoluteFile());
+			BufferedWriter bw = new BufferedWriter(fw);
+ 
+			while ((inputLine = br.readLine()) != null) {
+				bw.write(inputLine+"\n");
+			}
+ 
+			bw.close();
+			br.close();
+ 
+			//System.out.println("Done");
+			return true;
+		} catch (MalformedURLException e) {
+			e.printStackTrace();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return false;
+ 
+	}
+}
diff --git a/qpysdk/src/main/java/org/qpython/qpysdk/utils/FileUtils.java b/qpysdk/src/main/java/org/qpython/qpysdk/utils/FileUtils.java
new file mode 100644
index 00000000..5387e26b
--- /dev/null
+++ b/qpysdk/src/main/java/org/qpython/qpysdk/utils/FileUtils.java
@@ -0,0 +1,162 @@
+package org.qpython.qpysdk.utils;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.util.Log;
+
+import java.io.File;
+import java.lang.reflect.Method;
+
+/**
+ * Created by mathiasluo on 16-5-13.
+ */
+public class FileUtils {
+
+    public static boolean deleteDir(File dir) {
+        try {
+            if (dir.isDirectory()) {
+                String[] children = dir.list();
+                for (int i=0; i<children.length; i++) {
+                    boolean success = deleteDir(new File(dir, children[i]));
+                    if (!success) {
+                        return false;
+                    }
+                }
+            }
+
+            // The directory is now empty so delete it
+            return dir.delete();
+
+        } catch (Exception e) {
+            Log.e("FileUtils","Failed to delete " + dir + " : " + e);
+            return false;
+        }
+    }
+
+    public static int chmod(File path, int mode) throws Exception {
+        Class<?> fileUtils = Class.forName("android.os.FileUtils");
+        Method setPermissions =
+                fileUtils.getMethod("setPermissions", String.class, int.class, int.class, int.class);
+        return (Integer) setPermissions.invoke(null, path.getAbsolutePath(), mode, -1, -1);
+    }
+
+    /**
+     * 根据文件后缀名获得对应的MIME类型。
+     *
+     * @param file
+     */
+    public static final String getMIMEType(File file) {
+        String type = "*/*";
+        String fName = file.getName();
+        //获取后缀名前的分隔符"."在fName中的位置。
+        int dotIndex = fName.lastIndexOf(".");
+        if (dotIndex < 0) {
+            return type;
+        }
+    /* 获取文件的后缀名 */
+        String end = fName.substring(dotIndex, fName.length()).toLowerCase();
+        if (end == "") return type;
+        //在MIME和文件类型的匹配表中找到对应的MIME类型。
+        for (int i = 0; i < MIME_MapTable.length; i++) {
+            if (end.equals(MIME_MapTable[i][0]))
+                type = MIME_MapTable[i][1];
+        }
+        return type;
+    }
+
+    /**
+     * 打开文件
+     *
+     * @param file
+     */
+    public static final void openFile(Context context, File file) {
+        //Uri uri = Uri.parse("file://"+file.getAbsolutePath());
+        Intent intent = new Intent();
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        //设置intent的Action属性
+        intent.setAction(Intent.ACTION_VIEW);
+        //获取文件file的MIME类型
+        String type = getMIMEType(file);
+        //设置intent的data和Type属性。
+        intent.setDataAndType(/*uri*/Uri.fromFile(file), type);
+        //跳转
+        context.startActivity(intent);
+    }
+
+
+    public static final boolean delectFile(File file) {
+        return file.delete();
+    }
+
+
+    //建立一个MIME类型与文件后缀名的匹配表
+    public static final String[][] MIME_MapTable = {
+            //{后缀名，    MIME类型}
+            {".3gp", "video/3gpp"},
+            {".apk", "application/vnd.android.package-archive"},
+            {".asf", "video/x-ms-asf"},
+            {".avi", "video/x-msvideo"},
+            {".bin", "application/octet-stream"},
+            {".bmp", "image/bmp"},
+            {".c", "text/plain"},
+            {".class", "application/octet-stream"},
+            {".conf", "text/plain"},
+            {".cpp", "text/plain"},
+            {".doc", "application/msword"},
+            {".exe", "application/octet-stream"},
+            {".gif", "image/gif"},
+            {".gtar", "application/x-gtar"},
+            {".gz", "application/x-gzip"},
+            {".h", "text/plain"},
+            {".htm", "text/html"},
+            {".html", "text/html"},
+            {".jar", "application/java-archive"},
+            {".java", "text/plain"},
+            {".jpeg", "image/jpeg"},
+            {".jpg", "image/jpeg"},
+            {".js", "application/x-javascript"},
+            {".log", "text/plain"},
+            {".m3u", "audio/x-mpegurl"},
+            {".m4a", "audio/mp4a-latm"},
+            {".m4b", "audio/mp4a-latm"},
+            {".m4p", "audio/mp4a-latm"},
+            {".m4u", "video/vnd.mpegurl"},
+            {".m4v", "video/x-m4v"},
+            {".mov", "video/quicktime"},
+            {".mp2", "audio/x-mpeg"},
+            {".mp3", "audio/x-mpeg"},
+            {".mp4", "video/mp4"},
+            {".mpc", "application/vnd.mpohun.certificate"},
+            {".mpe", "video/mpeg"},
+            {".mpeg", "video/mpeg"},
+            {".mpg", "video/mpeg"},
+            {".mpg4", "video/mp4"},
+            {".mpga", "audio/mpeg"},
+            {".msg", "application/vnd.ms-outlook"},
+            {".ogg", "audio/ogg"},
+            {".pdf", "application/pdf"},
+            {".png", "image/png"},
+            {".pps", "application/vnd.ms-powerpoint"},
+            {".ppt", "application/vnd.ms-powerpoint"},
+            {".prop", "text/plain"},
+            {".rar", "application/x-rar-compressed"},
+            {".rc", "text/plain"},
+            {".rmvb", "audio/x-pn-realaudio"},
+            {".rtf", "application/rtf"},
+            {".sh", "text/plain"},
+            {".tar", "application/x-tar"},
+            {".tgz", "application/x-compressed"},
+            {".txt", "text/plain"},
+            {".wav", "audio/x-wav"},
+            {".wma", "audio/x-ms-wma"},
+            {".wmv", "audio/x-ms-wmv"},
+            {".wps", "application/vnd.ms-works"},
+            //{".xml",    "text/xml"},
+            {".xml", "text/plain"},
+            {".z", "application/x-compress"},
+            {".zip", "application/zip"},
+            {"", "*/*"}
+    };
+
+}
diff --git a/qpysdk/src/main/java/org/qpython/qpysdk/utils/ResourceManager.java b/qpysdk/src/main/java/org/qpython/qpysdk/utils/ResourceManager.java
new file mode 100644
index 00000000..78a5fc19
--- /dev/null
+++ b/qpysdk/src/main/java/org/qpython/qpysdk/utils/ResourceManager.java
@@ -0,0 +1,47 @@
+/**
+ * This class takes care of managing resources for us. In our code, we
+ * can't use R, since the name of the package containing R will
+ * change. (This same code is used in both org.renpy.android and
+ * org.renpy.pygame.) So this is the next best thing.
+ */
+
+package org.qpython.qpysdk.utils;
+
+import android.app.Activity;
+import android.content.res.Resources;
+import android.view.View;
+
+public class ResourceManager {
+
+    private Activity act;
+    private Resources res;
+
+    public ResourceManager(Activity activity) {
+        act = activity;
+        res = act.getResources();
+    }
+
+    public int getIdentifier(String name, String kind) {
+        return res.getIdentifier(name, kind, act.getPackageName());
+    }
+
+    public String getString(String name) {
+
+        try {
+            return res.getString(getIdentifier(name, "string"));
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    public View inflateView(String name) {
+        int id = getIdentifier(name, "layout");
+        return act.getLayoutInflater().inflate(id, null);
+    }
+
+    public View getViewById(View v, String name) {
+        int id = getIdentifier(name, "id");
+        return v.findViewById(id);
+    }
+
+}
diff --git a/src/com/hipipal/sl4alib/StreamGobbler.java b/qpysdk/src/main/java/org/qpython/qpysdk/utils/StreamGobbler.java
similarity index 91%
rename from src/com/hipipal/sl4alib/StreamGobbler.java
rename to qpysdk/src/main/java/org/qpython/qpysdk/utils/StreamGobbler.java
index d2f0b940..0c762949 100644
--- a/src/com/hipipal/sl4alib/StreamGobbler.java
+++ b/qpysdk/src/main/java/org/qpython/qpysdk/utils/StreamGobbler.java
@@ -1,308 +1,308 @@
-package com.hipipal.sl4alib;
-
-import com.googlecode.android_scripting.Log;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * A <code>StreamGobbler</code> is an InputStream that uses an internal worker thread to constantly consume input from
- * another InputStream. It uses a buffer to store the consumed data. The buffer size is automatically adjusted, if
- * needed.
- * <p>
- * This class is sometimes very convenient - if you wrap a session's STDOUT and STDERR InputStreams with instances of
- * this class, then you don't have to bother about the shared window of STDOUT and STDERR in the low level SSH-2
- * protocol, since all arriving data will be immediatelly consumed by the worker threads. Also, as a side effect, the
- * streams will be buffered (e.g., single byte read() operations are faster).
- * <p>
- * Other SSH for Java libraries include this functionality by default in their STDOUT and STDERR InputStream
- * implementations, however, please be aware that this approach has also a downside:
- * <p>
- * If you do not call the StreamGobbler's <code>read()</code> method often enough and the peer is constantly sending
- * huge amounts of data, then you will sooner or later encounter a low memory situation due to the aggregated data
- * (well, it also depends on the Java heap size). Joe Average will like this class anyway - a paranoid programmer would
- * never use such an approach.
- * <p>
- * The term "StreamGobbler" was taken from an article called "When Runtime.exec() won't", see
- * http://www.javaworld.com/javaworld/jw-12-2000/jw-1229-traps.html.
- * 
- * @author Christian Plattner, plattner@trilead.com
- * @version $Id: StreamGobbler.java,v 1.1 2007/10/15 12:49:56 cplattne Exp $
- */
-
-public class StreamGobbler extends InputStream {
-	class GobblerThread extends Thread {
-		/*
-		@Override
-		public void run() {
-
-			while (true) {
-				try {
-					byte[] saveBuffer = null;
-
-					int avail = is.read(buffer, write_pos, buffer.length - write_pos);
-					synchronized (synchronizer) {
-						if (avail <= 0) {
-							isEOF = true;
-							synchronizer.notifyAll();
-							break;
-						}
-						write_pos += avail;
-
-						int space_available = buffer.length - write_pos;
-						Log.e("space_available:" + buffer.length + "-" + write_pos);
-
-						if (space_available == 0) {
-							if (read_pos > 0) {
-								saveBuffer = new byte[read_pos];
-								System.arraycopy(buffer, 0, saveBuffer, 0, read_pos);
-								System.arraycopy(buffer, read_pos, buffer, 0, buffer.length - read_pos);
-								write_pos -= read_pos;
-								read_pos = 0;
-
-								Log.e("read_pos > 0:" + buffer);
-
-							}
-							else {
-								write_pos = 0;
-								saveBuffer = buffer;
-
-								Log.e("read_pos <=0 :" + buffer);
-
-							}
-						}
-
-						synchronizer.notifyAll();
-					}
-					writeToFile(saveBuffer);
-
-				}
-				catch (IOException e) {
-					synchronized (synchronizer) {
-						exception = e;
-						synchronizer.notifyAll();
-						break;
-					}
-				}
-			}
-		}*/
-
-		public void run() {
-			byte[] buff = new byte[8192];
-
-			while (true) {
-				try {
-					int avail = is.read(buff);
-
-					synchronized (synchronizer) {
-						if (avail <= 0) {
-							isEOF = true;
-							synchronizer.notifyAll();
-							break;
-						}
-
-						int space_available = buffer.length - write_pos;
-
-						if (space_available < avail) {
-
-							int unread_size = write_pos - read_pos;
-							int need_space = unread_size + avail;
-
-							byte[] new_buffer = buffer;
-
-							if (need_space > buffer.length) {
-								int inc = need_space / 3;
-								inc = (inc < 256) ? 256 : inc;
-								inc = (inc > 8192) ? 8192 : inc;
-								new_buffer = new byte[need_space + inc];
-							}
-
-							if (unread_size > 0)
-								System.arraycopy(buffer, read_pos, new_buffer, 0, unread_size);
-
-							buffer = new_buffer;
-
-							read_pos = 0;
-							write_pos = unread_size;
-						}
-
-						byte[] s_buffer = new byte[avail];
-						System.arraycopy(buff, 0, s_buffer, 0, avail);
-						System.arraycopy(buff, 0, buffer, write_pos, avail);
-						write_pos += avail;
-
-						synchronizer.notifyAll();
-						writeToFile(s_buffer);
-						// Log.e("OUTPUT:"+String.valueOf(s_buffer));
-					}
-
-				}
-				catch (IOException e) {
-					synchronized (synchronizer) {
-						exception = e;
-						synchronizer.notifyAll();
-						break;
-					}
-				}
-			}
-		}
-	}
-
-	private InputStream is;
-
-	private GobblerThread t;
-
-	private Object synchronizer = new Object();
-
-	private boolean isEOF = false;
-
-	private boolean isClosed = false;
-
-	private IOException exception = null;
-
-	private byte[] buffer;
-
-	private int read_pos = 0;
-
-	private int write_pos = 0;
-
-	private final FileOutputStream mLogStream;
-
-	private final int mBufferSize;
-
-	public StreamGobbler(InputStream is, File log, int buffer_size) {
-		this.is = is;
-		mBufferSize = buffer_size;
-		FileOutputStream out = null;
-		try {
-			out = new FileOutputStream(log, false);
-		}
-		catch (IOException e) {
-			Log.e(e);
-		}
-		mLogStream = out;
-		buffer = new byte[mBufferSize];
-		t = new GobblerThread();
-		t.setDaemon(true);
-		t.start();
-	}
-
-	public void writeToFile(byte[] buffer) {
-
-		if (mLogStream != null && buffer != null) {
-			try {
-				mLogStream.write(buffer);
-			}
-			catch (IOException e) {
-				Log.e(e);
-			}
-		}
-	}
-
-	@Override
-	public int read() throws IOException {
-		synchronized (synchronizer) {
-			if (isClosed) {
-				throw new IOException("This StreamGobbler is closed.");
-			}
-
-			while (read_pos == write_pos) {
-				if (exception != null) {
-					throw exception;
-				}
-
-				if (isEOF) {
-					return -1;
-				}
-
-				try {
-					synchronizer.wait();
-				}
-				catch (InterruptedException e) {
-				}
-			}
-
-			int b = buffer[read_pos++] & 0xff;
-
-			return b;
-		}
-	}
-
-	@Override
-	public int available() throws IOException {
-		synchronized (synchronizer) {
-			if (isClosed) {
-				throw new IOException("This StreamGobbler is closed.");
-			}
-
-			return write_pos - read_pos;
-		}
-	}
-
-	@Override
-	public int read(byte[] b) throws IOException {
-		return read(b, 0, b.length);
-	}
-
-	@Override
-	public void close() throws IOException {
-		synchronized (synchronizer) {
-			if (isClosed) {
-				return;
-			}
-			isClosed = true;
-			isEOF = true;
-			synchronizer.notifyAll();
-			is.close();
-		}
-	}
-
-	@Override
-	public int read(byte[] b, int off, int len) throws IOException {
-		if (b == null) {
-			throw new NullPointerException();
-		}
-
-		if ((off < 0) || (len < 0) || ((off + len) > b.length) || ((off + len) < 0) || (off > b.length)) {
-			throw new IndexOutOfBoundsException();
-		}
-
-		if (len == 0) {
-			return 0;
-		}
-
-		synchronized (synchronizer) {
-			if (isClosed) {
-				throw new IOException("This StreamGobbler is closed.");
-			}
-
-			while (read_pos == write_pos) {
-				if (exception != null) {
-					throw exception;
-				}
-
-				if (isEOF) {
-					return -1;
-				}
-
-				try {
-					synchronizer.wait();
-				}
-				catch (InterruptedException e) {
-				}
-			}
-
-			int avail = write_pos - read_pos;
-
-			avail = (avail > len) ? len : avail;
-
-			System.arraycopy(buffer, read_pos, b, off, avail);
-
-			read_pos += avail;
-
-			return avail;
-		}
-	}
-}
+package org.qpython.qpysdk.utils;
+
+import android.util.Log;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * A <code>StreamGobbler</code> is an InputStream that uses an internal worker thread to constantly consume input from
+ * another InputStream. It uses a buffer to store the consumed data. The buffer size is automatically adjusted, if
+ * needed.
+ * <p>
+ * This class is sometimes very convenient - if you wrap a session's STDOUT and STDERR InputStreams with instances of
+ * this class, then you don't have to bother about the shared window of STDOUT and STDERR in the low level SSH-2
+ * protocol, since all arriving data will be immediatelly consumed by the worker threads. Also, as a side effect, the
+ * streams will be buffered (e.g., single byte read() operations are faster).
+ * <p>
+ * Other SSH for Java libraries include this functionality by default in their STDOUT and STDERR InputStream
+ * implementations, however, please be aware that this approach has also a downside:
+ * <p>
+ * If you do not call the StreamGobbler's <code>read()</code> method often enough and the peer is constantly sending
+ * huge amounts of data, then you will sooner or later encounter a low memory situation due to the aggregated data
+ * (well, it also depends on the Java heap size). Joe Average will like this class anyway - a paranoid programmer would
+ * never use such an approach.
+ * <p>
+ * The term "StreamGobbler" was taken from an article called "When Runtime.exec() won't", see
+ * http://www.javaworld.com/javaworld/jw-12-2000/jw-1229-traps.html.
+ * 
+ * @author Christian Plattner, plattner@trilead.com
+ * @version $Id: StreamGobbler.java,v 1.1 2007/10/15 12:49:56 cplattne Exp $
+ */
+
+public class StreamGobbler extends InputStream {
+	class GobblerThread extends Thread {
+		/*
+		@Override
+		public void run() {
+
+			while (true) {
+				try {
+					byte[] saveBuffer = null;
+
+					int avail = is.read(buffer, write_pos, buffer.length - write_pos);
+					synchronized (synchronizer) {
+						if (avail <= 0) {
+							isEOF = true;
+							synchronizer.notifyAll();
+							break;
+						}
+						write_pos += avail;
+
+						int space_available = buffer.length - write_pos;
+						LogUtil.e("space_available:" + buffer.length + "-" + write_pos);
+
+						if (space_available == 0) {
+							if (read_pos > 0) {
+								saveBuffer = new byte[read_pos];
+								System.arraycopy(buffer, 0, saveBuffer, 0, read_pos);
+								System.arraycopy(buffer, read_pos, buffer, 0, buffer.length - read_pos);
+								write_pos -= read_pos;
+								read_pos = 0;
+
+								LogUtil.e("read_pos > 0:" + buffer);
+
+							}
+							else {
+								write_pos = 0;
+								saveBuffer = buffer;
+
+								LogUtil.e("read_pos <=0 :" + buffer);
+
+							}
+						}
+
+						synchronizer.notifyAll();
+					}
+					writeToFile(saveBuffer);
+
+				}
+				catch (IOException e) {
+					synchronized (synchronizer) {
+						exception = e;
+						synchronizer.notifyAll();
+						break;
+					}
+				}
+			}
+		}*/
+
+		public void run() {
+			byte[] buff = new byte[8192];
+
+			while (true) {
+				try {
+					int avail = is.read(buff);
+
+					synchronized (synchronizer) {
+						if (avail <= 0) {
+							isEOF = true;
+							synchronizer.notifyAll();
+							break;
+						}
+
+						int space_available = buffer.length - write_pos;
+
+						if (space_available < avail) {
+
+							int unread_size = write_pos - read_pos;
+							int need_space = unread_size + avail;
+
+							byte[] new_buffer = buffer;
+
+							if (need_space > buffer.length) {
+								int inc = need_space / 3;
+								inc = (inc < 256) ? 256 : inc;
+								inc = (inc > 8192) ? 8192 : inc;
+								new_buffer = new byte[need_space + inc];
+							}
+
+							if (unread_size > 0)
+								System.arraycopy(buffer, read_pos, new_buffer, 0, unread_size);
+
+							buffer = new_buffer;
+
+							read_pos = 0;
+							write_pos = unread_size;
+						}
+
+						byte[] s_buffer = new byte[avail];
+						System.arraycopy(buff, 0, s_buffer, 0, avail);
+						System.arraycopy(buff, 0, buffer, write_pos, avail);
+						write_pos += avail;
+
+						synchronizer.notifyAll();
+						writeToFile(s_buffer);
+						// LogUtil.e("OUTPUT:"+String.valueOf(s_buffer));
+					}
+
+				}
+				catch (IOException e) {
+					synchronized (synchronizer) {
+						exception = e;
+						synchronizer.notifyAll();
+						break;
+					}
+				}
+			}
+		}
+	}
+
+	private InputStream is;
+
+	private GobblerThread t;
+
+	private Object synchronizer = new Object();
+
+	private boolean isEOF = false;
+
+	private boolean isClosed = false;
+
+	private IOException exception = null;
+
+	private byte[] buffer;
+
+	private int read_pos = 0;
+
+	private int write_pos = 0;
+
+	private final FileOutputStream mLogStream;
+
+	private final int mBufferSize;
+
+	public StreamGobbler(InputStream is, File log, int buffer_size) {
+		this.is = is;
+		mBufferSize = buffer_size;
+		FileOutputStream out = null;
+		try {
+			out = new FileOutputStream(log, false);
+		}
+		catch (IOException e) {
+			Log.e("StreamGobbler", e+"");
+		}
+		mLogStream = out;
+		buffer = new byte[mBufferSize];
+		t = new GobblerThread();
+		t.setDaemon(true);
+		t.start();
+	}
+
+	public void writeToFile(byte[] buffer) {
+
+		if (mLogStream != null && buffer != null) {
+			try {
+				mLogStream.write(buffer);
+			}
+			catch (IOException e) {
+				Log.e("StreamGobbler", e+"");
+			}
+		}
+	}
+
+	@Override
+	public int read() throws IOException {
+		synchronized (synchronizer) {
+			if (isClosed) {
+				throw new IOException("This StreamGobbler is closed.");
+			}
+
+			while (read_pos == write_pos) {
+				if (exception != null) {
+					throw exception;
+				}
+
+				if (isEOF) {
+					return -1;
+				}
+
+				try {
+					synchronizer.wait();
+				}
+				catch (InterruptedException e) {
+				}
+			}
+
+			int b = buffer[read_pos++] & 0xff;
+
+			return b;
+		}
+	}
+
+	@Override
+	public int available() throws IOException {
+		synchronized (synchronizer) {
+			if (isClosed) {
+				throw new IOException("This StreamGobbler is closed.");
+			}
+
+			return write_pos - read_pos;
+		}
+	}
+
+	@Override
+	public int read(byte[] b) throws IOException {
+		return read(b, 0, b.length);
+	}
+
+	@Override
+	public void close() throws IOException {
+		synchronized (synchronizer) {
+			if (isClosed) {
+				return;
+			}
+			isClosed = true;
+			isEOF = true;
+			synchronizer.notifyAll();
+			is.close();
+		}
+	}
+
+	@Override
+	public int read(byte[] b, int off, int len) throws IOException {
+		if (b == null) {
+			throw new NullPointerException();
+		}
+
+		if ((off < 0) || (len < 0) || ((off + len) > b.length) || ((off + len) < 0) || (off > b.length)) {
+			throw new IndexOutOfBoundsException();
+		}
+
+		if (len == 0) {
+			return 0;
+		}
+
+		synchronized (synchronizer) {
+			if (isClosed) {
+				throw new IOException("This StreamGobbler is closed.");
+			}
+
+			while (read_pos == write_pos) {
+				if (exception != null) {
+					throw exception;
+				}
+
+				if (isEOF) {
+					return -1;
+				}
+
+				try {
+					synchronizer.wait();
+				}
+				catch (InterruptedException e) {
+				}
+			}
+
+			int avail = write_pos - read_pos;
+
+			avail = (avail > len) ? len : avail;
+
+			System.arraycopy(buffer, read_pos, b, off, avail);
+
+			read_pos += avail;
+
+			return avail;
+		}
+	}
+}
diff --git a/qpysdk/src/main/java/org/qpython/qpysdk/utils/Utils.java b/qpysdk/src/main/java/org/qpython/qpysdk/utils/Utils.java
new file mode 100644
index 00000000..ecbca606
--- /dev/null
+++ b/qpysdk/src/main/java/org/qpython/qpysdk/utils/Utils.java
@@ -0,0 +1,194 @@
+package org.qpython.qpysdk.utils;
+
+import android.app.ActivityManager;
+import android.app.Notification;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.pm.ConfigurationInfo;
+import android.graphics.Bitmap;
+import android.os.Build;
+import android.util.Log;
+
+import com.quseit.qpyengine.R;
+
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.net.ConnectException;
+import java.net.HttpURLConnection;
+import java.net.InetSocketAddress;
+import java.net.MalformedURLException;
+import java.net.Socket;
+import java.net.URL;
+import java.sql.Time;
+
+/**
+ * Created by yhc on 16/8/21.
+ */
+public class Utils {
+    static final String TAG = "Utils";
+
+    public final int KIVY_REQUEST_CODE = 10103;
+    public static final String TITLE = "title";
+    public static final String PATH = "path";
+
+    public static void checkRunTimeLog(Context context, String title, String path) {
+        final Intent updateIntent = new Intent();
+        updateIntent.setClassName(context.getPackageName(), "org.qpython.qpy.main.activity.LogActivity");
+        updateIntent.putExtra(TITLE, title);
+        updateIntent.putExtra(PATH, path);
+        context.startActivity(updateIntent);
+
+    }
+    public static String getCode(Context context) {
+        String packageName = context.getPackageName();
+        String[] xcode = packageName.split("\\.");
+        String code = xcode[xcode.length-1];
+        return code;
+    }
+
+    private static int reverseResourceId(Context ctx,String resourceName,String typeName) {
+        if (ctx == null) {
+            // FIXME 这里请使用 {@link IllegalArgumentException}
+            throw new IllegalArgumentException();
+        }
+        return ctx.getResources().getIdentifier(resourceName, typeName, ctx.getApplicationContext().getPackageName());
+    }
+    public static int getDrawableId(Context ctx,String drawableResourceName) {
+        return reverseResourceId(ctx,drawableResourceName,"drawable");
+    }
+
+
+    public static Notification getNotification(Context context, String contentTitle, String contentText, PendingIntent intent,
+                                               int smallIconId, Bitmap largeIconId, int flags) {
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN) {
+            Notification notification = new Notification.Builder(context) //new Notification(icon, tickerText, when);
+                    .setTicker(contentTitle)
+                    .setContentTitle(contentTitle)
+                    .setContentText(contentText)
+                    .setSmallIcon(smallIconId)
+                    .setLargeIcon(largeIconId)
+                    .setAutoCancel(true)
+                    .setContentIntent(intent)
+                    .build();
+
+            return notification;
+        } else if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB){
+            Notification notification = new Notification.Builder(context) //new Notification(icon, tickerText, when);
+                    .setTicker(contentTitle)
+                    .setContentTitle(contentTitle)
+                    .setContentText(contentText)
+                    .setSmallIcon(smallIconId)
+                    .setSmallIcon(smallIconId)
+                    .setLargeIcon(largeIconId)
+                    .setAutoCancel(true)
+                    .setContentIntent(intent)
+                    .getNotification();
+            return notification;
+        } else {
+            Notification notification = new Notification(smallIconId, contentTitle, System.currentTimeMillis());
+            notification.tickerText = contentTitle;
+            notification.contentIntent = intent;
+            notification.flags |= flags;
+            return null;
+        }
+    }
+
+
+    public static String getSP(Context context, String key)	{
+        String val;
+        SharedPreferences obj = context.getSharedPreferences("qpyspf",0);
+        val = obj.getString(key,"");
+        return val;
+    }
+
+    public static boolean isOpenGL2supported(Context context) {
+
+        final ActivityManager activityManager =
+                (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
+        final ConfigurationInfo configurationInfo =
+                activityManager.getDeviceConfigurationInfo();
+        final boolean supportsEs2 = configurationInfo.reqGlEsVersion >= 0x20000;
+        return supportsEs2;
+    }
+
+    public static boolean socketPing(String url, int timeout) {
+        try {
+            Thread.sleep(timeout);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+
+        try {
+            URL hello = new URL(url);
+            Log.d(TAG, "socketPing:" + hello.getHost() + "-" + hello.getPort() + "-");
+            Socket s = new Socket();
+            s.connect(new InetSocketAddress(hello.getHost(), hello.getPort()), timeout);
+            s.close();
+
+            return true;
+        } catch (ConnectException ex) {
+            return false;
+        } catch (Exception e) {
+            return false;
+        }
+    }
+    public static boolean httpPing(String url, int timeout)  {
+        Log.d(TAG, "httpPing:"+url);
+        url = url.replaceFirst("https", "http"); // Otherwise an exception may be thrown on invalid SSL certificates.
+        try {
+//            URL hello = new URL(url);
+//            LogUtil.d(TAG, "httpPing:"+hello.getHost()+"-"+hello.getPort()+"-");
+//
+//            Socket s = new Socket(hello.getHost(), hello.getPort());
+//            boolean stat = s.isConnected();
+//
+//            s.close();
+//
+//
+//            return stat;
+
+            HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection();
+            connection.setConnectTimeout(timeout);
+            connection.setReadTimeout(timeout);
+            connection.setRequestMethod("GET");
+            int responseCode = connection.getResponseCode();
+            Log.d(TAG, "responseCode:"+responseCode);
+
+            try {
+                Thread.sleep(timeout);
+            } catch (InterruptedException ex) {
+
+            }
+
+            return (responseCode>0);
+            //return (200 <= responseCode && responseCode <= 399);
+        } catch (IOException exception) {
+            Log.d(TAG, "exception:"+exception.getLocalizedMessage());
+
+
+            return false;
+        }
+    }
+    static public boolean isSrvOk(String srv) {
+        try {
+            URL u = new URL(srv);
+            int port = 80;
+            if (u.getPort() != -1) {
+                port = u.getPort();
+            }
+            String url = u.getProtocol() + "://" +u.getHost()+":"+port+"/";
+            boolean ret =  httpPing(url, 1000);
+            return ret;
+
+        } catch (MalformedURLException e) {
+            //LogUtil.d("Bean", "MalformedURLException:"+e);
+            return false;
+        }
+    }
+
+
+
+
+}
diff --git a/qpysdk/src/main/java/org/renpy/android/Action.java b/qpysdk/src/main/java/org/renpy/android/Action.java
new file mode 100644
index 00000000..fb70b3b0
--- /dev/null
+++ b/qpysdk/src/main/java/org/renpy/android/Action.java
@@ -0,0 +1,32 @@
+package org.renpy.android;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.app.Activity;
+import android.util.Log;
+
+public class Action {
+
+    static Context context;
+
+    /* Deliver some data to someone else
+    */
+    static void send(String mimeType, String filename, String subject, String text, String chooser_title) {
+        Intent emailIntent = new Intent(android.content.Intent.ACTION_SEND);
+        emailIntent.setType(mimeType);
+        /** tryied with String [] emails, but hard to code the whole C/Cython part.
+          if (emails != null)
+          emailIntent.putExtra(android.content.Intent.EXTRA_EMAIL, emails);
+         **/
+        if (subject != null)
+            emailIntent.putExtra(android.content.Intent.EXTRA_SUBJECT, subject);
+        if (text != null)
+            emailIntent.putExtra(android.content.Intent.EXTRA_TEXT, text);
+        if (filename != null)
+            emailIntent.putExtra(Intent.EXTRA_STREAM, Uri.parse("file://"+ filename));
+        if (chooser_title == null)
+            chooser_title = "Send mail";
+        context.startActivity(Intent.createChooser(emailIntent, chooser_title));
+    }
+}
diff --git a/qpysdk/src/main/java/org/renpy/android/AssetExtract.java b/qpysdk/src/main/java/org/renpy/android/AssetExtract.java
new file mode 100644
index 00000000..b04a1436
--- /dev/null
+++ b/qpysdk/src/main/java/org/renpy/android/AssetExtract.java
@@ -0,0 +1,119 @@
+// This string is autogenerated by ChangeAppSettings.sh, do not change
+// spaces amount
+package org.renpy.android;
+
+import java.io.*;
+
+import android.app.Activity;
+import android.util.Log;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.File;
+
+import java.util.zip.GZIPInputStream;
+
+import android.content.res.AssetManager;
+
+import com.quseit.common.jtar.TarEntry;
+import com.quseit.common.jtar.TarInputStream;
+
+
+class AssetExtract {
+
+    private AssetManager mAssetManager = null;
+    private Activity mActivity = null;
+
+    AssetExtract(Activity act) {
+        mActivity = act;
+        mAssetManager = act.getAssets();
+    }
+
+    public boolean extractTar(String asset, String target) {
+
+        byte buf[] = new byte[1024 * 1024];
+
+        InputStream assetStream = null;
+        TarInputStream tis = null;
+
+        Log.i("python", "extracting " + asset + " to " + target);
+        
+        try {
+            assetStream = mAssetManager.open(asset, AssetManager.ACCESS_STREAMING);
+            tis = new TarInputStream(new BufferedInputStream(new GZIPInputStream(new BufferedInputStream(assetStream, 8192)), 8192));
+        } catch (IOException e) {
+            Log.e("python", "opening up extract tar", e);
+            return false;
+        }
+
+        while (true) {
+            TarEntry entry = null;
+
+            try {
+                entry = tis.getNextEntry();
+            } catch ( java.io.IOException e ) {
+                Log.e("python", "extracting tar", e);
+                return false;
+            }
+
+            if ( entry == null ) {
+                break;
+            }
+
+            // LogUtil.i("python", "extracting " + entry.getName());
+
+            if (entry.isDirectory()) {
+
+                try {
+                    new File(target +"/" + entry.getName()).mkdirs();
+                } catch ( SecurityException e ) { };
+
+                continue;
+            }
+
+            OutputStream out = null;
+            String path = target + "/" + entry.getName();
+
+            try {
+                out = new BufferedOutputStream(new FileOutputStream(path), 8192);
+            } catch ( FileNotFoundException e ) {
+            } catch ( SecurityException e ) { };
+
+            if ( out == null ) {
+                Log.e("python", "could not open " + path);
+                return false;
+            }
+
+            try {
+                while (true) {
+                    int len = tis.read(buf);
+
+                    if (len == -1) {
+                        break;
+                    }
+
+                    out.write(buf, 0, len);
+                }
+
+                out.flush();
+                out.close();
+            } catch ( java.io.IOException e ) {
+                Log.e("python", "extracting zip", e);
+                return false;
+            }
+        }
+
+        try {
+            tis.close();
+            assetStream.close();
+        } catch (IOException e) {
+            // pass
+        }
+
+        return true;
+    }
+}
diff --git a/qpysdk/src/main/java/org/renpy/android/Constants.java b/qpysdk/src/main/java/org/renpy/android/Constants.java
new file mode 100644
index 00000000..1fc0b646
--- /dev/null
+++ b/qpysdk/src/main/java/org/renpy/android/Constants.java
@@ -0,0 +1,14 @@
+package org.renpy.android;
+
+public class Constants {
+	// Used by the google play store.
+//    public static String PLAY_BASE64_PUBLIC_KEY = "{{ config.google_play_key }}";
+//    public static byte[] PLAY_SALT = new byte[] { {{ config.google_play_salt }} };
+//
+//    // Used by the expansion downloader.
+//    public static int fileVersion = {{ config.numeric_version }};
+//    public static int fileSize = {{ file_size }};
+
+    // Used by the in-app purchasing code.
+    public static String store = "{{ config.store }}";
+}
diff --git a/qpysdk/src/main/java/org/renpy/android/GenericBroadcastReceiver.java b/qpysdk/src/main/java/org/renpy/android/GenericBroadcastReceiver.java
new file mode 100644
index 00000000..ec3ed901
--- /dev/null
+++ b/qpysdk/src/main/java/org/renpy/android/GenericBroadcastReceiver.java
@@ -0,0 +1,19 @@
+package org.renpy.android;
+
+import android.content.BroadcastReceiver;
+import android.content.Intent;
+import android.content.Context;
+
+public class GenericBroadcastReceiver extends BroadcastReceiver {
+
+    GenericBroadcastReceiverCallback listener;
+
+    public GenericBroadcastReceiver(GenericBroadcastReceiverCallback listener) {
+        super();
+        this.listener = listener;
+    }
+
+    public void onReceive(Context context, Intent intent) {
+        this.listener.onReceive(context, intent);
+    }
+}
diff --git a/qpysdk/src/main/java/org/renpy/android/GenericBroadcastReceiverCallback.java b/qpysdk/src/main/java/org/renpy/android/GenericBroadcastReceiverCallback.java
new file mode 100644
index 00000000..b934ca9f
--- /dev/null
+++ b/qpysdk/src/main/java/org/renpy/android/GenericBroadcastReceiverCallback.java
@@ -0,0 +1,8 @@
+package org.renpy.android;
+
+import android.content.Intent;
+import android.content.Context;
+
+public interface GenericBroadcastReceiverCallback {
+    void onReceive(Context context, Intent intent);
+};
diff --git a/qpysdk/src/main/java/org/renpy/android/PythonSDLActivity.java b/qpysdk/src/main/java/org/renpy/android/PythonSDLActivity.java
new file mode 100644
index 00000000..e727399e
--- /dev/null
+++ b/qpysdk/src/main/java/org/renpy/android/PythonSDLActivity.java
@@ -0,0 +1,450 @@
+package org.renpy.android;
+
+import org.libsdl.app.SDLActivity;
+import org.qpython.qpysdk.QPyConstants;
+import org.qpython.qpysdk.utils.FileHelper;
+import org.qpython.qpysdk.utils.Utils;
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Environment;
+import android.os.PowerManager;
+import android.os.Vibrator;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.view.View;
+import android.view.View.OnSystemUiVisibilityChangeListener;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+import android.widget.Toast;
+
+
+import com.quseit.util.NAction;
+import com.quseit.util.NUtil;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+
+public class PythonSDLActivity extends SDLActivity {
+
+    public final static int    PY_NOTI_FLAG = 123400;
+    public static final String NOTIFY       = "notify";
+    public static final String ACT          = "act";
+    public static final String PATH         = "path";
+    public static final String DEBUG_FLAG   = "debug_flag";
+    public static final String ROOT         = "root";
+    public static final String FULL         = "full";
+
+    private final String TAG = "PythonSDLActivity";
+    /**
+     * This exists so python code can access this activity.
+     */
+    public static PythonSDLActivity mActivity = null;
+
+    /**
+     * The layout that contains the SDL view. VideoPlayer uses this to add
+     * its own view on on top of the SDL view.
+     */
+    public FrameLayout mFrameLayout;
+
+
+    /**
+     * A layout that contains mLayout. This is a 3x3 grid, with the layout
+     * in the center. The idea is that if someone wants to show an ad, they
+     * can stick it in one of the other cells..
+     */
+    public LinearLayout mVbox;
+
+    ResourceManager resourceManager;
+
+
+    protected String[] getLibraries() {
+        return new String[] {
+            "png16",
+            "SDL2",
+            "SDL2_image",
+            "SDL2_ttf",
+            "SDL2_gfx",
+            "SDL2_mixer",
+            "python2.7",
+            "main",
+        };
+    }
+
+
+    // GUI code. /////////////////////////////////////////////////////////////
+
+
+    public void addView(View view, int index) {
+        mVbox.addView(view, index, new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT, (float) 0.0));
+    }
+
+    public void removeView(View view) {
+        mVbox.removeView(view);
+    }
+
+    @Override
+    public void setContentView(View view) {
+        mFrameLayout = new FrameLayout(this);
+        mFrameLayout.addView(view);
+
+        mVbox = new LinearLayout(this);
+        mVbox.setOrientation(LinearLayout.VERTICAL);
+        mVbox.addView(mFrameLayout, new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, 0, (float) 1.0));
+
+        super.setContentView(mVbox);
+    }
+
+
+    private void setupMainWindowDisplayMode() {
+        View decorView = setSystemUiVisibilityMode();
+        decorView.setOnSystemUiVisibilityChangeListener(new OnSystemUiVisibilityChangeListener() {
+            @Override
+            public void onSystemUiVisibilityChange(int visibility) {
+                setSystemUiVisibilityMode(); // Needed to avoid exiting immersive_sticky when keyboard is displayed
+            }
+        });
+    }
+
+    private View setSystemUiVisibilityMode() {
+        View decorView = getWindow().getDecorView();
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+
+            int options;
+            options =
+                    View.SYSTEM_UI_FLAG_LAYOUT_STABLE
+                    | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
+                    | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+                    | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION // hide nav bar
+                    | View.SYSTEM_UI_FLAG_FULLSCREEN // hide status bar
+                    | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY;
+
+            decorView.setSystemUiVisibility(options);
+
+        }
+
+        return decorView;
+    }
+
+    @Override
+    public void onWindowFocusChanged(boolean hasFocus) {
+        super.onWindowFocusChanged(hasFocus);
+
+        if (hasFocus) {
+            setupMainWindowDisplayMode();
+        }
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        setupMainWindowDisplayMode();
+    }
+
+    // Code to unpack python and get things running ///////////////////////////
+
+    public void recursiveDelete(File f) {
+        if (f.isDirectory()) {
+            for (File r : f.listFiles()) {
+                recursiveDelete(r);
+            }
+        }
+        f.delete();
+    }
+
+    /**
+     * This determines if unpacking one the zip files included in
+     * the .apk is necessary. If it is, the zip file is unpacked.
+     */
+    public void unpackData(final String resource, File target) {
+
+        /**
+         * Delete main.pyo unconditionally. This fixes a problem where we have
+         * a main.py newer than main.pyo, but start.c won't run it.
+         */
+        new File(target, "main.py").delete();
+
+        boolean shouldUnpack = false;
+
+        // The version of data in memory and on disk.
+        String data_version = resourceManager.getString(resource + "_version");
+        String disk_version = null;
+
+        String filesDir = target.getAbsolutePath();
+        String disk_version_fn = filesDir + "/" + resource + ".version";
+
+        // If no version, no unpacking is necessary.
+        if (data_version != null) {
+
+            try {
+                byte buf[] = new byte[64];
+                InputStream is = new FileInputStream(disk_version_fn);
+                int len = is.read(buf);
+                disk_version = new String(buf, 0, len);
+                is.close();
+            } catch (Exception e) {
+                disk_version = "";
+            }
+
+            if (! data_version.equals(disk_version)) {
+                shouldUnpack = true;
+            }
+        }
+
+
+        // If the disk data is out of date, extract it and write the
+        // version file.
+        if (shouldUnpack) {
+            Log.v("python", "Extracting " + resource + " assets.");
+
+            // Delete old libraries & renpy files.
+            recursiveDelete(new File(target, "lib"));
+            recursiveDelete(new File(target, "renpy"));
+
+            target.mkdirs();
+
+            AssetExtract ae = new AssetExtract(this);
+            if (!ae.extractTar(resource + ".mp3", target.getAbsolutePath())) {
+                toastError("Could not extract " + resource + " data.");
+            }
+
+            try {
+                // Write .nomedia.
+                new File(target, ".nomedia").createNewFile();
+
+                // Write version file.
+                FileOutputStream os = new FileOutputStream(disk_version_fn);
+                os.write(data_version.getBytes());
+                os.close();
+            } catch (Exception e) {
+                Log.w("python", e);
+            }
+        }
+
+    }
+
+    /**
+     * Show an error using a toast. (Only makes sense from non-UI
+     * threads.)
+     */
+    public void toastError(final String msg) {
+
+        final Activity thisActivity = this;
+
+        runOnUiThread(new Runnable () {
+            public void run() {
+                Toast.makeText(thisActivity, msg, Toast.LENGTH_LONG).show();
+            }
+        });
+
+        // Wait to show the error.
+        synchronized (this) {
+            try {
+                this.wait(1000);
+            } catch (InterruptedException e) {
+            }
+        }
+    }
+
+    public static native void nativeSetEnv(String variable, String value);
+
+    public void initEnviron() {
+        Log.v("python", "initEnviron");
+
+        Intent intent = getIntent();
+
+        String script = null;
+        if (intent != null && intent.getData() != null) {
+            script = intent.getData().getPath();
+        }
+        File path;
+
+        if (script!=null) {
+            path = new File(script).getParentFile();
+            nativeSetEnv("ANDROID_ARGUMENT", path.getAbsolutePath());
+
+        } else {
+            nativeSetEnv("ANDROID_ARGUMENT", QPyConstants.ABSOLUTE_PATH);
+
+        }
+
+
+
+
+    }
+    public void preparePython() {
+        Log.v("python", "Starting preparePython.");
+
+        Intent intent = getIntent();
+        String script = null;
+        if (intent != null && intent.getData() != null) {
+
+            script = intent.getData().getPath();
+        }
+
+
+        mActivity = this;
+
+        resourceManager = new ResourceManager(this);
+
+        File oldExternalStorage = new File(Environment.getExternalStorageDirectory(), getPackageName());
+        File externalStorage = getExternalFilesDir(null);
+        File path;
+
+        if (externalStorage == null) {
+            externalStorage = oldExternalStorage;
+        }
+
+        if (script!=null) {
+            path = new File(script).getParentFile();
+            if (path.getName().startsWith("scripts")) {
+                nativeSetEnv("ANDROID_MAIN", new File(script).getName());
+
+            } else {
+                nativeSetEnv("ANDROID_MAIN", "main.py");
+
+            }
+
+        } else {
+            nativeSetEnv("ANDROID_MAIN", "main.py");
+
+            path = getFilesDir();
+        }
+
+        nativeSetEnv("ANDROID_LOG", QPyConstants.ABSOLUTE_LOG);
+
+        File filesDir = getFilesDir();
+        //unpackData("private", getFilesDir());
+        // unpackData("public", externalStorage);
+
+        nativeSetEnv("ANDROID_ARGUMENT", path.getAbsolutePath());
+        nativeSetEnv("ANDROID_PRIVATE", getFilesDir().getAbsolutePath());
+        nativeSetEnv("ANDROID_PUBLIC", QPyConstants.ABSOLUTE_PATH);
+        nativeSetEnv("ANDROID_OLD_PUBLIC", oldExternalStorage.getAbsolutePath());
+
+        nativeSetEnv("LD_LIBRARY_PATH", ".:"+filesDir+"/lib/"+":"+filesDir+"/:"+filesDir.getParentFile()+"/lib/");
+        nativeSetEnv("AP_HOST", Utils.getSP(mActivity, "sl4a.hostname"));
+        nativeSetEnv("AP_PORT", Utils.getSP(mActivity, "sl4a.port"));
+        nativeSetEnv("AP_HANDSHAKE", Utils.getSP(mActivity, "sl4a.secue"));
+
+        // Figure out the APK path.
+        String apkFilePath;
+        ApplicationInfo appInfo;
+        PackageManager packMgmr = getApplication().getPackageManager();
+
+        try {
+            appInfo = packMgmr.getApplicationInfo(getPackageName(), 0);
+            apkFilePath = appInfo.sourceDir;
+        } catch (NameNotFoundException e) {
+            apkFilePath = "";
+        }
+
+        nativeSetEnv("ANDROID_APK", apkFilePath);
+
+        String expansionFile = getIntent().getStringExtra("expansionFile");
+
+//        if (expansionFile != null) {
+//            nativeSetEnv("ANDROID_EXPANSION", expansionFile);
+//        }
+
+        nativeSetEnv("PYTHONOPTIMIZE", "2");
+        nativeSetEnv("PYTHONHOME", getFilesDir().getAbsolutePath());
+        nativeSetEnv("PYTHONPATH", path.getAbsolutePath() + ":" + getFilesDir().getAbsolutePath() + "/lib");
+
+        Log.v("python", "Finished preparePython.");
+
+    };
+
+    // HACK BY RIVER
+    static {
+        //System.load("/data/data/org.qpython.qpy/files/lib/libpython2.7.so.1.0");
+    }
+
+    // Code to support devicePurchase. /////////////////////////////////////////
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        //preparePython();
+
+        //  Intent intent = getIntent();
+//        boolean isLandscape = true;
+//        if (intent != null && intent.getData() != null) {
+//            String script = intent.getData().getPath();
+//            String header_512 = FileHelper.getFileContents(script, 512);
+//                isLandscape = header_512.contains("#qpy:landscape");
+//
+//            LogUtil.d(TAG, "onCreate:"+script);
+//
+//        }
+
+//        if (isLandscape) {
+//            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+//        } else {
+//            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+//        }
+        super.onCreate(savedInstanceState);
+
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+    }
+
+    protected void onActivityResult(int requestCode, int resultCode, Intent intent) {
+        super.onActivityResult(requestCode, resultCode, intent);
+    }
+
+    // Code to support public APIs. ////////////////////////////////////////////
+
+    public void openUrl(String url) {
+        Log.i("python", "Opening URL: " + url);
+
+        Intent i = new Intent(Intent.ACTION_VIEW);
+        i.setData(Uri.parse(url));
+        startActivity(i);
+    }
+
+    @SuppressLint("MissingPermission")
+    public void vibrate(double s) {
+        Vibrator v = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE);
+        if (v != null) {
+            v.vibrate((int) (1000 * s));
+        }
+    }
+
+    public int getDPI() {
+        DisplayMetrics metrics = new DisplayMetrics();
+        getWindowManager().getDefaultDisplay().getMetrics(metrics);
+        return metrics.densityDpi;
+    }
+
+    public PowerManager.WakeLock wakeLock = null;
+
+    public void setWakeLock(boolean active) {
+        if (wakeLock == null) {
+            PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
+            wakeLock = pm.newWakeLock(PowerManager.SCREEN_BRIGHT_WAKE_LOCK, "Screen On");
+            wakeLock.setReferenceCounted(false);
+        }
+
+        if (active) {
+            wakeLock.acquire();
+        } else {
+            wakeLock.release();
+        }
+    }
+
+}
diff --git a/qpysdk/src/main/java/org/renpy/android/RenPySound.java b/qpysdk/src/main/java/org/renpy/android/RenPySound.java
new file mode 100644
index 00000000..59ad47d8
--- /dev/null
+++ b/qpysdk/src/main/java/org/renpy/android/RenPySound.java
@@ -0,0 +1,336 @@
+package org.renpy.android;
+
+import android.media.MediaPlayer;
+import android.util.Log;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.HashMap;
+
+public class RenPySound {
+
+    private static class Channel implements MediaPlayer.OnCompletionListener, MediaPlayer.OnPreparedListener {
+
+        // MediaPlayers for the currently playing and queued up
+        // sounds.
+        MediaPlayer player[];
+
+        // Filenames for the currently playing and queued up sounds.
+        String filename[];
+
+        // Is the corresponding player prepareD?
+        boolean prepared[];
+
+        // The volume for the left and right channel.
+        double volume;
+        double secondary_volume;
+        double left_volume;
+        double right_volume;
+
+        Channel() {
+            player = new MediaPlayer[2];
+            filename = new String[2];
+            prepared = new boolean[2];
+
+            player[0] = new MediaPlayer();
+            player[1] = new MediaPlayer();
+
+            volume = 1.0;
+            secondary_volume = 1.0;
+            left_volume = 1.0;
+            right_volume = 1.0;
+        }
+
+        /**
+         * Queue up a sound file.
+         */
+        synchronized void queue(String fn, String real_fn, long base, long length) {
+            MediaPlayer mp = player[1];
+
+            mp.reset();
+
+            try {
+                FileInputStream f = new FileInputStream(real_fn);
+
+                if (length >= 0) {
+                    mp.setDataSource(f.getFD(), base, length);
+                } else {
+                    mp.setDataSource(f.getFD());
+                }
+
+                mp.setOnCompletionListener(this);
+                mp.setOnPreparedListener(this);
+
+                mp.prepareAsync();
+
+                f.close();
+            } catch (IOException e) {
+                Log.w("RenPySound", e);
+                return;
+            }
+
+
+            filename[1] = fn;
+
+        }
+
+        /**
+         * Play the queued-up sound.
+         */
+        synchronized void play() {
+            MediaPlayer tmp;
+
+            player[0].reset();
+
+            tmp = player[0];
+            player[0] = player[1];
+            player[1] = tmp;
+
+            filename[0] = filename[1];
+            filename[1] = null;
+
+            prepared[0] = prepared[1];
+            prepared[1] = false;
+
+            Log.i("python", "Using queued file " + filename[0]);
+
+            if (filename[0] != null) {
+                updateVolume();
+
+                if (prepared[0]) {
+                    player[0].start();
+                }
+            }
+        }
+
+        /**
+         * Seek to the position specified on this channel
+         */
+
+        synchronized void seek(float position) {
+            if (prepared[0]){
+                player[0].seekTo((int)position*1000);
+            }
+        }
+
+        /**
+         * Stop playback on this channel.
+         */
+        synchronized void stop() {
+            player[0].reset();
+            player[1].reset();
+
+            filename[0] = null;
+            filename[1] = null;
+
+            prepared[0] = false;
+            prepared[1] = false;
+        }
+
+        /**
+         * Dequeue the queued file on this channel.
+         */
+        synchronized void dequeue() {
+            player[1].reset();
+            filename[1] = null;
+            prepared[1] = false;
+        }
+
+
+        /**
+         * Updates the volume on the playing file.
+         */
+        synchronized void updateVolume() {
+            player[0].setVolume((float) (volume * secondary_volume * left_volume),
+                    (float) (volume * secondary_volume * right_volume));
+        }
+
+
+        /**
+         * Called to update the volume.
+         */
+        synchronized void set_volume(float v) {
+            volume = v;
+            updateVolume();
+        }
+
+        /**
+         * Called to update the volume.
+         */
+        synchronized void set_secondary_volume(float v) {
+            secondary_volume = v;
+            updateVolume();
+        }
+
+        /**
+         * Called to update the pan. (By setting up the fractional
+         * volume.)
+         */
+        synchronized void set_pan(float pan) {
+            if (pan < 0) {
+                left_volume = 1.0;
+                right_volume = 1.0 + pan;
+            } else {
+                left_volume = 1.0 - pan;
+                right_volume = 1.0;
+            }
+
+            updateVolume();
+        }
+
+        synchronized void pause() {
+            if (filename[0] != null) {
+                player[0].pause();
+            }
+        }
+
+        synchronized void unpause() {
+            if (filename[0] != null) {
+                player[0].start();
+            }
+        }
+
+        synchronized int get_pos(){
+            return player[0].getCurrentPosition();
+        }
+
+        synchronized int get_length(){
+            if (prepared[0]) {
+                return player[0].getDuration();
+            }
+            return 1;
+        }
+
+        synchronized public void onPrepared(MediaPlayer mp) {
+            if (mp == player[0]) {
+                prepared[0] = true;
+                player[0].start();
+            }
+
+            if (mp == player[1]) {
+                prepared[1] = true;
+            }
+        }
+
+        /**
+         * Called on completion.
+         */
+        synchronized public void onCompletion(MediaPlayer mp) {
+        	if (mp == player[0]) {
+        		play();
+            }
+        }
+
+
+    }
+
+    // A map from channel number to channel object.
+    static HashMap<Integer, Channel> channels = new HashMap<Integer, Channel>();
+
+    /**
+     * Gets the Channel object for the numbered channel, returning a
+     * new channel object as necessary.
+     */
+    static Channel getChannel(int num) {
+        Channel rv = channels.get(num);
+
+        if (rv == null) {
+            rv = new Channel();
+            channels.put(num, rv);
+        }
+
+        return rv;
+    }
+
+    public static void queue(int channel, String filename, String real_fn, long base, long length) {
+        Channel c = getChannel(channel);
+        c.queue(filename, real_fn, base, length);
+        if (c.filename[0] == null) {
+            c.play();
+        }
+
+    }
+
+    public static void play(int channel,
+            String filename,
+            String real_fn,
+            long base,
+            long length) {
+
+        Channel c = getChannel(channel);
+        c.queue(filename, real_fn, base, length);
+        c.play();
+    }
+
+    public static void seek(int channel, float position){
+        Channel c = getChannel(channel);
+        c.seek(position);
+    }
+
+    public static void stop(int channel) {
+        Channel c = getChannel(channel);
+        c.stop();
+    }
+
+    public static void dequeue(int channel) {
+        Channel c = getChannel(channel);
+        c.dequeue();
+    }
+
+
+    public static String playing_name(int channel) {
+        Channel c = getChannel(channel);
+        if (c.filename[0] == null) {
+            return "";
+        }
+
+        return c.filename[0];
+    }
+
+    public static int queue_depth(int channel) {
+        Channel c = getChannel(channel);
+
+        if (c.filename[0] == null) return 0;
+        if (c.filename[1] == null) return 1;
+        return 2;
+    }
+
+    public static void set_volume(int channel, float v) {
+        Channel c = getChannel(channel);
+        c.set_volume(v);
+    }
+
+    public static void set_secondary_volume(int channel, float v) {
+        Channel c = getChannel(channel);
+        c.set_secondary_volume(v);
+    }
+
+    public static void set_pan(int channel, float pan) {
+        Channel c = getChannel(channel);
+        c.set_pan(pan);
+    }
+
+    public static void pause(int channel) {
+        Channel c = getChannel(channel);
+        c.pause();
+    }
+
+    public static void unpause(int channel) {
+        Channel c = getChannel(channel);
+        c.unpause();
+    }
+
+    public static int get_pos(int channel){
+        Channel c = getChannel(channel);
+        return c.get_pos();
+    }
+
+    public static int get_length(int channel){
+        Channel c = getChannel(channel);
+        return c.get_length();
+    }
+
+    static {
+        new MediaPlayer();
+    }
+
+}
diff --git a/qpysdk/src/main/java/org/renpy/android/ResourceManager.java b/qpysdk/src/main/java/org/renpy/android/ResourceManager.java
new file mode 100644
index 00000000..f80fe843
--- /dev/null
+++ b/qpysdk/src/main/java/org/renpy/android/ResourceManager.java
@@ -0,0 +1,47 @@
+/**
+ * This class takes care of managing resources for us. In our code, we
+ * can't use R, since the name of the package containing R will
+ * change. (This same code is used in both org.renpy.android and
+ * org.renpy.pygame.) So this is the next best thing.
+ */
+
+package org.renpy.android;
+
+import android.app.Activity;
+import android.content.res.Resources;
+import android.view.View;
+
+public class ResourceManager {
+
+    private Activity act;
+    private Resources res;
+
+    public ResourceManager(Activity activity) {
+        act = activity;
+        res = act.getResources();
+    }
+
+    public int getIdentifier(String name, String kind) {
+        return res.getIdentifier(name, kind, act.getPackageName());
+    }
+
+    public String getString(String name) {
+
+        try {
+            return res.getString(getIdentifier(name, "string"));
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    public View inflateView(String name) {
+        int id = getIdentifier(name, "layout");
+        return act.getLayoutInflater().inflate(id, null);
+    }
+
+    public View getViewById(View v, String name) {
+        int id = getIdentifier(name, "id");
+        return v.findViewById(id);
+    }
+
+}
diff --git a/qpysdk/src/main/java/org/renpy/android/VideoPlayer.java b/qpysdk/src/main/java/org/renpy/android/VideoPlayer.java
new file mode 100644
index 00000000..40a74833
--- /dev/null
+++ b/qpysdk/src/main/java/org/renpy/android/VideoPlayer.java
@@ -0,0 +1,168 @@
+package org.renpy.android;
+
+import android.media.MediaPlayer;
+import android.util.Log;
+import android.view.SurfaceView;
+import android.view.SurfaceHolder;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+
+public class VideoPlayer implements SurfaceHolder.Callback, MediaPlayer.OnErrorListener, MediaPlayer.OnCompletionListener {
+
+	MediaPlayer player = null;
+	SurfaceView view = null;
+
+	boolean playing = true;
+
+
+	public boolean onError(MediaPlayer mp, int what, int extra) {
+		Log.i("VP", "Error is " + what + " " + extra);
+		return false;
+	}
+
+	public void onCompletion(MediaPlayer mp) {
+		Log.i("VP", "Completion.");
+
+		if (playing) {
+			stop();
+		}
+	}
+
+	public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
+	}
+
+	public void surfaceCreated(SurfaceHolder holder) {
+		Log.i("VP", "Surface created.");
+
+		try {
+			player = new MediaPlayer();
+
+			player.setOnErrorListener(this);
+			player.setOnCompletionListener(this);
+
+			player.setDisplay(view.getHolder());
+
+			Log.i("VP", "Set display.");
+
+			FileInputStream f = new FileInputStream(realFn);
+
+	        if (length >= 0) {
+	            player.setDataSource(f.getFD(), base, length);
+	        } else {
+	            player.setDataSource(f.getFD());
+	        }
+
+			f.close();
+
+	        Log.i("VP", "Set input stream.");
+
+			player.prepare();
+
+			Log.i("VP", "Prepared, duration = " + player.getDuration());
+
+			player.start();
+
+			Log.i("VP", "Started playing");
+
+
+		} catch (Exception e) {
+
+			Log.e("VP", "exception in surface creation", e);
+			stop();
+			return;
+		}
+
+		synchronized (VideoPlayer.this) {
+			VideoPlayer.this.notifyAll();
+		}
+	}
+
+	public void surfaceDestroyed(SurfaceHolder holder) {
+	}
+
+	/**
+	 * This runs on the UI thread to create the surface.
+	 */
+	private void startPlaying() {
+		Log.i("VP", "startPlaying called");
+
+
+		view = new SurfaceView(PythonSDLActivity.mActivity);
+		view.setZOrderOnTop(true);
+
+		view.getHolder().addCallback(this);
+
+		PythonSDLActivity.mActivity.mFrameLayout.addView(view);
+
+		Log.i("VP", "startPlaying done");
+	}
+
+	/**
+	 * This runs on the UI thread to remove the view.
+	 */
+	private void stopPlaying() {
+		player.release();
+		PythonSDLActivity.mActivity.mFrameLayout.removeView(view);
+	}
+
+	public void pause() {
+		if (playing) {
+			player.pause();
+			Log.i("VP", "paused");
+		}
+	}
+
+	public void unpause() {
+		if (playing) {
+			player.start();
+			Log.i("VP", "unpaused");
+		}
+	}
+
+
+	public void stop() {
+
+		playing = false;
+
+		PythonSDLActivity.mActivity.runOnUiThread(new Runnable() {
+			public void run() {
+				stopPlaying();
+			}
+		});
+	}
+
+	public boolean isPlaying() {
+		return this.playing;
+	}
+
+	String realFn;
+	long base;
+	long length;
+
+	/**
+	 * Creates a new videoplayer and starts it playing.
+	 */
+	public VideoPlayer(String realFn, long base, long length) {
+
+		this.realFn = realFn;
+		this.base = base;
+		this.length = length;
+
+		synchronized (this) {
+			PythonSDLActivity.mActivity.runOnUiThread(new Runnable() {
+				public void run() {
+					startPlaying();
+				}
+			});
+
+			try {
+				wait();
+			} catch (InterruptedException e) {
+
+			}
+		}
+
+	}
+
+}
diff --git a/qpysdk/src/main/jni b/qpysdk/src/main/jni
new file mode 160000
index 00000000..3ee8b209
--- /dev/null
+++ b/qpysdk/src/main/jni
@@ -0,0 +1 @@
+Subproject commit 3ee8b209df6481a585826a44bfa94eeecd621e4e
diff --git a/qpysdk/src/main/libs/armeabi-v7a/libSDL2.so b/qpysdk/src/main/libs/armeabi-v7a/libSDL2.so
new file mode 100755
index 00000000..5338e91e
Binary files /dev/null and b/qpysdk/src/main/libs/armeabi-v7a/libSDL2.so differ
diff --git a/qpysdk/src/main/libs/armeabi-v7a/libSDL2_gfx.so b/qpysdk/src/main/libs/armeabi-v7a/libSDL2_gfx.so
new file mode 100755
index 00000000..80d01e32
Binary files /dev/null and b/qpysdk/src/main/libs/armeabi-v7a/libSDL2_gfx.so differ
diff --git a/qpysdk/src/main/libs/armeabi-v7a/libSDL2_image.so b/qpysdk/src/main/libs/armeabi-v7a/libSDL2_image.so
new file mode 100755
index 00000000..03484635
Binary files /dev/null and b/qpysdk/src/main/libs/armeabi-v7a/libSDL2_image.so differ
diff --git a/qpysdk/src/main/libs/armeabi-v7a/libSDL2_mixer.so b/qpysdk/src/main/libs/armeabi-v7a/libSDL2_mixer.so
new file mode 100755
index 00000000..c48ebb56
Binary files /dev/null and b/qpysdk/src/main/libs/armeabi-v7a/libSDL2_mixer.so differ
diff --git a/qpysdk/src/main/libs/armeabi-v7a/libSDL2_ttf.so b/qpysdk/src/main/libs/armeabi-v7a/libSDL2_ttf.so
new file mode 100755
index 00000000..98aeea15
Binary files /dev/null and b/qpysdk/src/main/libs/armeabi-v7a/libSDL2_ttf.so differ
diff --git a/qpysdk/src/main/libs/armeabi-v7a/libmain.so b/qpysdk/src/main/libs/armeabi-v7a/libmain.so
new file mode 100755
index 00000000..44643b21
Binary files /dev/null and b/qpysdk/src/main/libs/armeabi-v7a/libmain.so differ
diff --git a/qpysdk/src/main/libs/armeabi-v7a/libpng16.so b/qpysdk/src/main/libs/armeabi-v7a/libpng16.so
new file mode 100755
index 00000000..a16e3512
Binary files /dev/null and b/qpysdk/src/main/libs/armeabi-v7a/libpng16.so differ
diff --git a/qpysdk/src/main/libs/armeabi-v7a/libpython2.7.so b/qpysdk/src/main/libs/armeabi-v7a/libpython2.7.so
new file mode 100755
index 00000000..4b3fbaa5
Binary files /dev/null and b/qpysdk/src/main/libs/armeabi-v7a/libpython2.7.so differ
diff --git a/qpysdk/src/main/libs/armeabi-v7a/libqpysdk.so b/qpysdk/src/main/libs/armeabi-v7a/libqpysdk.so
new file mode 100755
index 00000000..1b189d79
Binary files /dev/null and b/qpysdk/src/main/libs/armeabi-v7a/libqpysdk.so differ
diff --git a/qpysdk/src/main/res/drawable/presplash2.jpg b/qpysdk/src/main/res/drawable/presplash2.jpg
new file mode 100644
index 00000000..a42ee23d
Binary files /dev/null and b/qpysdk/src/main/res/drawable/presplash2.jpg differ
diff --git a/qpysdk/src/main/res/values-zh-rCN/strings.xml b/qpysdk/src/main/res/values-zh-rCN/strings.xml
new file mode 100644
index 00000000..fa7fe166
--- /dev/null
+++ b/qpysdk/src/main/res/values-zh-rCN/strings.xml
@@ -0,0 +1,4 @@
+<resources>
+    <string name="app_name">QPYSDK</string>
+    <string name="open_log">查看日志么？</string>
+</resources>
diff --git a/qpysdk/src/main/res/values/strings.xml b/qpysdk/src/main/res/values/strings.xml
new file mode 100644
index 00000000..d87960cf
--- /dev/null
+++ b/qpysdk/src/main/res/values/strings.xml
@@ -0,0 +1,4 @@
+<resources>
+    <string name="app_name">QPYSDK</string>
+    <string name="open_log">Do you want to check the runtime log?</string>
+</resources>
\ No newline at end of file
diff --git a/qpysl4a b/qpysl4a
new file mode 160000
index 00000000..fc9d4745
--- /dev/null
+++ b/qpysl4a
@@ -0,0 +1 @@
+Subproject commit fc9d47452c2cdd99b1314c2d5f913dfea33698ad
diff --git a/qpython/build.gradle b/qpython/build.gradle
new file mode 100644
index 00000000..738e1a9e
--- /dev/null
+++ b/qpython/build.gradle
@@ -0,0 +1,218 @@
+apply plugin: 'com.android.application'
+apply plugin: 'com.jakewharton.butterknife'
+apply plugin: 'realm-android'
+
+//获取系统时间
+def releaseTime() {
+    return new Date().format("yyyy-MM-dd", TimeZone.getTimeZone("UTC"))
+}
+
+android {
+    compileSdkVersion rootProject.ext.compileSdkVersion
+    buildToolsVersion rootProject.ext.buildToolsVersion
+    flavorDimensions "default"
+    defaultConfig {
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
+        versionCode 304
+        versionName "3.0.0"
+        multiDexEnabled true
+        vectorDrawables.useSupportLibrary = true
+
+        ndk {
+            abiFilters 'armeabi-v7a',"arm64-v8a"
+
+        }
+
+        sourceSets {
+            main {
+                jniLibs.srcDirs = ['libs']
+
+            }
+        }
+    }
+
+    signingConfigs {
+        release {
+            keyAlias 'zuowuxuxi'
+            keyPassword 'myxiake1q'
+            storeFile file('qpython.key')
+            storePassword 'myxiake1q'
+            v1SigningEnabled true
+            v2SigningEnabled false
+        }
+
+        debug {
+            storeFile file("../debug.keystore")
+        }
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            shrinkResources false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+
+            signingConfig signingConfigs.release
+
+            //修改生成的包名
+            applicationVariants.all { variant ->
+                variant.outputs.each { output ->
+                    def outputFile = output.outputFile
+                    if (outputFile != null && outputFile.name.endsWith('.apk')) {
+                        def fileName = "qpython_os_${releaseTime()}_${variant.productFlavors[0].name}.apk"
+                        output.outputFileName = fileName
+                    }
+                }
+            }
+        }
+
+        debug {
+            signingConfig signingConfigs.release
+        }
+
+    }
+
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    dataBinding {
+        enabled = true
+    }
+    lintOptions {
+        disable 'MissingTranslation'
+        abortOnError false
+    }
+
+    //为了解决部分第三方库重复打包了META-INF的问题
+    packagingOptions {
+        exclude 'META-INF/LICENSE.txt'
+        exclude 'META-INF/NOTICE.txt'
+    }
+
+    //设置渠道
+    productFlavors {
+
+        ol {
+//            resValue "string", "app_name", "Qpython"
+            applicationId "org.qpython.qpy"
+        }
+        os {
+//            resValue "string", "app_name", "Qpython"
+            applicationId "org.qpython.qpy"
+        }
+        od {
+//            resValue "string", "app_name", "Qpython"
+            applicationId "org.qpython.qpy"
+        }
+        op {
+//            resValue "string", "app_name", "QpythonL"
+            applicationId "com.hipipal.qpyplus"
+        }
+        oh {
+//            resValue "string", "app_name", "QpythonL"
+            applicationId "com.hipipal.qpyplus"
+        }
+
+    }
+
+    repositories {
+        flatDir {
+            dirs 'libs'
+        }
+    }
+
+
+//    dexOptions {
+//        incremental =true
+//    }
+
+}
+
+configurations {
+    all*.exclude group: 'commons-logging', module: 'commons-logging'
+}
+
+dependencies {
+    //api rootProject.ext.libButterknife
+    //annotationProcessor rootProject.ext.libButterknifeCompiler
+
+    api fileTree(include: ['*.jar'], dir: 'libs')
+    api fileTree(include: ['*.so'], dir: 'libs')
+
+    api project(':termemulator')
+    api project(':termexec')
+    api project(':qpypluginman')
+    api project(':qpysdk')
+
+    api files('libs/markdown4j.jar')
+    //api files('libs/android-async-http-1.4.8.aar')
+    //api 'com.loopj.android:android-async-http:1.4.8'
+
+    api('com.github.afollestad.material-dialogs:commons:0.8.5.6') { transitive = true }
+
+    api 'me.zhanghai.android.materialprogressbar:library:1.1.4'
+    api 'org.apmem.tools:layouts:1.9@aar'
+    api 'com.azeesoft.lib.colorpicker:colorpicker:1.0.8@aar'
+    api 'com.googlecode.juniversalchardet:juniversalchardet:1.0.3'
+    api 'com.daimajia.numberprogressbar:library:1.2@aar'
+    api 'org.litepal.android:core:1.3.1'
+    api 'me.dm7.barcodescanner:zxing:1.9'
+    api 'com.android.support:multidex:1.0.1'
+
+    api rootProject.ext.libOkHttp3
+    api rootProject.ext.libOkHttp3Log
+
+    api 'com.squareup.okio:okio:1.9.0'
+    api 'com.google.code.gson:gson:2.7'
+    api 'com.yanzhenjie:recyclerview-swipe:1.1.3'
+
+    api rootProject.ext.libRxAndroid
+    api rootProject.ext.libRxJava
+
+    api rootProject.ext.libSupportCardView
+    api rootProject.ext.libSupportPreference
+
+    osApi rootProject.ext.firebaseCore
+    osApi rootProject.ext.firebaseMsg
+    osApi rootProject.ext.firebaseAuth
+    osApi rootProject.ext.firebaseDatabase
+    osApi rootProject.ext.googlePlayServiceAuth
+
+    olApi rootProject.ext.firebaseCore
+    olApi rootProject.ext.firebaseMsg
+    olApi rootProject.ext.firebaseAuth
+    olApi rootProject.ext.firebaseDatabase
+    olApi rootProject.ext.googlePlayServiceAuth
+
+    api rootProject.ext.retrofit
+    api rootProject.ext.retrofitCoverterGson
+    api rootProject.ext.retrofitAdapterRxjava
+
+    api 'com.android.support.constraint:constraint-layout:1.0.2'
+
+    //    微信
+    opApi('com.tencent.mm.opensdk:wechat-sdk-android-with-mta:1.4.0') {
+        exclude group: 'com.android.support:support-v4'
+    }
+    //    友盟统计
+    opApi('com.umeng.analytics:analytics:6.1.2') {
+        exclude group: 'com.android.support:support-v4'
+    }
+
+    ohApi('com.tencent.mm.opensdk:wechat-sdk-android-with-mta:1.4.0') {
+        exclude group: 'com.android.support:support-v4'
+    }
+    //    友盟统计
+    ohApi('com.umeng.analytics:analytics:6.1.2') {
+        exclude group: 'com.android.support:support-v4'
+    }
+
+
+    api 'com.youth.banner:banner:1.4.10'
+}
+
+apply plugin: 'com.google.gms.google-services'
\ No newline at end of file
diff --git a/qpython/google-services.json b/qpython/google-services.json
new file mode 100644
index 00000000..dcb69ca8
--- /dev/null
+++ b/qpython/google-services.json
@@ -0,0 +1,68 @@
+{
+  "project_info": {
+    "project_number": "955258715976",
+    "firebase_url": "https://qpython-316a3.firebaseio.com",
+    "project_id": "qpython-316a3",
+    "storage_bucket": "qpython-316a3.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:955258715976:android:4fd6edc2d9a8f5a8",
+        "android_client_info": {
+          "package_name": "org.qpython.qpy"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "955258715976-griocs2ml4pm168gggtrrvqv8m6aftvs.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "org.qpython.qpy",
+            "certificate_hash": "45fd6098019a37d98403063602f6852ca21fb867"
+          }
+        },
+        {
+          "client_id": "955258715976-i6t5usa0tjg8favq17lsfaj885l4lilv.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyB7W6_FKMJO13hQ2HKhMopGQvemjjuDv4c"
+        }
+      ],
+      "services": {
+        "analytics_service": {
+          "status": 1
+        },
+        "appinvite_service": {
+          "status": 2,
+          "other_platform_oauth_client": [
+            {
+              "client_id": "955258715976-i6t5usa0tjg8favq17lsfaj885l4lilv.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        },
+        "ads_service": {
+          "status": 2
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:955258715976:android:4fd6edc2d9a8f5a8",
+        "android_client_info": {
+          "package_name": "com.hipipal.qpyplus"
+        }
+      },
+      "api_key": [
+        {
+          "current_key": "AIzaSyB7W6_FKMJO13hQ2HKhMopGQvemjjuDv4c"
+        }
+      ]
+    }
+  ],
+  "configuration_version": "1"
+}
\ No newline at end of file
diff --git a/qpython/gradle/wrapper/gradle-wrapper.jar b/qpython/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 00000000..13372aef
Binary files /dev/null and b/qpython/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/qpython/gradlew b/qpython/gradlew
new file mode 100644
index 00000000..9d82f789
--- /dev/null
+++ b/qpython/gradlew
@@ -0,0 +1,160 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/qpython/gradlew.bat b/qpython/gradlew.bat
new file mode 100644
index 00000000..8a0b282a
--- /dev/null
+++ b/qpython/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/qpython/libs/android-async-http-1.4.8.aar b/qpython/libs/android-async-http-1.4.8.aar
new file mode 100644
index 00000000..41776363
Binary files /dev/null and b/qpython/libs/android-async-http-1.4.8.aar differ
diff --git a/qpython/libs/markdown4j.jar b/qpython/libs/markdown4j.jar
new file mode 100644
index 00000000..65030fa0
Binary files /dev/null and b/qpython/libs/markdown4j.jar differ
diff --git a/qpython/proguard-rules.pro b/qpython/proguard-rules.pro
new file mode 100644
index 00000000..0a213a26
--- /dev/null
+++ b/qpython/proguard-rules.pro
@@ -0,0 +1,245 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /home/mathiasluo/Android-SDK/android-sdk-linux/tools/proguard/proguard-android.txt
+# You can edit the include mPath and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public org.qpython.qpy.main.event.Bean
+#}
+-keepattributes SourceFile,LineNumberTable
+-renamesourcefileattribute SourceFile
+
+# Platform calls Class.forName on types which do not exist on Android to determine platform.
+-dontnote retrofit2.Platform
+# Platform used when running on Java 8 VMs. Will not be used at runtime.
+-dontwarn retrofit2.Platform$Java8
+# Retain generic type information for use by reflection by converters and adapters.
+-keepattributes Signature
+# Retain declared checked exceptions for use by a Proxy instance.
+-keepattributes Exceptions
+-dontwarn rx.**
+-dontwarn okio.**
+-keep class org.apache.http.** { *; }
+-dontwarn org.apache.http.**
+-dontwarn java.lang.invoke.**
+-keep class com.google.**
+-dontwarn com.google.**
+# EventBus 3.0
+-keep class de.greenrobot.event.** { *; }
+-keep class * {
+    @de.greenrobot.event.* <methods>;
+}
+-keepattributes *Annotation*
+-keepclassmembers class ** {
+    @org.greenrobot.eventbus.Subscribe <methods>;
+}
+-keep enum org.greenrobot.eventbus.ThreadMode { *; }
+
+-dontpreverify
+
+#-keep class * extends junit.framework.TestCase
+#-keepclassmembers class * extends junit.framework.TestCase { *; }
+
+# android
+-repackageclasses ''
+-allowaccessmodification
+-optimizations !code/simplification/arithmetic
+#
+## retrace
+#-renamesourcefileattribute SourceFile
+#-keepattributes SourceFile,LineNumberTable
+#
+#-keep public class * extends android.app.Activity
+#-keep public class * extends android.app.Application
+#-keep public class * extends android.app.Service
+#-keep public class * extends android.content.BroadcastReceiver
+#-keep public class * extends android.content.ContentProvider
+#
+#-keep public class * extends android.view.View {
+#    public <init>(android.content.Context);
+#    public <init>(android.content.Context, android.util.AttributeSet);
+#    public <init>(android.content.Context, android.util.AttributeSet, int);
+#    public void set*(...);
+#}
+#
+#-keepclasseswithmembers class * {
+#    public <init>(android.content.Context, android.util.AttributeSet);
+#}
+#
+#-keepclasseswithmembers class * {
+#    public <init>(android.content.Context, android.util.AttributeSet, int);
+#}
+#
+#-keepclassmembers class * extends android.content.Context {
+#    public void *(android.view.View);
+#    public void *(android.view.MenuItem);
+#}
+#
+#-keepclassmembers class * implements android.os.Parcelable {
+#    static ** CREATOR;
+#}
+#
+#-keepclassmembers class **.R$* {
+#    public static <fields>;
+#}
+#
+#-keepclassmembers class * {
+#    @android.webkit.JavascriptInterface <methods>;
+#}
+
+
+# gms
+-keep public class com.google.android.gms.**
+-dontwarn com.google.android.gms.**
+
+# OkHttp
+-dontwarn okio.**
+
+# rx
+-dontwarn sun.misc.Unsafe
+-keep class rx.schedulers.Schedulers {
+    public static <methods>;
+}
+-keep class rx.schedulers.ImmediateScheduler {
+    public <methods>;
+}
+-keep class rx.schedulers.TestScheduler {
+    public <methods>;
+}
+-keep class rx.schedulers.Schedulers {
+    public static ** test();
+}
+-keepclassmembers class rx.internal.util.unsafe.*ArrayQueue*Field* {
+    long producerIndex;
+    long consumerIndex;
+}
+-keepclassmembers class rx.internal.util.unsafe.BaseLinkedQueueProducerNodeRef {
+    long producerNode;
+    long consumerNode;
+}
+
+
+## databinding
+-keep class android.databinding.** { *; }
+-keepnames class * implements java.io.Serializable
+-keepclassmembers class * implements java.io.Serializable {
+    static final long serialVersionUID;
+    private static final java.io.ObjectStreamField[] serialPersistentFields;
+    !static !transient <fields>;
+    private void writeObject(java.io.ObjectOutputStream);
+    private void readObject(java.io.ObjectInputStream);
+    java.lang.Object writeReplace();
+    java.lang.Object readResolve();
+}
+-keepattributes *Annotation*
+-keepattributes javax.xml.bind.annotation.*
+-keepattributes javax.annotation.processing.*
+-keepclassmembers class * extends java.lang.Enum { *; }
+-keepclasseswithmembernames class android.**
+-keepclasseswithmembernames interface android.**
+-libraryjars  <java.home>/lib/rt.jar
+-libraryjars  <java.home>/lib/jce.jar
+
+##---------------Begin: proguard configuration for Gson  ----------
+# Gson uses generic type information stored in a class file when working with fields. Proguard
+# removes such information by default, so configure it to keep all of it.
+#-keepattributes Signature
+
+# For using GSON @Expose annotation
+#-keepattributes *Annotation*
+
+# Gson specific classes
+-keep class sun.misc.Unsafe { *; }
+#-keep class com.google.gson.stream.** { *; }
+
+# Application classes that will be serialized/deserialized over Gson
+-keep class com.google.gson.examples.android.model.** { *; }
+
+# Prevent proguard from stripping interface information from TypeAdapterFactory,
+# JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter)
+-keep class * implements com.google.gson.TypeAdapterFactory
+-keep class * implements com.google.gson.JsonSerializer
+-keep class * implements com.google.gson.JsonDeserializer
+-keep class org.qpython.qpy.main.server.model.** {*;}
+##---------------End: proguard configuration for Gson  ----------
+
+##---------------Begin: proguard configuration for SL4A  ----------
+-keep class org.qpython.sl4a.** {*;}
+##---------------End: proguard configuration for SL4A  ----------
+
+# leancloud
+-keepattributes Signature
+-dontwarn com.jcraft.jzlib.**
+-keep class com.jcraft.jzlib.**  { *;}
+
+-dontwarn sun.misc.**
+-keep class sun.misc.** { *;}
+
+-dontwarn com.alibaba.fastjson.**
+-keep class com.alibaba.fastjson.** { *;}
+
+-dontwarn sun.security.**
+-keep class sun.security.** { *; }
+
+-dontwarn com.google.**
+-keep class com.google.** { *;}
+
+-dontwarn com.avos.**
+-keep class com.avos.** { *;}
+
+-keep public class android.net.http.SslError
+-keep public class android.webkit.WebViewClient
+
+-dontwarn android.webkit.WebView
+-dontwarn android.net.http.SslError
+-dontwarn android.webkit.WebViewClient
+
+-dontwarn android.support.**
+
+-dontwarn org.apache.**
+-keep class org.apache.** { *;}
+
+-dontwarn org.jivesoftware.smack.**
+-keep class org.jivesoftware.smack.** { *;}
+
+-dontwarn com.loopj.**
+-keep class com.loopj.** { *;}
+
+-dontwarn com.squareup.okhttp.**
+-keep class com.squareup.okhttp.** { *;}
+-keep interface com.squareup.okhttp.** { *; }
+
+-dontwarn okio.**
+
+-dontwarn org.xbill.**
+-keep class org.xbill.** { *;}
+
+-keepattributes *Annotation*
+
+#wx
+-keep class com.tencent.mm.sdk.** {
+   *;
+}
+
+#umeng
+-keepclassmembers class * {
+   public <init> (org.json.JSONObject);
+}
+
+-keep public class org.qpython.qpy.R$*{
+public static final int *;
+}
+
+-keepclassmembers enum * {
+    public static **[] values();
+    public static ** valueOf(java.lang.String);
+}
\ No newline at end of file
diff --git a/qpython/release/cn/release/output.json b/qpython/release/cn/release/output.json
new file mode 100644
index 00000000..47944358
--- /dev/null
+++ b/qpython/release/cn/release/output.json
@@ -0,0 +1 @@
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":241},"path":"Qpython_2018-02-28_cn.apk","properties":{"packageId":"com.hipipal.qpyplus","split":"","minSdkVersion":"14"}}]
\ No newline at end of file
diff --git a/qpython/release/output.json b/qpython/release/output.json
new file mode 100644
index 00000000..bd56657f
--- /dev/null
+++ b/qpython/release/output.json
@@ -0,0 +1 @@
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":229},"path":"qpython-release.apk","properties":{"packageId":"org.qpython.qpy","split":"","minSdkVersion":"14"}}]
\ No newline at end of file
diff --git a/qpython/src/lint.xml b/qpython/src/lint.xml
new file mode 100644
index 00000000..45998cd6
--- /dev/null
+++ b/qpython/src/lint.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<lint>
+    <issue id="MissingTranslation" severity="ignore" />
+    <issue id="UseSparseArrays" severity="ignore" />
+</lint>
diff --git a/qpython/src/main/AndroidManifest.xml b/qpython/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..db2647f9
--- /dev/null
+++ b/qpython/src/main/AndroidManifest.xml
@@ -0,0 +1,376 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:tools="http://schemas.android.com/tools"
+          package="org.qpython.qpy">
+
+    <uses-feature
+        android:name="android.hardware.touchscreen"
+        android:required="false"/>
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.CAMERA"/>
+    <uses-permission android:name="android.permission.FLASHLIGHT"/>
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
+    <uses-permission android:name="com.android.vending.BILLING"/>
+    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
+    <uses-permission android:name="com.android.launcher.permission.UNINSTALL_SHORTCUT" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_MEDIA_STORAGE" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+    <uses-permission android:name="android.permission.NFC" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.ACCESS_NOTIFICATION_POLICY" />
+    <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES"/>
+    <uses-permission android:name="net.dinglisch.android.tasker.PERMISSION_RUN_TASKS" />
+
+    <uses-feature android:name="android.hardware.microphone" android:required="false"/>
+    <uses-feature android:name="android.hardware.telephony" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.flash" android:required="false"/>
+    <uses-feature android:name="android.hardware.screen.landscape" android:required="false"/>
+    <uses-feature android:name="android.hardware.wifi" android:required="false"/>
+    <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
+    <uses-feature android:name="android.hardware.location.gps" android:required="false"/>
+    <uses-feature android:name="android.hardware.location.network" android:required="false"/>
+    <uses-feature android:name="android.hardware.bluetooth" android:required="false"/>
+
+    <uses-feature android:glEsVersion="0x00020000" android:required="false"/>
+
+    <application
+        android:networkSecurityConfig="@xml/network_security_config"
+        android:name="org.qpython.qpy.main.app.App"
+        android:allowBackup="true"
+        android:hardwareAccelerated="true"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:largeHeap="true"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
+        <uses-library android:name="org.apache.http.legacy" android:required="false"/>
+
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_icon"
+            android:resource="@drawable/img_home_logo"/>
+
+        <service android:name=".main.service.QPyService"/>
+        <service android:name="org.qpython.qsl4a.QPyScriptService"/>
+        <service android:name=".main.service.FTPServerService"/>
+        <activity
+            android:name=".main.activity.SignInActivity"
+            android:launchMode="singleTask"/>
+        <activity
+            android:name="org.renpy.android.PythonSDLActivity"
+            android:hardwareAccelerated="true"
+            android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|fontScale|uiMode|orientation"
+            android:launchMode="singleTask"
+            android:process=":python"
+            android:screenOrientation="user"
+            android:theme="@style/AppTheme"
+            android:windowSoftInputMode="stateAlwaysHidden">
+        </activity>
+
+        <activity
+            android:name="org.qpython.qpylib.MPyApi"
+            android:exported="true"
+            android:theme="@style/Theme.AppCompat"/>
+
+        <service
+            android:name="org.qpython.qpylib.MPyService"
+            android:exported="true"
+            tools:ignore="ExportedService"/>
+
+        <activity
+            android:name=".main.activity.SplashActivity"
+            android:theme="@style/FullscreenTheme"
+            >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name="org.qpython.qpy.main.activity.HomeMainActivity"
+            android:launchMode="singleTask">
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcuts"/>
+        </activity>
+
+        <activity
+            android:name="org.qpython.qpy.main.activity.QWebViewActivity"
+            android:label="@string/browser">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW"/>
+
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE"/>
+
+                <data android:mimeType="text/plain"/>
+                <data android:mimeType="image/*"/>
+                <data
+                    android:host="course"
+                    android:path="/"
+                    android:scheme="qpython"/>
+            </intent-filter>
+
+            <!-- Used to handle Chrome then menu then share.-->
+            <intent-filter>
+                <action android:name="android.intent.action.SEND"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <data android:mimeType="text/plain"/>
+                <data android:mimeType="image/*"/>
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".main.activity.CourseActivity"
+            android:configChanges="orientation|screenSize"/>
+        <activity android:name=".main.activity.CourseIndexActivity"/>
+        <activity android:name=".main.activity.GistEditActivity"/>
+        <activity android:name=".main.activity.CodeDetailActivity"/>
+        <activity android:name=".main.activity.CodeShareActivity"/>
+        <activity android:name=".main.activity.UserActivity"/>
+        <activity
+            android:name="org.qpython.qpy.main.activity.SettingActivity"
+            android:theme="@style/AppTheme"/>
+        <activity
+            android:name="org.qpython.qpy.console.TermActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:theme="@style/AppTheme"/>
+        <activity
+            android:name=".main.activity.LogActivity"
+            android:theme="@style/AppTheme"/>
+        <activity
+            android:name=".texteditor.EditorActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:exported="true"
+            android:label="@string/editor">
+            <intent-filter>
+                <!--<action android:name="android.intent.action.SEND"/>-->
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:mimeType="text/*"/>
+                <data android:scheme="file"/>
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="content"/>
+                <data android:host="*"/>
+                <data android:mimeType="*/*"/>
+                <data android:pathPattern=".*\\.txt"/>
+                <data android:pathPattern=".*\\.html"/>
+                <data android:pathPattern=".*\\.css"/>
+                <data android:pathPattern=".*\\.js"/>
+                <data android:pathPattern=".*\\.md"/>
+                <data android:pathPattern=".*\\.php"/>
+                <data android:pathPattern=".*\\.py"/>
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name="org.qpython.qpy.texteditor.TedLocalActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
+        <activity
+            android:name="org.qpython.qpy.texteditor.TedSettingsActivity"
+            android:theme="@style/SettingTheme"
+            android:windowSoftInputMode="stateHidden"/>
+        <activity
+            android:name="org.qpython.qpy.texteditor.TedFontActivity"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
+
+        <activity
+            android:name=".main.activity.LibActivity"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar">
+            <intent-filter>
+                <action android:name="org.qpython.qpy.OPEN_AIPY_FRAGMENT"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name=".main.activity.AboutActivity"/>
+
+        <activity
+            android:name=".main.activity.AppListActivity"
+            android:exported="true"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar">
+        </activity>
+        <activity
+            android:name="org.swiftp.gui.ServerPreferenceActivity"
+            android:label="Preferences"/>
+        <activity android:name=".texteditor.MFTPSettingActivity"/>
+        <activity android:name=".main.activity.PurchaseActivity"/>
+
+        <activity-alias
+            android:name="TermInternal"
+            android:exported="false"
+            android:targetActivity="org.qpython.qpy.console.TermActivity"
+            android:theme="@style/ConsoleTheme">
+            <intent-filter>
+                <action android:name="jackpal.androidterm.private.OPEN_NEW_WINDOW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="jackpal.androidterm.private.SWITCH_WINDOW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity-alias>
+        <activity
+            android:name="org.qpython.qpy.console.RemoteInterface"
+            android:excludeFromRecents="true"
+            android:theme="@style/ConsoleTheme">
+            <intent-filter>
+                <action android:name="jackpal.androidterm.OPEN_NEW_WINDOW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+        <activity-alias
+            android:name="TermHere"
+            android:exported="true"
+            android:label="@string/activity_term_here_title"
+            android:targetActivity="org.qpython.qpy.console.RemoteInterface"
+            android:theme="@style/ConsoleTheme">
+        </activity-alias>
+
+        <activity
+            android:name="org.qpython.qsl4a.qsl4a.activity.FutureActivity"
+            android:label="QSL4A FutureActivity"
+            android:theme="@style/AppTheme">
+            <intent-filter>
+                <action android:name="android.nfc.action.NDEF_DISCOVERED"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <data android:mimeType="application/com.hipipal.qpy.nfc"/>
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name="org.qpython.qpy.console.RunScript"
+            android:excludeFromRecents="true"
+            android:permission="jackpal.androidterm.permission.RUN_SCRIPT"
+            android:theme="@style/ConsoleTheme">
+            <intent-filter>
+                <action android:name="jackpal.androidterm.RUN_SCRIPT"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="org.qpython.qpy.console.RunShortcut"
+            android:excludeFromRecents="true"
+            android:theme="@style/ConsoleTheme">
+            <intent-filter>
+                <action android:name="jackpal.androidterm.RUN_SHORTCUT"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="org.qpython.qpy.console.TermPreferences"
+            android:label="@string/preferences"
+            android:theme="@style/ConsoleTheme"/>
+        <activity
+            android:name="org.qpython.qpy.console.WindowList"
+            android:label="@string/window_list"
+            android:theme="@style/ConsoleTheme"/>
+        <activity
+            android:name="org.qpython.qpy.console.shortcuts.AddShortcut"
+            android:configChanges="orientation|keyboard|keyboardHidden"
+            android:label="@string/activity_shortcut_create"
+            android:launchMode="singleTop"
+            android:theme="@style/Theme.AppCompat">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.CREATE_SHORTCUT"/>
+            </intent-filter>
+            <intent-filter>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <data android:mimeType="text/*"/>
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="org.qpython.qpy.console.shortcuts.FSNavigator"
+            android:configChanges="orientation|keyboardHidden"
+            android:exported="true"
+            android:label="@string/addshortcut_button_find_command"
+            android:launchMode="singleTop"
+            android:theme="@style/ConsoleTheme">
+            <intent-filter>
+                <action android:name="android.intent.action.PICK"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.GET_CONTENT"/>
+
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.OPENABLE"/>
+
+                <data android:mimeType="*/*"/>
+            </intent-filter>
+        </activity>
+
+        <activity android:name="org.qpython.qpy.plugin.activity.PluginManagerActivity"/>
+        <activity android:name="org.qpython.qpy.plugin.activity.LocalPluginInstallActivity"/>
+
+        <!--zxing-->
+        <activity android:name="org.qpython.qpy.main.activity.QrCodeActivity"/>
+        <activity
+            android:name=".main.activity.GistActivity"
+            android:configChanges="orientation"
+            android:launchMode="singleTask"/>
+        <activity
+            android:name=".main.activity.GistDetailActivity"
+            android:configChanges="orientation"/>
+        <activity
+            android:name=".main.activity.MyGistActivity"
+            android:configChanges="orientation"/>
+        <!--SERVICE-->
+        <service android:name="org.qpython.qpy.console.TermService"
+                 tools:ignore="ExportedService">
+            <intent-filter>
+                <action android:name="jackpal.androidterm.action.START_TERM.v1"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </service>
+
+        <activity android:name=".main.activity.CourseIndexFundingActivity"/>
+        <activity android:name=".main.activity.FundingPurchaseActivity"/>
+        <activity
+            android:name=".main.activity.NotebookActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:launchMode="singleTask"
+            android:windowSoftInputMode="adjustResize"
+            android:exported="true">
+            <intent-filter >
+                <action android:name="android.intent.action.VIEW"/>
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".main.activity.NotebookListActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"/>
+
+        <receiver android:name="org.qpython.qpy.main.receiver.BootBroadcastReceiver" />
+    </application>
+
+    <meta-data
+        android:name="com.sec.android.support.multiwindow"
+        android:value="true"/>
+
+</manifest>
\ No newline at end of file
diff --git a/qpython/src/main/aidl/com/android/vending/billing/IInAppBillingService.aidl b/qpython/src/main/aidl/com/android/vending/billing/IInAppBillingService.aidl
new file mode 100644
index 00000000..0f2bcae3
--- /dev/null
+++ b/qpython/src/main/aidl/com/android/vending/billing/IInAppBillingService.aidl
@@ -0,0 +1,281 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.vending.billing;
+
+import android.os.Bundle;
+
+/**
+ * InAppBillingService is the service that provides in-app billing version 3 and beyond.
+ * This service provides the following features:
+ * 1. Provides a new API to get details of in-app items published for the app including
+ *    price, type, title and description.
+ * 2. The purchase flow is synchronous and purchase information is available immediately
+ *    after it completes.
+ * 3. Purchase information of in-app purchases is maintained within the Google Play system
+ *    till the purchase is consumed.
+ * 4. An API to consume a purchase of an inapp item. All purchases of one-time
+ *    in-app items are consumable and thereafter can be purchased again.
+ * 5. An API to get current purchases of the user immediately. This will not contain any
+ *    consumed purchases.
+ *
+ * All calls will give a response code with the following possible values
+ * RESULT_OK = 0 - success
+ * RESULT_USER_CANCELED = 1 - User pressed back or canceled a dialog
+ * RESULT_SERVICE_UNAVAILABLE = 2 - The network connection is down
+ * RESULT_BILLING_UNAVAILABLE = 3 - This billing API version is not supported for the type requested
+ * RESULT_ITEM_UNAVAILABLE = 4 - Requested SKU is not available for purchase
+ * RESULT_DEVELOPER_ERROR = 5 - Invalid arguments provided to the API
+ * RESULT_ERROR = 6 - Fatal error during the API action
+ * RESULT_ITEM_ALREADY_OWNED = 7 - Failure to purchase since item is already owned
+ * RESULT_ITEM_NOT_OWNED = 8 - Failure to consume since item is not owned
+ */
+interface IInAppBillingService {
+    /**
+     * Checks support for the requested billing API version, package and in-app type.
+     * Minimum API version supported by this interface is 3.
+     * @param apiVersion billing API version that the app is using
+     * @param packageName the package name of the calling app
+     * @param type type of the in-app item being purchased ("inapp" for one-time purchases
+     *        and "subs" for subscriptions)
+     * @return RESULT_OK(0) on success and appropriate response code on failures.
+     */
+    int isBillingSupported(int apiVersion, String packageName, String type);
+
+    /**
+     * Provides details of a list of SKUs
+     * Given a list of SKUs of a valid type in the skusBundle, this returns a bundle
+     * with a list JSON strings containing the productId, price, title and description.
+     * This API can be called with a maximum of 20 SKUs.
+     * @param apiVersion billing API version that the app is using
+     * @param packageName the package name of the calling app
+     * @param type of the in-app items ("inapp" for one-time purchases
+     *        and "subs" for subscriptions)
+     * @param skusBundle bundle containing a StringArrayList of SKUs with key "ITEM_ID_LIST"
+     * @return Bundle containing the following key-value pairs
+     *         "RESPONSE_CODE" with int value, RESULT_OK(0) if success, appropriate response codes
+     *                         on failures.
+     *         "DETAILS_LIST" with a StringArrayList containing purchase information
+     *                        in JSON format similar to:
+     *                        '{ "productId" : "exampleSku",
+     *                           "type" : "inapp",
+     *                           "price" : "$5.00",
+     *                           "price_currency": "USD",
+     *                           "price_amount_micros": 5000000,
+     *                           "title : "Example Title",
+     *                           "description" : "This is an example description" }'
+     */
+    Bundle getSkuDetails(int apiVersion, String packageName, String type, in Bundle skusBundle);
+
+    /**
+     * Returns a pending intent to launch the purchase flow for an in-app item by providing a SKU,
+     * the type, a unique purchase token and an optional developer payload.
+     * @param apiVersion billing API version that the app is using
+     * @param packageName package name of the calling app
+     * @param sku the SKU of the in-app item as published in the developer console
+     * @param type of the in-app item being purchased ("inapp" for one-time purchases
+     *        and "subs" for subscriptions)
+     * @param developerPayload optional argument to be sent back with the purchase information
+     * @return Bundle containing the following key-value pairs
+     *         "RESPONSE_CODE" with int value, RESULT_OK(0) if success, appropriate response codes
+     *                         on failures.
+     *         "BUY_INTENT" - PendingIntent to start the purchase flow
+     *
+     * The Pending intent should be launched with startIntentSenderForResult. When purchase flow
+     * has completed, the onActivityResult() will give a resultCode of OK or CANCELED.
+     * If the purchase is successful, the result data will contain the following key-value pairs
+     *         "RESPONSE_CODE" with int value, RESULT_OK(0) if success, appropriate response
+     *                         codes on failures.
+     *         "INAPP_PURCHASE_DATA" - String in JSON format similar to
+     *                                 '{"orderId":"12999763169054705758.1371079406387615",
+     *                                   "packageName":"com.example.app",
+     *                                   "productId":"exampleSku",
+     *                                   "purchaseTime":1345678900000,
+     *                                   "purchaseToken" : "122333444455555",
+     *                                   "developerPayload":"example developer payload" }'
+     *         "INAPP_DATA_SIGNATURE" - String containing the signature of the purchase data that
+     *                                  was signed with the private key of the developer
+     */
+    Bundle getBuyIntent(int apiVersion, String packageName, String sku, String type,
+        String developerPayload);
+
+    /**
+     * Returns the current SKUs owned by the user of the type and package name specified along with
+     * purchase information and a signature of the data to be validated.
+     * This will return all SKUs that have been purchased in V3 and managed items purchased using
+     * V1 and V2 that have not been consumed.
+     * @param apiVersion billing API version that the app is using
+     * @param packageName package name of the calling app
+     * @param type of the in-app items being requested ("inapp" for one-time purchases
+     *        and "subs" for subscriptions)
+     * @param continuationToken to be set as null for the first call, if the number of owned
+     *        skus are too many, a continuationToken is returned in the response bundle.
+     *        This method can be called again with the continuation token to get the next set of
+     *        owned skus.
+     * @return Bundle containing the following key-value pairs
+     *         "RESPONSE_CODE" with int value, RESULT_OK(0) if success, appropriate response codes
+                               on failures.
+     *         "INAPP_PURCHASE_ITEM_LIST" - StringArrayList containing the list of SKUs
+     *         "INAPP_PURCHASE_DATA_LIST" - StringArrayList containing the purchase information
+     *         "INAPP_DATA_SIGNATURE_LIST"- StringArrayList containing the signatures
+     *                                      of the purchase information
+     *         "INAPP_CONTINUATION_TOKEN" - String containing a continuation token for the
+     *                                      next set of in-app purchases. Only set if the
+     *                                      user has more owned skus than the current list.
+     */
+    Bundle getPurchases(int apiVersion, String packageName, String type, String continuationToken);
+
+    /**
+     * Consume the last purchase of the given SKU. This will result in this item being removed
+     * from all subsequent responses to getPurchases() and allow re-purchase of this item.
+     * @param apiVersion billing API version that the app is using
+     * @param packageName package name of the calling app
+     * @param purchaseToken token in the purchase information JSON that identifies the purchase
+     *        to be consumed
+     * @return RESULT_OK(0) if consumption succeeded, appropriate response codes on failures.
+     */
+    int consumePurchase(int apiVersion, String packageName, String purchaseToken);
+
+    /**
+     * This API is currently under development.
+     */
+    int stub(int apiVersion, String packageName, String type);
+
+    /**
+     * Returns a pending intent to launch the purchase flow for upgrading or downgrading a
+     * subscription. The existing owned SKU(s) should be provided along with the new SKU that
+     * the user is upgrading or downgrading to.
+     * @param apiVersion billing API version that the app is using, must be 5 or later
+     * @param packageName package name of the calling app
+     * @param oldSkus the SKU(s) that the user is upgrading or downgrading from,
+     *        if null or empty this method will behave like {@link #getBuyIntent}
+     * @param newSku the SKU that the user is upgrading or downgrading to
+     * @param type of the item being purchased, currently must be "subs"
+     * @param developerPayload optional argument to be sent back with the purchase information
+     * @return Bundle containing the following key-value pairs
+     *         "RESPONSE_CODE" with int value, RESULT_OK(0) if success, appropriate response codes
+     *                         on failures.
+     *         "BUY_INTENT" - PendingIntent to start the purchase flow
+     *
+     * The Pending intent should be launched with startIntentSenderForResult. When purchase flow
+     * has completed, the onActivityResult() will give a resultCode of OK or CANCELED.
+     * If the purchase is successful, the result data will contain the following key-value pairs
+     *         "RESPONSE_CODE" with int value, RESULT_OK(0) if success, appropriate response
+     *                         codes on failures.
+     *         "INAPP_PURCHASE_DATA" - String in JSON format similar to
+     *                                 '{"orderId":"12999763169054705758.1371079406387615",
+     *                                   "packageName":"com.example.app",
+     *                                   "productId":"exampleSku",
+     *                                   "purchaseTime":1345678900000,
+     *                                   "purchaseToken" : "122333444455555",
+     *                                   "developerPayload":"example developer payload" }'
+     *         "INAPP_DATA_SIGNATURE" - String containing the signature of the purchase data that
+     *                                  was signed with the private key of the developer
+     */
+    Bundle getBuyIntentToReplaceSkus(int apiVersion, String packageName,
+        in List<String> oldSkus, String newSku, String type, String developerPayload);
+
+    /**
+     * Returns a pending intent to launch the purchase flow for an in-app item. This method is
+     * a variant of the {@link #getBuyIntent} method and takes an additional {@code extraParams}
+     * parameter. This parameter is a Bundle of optional keys and values that affect the
+     * operation of the method.
+     * @param apiVersion billing API version that the app is using, must be 6 or later
+     * @param packageName package name of the calling app
+     * @param sku the SKU of the in-app item as published in the developer console
+     * @param type of the in-app item being purchased ("inapp" for one-time purchases
+     *        and "subs" for subscriptions)
+     * @param developerPayload optional argument to be sent back with the purchase information
+     * @extraParams a Bundle with the following optional keys:
+     *        "skusToReplace" - List<String> - an optional list of SKUs that the user is
+     *                          upgrading or downgrading from.
+     *                          Pass this field if the purchase is upgrading or downgrading
+     *                          existing subscriptions.
+     *                          The specified SKUs are replaced with the SKUs that the user is
+     *                          purchasing. Google Play replaces the specified SKUs at the start of
+     *                          the next billing cycle.
+     * "replaceSkusProration" - Boolean - whether the user should be credited for any unused
+     *                          subscription time on the SKUs they are upgrading or downgrading.
+     *                          If you set this field to true, Google Play swaps out the old SKUs
+     *                          and credits the user with the unused value of their subscription
+     *                          time on a pro-rated basis.
+     *                          Google Play applies this credit to the new subscription, and does
+     *                          not begin billing the user for the new subscription until after
+     *                          the credit is used up.
+     *                          If you set this field to false, the user does not receive credit for
+     *                          any unused subscription time and the recurrence date does not
+     *                          change.
+     *                          Default value is true. Ignored if you do not pass skusToReplace.
+     *            "accountId" - String - an optional obfuscated string that is uniquely
+     *                          associated with the user's account in your app.
+     *                          If you pass this value, Google Play can use it to detect irregular
+     *                          activity, such as many devices making purchases on the same
+     *                          account in a short period of time.
+     *                          Do not use the developer ID or the user's Google ID for this field.
+     *                          In addition, this field should not contain the user's ID in
+     *                          cleartext.
+     *                          We recommend that you use a one-way hash to generate a string from
+     *                          the user's ID, and store the hashed string in this field.
+     *                   "vr" - Boolean - an optional flag indicating whether the returned intent
+     *                          should start a VR purchase flow. The apiVersion must also be 7 or
+     *                          later to use this flag.
+     */
+    Bundle getBuyIntentExtraParams(int apiVersion, String packageName, String sku,
+        String type, String developerPayload, in Bundle extraParams);
+
+    /**
+     * Returns the most recent purchase made by the user for each SKU, even if that purchase is
+     * expired, canceled, or consumed.
+     * @param apiVersion billing API version that the app is using, must be 6 or later
+     * @param packageName package name of the calling app
+     * @param type of the in-app items being requested ("inapp" for one-time purchases
+     *        and "subs" for subscriptions)
+     * @param continuationToken to be set as null for the first call, if the number of owned
+     *        skus is too large, a continuationToken is returned in the response bundle.
+     *        This method can be called again with the continuation token to get the next set of
+     *        owned skus.
+     * @param extraParams a Bundle with extra params that would be appended into http request
+     *        query string. Not used at this moment. Reserved for future functionality.
+     * @return Bundle containing the following key-value pairs
+     *         "RESPONSE_CODE" with int value: RESULT_OK(0) if success,
+     *         {@link IabHelper#BILLING_RESPONSE_RESULT_*} response codes on failures.
+     *
+     *         "INAPP_PURCHASE_ITEM_LIST" - ArrayList<String> containing the list of SKUs
+     *         "INAPP_PURCHASE_DATA_LIST" - ArrayList<String> containing the purchase information
+     *         "INAPP_DATA_SIGNATURE_LIST"- ArrayList<String> containing the signatures
+     *                                      of the purchase information
+     *         "INAPP_CONTINUATION_TOKEN" - String containing a continuation token for the
+     *                                      next set of in-app purchases. Only set if the
+     *                                      user has more owned skus than the current list.
+     */
+    Bundle getPurchaseHistory(int apiVersion, String packageName, String type,
+        String continuationToken, in Bundle extraParams);
+
+    /**
+    * This method is a variant of {@link #isBillingSupported}} that takes an additional
+    * {@code extraParams} parameter.
+    * @param apiVersion billing API version that the app is using, must be 7 or later
+    * @param packageName package name of the calling app
+    * @param type of the in-app item being purchased ("inapp" for one-time purchases and "subs"
+    *        for subscriptions)
+    * @param extraParams a Bundle with the following optional keys:
+    *        "vr" - Boolean - an optional flag to indicate whether {link #getBuyIntentExtraParams}
+    *               supports returning a VR purchase flow.
+    * @return RESULT_OK(0) on success and appropriate response code on failures.
+    */
+    int isBillingSupportedExtraParams(int apiVersion, String packageName, String type,
+        in Bundle extraParams);
+}
diff --git a/qpython/src/main/assets/Apache_License b/qpython/src/main/assets/Apache_License
new file mode 100644
index 00000000..8e911f15
--- /dev/null
+++ b/qpython/src/main/assets/Apache_License
@@ -0,0 +1,15 @@
+"""
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
\ No newline at end of file
diff --git a/qpython/src/main/assets/QPy_ConsoleApp b/qpython/src/main/assets/QPy_ConsoleApp
new file mode 100644
index 00000000..d878d640
--- /dev/null
+++ b/qpython/src/main/assets/QPy_ConsoleApp
@@ -0,0 +1,4 @@
+#-*-coding:utf8;-*-
+#qpy:console
+
+print "This is console module"
diff --git a/qpython/src/main/assets/QPy_PygameApp b/qpython/src/main/assets/QPy_PygameApp
new file mode 100644
index 00000000..8e6ef873
--- /dev/null
+++ b/qpython/src/main/assets/QPy_PygameApp
@@ -0,0 +1,24 @@
+#-*-coding:utf8;-*-
+#qpy:pygame
+
+import sys
+import pygame
+from pygame.locals import *
+
+pygame.init()
+# Resolution is ignored on Android
+surface = pygame.display.set_mode((640, 480))
+# Only one built in font is available on Android
+myfont = pygame.font.SysFont("DejaVuSans", 64)
+label = myfont.render("Hello, QPython!", 1, (255, 255, 255))
+clock = pygame.time.Clock()
+
+while True:
+    for ev in pygame.event.get():
+        if ev.type == QUIT:
+            pygame.quit()
+    # Framelimiter
+    clock.tick(60)
+    surface.fill((0, 0, 0))
+    surface.blit(label, (0, 0))
+    pygame.display.flip()
diff --git a/qpython/src/main/assets/QPy_SL4AApp b/qpython/src/main/assets/QPy_SL4AApp
new file mode 100644
index 00000000..e6b595d0
--- /dev/null
+++ b/qpython/src/main/assets/QPy_SL4AApp
@@ -0,0 +1,109 @@
+#qpy:quiet
+#-*-coding:utf8;-*-
+"""
+This is a sample project which use SL4A UI Framework,
+There is another Sample project: https://github.com/qpython-android/qpy-calcount
+"""
+import qpy
+import androidhelper
+try:
+    import urllib.request as ur
+except:
+    import urllib as ur
+from qsl4ahelper.fullscreenwrapper2 import *
+
+droid = androidhelper.Android()
+
+class MainScreen(Layout):
+    def __init__(self):
+        super(MainScreen,self).__init__(str("""<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	android:layout_width="fill_parent"
+	android:layout_height="fill_parent"
+	android:background="#ff0E4200"
+	android:orientation="vertical"
+	xmlns:android="http://schemas.android.com/apk/res/android">
+	<ImageView
+		android:id="@+id/logo"
+		android:layout_width="fill_parent"
+		android:layout_height="0px"
+		android:layout_weight="10"
+	/>
+	<LinearLayout
+		android:layout_width="fill_parent"
+		android:layout_height="0px"
+		android:orientation="horizontal"
+		android:layout_weight="20">
+
+		<TextView
+			android:layout_width="fill_parent"
+			android:layout_height="fill_parent"
+			android:textSize="8dp"
+			android:text="Hello, QPython"
+			android:textColor="#ffffffff"
+			android:layout_weight="1"
+			android:gravity="center"
+		/>
+    </LinearLayout>
+
+	<ListView
+		android:id="@+id/data_list"
+		android:layout_width="fill_parent"
+		android:layout_height="0px"
+		android:layout_weight="55"/>
+
+	<LinearLayout
+		android:layout_width="fill_parent"
+		android:layout_height="0px"
+		android:orientation="horizontal"
+		android:layout_weight="8">
+		<Button
+			android:layout_width="fill_parent"
+			android:layout_height="fill_parent"
+			android:text="Load"
+			android:id="@+id/but_load"
+			android:textSize="8dp"
+			android:background="#ffEFC802"
+			android:textColor="#ffffffff"
+			android:layout_weight="1"
+			android:gravity="center"/>
+		<Button
+			android:layout_width="fill_parent"
+			android:layout_height="fill_parent"
+			android:text="Exit"
+			android:id="@+id/but_exit"
+			android:textSize="8dp"
+			android:background="#ff06AF00"
+			android:textColor="#ffffffff"
+			android:layout_weight="1"
+			android:gravity="center"/>
+	</LinearLayout>
+</LinearLayout>
+"""),"SL4AApp")
+
+    def on_show(self):
+        self.views.but_exit.add_event(click_EventHandler(self.views.but_exit, self.exit))
+        self.views.but_load.add_event(click_EventHandler(self.views.but_load, self.load))
+
+        pass
+
+    def on_close(self):
+        pass
+
+    def load(self, view, dummy):
+        droid = FullScreenWrapper2App.get_android_instance()
+        droid.makeToast("Load")
+
+        saved_logo = qpy.tmp+"/qpy.logo"
+        ur.urlretrieve("https://www.qpython.org/static/img_logo.png", saved_logo)
+        self.views.logo.src = "file://"+saved_logo
+
+    def exit(self, view, dummy):
+        droid = FullScreenWrapper2App.get_android_instance()
+        droid.makeToast("Exit")
+        FullScreenWrapper2App.close_layout()
+
+if __name__ == '__main__':
+    FullScreenWrapper2App.initialize(droid)
+    FullScreenWrapper2App.show_layout(MainScreen())
+    FullScreenWrapper2App.eventloop()
diff --git a/qpython/src/main/assets/QPy_WebApp b/qpython/src/main/assets/QPy_WebApp
new file mode 100644
index 00000000..86f447e9
--- /dev/null
+++ b/qpython/src/main/assets/QPy_WebApp
@@ -0,0 +1,53 @@
+#qpy:webapp:Hello Qpython
+#qpy://127.0.0.1:8080/
+"""
+This is a sample for qpython webapp
+"""
+from bottle import Bottle, ServerAdapter
+from bottle import run, debug, route, error, static_file, template
+
+######### QPYTHON WEB SERVER ###############
+class MyWSGIRefServer(ServerAdapter):
+    server = None
+    def run(self, handler):
+        from wsgiref.simple_server import make_server, WSGIRequestHandler
+        if self.quiet:
+            class QuietHandler(WSGIRequestHandler):
+                def log_request(*args, **kw): pass
+            self.options['handler_class'] = QuietHandler
+        self.server = make_server(self.host, self.port, handler, **self.options)
+        self.server.serve_forever()
+
+    def stop(self):
+        import threading
+        threading.Thread(target=self.server.shutdown).start()
+        self.server.server_close()
+
+######### BUILT-IN ROUTERS ###############
+@route('/__exit', method=['GET','HEAD'])
+def __exit():
+    global server
+    server.stop()
+
+@route('/assets/<filepath:path>')
+def server_static(filepath):
+    return static_file(filepath, root='/sdcard')
+
+
+######### WEBAPP ROUTERS WRITE YOUR CODE BELOW###############
+@route('/')
+def home():
+    return template('<h1>Hello {{name}} !</h1><a href="/assets/qpython/projects/WebAppSample/main.py">View code</a><br /><br /> <a href="http://edu.qpython.org/qpython-webapp/index.html">>> About QPython Web App</a>',name='QPython')
+
+######### WEBAPP ROUTERS ###############
+app = Bottle()
+app.route('/', method='GET')(home)
+app.route('/__exit', method=['GET','HEAD'])(__exit)
+app.route('/assets/<filepath:path>', method='GET')(server_static)
+
+try:
+    server = MyWSGIRefServer(host="127.0.0.1", port="8080")
+    app.run(server=server,reloader=False)
+except Exception,ex:
+    errs = "Exception: %s" % repr(ex)
+    print(errs)
diff --git a/qpython/src/main/assets/The_MIT_License b/qpython/src/main/assets/The_MIT_License
new file mode 100644
index 00000000..758aec2b
--- /dev/null
+++ b/qpython/src/main/assets/The_MIT_License
@@ -0,0 +1,23 @@
+"""
+The MIT License (MIT)
+
+Copyright (c) <year> <copyright holders>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+"""
\ No newline at end of file
diff --git a/qpython/src/main/assets/Untitled.ipynb b/qpython/src/main/assets/Untitled.ipynb
new file mode 100644
index 00000000..7d650b22
--- /dev/null
+++ b/qpython/src/main/assets/Untitled.ipynb
@@ -0,0 +1,14 @@
+{
+ "cells": [
+  {
+   "cell_type": "code",
+   "execution_count": 1,
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  }
+ ],
+ "metadata": {},
+  "nbformat": 4,
+  "nbformat_minor": 2
+}
diff --git a/qpython/src/main/assets/ipynb.mp3 b/qpython/src/main/assets/ipynb.mp3
new file mode 100644
index 00000000..82ab6e18
Binary files /dev/null and b/qpython/src/main/assets/ipynb.mp3 differ
diff --git a/qpython/src/main/assets/notebook3.mp3 b/qpython/src/main/assets/notebook3.mp3
new file mode 100644
index 00000000..5f1e2e9d
Binary files /dev/null and b/qpython/src/main/assets/notebook3.mp3 differ
diff --git a/qpython/src/main/assets/private1.mp3 b/qpython/src/main/assets/private1.mp3
new file mode 100644
index 00000000..04bcab83
Binary files /dev/null and b/qpython/src/main/assets/private1.mp3 differ
diff --git a/qpython/src/main/assets/private2.mp3 b/qpython/src/main/assets/private2.mp3
new file mode 100644
index 00000000..19447780
Binary files /dev/null and b/qpython/src/main/assets/private2.mp3 differ
diff --git a/qpython/src/main/assets/private3.mp3 b/qpython/src/main/assets/private3.mp3
new file mode 100644
index 00000000..ea8d4793
Binary files /dev/null and b/qpython/src/main/assets/private3.mp3 differ
diff --git a/qpython/src/main/assets/private31.mp3 b/qpython/src/main/assets/private31.mp3
new file mode 100644
index 00000000..8602504a
Binary files /dev/null and b/qpython/src/main/assets/private31.mp3 differ
diff --git a/qpython/src/main/assets/private32.mp3 b/qpython/src/main/assets/private32.mp3
new file mode 100644
index 00000000..01d7727a
Binary files /dev/null and b/qpython/src/main/assets/private32.mp3 differ
diff --git a/qpython/src/main/assets/private33.mp3 b/qpython/src/main/assets/private33.mp3
new file mode 100644
index 00000000..81a47e3e
Binary files /dev/null and b/qpython/src/main/assets/private33.mp3 differ
diff --git a/qpython/src/main/assets/public.mp3 b/qpython/src/main/assets/public.mp3
new file mode 100644
index 00000000..392ee266
Binary files /dev/null and b/qpython/src/main/assets/public.mp3 differ
diff --git a/qpython/src/main/assets/public3.mp3 b/qpython/src/main/assets/public3.mp3
new file mode 100644
index 00000000..fd02b4b4
Binary files /dev/null and b/qpython/src/main/assets/public3.mp3 differ
diff --git a/qpython/src/main/assets/syntax/css.xml b/qpython/src/main/assets/syntax/css.xml
new file mode 100644
index 00000000..b219a193
--- /dev/null
+++ b/qpython/src/main/assets/syntax/css.xml
@@ -0,0 +1,950 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE MODE SYSTEM "xmode.dtd">
+
+<MODE>
+	<PROPS>
+		<PROPERTY NAME="commentStart" VALUE="/*" />
+		<PROPERTY NAME="commentEnd" VALUE="*/" />
+		<PROPERTY NAME="indentOpenBrackets" VALUE="{" />
+		<PROPERTY NAME="indentCloseBrackets" VALUE="}" />
+		<PROPERTY NAME="noWordSep" VALUE="-" />
+		<PROPERTY NAME="noWordSep" VALUE="_" />
+	</PROPS>
+
+	<RULES DIGIT_RE="-?\d+(\.\d+)?(pt|pc|in|mm|cm|em|ex|px|ms|s|%|)"
+		HIGHLIGHT_DIGITS="TRUE"
+		IGNORE_CASE="TRUE"
+		NO_WORD_SEP="-_%">
+
+		<!-- classes: -->
+		<MARK_FOLLOWING TYPE="LITERAL1">.</MARK_FOLLOWING>
+		<!-- IDs: -->
+		<MARK_FOLLOWING TYPE="LITERAL2">#</MARK_FOLLOWING>
+
+		<SEQ TYPE="OPERATOR">&gt;</SEQ>
+
+		<!-- TODO: selectors, see http://www.w3.org/TR/REC-CSS2/selector.html -->
+
+		<SEQ DELEGATE="PSEUDO" TYPE="OPERATOR">:</SEQ>
+		<SEQ TYPE="OPERATOR">,</SEQ>
+
+		<!-- property blocks: -->
+		<SPAN DELEGATE="PROPERTIES" TYPE="OPERATOR">
+			<BEGIN>{</BEGIN>
+			<END>}</END>
+		</SPAN>
+
+		<IMPORT DELEGATE="GLOBAL" />
+		<IMPORT DELEGATE="html::TAGS" />
+	</RULES>
+
+
+	<!-- Pseudo classes like ":active" -->
+	<RULES SET="PSEUDO">
+		<!-- Delegate back: -->
+		<SEQ DELEGATE="MAIN" TYPE="NULL"> </SEQ>
+		<SEQ DELEGATE="MAIN" TYPE="OPERATOR">,</SEQ>
+
+		<SEQ DELEGATE="PROPERTIES" TYPE="OPERATOR">{</SEQ>
+
+		<SPAN_REGEXP HASH_CHAR="lang" TYPE="KEYWORD4">
+			<BEGIN>lang\s*\(</BEGIN>
+			<END>)</END>
+		</SPAN_REGEXP>
+
+		<SPAN_REGEXP HASH_CHAR="lang" TYPE="KEYWORD4">
+			<BEGIN>lang\s*\(</BEGIN>
+			<END>)</END>
+		</SPAN_REGEXP>
+
+		<!-- For delegating to PROPERTIES: -->
+		<IMPORT DELEGATE="GLOBAL" />
+
+		<KEYWORDS>
+			<KEYWORD4>after</KEYWORD4>
+			<KEYWORD4>before</KEYWORD4>
+			<KEYWORD4>first-childList</KEYWORD4>
+			<KEYWORD4>last-childList</KEYWORD4>
+			<KEYWORD4>link</KEYWORD4>
+			<KEYWORD4>visited</KEYWORD4>
+			<KEYWORD4>active</KEYWORD4>
+			<KEYWORD4>hover</KEYWORD4>
+			<KEYWORD4>focus</KEYWORD4>
+		</KEYWORDS>
+	</RULES>
+
+	<!-- Properties: -->
+	<RULES ESCAPE="\" SET="PROPERTIES">
+		<!-- Delegate back -->
+		<SEQ DELEGATE="MAIN" TYPE="OPERATOR">}</SEQ>
+
+		<SEQ DELEGATE="PROP_VALUE" TYPE="OPERATOR">:</SEQ>
+
+		<IMPORT DELEGATE="GLOBAL" />
+
+		<KEYWORDS>
+			<!-- CSS2 & 3 properties -->
+
+			<!-- Color and background properties -->
+			<KEYWORD2>background</KEYWORD2>
+			<KEYWORD2>background-attachment</KEYWORD2>
+			<KEYWORD2>background-color</KEYWORD2>
+			<KEYWORD2>background-image</KEYWORD2>
+			<KEYWORD2>background-position</KEYWORD2>
+			<KEYWORD2>background-repeat</KEYWORD2>
+			<KEYWORD2>background-origin</KEYWORD2>
+			<KEYWORD2>background-clip</KEYWORD2>
+			<KEYWORD2>background-size</KEYWORD2>
+			<KEYWORD2>color</KEYWORD2>
+			<KEYWORD2>opacity</KEYWORD2>
+			<KEYWORD2>rendering-intent</KEYWORD2>
+
+			<!-- Font properties -->
+			<KEYWORD2>font</KEYWORD2>
+			<KEYWORD2>font-family</KEYWORD2>
+			<KEYWORD2>font-size</KEYWORD2>
+			<KEYWORD2>font-style</KEYWORD2>
+			<KEYWORD2>font-variant</KEYWORD2>
+			<KEYWORD2>font-weight</KEYWORD2>
+			<KEYWORD2>font-stretch</KEYWORD2>
+			<KEYWORD2>src</KEYWORD2>
+			<KEYWORD2>definition-src</KEYWORD2>
+			<KEYWORD2>unicode-range</KEYWORD2>
+			<KEYWORD2>panose-1</KEYWORD2>
+			<KEYWORD2>stemv</KEYWORD2>
+			<KEYWORD2>stemh</KEYWORD2>
+			<KEYWORD2>units-per-em</KEYWORD2>
+			<KEYWORD2>slope</KEYWORD2>
+			<KEYWORD2>cap-height</KEYWORD2>
+			<KEYWORD2>x-height</KEYWORD2>
+			<KEYWORD2>ascent</KEYWORD2>
+			<KEYWORD2>descent</KEYWORD2>
+			<KEYWORD2>baseline</KEYWORD2>
+			<KEYWORD2>centerline</KEYWORD2>
+			<KEYWORD2>mathline</KEYWORD2>
+			<KEYWORD2>topline</KEYWORD2>
+
+			<!-- Text properties -->
+			<KEYWORD2>letter-spacing</KEYWORD2>
+			<KEYWORD2>text-align</KEYWORD2>
+			<KEYWORD2>text-shadow</KEYWORD2>
+			<KEYWORD2>text-decoration</KEYWORD2>
+			<KEYWORD2>text-indent</KEYWORD2>
+			<KEYWORD2>text-justify</KEYWORD2>
+			<KEYWORD2>text-overflow</KEYWORD2>
+			<KEYWORD2>text-transform</KEYWORD2>
+			<KEYWORD2>word-break</KEYWORD2>
+			<KEYWORD2>word-spacing</KEYWORD2>
+			<KEYWORD2>word-wrap</KEYWORD2>
+			<KEYWORD2>letter-spacing</KEYWORD2>
+			<KEYWORD2>white-space</KEYWORD2>
+
+			<!-- Box properties -->
+			<KEYWORD2>border</KEYWORD2>
+			<KEYWORD2>bottom</KEYWORD2>
+			<KEYWORD2>border</KEYWORD2>
+			<KEYWORD2>border-bottom</KEYWORD2>
+			<KEYWORD2>border-bottom-color</KEYWORD2>
+			<KEYWORD2>border-bottom-style</KEYWORD2>
+			<KEYWORD2>border-bottom-width</KEYWORD2>
+			<KEYWORD2>border-collapse</KEYWORD2>
+			<KEYWORD2>border-color</KEYWORD2>
+			<KEYWORD2>border-left</KEYWORD2>
+			<KEYWORD2>border-left-color</KEYWORD2>
+			<KEYWORD2>border-left-style</KEYWORD2>
+			<KEYWORD2>border-left-width</KEYWORD2>
+			<KEYWORD2>border-right</KEYWORD2>
+			<KEYWORD2>border-right-color</KEYWORD2>
+			<KEYWORD2>border-right-style</KEYWORD2>
+			<KEYWORD2>border-right-width</KEYWORD2>
+			<KEYWORD2>border-spacing</KEYWORD2>
+			<KEYWORD2>border-style</KEYWORD2>
+			<KEYWORD2>border-top</KEYWORD2>
+			<KEYWORD2>border-top-color</KEYWORD2>
+			<KEYWORD2>border-top-style</KEYWORD2>
+			<KEYWORD2>border-top-width</KEYWORD2>
+			<KEYWORD2>border-width</KEYWORD2>
+			<KEYWORD2>border-bottom-left-radius</KEYWORD2>
+			<KEYWORD2>border-bottom-right-radius</KEYWORD2>
+			<KEYWORD2>border-radius</KEYWORD2>
+			<KEYWORD2>border-top-left-radius</KEYWORD2>
+			<KEYWORD2>border-top-right-radius</KEYWORD2>
+			<KEYWORD2>box-align</KEYWORD2>
+			<KEYWORD2>box-direction</KEYWORD2>
+			<KEYWORD2>box-flex</KEYWORD2>
+			<KEYWORD2>box-ordinal-group</KEYWORD2>
+			<KEYWORD2>box-orient</KEYWORD2>
+			<KEYWORD2>box-pack</KEYWORD2>
+			<KEYWORD2>box-sizing</KEYWORD2>
+			<KEYWORD2>box-shadow</KEYWORD2>
+			<KEYWORD2>clear</KEYWORD2>
+			<KEYWORD2>float</KEYWORD2>
+			<KEYWORD2>height</KEYWORD2>
+			<KEYWORD2>margin</KEYWORD2>
+			<KEYWORD2>margin-bottom</KEYWORD2>
+			<KEYWORD2>margin-left</KEYWORD2>
+			<KEYWORD2>margin-right</KEYWORD2>
+			<KEYWORD2>margin-top</KEYWORD2>
+			<KEYWORD2>padding</KEYWORD2>
+			<KEYWORD2>padding-bottom</KEYWORD2>
+			<KEYWORD2>padding-left</KEYWORD2>
+			<KEYWORD2>padding-right</KEYWORD2>
+			<KEYWORD2>padding-top</KEYWORD2>
+			
+			<KEYWORD2>column-count</KEYWORD2>
+			<KEYWORD2>column-fill</KEYWORD2>
+			<KEYWORD2>column-gap</KEYWORD2>
+			<KEYWORD2>column-rule</KEYWORD2>
+			<KEYWORD2>column-rule-color</KEYWORD2>
+			<KEYWORD2>column-rule-style</KEYWORD2>
+			<KEYWORD2>column-rule-width</KEYWORD2>
+			<KEYWORD2>column-span</KEYWORD2>
+			<KEYWORD2>column-width</KEYWORD2>
+			<KEYWORD2>columns</KEYWORD2>
+			
+			<KEYWORD2>handing-punctuation</KEYWORD2>
+			
+			
+
+			<!-- Visual formatting properties -->
+			<KEYWORD2>display</KEYWORD2>
+			<KEYWORD2>position</KEYWORD2>
+			<KEYWORD2>top</KEYWORD2>
+			<KEYWORD2>right</KEYWORD2>
+			<KEYWORD2>bottom</KEYWORD2>
+			<KEYWORD2>left</KEYWORD2>
+			<KEYWORD2>float</KEYWORD2>
+			<KEYWORD2>z-index</KEYWORD2>
+			<KEYWORD2>direction</KEYWORD2>
+			<KEYWORD2>unicode-bidi</KEYWORD2>
+			<KEYWORD2>width</KEYWORD2>
+			<KEYWORD2>min-width</KEYWORD2>
+			<KEYWORD2>max-width</KEYWORD2>
+			<KEYWORD2>height</KEYWORD2>
+			<KEYWORD2>min-height</KEYWORD2>
+			<KEYWORD2>max-height</KEYWORD2>
+			<KEYWORD2>line-height</KEYWORD2>
+			<KEYWORD2>vertical-align</KEYWORD2>
+
+			<!-- Visual effects -->
+			<KEYWORD2>overflow</KEYWORD2>
+			<KEYWORD2>overflow-x</KEYWORD2>
+			<KEYWORD2>overflow-y</KEYWORD2>
+			<KEYWORD2>clip</KEYWORD2>
+			<KEYWORD2>visibility</KEYWORD2>
+			<KEYWORD2>perspective</KEYWORD2>
+			<KEYWORD2>perspective-origin</KEYWORD2>
+			<KEYWORD2>transform</KEYWORD2>
+			<KEYWORD2>transform-origin</KEYWORD2>
+			<KEYWORD2>transform-style</KEYWORD2>
+			<KEYWORD2>transition</KEYWORD2>
+			<KEYWORD2>transition-property</KEYWORD2>
+			<KEYWORD2>transition-duration</KEYWORD2>
+			<KEYWORD2>transition-timing-function</KEYWORD2>
+			<KEYWORD2>transition-delay</KEYWORD2>
+
+			<!-- Page properties -->
+			<KEYWORD2>page-break-before</KEYWORD2>
+			<KEYWORD2>page-break-after</KEYWORD2>
+			<KEYWORD2>page-break-inside</KEYWORD2>
+			<KEYWORD2>orphans</KEYWORD2>
+			<KEYWORD2>widows</KEYWORD2>
+
+			<!-- Table properties -->
+			<KEYWORD2>caption-side</KEYWORD2>
+			<KEYWORD2>table-layout</KEYWORD2>
+			<KEYWORD2>border-collapse</KEYWORD2>
+			<KEYWORD2>border-spacing</KEYWORD2>
+			<KEYWORD2>empty-cells</KEYWORD2>
+			<KEYWORD2>speak-headers</KEYWORD2>
+
+			<!-- User interface -->
+			<KEYWORD2>cursor</KEYWORD2>
+			<KEYWORD2>outline</KEYWORD2>
+			<KEYWORD2>outline-width</KEYWORD2>
+			<KEYWORD2>outline-style</KEYWORD2>
+			<KEYWORD2>outline-color</KEYWORD2>
+			<KEYWORD2>outline-offset</KEYWORD2>
+
+			<!-- Aural properties -->
+			<KEYWORD2>azimuth</KEYWORD2>
+			<KEYWORD2>volume</KEYWORD2>
+			<KEYWORD2>speak</KEYWORD2>
+			<KEYWORD2>pause</KEYWORD2>
+			<KEYWORD2>pause-before</KEYWORD2>
+			<KEYWORD2>pause-after</KEYWORD2>
+			<KEYWORD2>cue</KEYWORD2>
+			<KEYWORD2>cue-before</KEYWORD2>
+			<KEYWORD2>cue-after</KEYWORD2>
+			<KEYWORD2>play-during</KEYWORD2>
+			<KEYWORD2>elevation</KEYWORD2>
+			<KEYWORD2>speech-rate</KEYWORD2>
+			<KEYWORD2>voice-family</KEYWORD2>
+			<KEYWORD2>pitch</KEYWORD2>
+			<KEYWORD2>pitch-range</KEYWORD2>
+			<KEYWORD2>stress</KEYWORD2>
+			<KEYWORD2>richness</KEYWORD2>
+			<KEYWORD2>speak-punctuation</KEYWORD2>
+			<KEYWORD2>speak-numeral</KEYWORD2>
+			<KEYWORD2>speak-header-cell</KEYWORD2>
+			
+			<KEYWORD2>animation</KEYWORD2>
+			<KEYWORD2>animation-name</KEYWORD2>
+			<KEYWORD2>animation-duration</KEYWORD2>
+			<KEYWORD2>animation-timing-function</KEYWORD2>
+			<KEYWORD2>animation-delay</KEYWORD2>
+			<KEYWORD2>animation-iteration-count</KEYWORD2>
+			<KEYWORD2>animation-direction</KEYWORD2>
+			<KEYWORD2>animation-play-state</KEYWORD2>
+			
+			<KEYWORD2>appearance</KEYWORD2>
+			
+			<!-- these properties are proposed for css3, but are either not
+			supported by any browser or are specific to a single browser. -->
+			<INVALID>alignment-adjust</INVALID> 					
+			<INVALID>alignment-baseline</INVALID>			
+			<INVALID>backface-visibility</INVALID> 					
+			<INVALID>baseline-shift</INVALID> 					
+			<INVALID>bookmark-label</INVALID> 					
+			<INVALID>bookmark-level</INVALID> 					
+			<INVALID>bookmark-target</INVALID>	
+			<INVALID>border-image</INVALID> 					
+			<INVALID>border-image-outset</INVALID> 					
+			<INVALID>border-image-repeat</INVALID> 					
+			<INVALID>border-image-slice</INVALID> 					
+			<INVALID>border-image-code</INVALID>
+			<INVALID>border-image-width</INVALID>
+			<INVALID>box-decoration-break</INVALID>
+			<INVALID>box-flex-group</INVALID> 					
+			<INVALID>box-lines</INVALID>
+			<INVALID>color-profile</INVALID> 					
+			<INVALID>column-fill</INVALID>
+			<INVALID>crop</INVALID> 					
+			<INVALID>dominant-baseline</INVALID> 					
+			<INVALID>drop-initial-after-adjust</INVALID> 					
+			<INVALID>drop-initial-after-align</INVALID> 					
+			<INVALID>drop-initial-before-adjust</INVALID> 					
+			<INVALID>drop-initial-before-align</INVALID> 					
+			<INVALID>drop-initial-size</INVALID> 					
+			<INVALID>drop-initial-value</INVALID> 					
+			<INVALID>fit</INVALID> 					
+			<INVALID>fit-position</INVALID> 					
+			<INVALID>float-offset</INVALID>
+			<INVALID>font-stretch</INVALID> 					
+			<INVALID>font-size-adjust</INVALID> 					
+			<INVALID>grid-columns</INVALID> 					
+			<INVALID>grid-rows</INVALID> 					
+			<INVALID>hanging-punctuation</INVALID> 					
+			<INVALID>hyphenate-after</INVALID> 					
+			<INVALID>hyphenate-before</INVALID> 					
+			<INVALID>hyphenate-characters</INVALID> 					
+			<INVALID>hyphenate-lines</INVALID> 					
+			<INVALID>hyphenate-resource</INVALID> 					
+			<INVALID>hyphens</INVALID> 					
+			<INVALID>icon</INVALID> 					
+			<INVALID>image-orientation</INVALID> 					
+			<INVALID>image-resolution</INVALID>
+			<INVALID>inline-box-align</INVALID> 					
+			<INVALID>line-stacking</INVALID> 					
+			<INVALID>line-stacking-ruby</INVALID> 					
+			<INVALID>line-stacking-shift</INVALID> 					
+			<INVALID>line-stacking-strategy</INVALID> 					
+			<INVALID>mark</INVALID> 					
+			<INVALID>mark-after</INVALID> 					
+			<INVALID>mark-before</INVALID> 					
+			<INVALID>marks</INVALID> 					
+			<INVALID>marquee-direction</INVALID> 					
+			<INVALID>marquee-play-count</INVALID> 					
+			<INVALID>marquee-speed</INVALID> 					
+			<INVALID>marquee-style</INVALID> 					
+			<INVALID>move-to</INVALID>
+			<INVALID>nav-down</INVALID>
+			<INVALID>nav-index</INVALID>
+			<INVALID>nav-left</INVALID>
+			<INVALID>nav-right</INVALID>
+			<INVALID>nav-up</INVALID>
+			<INVALID>overflow-style</INVALID>
+			<INVALID>page</INVALID> 					
+			<INVALID>page-policy</INVALID>
+			<INVALID>phonemes</INVALID>
+			<INVALID>punctuation-trim</INVALID>
+			<INVALID>rest</INVALID> 					
+			<INVALID>rest-after</INVALID> 					
+			<INVALID>rest-before</INVALID> 					
+			<INVALID>rotation</INVALID> 					
+			<INVALID>rotation-point</INVALID>
+			<INVALID>ruby-align</INVALID> 					
+			<INVALID>ruby-overhang</INVALID> 					
+			<INVALID>ruby-position</INVALID> 					
+			<INVALID>ruby-span</INVALID> 					
+			<INVALID>size</INVALID> 					
+			<INVALID>string-set</INVALID> 					
+			<INVALID>target</INVALID> 					
+			<INVALID>target-name</INVALID> 					
+			<INVALID>target-new</INVALID> 					
+			<INVALID>target-position</INVALID> 					
+			<INVALID>text-align-last</INVALID> 					
+			<INVALID>text-emphasis</INVALID> 					
+			<INVALID>text-height</INVALID>
+			<INVALID>text-outline</INVALID>
+			<INVALID>text-wrap</INVALID>
+			<INVALID>voice-balance</INVALID> 					
+			<INVALID>voice-duration</INVALID> 					
+			<INVALID>voice-pitch</INVALID> 					
+			<INVALID>voice-pitch-range</INVALID> 					
+			<INVALID>voice-rate</INVALID> 					
+			<INVALID>voice-stress</INVALID> 					
+			<INVALID>voice-volume</INVALID>
+
+		</KEYWORDS>
+	</RULES>
+
+
+	<!-- Values: -->
+	<RULES DIGIT_RE="-?\d+(\.\d+)?(pt|pc|in|mm|cm|em|ex|px|ms|s|%|)"
+		HIGHLIGHT_DIGITS="TRUE"
+		NO_WORD_SEP="-_%"
+		SET="PROP_VALUE">
+
+		<SPAN_REGEXP ESCAPE="\" HASH_CHARS="&quot;'" TYPE="LITERAL1">
+			<BEGIN>(["'])</BEGIN>
+			<END>$1</END>
+		</SPAN_REGEXP>
+
+		<!-- "functions" -->
+
+		<!-- url without quotes -->
+		<SPAN_REGEXP ESCAPE="\" HASH_CHAR="url(" MATCH_TYPE="KEYWORD1" TYPE="LITERAL1">
+			<BEGIN>url\((?=\s*[^"'])</BEGIN>
+			<END>)</END>
+		</SPAN_REGEXP>
+
+		<!-- proprietary IE function: -->
+		<SPAN_REGEXP DELEGATE="javascript::MAIN" HASH_CHAR="expression" TYPE="FUNCTION">
+			<BEGIN>expression\s*\(</BEGIN>
+			<END>)</END>
+		</SPAN_REGEXP>
+
+		<!-- all other functions -->
+		<SPAN_REGEXP DELEGATE="PROP_VALUE" TYPE="KEYWORD1">
+			<BEGIN>[\w-]+\(</BEGIN>
+			<END>)</END>
+		</SPAN_REGEXP>
+
+		<MARK_FOLLOWING TYPE="DIGIT">#</MARK_FOLLOWING>
+
+		<SEQ_REGEXP HASH_CHAR="!" TYPE="KEYWORD2">!\s*important</SEQ_REGEXP>
+
+		<!-- Delegate back: -->
+		<SEQ DELEGATE="PROPERTIES" TYPE="OPERATOR">;</SEQ>
+		<SEQ DELEGATE="MAIN" TYPE="INVALID">}</SEQ> <!-- end properties block, but it's invalid -->
+
+		<IMPORT DELEGATE="GLOBAL" />
+
+		<KEYWORDS>
+            <KEYWORD3>above</KEYWORD3>
+            <KEYWORD3>absolute</KEYWORD3>
+            <KEYWORD3>absolute-colorimetric</KEYWORD3>
+            <KEYWORD3>adjacent</KEYWORD3>
+            <KEYWORD3>after</KEYWORD3>
+            <KEYWORD3>after-edge</KEYWORD3>
+            <KEYWORD3>all</KEYWORD3>
+            <KEYWORD3>allow-end</KEYWORD3>
+            <KEYWORD3>alphabetic</KEYWORD3>
+            <KEYWORD3>alphabetical</KEYWORD3>
+            <KEYWORD3>alternate</KEYWORD3>
+            <KEYWORD3>always</KEYWORD3>
+            <KEYWORD3>armenian</KEYWORD3>
+            <KEYWORD3>attr</KEYWORD3>
+            <KEYWORD3>auto</KEYWORD3>
+            <KEYWORD3>avoid</KEYWORD3>
+            <KEYWORD3>back</KEYWORD3>
+            <KEYWORD3>balance</KEYWORD3>
+            <KEYWORD3>baseline</KEYWORD3>
+            <KEYWORD3>before</KEYWORD3>
+            <KEYWORD3>before-edge</KEYWORD3>
+            <KEYWORD3>behind</KEYWORD3>
+            <KEYWORD3>bidi-override</KEYWORD3>
+            <KEYWORD3>blink</KEYWORD3>
+            <KEYWORD3>block</KEYWORD3>
+            <KEYWORD3>block-axis</KEYWORD3>
+            <KEYWORD3>block-line-height</KEYWORD3>
+            <KEYWORD3>blur</KEYWORD3>
+            <KEYWORD3>bold</KEYWORD3>
+            <KEYWORD3>bolder</KEYWORD3>
+            <KEYWORD3>border-box</KEYWORD3>
+            <KEYWORD3>border-box </KEYWORD3>
+            <KEYWORD3>both</KEYWORD3>
+            <KEYWORD3>bottom</KEYWORD3>
+            <KEYWORD3>break-all</KEYWORD3>
+            <KEYWORD3>break-word</KEYWORD3>
+            <KEYWORD3>button</KEYWORD3>
+            <KEYWORD3>capitalize</KEYWORD3>
+            <KEYWORD3>caps-height</KEYWORD3>
+            <KEYWORD3>caption</KEYWORD3>
+            <KEYWORD3>center</KEYWORD3>
+            <KEYWORD3>center bottom</KEYWORD3>
+            <KEYWORD3>center center</KEYWORD3>
+            <KEYWORD3>center top</KEYWORD3>
+            <KEYWORD3>central</KEYWORD3>
+            <KEYWORD3>circle</KEYWORD3>
+            <KEYWORD3>clip</KEYWORD3>
+            <KEYWORD3>close-quote</KEYWORD3>
+            <KEYWORD3>collapse</KEYWORD3>
+            <KEYWORD3>color</KEYWORD3>
+            <KEYWORD3>condensed</KEYWORD3>
+            <KEYWORD3>consider-shifts</KEYWORD3>
+            <KEYWORD3>contain</KEYWORD3>
+            <KEYWORD3>content</KEYWORD3>
+            <KEYWORD3>content-box</KEYWORD3>
+            <KEYWORD3>counter</KEYWORD3>
+            <KEYWORD3>cover</KEYWORD3>
+            <KEYWORD3>crop</KEYWORD3>
+            <KEYWORD3>cross</KEYWORD3>
+            <KEYWORD3>crosshair</KEYWORD3>
+            <KEYWORD3>cubic-bezier</KEYWORD3>
+            <KEYWORD3>current</KEYWORD3>
+            <KEYWORD3>cursive</KEYWORD3>
+            <KEYWORD3>dashed</KEYWORD3>
+            <KEYWORD3>decimal</KEYWORD3>
+            <KEYWORD3>decimal-leading-zero</KEYWORD3>
+            <KEYWORD3>default</KEYWORD3>
+            <KEYWORD3>disc</KEYWORD3>
+            <KEYWORD3>disregard-shifts</KEYWORD3>
+            <KEYWORD3>distribute</KEYWORD3>
+            <KEYWORD3>distribute-letter</KEYWORD3>
+            <KEYWORD3>distribute-space</KEYWORD3>
+            <KEYWORD3>dotted</KEYWORD3>
+            <KEYWORD3>double</KEYWORD3>
+            <KEYWORD3>resize</KEYWORD3>
+            <KEYWORD3>e-resize</KEYWORD3>
+            <KEYWORD3>ease</KEYWORD3>
+            <KEYWORD3>ease-in</KEYWORD3>
+            <KEYWORD3>ease-in-out</KEYWORD3>
+            <KEYWORD3>ease-out</KEYWORD3>
+            <KEYWORD3>ellipsis</KEYWORD3>
+            <KEYWORD3>embed</KEYWORD3>
+            <KEYWORD3>end</KEYWORD3>
+            <KEYWORD3>end-edge</KEYWORD3>
+            <KEYWORD3>exclude-ruby</KEYWORD3>
+            <KEYWORD3>extra-condensed</KEYWORD3>
+            <KEYWORD3>extra-expanded</KEYWORD3>
+            <KEYWORD3>family-name</KEYWORD3>
+            <KEYWORD3>fantasy</KEYWORD3>
+            <KEYWORD3>fast</KEYWORD3>
+            <KEYWORD3>field</KEYWORD3>
+            <KEYWORD3>fill</KEYWORD3>
+            <KEYWORD3>first</KEYWORD3>
+            <KEYWORD3>fixed</KEYWORD3>
+            <KEYWORD3>flat</KEYWORD3>
+            <KEYWORD3>font-family</KEYWORD3>
+            <KEYWORD3>font-size</KEYWORD3>
+            <KEYWORD3>forward</KEYWORD3>
+            <KEYWORD3>front</KEYWORD3>
+            <KEYWORD3>georgian</KEYWORD3>
+            <KEYWORD3>grid-height</KEYWORD3>
+            <KEYWORD3>groove</KEYWORD3>
+            <KEYWORD3>h-shadow</KEYWORD3>
+            <KEYWORD3>hanging</KEYWORD3>
+            <KEYWORD3>help</KEYWORD3>
+            <KEYWORD3>here</KEYWORD3>
+            <KEYWORD3>hidden</KEYWORD3>
+            <KEYWORD3>hide</KEYWORD3>
+            <KEYWORD3>high</KEYWORD3>
+            <KEYWORD3>horizontal</KEYWORD3>
+            <KEYWORD3>hyphenate</KEYWORD3>
+            <KEYWORD3>icon</KEYWORD3>
+            <KEYWORD3>ideographic</KEYWORD3>
+            <KEYWORD3>include-ruby</KEYWORD3>
+            <KEYWORD3>infinite</KEYWORD3>
+            <KEYWORD3>inherit</KEYWORD3>
+            <KEYWORD3>initial</KEYWORD3>
+            <KEYWORD3>inline</KEYWORD3>
+            <KEYWORD3>inline-axis</KEYWORD3>
+            <KEYWORD3>inline-block</KEYWORD3>
+            <KEYWORD3>inline-line-height</KEYWORD3>
+            <KEYWORD3>inline-table</KEYWORD3>
+            <KEYWORD3>inset</KEYWORD3>
+            <KEYWORD3>inside</KEYWORD3>
+            <KEYWORD3>integer</KEYWORD3>
+            <KEYWORD3>inter-cluster</KEYWORD3>
+            <KEYWORD3>inter-ideograph</KEYWORD3>
+            <KEYWORD3>inter-word</KEYWORD3>
+            <KEYWORD3>italic</KEYWORD3>
+            <KEYWORD3>justify</KEYWORD3>
+            <KEYWORD3>kashida</KEYWORD3>
+            <KEYWORD3>landscape</KEYWORD3>
+            <KEYWORD3>large</KEYWORD3>
+            <KEYWORD3>larger</KEYWORD3>
+            <KEYWORD3>last</KEYWORD3>
+            <KEYWORD3>left</KEYWORD3>
+            <KEYWORD3>left bottom</KEYWORD3>
+            <KEYWORD3>left center</KEYWORD3>
+            <KEYWORD3>left top</KEYWORD3>
+            <KEYWORD3>leftwards</KEYWORD3>
+            <KEYWORD3>length</KEYWORD3>
+            <KEYWORD3>lighter</KEYWORD3>
+            <KEYWORD3>line-edge</KEYWORD3>
+            <KEYWORD3>line-through</KEYWORD3>
+            <KEYWORD3>linear</KEYWORD3>
+            <KEYWORD3>list-item</KEYWORD3>
+            <KEYWORD3>loud</KEYWORD3>
+            <KEYWORD3>low</KEYWORD3>
+            <KEYWORD3>lower-alpha</KEYWORD3>
+            <KEYWORD3>lower-greek</KEYWORD3>
+            <KEYWORD3>lower-latin</KEYWORD3>
+            <KEYWORD3>lower-roman</KEYWORD3>
+            <KEYWORD3>lowercase</KEYWORD3>
+            <KEYWORD3>ltr</KEYWORD3>
+            <KEYWORD3>manual</KEYWORD3>
+            <KEYWORD3>mathematical</KEYWORD3>
+            <KEYWORD3>max-height</KEYWORD3>
+            <KEYWORD3>max-size</KEYWORD3>
+            <KEYWORD3>medium</KEYWORD3>
+            <KEYWORD3>meet</KEYWORD3>
+            <KEYWORD3>menu</KEYWORD3>
+            <KEYWORD3>message-box</KEYWORD3>
+            <KEYWORD3>middle</KEYWORD3>
+            <KEYWORD3>modal</KEYWORD3>
+            <KEYWORD3>moderate</KEYWORD3>
+            <KEYWORD3>monospace</KEYWORD3>
+            <KEYWORD3>move</KEYWORD3>
+            <KEYWORD3>multiple</KEYWORD3>
+            <KEYWORD3>n-resize</KEYWORD3>
+            <KEYWORD3>name</KEYWORD3>
+            <KEYWORD3>narrower</KEYWORD3>
+            <KEYWORD3>ne-resize</KEYWORD3>
+            <KEYWORD3>new</KEYWORD3>
+            <KEYWORD3>no-change</KEYWORD3>
+            <KEYWORD3>no-close-quote</KEYWORD3>
+            <KEYWORD3>no-content</KEYWORD3>
+            <KEYWORD3>no-display</KEYWORD3>
+            <KEYWORD3>no-limit</KEYWORD3>
+            <KEYWORD3>no-open-quote</KEYWORD3>
+            <KEYWORD3>no-repeat</KEYWORD3>
+            <KEYWORD3>none</KEYWORD3>
+            <KEYWORD3>normal</KEYWORD3>
+            <KEYWORD3>nowrap</KEYWORD3>
+            <KEYWORD3>nw-resize</KEYWORD3>
+            <KEYWORD3>oblique</KEYWORD3>
+            <KEYWORD3>open-quote</KEYWORD3>
+            <KEYWORD3>outset</KEYWORD3>
+            <KEYWORD3>outside</KEYWORD3>
+            <KEYWORD3>overline</KEYWORD3>
+            <KEYWORD3>padding-box</KEYWORD3>
+            <KEYWORD3>page-size</KEYWORD3>
+            <KEYWORD3>parent</KEYWORD3>
+            <KEYWORD3>paused</KEYWORD3>
+            <KEYWORD3>percentage</KEYWORD3>
+            <KEYWORD3>perceptual</KEYWORD3>
+            <KEYWORD3>pointer</KEYWORD3>
+            <KEYWORD3>portrait</KEYWORD3>
+            <KEYWORD3>pre</KEYWORD3>
+            <KEYWORD3>pre-line</KEYWORD3>
+            <KEYWORD3>pre-wrap</KEYWORD3>
+            <KEYWORD3>preserve-3d</KEYWORD3>
+            <KEYWORD3>progress</KEYWORD3>
+            <KEYWORD3>reduced</KEYWORD3>
+            <KEYWORD3>relative</KEYWORD3>
+            <KEYWORD3>relative-colorimetric</KEYWORD3>
+            <KEYWORD3>repeat</KEYWORD3>
+            <KEYWORD3>repeat-x</KEYWORD3>
+            <KEYWORD3>repeat-y</KEYWORD3>
+            <KEYWORD3>reset-size</KEYWORD3>
+            <KEYWORD3>reverse</KEYWORD3>
+            <KEYWORD3>ridge</KEYWORD3>
+            <KEYWORD3>right</KEYWORD3>
+            <KEYWORD3>right bottom</KEYWORD3>
+            <KEYWORD3>right center</KEYWORD3>
+            <KEYWORD3>right top</KEYWORD3>
+            <KEYWORD3>rightwards</KEYWORD3>
+            <KEYWORD3>root</KEYWORD3>
+            <KEYWORD3>round</KEYWORD3>
+            <KEYWORD3>rtl</KEYWORD3>
+            <KEYWORD3>run-in</KEYWORD3>
+            <KEYWORD3>running</KEYWORD3>
+            <KEYWORD3>s-resize</KEYWORD3>
+            <KEYWORD3>sans-serif</KEYWORD3>
+            <KEYWORD3>saturation</KEYWORD3>
+            <KEYWORD3>scroll</KEYWORD3>
+            <KEYWORD3>se-resize</KEYWORD3>
+            <KEYWORD3>self</KEYWORD3>
+            <KEYWORD3>semi-condensed</KEYWORD3>
+            <KEYWORD3>semi-expanded</KEYWORD3>
+            <KEYWORD3>separate</KEYWORD3>
+            <KEYWORD3>serif</KEYWORD3>
+            <KEYWORD3>shape</KEYWORD3>
+            <KEYWORD3>show</KEYWORD3>
+            <KEYWORD3>silent</KEYWORD3>
+            <KEYWORD3>single</KEYWORD3>
+            <KEYWORD3>slice</KEYWORD3>
+            <KEYWORD3>slide</KEYWORD3>
+            <KEYWORD3>slow</KEYWORD3>
+            <KEYWORD3>small</KEYWORD3>
+            <KEYWORD3>small-caps</KEYWORD3>
+            <KEYWORD3>small-caption</KEYWORD3>
+            <KEYWORD3>smaller</KEYWORD3>
+            <KEYWORD3>soft</KEYWORD3>
+            <KEYWORD3>solid</KEYWORD3>
+            <KEYWORD3>spread</KEYWORD3>
+            <KEYWORD3>square</KEYWORD3>
+            <KEYWORD3>start</KEYWORD3>
+            <KEYWORD3>static</KEYWORD3>
+            <KEYWORD3>status-bar</KEYWORD3>
+            <KEYWORD3>stretch</KEYWORD3>
+            <KEYWORD3>strong</KEYWORD3>
+            <KEYWORD3>sub</KEYWORD3>
+            <KEYWORD3>super</KEYWORD3>
+            <KEYWORD3>suppress</KEYWORD3>
+            <KEYWORD3>sw-resize</KEYWORD3>
+            <KEYWORD3>tab</KEYWORD3>
+            <KEYWORD3>table</KEYWORD3>
+            <KEYWORD3>table-caption</KEYWORD3>
+            <KEYWORD3>table-cell</KEYWORD3>
+            <KEYWORD3>table-column</KEYWORD3>
+            <KEYWORD3>table-column-group</KEYWORD3>
+            <KEYWORD3>table-footer-group</KEYWORD3>
+            <KEYWORD3>table-header-group</KEYWORD3>
+            <KEYWORD3>table-row</KEYWORD3>
+            <KEYWORD3>table-row-group</KEYWORD3>
+            <KEYWORD3>text</KEYWORD3>
+            <KEYWORD3>text-after-edge</KEYWORD3>
+            <KEYWORD3>text-before-edge</KEYWORD3>
+            <KEYWORD3>text-bottom</KEYWORD3>
+            <KEYWORD3>text-size</KEYWORD3>
+            <KEYWORD3>text-top</KEYWORD3>
+            <KEYWORD3>thick</KEYWORD3>
+            <KEYWORD3>thin</KEYWORD3>
+            <KEYWORD3>top</KEYWORD3>
+            <KEYWORD3>transparent</KEYWORD3>
+            <KEYWORD3>ultra-condensed</KEYWORD3>
+            <KEYWORD3>ultra-expanded</KEYWORD3>
+            <KEYWORD3>underline</KEYWORD3>
+            <KEYWORD3>unrestricted</KEYWORD3>
+            <KEYWORD3>upper-alpha</KEYWORD3>
+            <KEYWORD3>upper-latin</KEYWORD3>
+            <KEYWORD3>upper-roman</KEYWORD3>
+            <KEYWORD3>uppercase</KEYWORD3>
+            <KEYWORD3>url</KEYWORD3>
+            <KEYWORD3>use-script</KEYWORD3>
+            <KEYWORD3>v-shadow</KEYWORD3>
+            <KEYWORD3>vertical</KEYWORD3>
+            <KEYWORD3>visible</KEYWORD3>
+            <KEYWORD3>w-resize</KEYWORD3>
+            <KEYWORD3>wait</KEYWORD3>
+            <KEYWORD3>weak</KEYWORD3>
+            <KEYWORD3>wider</KEYWORD3>
+            <KEYWORD3>window</KEYWORD3>
+            <KEYWORD3>x-fast</KEYWORD3>
+            <KEYWORD3>x-high</KEYWORD3>
+            <KEYWORD3>x-large</KEYWORD3>
+            <KEYWORD3>x-loud</KEYWORD3>
+            <KEYWORD3>x-low</KEYWORD3>
+            <KEYWORD3>x-slow</KEYWORD3>
+            <KEYWORD3>x-small</KEYWORD3>
+            <KEYWORD3>x-soft</KEYWORD3>
+            <KEYWORD3>x-strong</KEYWORD3>
+            <KEYWORD3>x-weak</KEYWORD3>
+            <KEYWORD3>xx-large</KEYWORD3>
+            <KEYWORD3>xx-small</KEYWORD3>
+			
+            <!-- Colors -->
+            <KEYWORD4>aliceblue</KEYWORD4>
+            <KEYWORD4>antiquewhite</KEYWORD4>
+            <KEYWORD4>aqua</KEYWORD4>
+            <KEYWORD4>aquamarine</KEYWORD4>
+            <KEYWORD4>azure</KEYWORD4>
+            <KEYWORD4>beige</KEYWORD4>
+            <KEYWORD4>bisque</KEYWORD4>
+            <KEYWORD4>black</KEYWORD4>
+            <KEYWORD4>blanchedalmond</KEYWORD4>
+            <KEYWORD4>blue</KEYWORD4>
+            <KEYWORD4>blueviolet</KEYWORD4>
+            <KEYWORD4>brown</KEYWORD4>
+            <KEYWORD4>burlywood</KEYWORD4>
+            <KEYWORD4>cadetblue</KEYWORD4>
+            <KEYWORD4>chartreuse</KEYWORD4>
+            <KEYWORD4>chocolate</KEYWORD4>
+            <KEYWORD4>coral</KEYWORD4>
+            <KEYWORD4>cornflowerblue</KEYWORD4>
+            <KEYWORD4>cornsilk</KEYWORD4>
+            <KEYWORD4>crimson</KEYWORD4>
+            <KEYWORD4>cyan</KEYWORD4>
+            <KEYWORD4>darkblue</KEYWORD4>
+            <KEYWORD4>darkcyan</KEYWORD4>
+            <KEYWORD4>darkgoldenrod</KEYWORD4>
+            <KEYWORD4>darkgray</KEYWORD4>
+            <KEYWORD4>darkgreen</KEYWORD4>
+            <KEYWORD4>darkgrey</KEYWORD4>
+            <KEYWORD4>darkkhaki</KEYWORD4>
+            <KEYWORD4>darkmagenta</KEYWORD4>
+            <KEYWORD4>darkolivegreen</KEYWORD4>
+            <KEYWORD4>darkorange</KEYWORD4>
+            <KEYWORD4>darkorchid</KEYWORD4>
+            <KEYWORD4>darkred</KEYWORD4>
+            <KEYWORD4>darksalmon</KEYWORD4>
+            <KEYWORD4>darkseagreen</KEYWORD4>
+            <KEYWORD4>darkslateblue</KEYWORD4>
+            <KEYWORD4>darkslategray</KEYWORD4>
+            <KEYWORD4>darkslategrey</KEYWORD4>
+            <KEYWORD4>darkturquoise</KEYWORD4>
+            <KEYWORD4>darkviolet</KEYWORD4>
+            <KEYWORD4>deeppink</KEYWORD4>
+            <KEYWORD4>deepskyblue</KEYWORD4>
+            <KEYWORD4>dimgray</KEYWORD4>
+            <KEYWORD4>dimgrey</KEYWORD4>
+            <KEYWORD4>dodgerblue</KEYWORD4>
+            <KEYWORD4>firebrick</KEYWORD4>
+            <KEYWORD4>floralwhite</KEYWORD4>
+            <KEYWORD4>forestgreen</KEYWORD4>
+            <KEYWORD4>fuchsia</KEYWORD4>
+            <KEYWORD4>gainsboro</KEYWORD4>
+            <KEYWORD4>ghostwhite</KEYWORD4>
+            <KEYWORD4>gold</KEYWORD4>
+            <KEYWORD4>goldenrod</KEYWORD4>
+            <KEYWORD4>gray</KEYWORD4>
+            <KEYWORD4>green</KEYWORD4>
+            <KEYWORD4>greenyellow</KEYWORD4>
+            <KEYWORD4>grey</KEYWORD4>
+            <KEYWORD4>honeydew</KEYWORD4>
+            <KEYWORD4>hotpink</KEYWORD4>
+            <KEYWORD4>indianred</KEYWORD4>
+            <KEYWORD4>indigo</KEYWORD4>
+            <KEYWORD4>ivory</KEYWORD4>
+            <KEYWORD4>khaki</KEYWORD4>
+            <KEYWORD4>lavender</KEYWORD4>
+            <KEYWORD4>lavenderblush</KEYWORD4>
+            <KEYWORD4>lawngreen</KEYWORD4>
+            <KEYWORD4>lemonchiffon</KEYWORD4>
+            <KEYWORD4>lightblue</KEYWORD4>
+            <KEYWORD4>lightcoral</KEYWORD4>
+            <KEYWORD4>lightcyan</KEYWORD4>
+            <KEYWORD4>lightgoldenrodyellow</KEYWORD4>
+            <KEYWORD4>lightgray</KEYWORD4>
+            <KEYWORD4>lightgreen</KEYWORD4>
+            <KEYWORD4>lightgrey</KEYWORD4>
+            <KEYWORD4>lightpink</KEYWORD4>
+            <KEYWORD4>lightsalmon</KEYWORD4>
+            <KEYWORD4>lightseagreen</KEYWORD4>
+            <KEYWORD4>lightskyblue</KEYWORD4>
+            <KEYWORD4>lightslategray</KEYWORD4>
+            <KEYWORD4>lightslategrey</KEYWORD4>
+            <KEYWORD4>lightsteelblue</KEYWORD4>
+            <KEYWORD4>lightyellow</KEYWORD4>
+            <KEYWORD4>lime</KEYWORD4>
+            <KEYWORD4>limegreen</KEYWORD4>
+            <KEYWORD4>linen</KEYWORD4>
+            <KEYWORD4>magenta</KEYWORD4>
+            <KEYWORD4>maroon</KEYWORD4>
+            <KEYWORD4>mediumaquamarine</KEYWORD4>
+            <KEYWORD4>mediumblue</KEYWORD4>
+            <KEYWORD4>mediumorchid</KEYWORD4>
+            <KEYWORD4>mediumpurple</KEYWORD4>
+            <KEYWORD4>mediumseagreen</KEYWORD4>
+            <KEYWORD4>mediumslateblue</KEYWORD4>
+            <KEYWORD4>mediumspringgreen</KEYWORD4>
+            <KEYWORD4>mediumturquoise</KEYWORD4>
+            <KEYWORD4>mediumvioletred</KEYWORD4>
+            <KEYWORD4>midnightblue</KEYWORD4>
+            <KEYWORD4>mintcream</KEYWORD4>
+            <KEYWORD4>mistyrose</KEYWORD4>
+            <KEYWORD4>moccasin</KEYWORD4>
+            <KEYWORD4>navajowhite</KEYWORD4>
+            <KEYWORD4>navy</KEYWORD4>
+            <KEYWORD4>oldlace</KEYWORD4>
+            <KEYWORD4>olive</KEYWORD4>
+            <KEYWORD4>olivedrab</KEYWORD4>
+            <KEYWORD4>orange</KEYWORD4>
+            <KEYWORD4>orangered</KEYWORD4>
+            <KEYWORD4>orchid</KEYWORD4>
+            <KEYWORD4>palegoldenrod</KEYWORD4>
+            <KEYWORD4>palegreen</KEYWORD4>
+            <KEYWORD4>paleturquoise</KEYWORD4>
+            <KEYWORD4>palevioletred</KEYWORD4>
+            <KEYWORD4>papayawhip</KEYWORD4>
+            <KEYWORD4>peachpuff</KEYWORD4>
+            <KEYWORD4>peru</KEYWORD4>
+            <KEYWORD4>pink</KEYWORD4>
+            <KEYWORD4>plum</KEYWORD4>
+            <KEYWORD4>powderblue</KEYWORD4>
+            <KEYWORD4>purple</KEYWORD4>
+            <KEYWORD4>red</KEYWORD4>
+            <KEYWORD4>rosybrown</KEYWORD4>
+            <KEYWORD4>royalblue</KEYWORD4>
+            <KEYWORD4>saddlebrown</KEYWORD4>
+            <KEYWORD4>salmon</KEYWORD4>
+            <KEYWORD4>sandybrown</KEYWORD4>
+            <KEYWORD4>seagreen</KEYWORD4>
+            <KEYWORD4>seashell</KEYWORD4>
+            <KEYWORD4>sienna</KEYWORD4>
+            <KEYWORD4>silver</KEYWORD4>
+            <KEYWORD4>skyblue</KEYWORD4>
+            <KEYWORD4>slateblue</KEYWORD4>
+            <KEYWORD4>slategray</KEYWORD4>
+            <KEYWORD4>slategrey</KEYWORD4>
+            <KEYWORD4>snow</KEYWORD4>
+            <KEYWORD4>springgreen</KEYWORD4>
+            <KEYWORD4>steelblue</KEYWORD4>
+            <KEYWORD4>tan</KEYWORD4>
+            <KEYWORD4>teal</KEYWORD4>
+            <KEYWORD4>thistle</KEYWORD4>
+            <KEYWORD4>tomato</KEYWORD4>
+            <KEYWORD4>turquoise</KEYWORD4>
+            <KEYWORD4>violet</KEYWORD4>
+            <KEYWORD4>wheat</KEYWORD4>
+            <KEYWORD4>white</KEYWORD4>
+            <KEYWORD4>whitesmoke</KEYWORD4>
+            <KEYWORD4>yellow</KEYWORD4>
+            <KEYWORD4>yellowgreen</KEYWORD4>
+
+			<!-- "functions", here for autocomplete: -->
+			<KEYWORD1>rgb</KEYWORD1>
+			<KEYWORD1>rgba</KEYWORD1>
+			<KEYWORD1>hsl</KEYWORD1>
+			<KEYWORD1>hsla</KEYWORD1>
+			<KEYWORD1>url</KEYWORD1>
+		</KEYWORDS>
+	</RULES>
+
+
+	<RULES SET="GLOBAL">
+		<SEQ TYPE="OPERATOR">:</SEQ>
+		<SEQ TYPE="NULL">;</SEQ>
+		<SPAN ESCAPE="\" TYPE="NULL">
+			<BEGIN>(</BEGIN>
+			<END>)</END>
+		</SPAN>
+		<SEQ TYPE="OPERATOR">{</SEQ>
+		<SEQ TYPE="OPERATOR">}</SEQ>
+		<SEQ TYPE="OPERATOR">,</SEQ>
+		<SEQ TYPE="OPERATOR">.</SEQ>
+		<SEQ TYPE="OPERATOR">!</SEQ>
+
+		<SPAN TYPE="COMMENT1">
+			<BEGIN>/*</BEGIN>
+			<END>*/</END>
+		</SPAN>
+
+		<KEYWORDS>
+			<!-- Generated content, automatic listing -->
+			<KEYWORD2>content</KEYWORD2>
+			<KEYWORD2>quotes</KEYWORD2>
+			<KEYWORD2>counter-reset</KEYWORD2>
+			<KEYWORD2>counter-increment</KEYWORD2>
+			<KEYWORD2>marker-offset</KEYWORD2>
+			<KEYWORD2>list-style</KEYWORD2>
+			<KEYWORD2>list-style-image</KEYWORD2>
+			<KEYWORD2>list-style-position</KEYWORD2>
+			<KEYWORD2>list-style-type</KEYWORD2>
+
+			<KEYWORD2>@import</KEYWORD2>
+			<KEYWORD2>@media</KEYWORD2>
+			<KEYWORD2>@page</KEYWORD2>
+			<KEYWORD2>@font-face</KEYWORD2>
+		</KEYWORDS>
+	</RULES>
+
+</MODE>
+
+
diff --git a/qpython/src/main/assets/syntax/html.xml b/qpython/src/main/assets/syntax/html.xml
new file mode 100644
index 00000000..c2396393
--- /dev/null
+++ b/qpython/src/main/assets/syntax/html.xml
@@ -0,0 +1,276 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE MODE SYSTEM "xmode.dtd">
+
+<MODE>
+	<PROPS>
+		<PROPERTY NAME="commentStart" VALUE="&lt;!--" />
+		<PROPERTY NAME="commentEnd" VALUE="--&gt;" />
+	</PROPS>
+
+	<RULES IGNORE_CASE="TRUE">
+		<!-- Sfrom_contentment -->
+		<SPAN TYPE="COMMENT1">
+			<BEGIN>&lt;!--</BEGIN>
+			<END>--&gt;</END>
+		</SPAN>
+
+		<!-- JavaScript -->
+		<SPAN_REGEXP TYPE="MARKUP" DELEGATE="JAVASCRIPT" HASH_CHAR="&lt;">
+			<BEGIN>&lt;(?=SCRIPT\b)</BEGIN>
+			<END REGEXP="TRUE">(?i)(?=&lt;/SCRIPT\b)</END>
+		</SPAN_REGEXP>
+
+		<!-- stylesheet -->
+		<SPAN_REGEXP TYPE="MARKUP" DELEGATE="CSS" HASH_CHAR="&lt;">
+			<BEGIN>&lt;(?=STYLE\b)</BEGIN>
+			<END REGEXP="TRUE">(?i)(?=&lt;/STYLE\b)</END>
+		</SPAN_REGEXP>
+
+		<!-- DTD instructions -->
+		<SPAN TYPE="KEYWORD2" DELEGATE="xml::DTD-TAGS">
+			<BEGIN>&lt;!</BEGIN>
+			<END>&gt;</END>
+		</SPAN>
+
+		<!-- markup tags -->
+		<SPAN TYPE="MARKUP" DELEGATE="TAGS">
+			<BEGIN>&lt;</BEGIN>
+			<END>&gt;</END>
+		</SPAN>
+
+		<!-- SGML character entities -->
+		<IMPORT DELEGATE="CHARACTER_ENTITIES" />
+	</RULES>
+
+	<RULES SET="TAGS" DEFAULT="MARKUP">
+		<!-- Inline CSS -->
+ 		<SPAN_REGEXP AT_WORD_START="TRUE" TYPE="MARKUP" DELEGATE="css::PROPERTIES" HASH_CHAR="style">
+			<BEGIN>style\s*=\s*(["'])</BEGIN>
+			<END>$1</END>
+		</SPAN_REGEXP>
+
+		<!-- Javascript: delegate on* attributes to Javascript mode -->
+ 		<SPAN_REGEXP AT_WORD_START="TRUE" DELEGATE="javascript::MAIN" HASH_CHAR="on" TYPE="MARKUP">
+			<BEGIN>on[a-z]+\s*=\s*(["'])</BEGIN>
+			<END>$1</END>
+		</SPAN_REGEXP>
+
+		<!-- NOTE: no ESCAPE for quotes, at least for attributes; e.g onclick="alert(\"foo\");" is invalid! -->
+		<SPAN TYPE="LITERAL1" DELEGATE="ATTRIBUTE">
+			<BEGIN>"</BEGIN>
+			<END>"</END>
+		</SPAN>
+		<SPAN TYPE="LITERAL1" DELEGATE="ATTRIBUTE">
+			<BEGIN>'</BEGIN>
+			<END>'</END>
+		</SPAN>
+
+		<SEQ TYPE="OPERATOR">=</SEQ>
+
+		<KEYWORDS>
+			<!-- HTML/XHTML elements, taken from http://de.selfhtml.org/html/referenz/elemente.htm -->
+			<!-- updated to include html5 elements. Obsolete and deprecated elements
+			are still here for backward compatibility. -->
+			<KEYWORD1>a</KEYWORD1>
+			<KEYWORD1>abbr</KEYWORD1>
+			<KEYWORD1>acronym</KEYWORD1>
+			<KEYWORD1>address</KEYWORD1>
+			<KEYWORD1>applet</KEYWORD1>
+			<KEYWORD1>area</KEYWORD1>
+			<KEYWORD1>article</KEYWORD1>
+			<KEYWORD1>aside</KEYWORD1>
+			<KEYWORD1>audio</KEYWORD1>
+			<KEYWORD1>b</KEYWORD1>
+			<KEYWORD1>base</KEYWORD1>
+			<KEYWORD1>basefont</KEYWORD1>
+			<KEYWORD1>bdi</KEYWORD1>
+			<KEYWORD1>bdo</KEYWORD1>
+			<KEYWORD1>big</KEYWORD1>
+			<KEYWORD1>blockquote</KEYWORD1>
+			<KEYWORD1>body</KEYWORD1>
+			<KEYWORD1>br</KEYWORD1>
+			<KEYWORD1>button</KEYWORD1>
+			<KEYWORD1>canvas</KEYWORD1>
+			<KEYWORD1>caption</KEYWORD1>
+			<KEYWORD1>center</KEYWORD1>
+			<KEYWORD1>cite</KEYWORD1>
+			<KEYWORD1>code</KEYWORD1>
+			<KEYWORD1>col</KEYWORD1>
+			<KEYWORD1>colgroup</KEYWORD1>
+			<KEYWORD1>command</KEYWORD1>
+			<KEYWORD1>data</KEYWORD1>
+			<KEYWORD1>datalist</KEYWORD1>
+			<KEYWORD1>dd</KEYWORD1>
+			<KEYWORD1>del</KEYWORD1>
+			<KEYWORD1>details</KEYWORD1>
+			<KEYWORD1>dfn</KEYWORD1>
+			<KEYWORD1>dir</KEYWORD1>
+			<KEYWORD1>div</KEYWORD1>
+			<KEYWORD1>dl</KEYWORD1>
+			<KEYWORD1>dt</KEYWORD1>
+			<KEYWORD1>em</KEYWORD1>
+			<KEYWORD1>embed</KEYWORD1>
+			<KEYWORD1>fieldset</KEYWORD1>
+			<KEYWORD1>figcaption</KEYWORD1>
+			<KEYWORD1>figure</KEYWORD1>
+			<KEYWORD1>font</KEYWORD1>
+			<KEYWORD1>footer</KEYWORD1>
+			<KEYWORD1>form</KEYWORD1>
+			<KEYWORD1>frame</KEYWORD1>
+			<KEYWORD1>frameset</KEYWORD1>
+			<KEYWORD1>h1</KEYWORD1>
+			<KEYWORD1>h2</KEYWORD1>
+			<KEYWORD1>h3</KEYWORD1>
+			<KEYWORD1>h4</KEYWORD1>
+			<KEYWORD1>h5</KEYWORD1>
+			<KEYWORD1>h6</KEYWORD1>
+			<KEYWORD1>head</KEYWORD1>
+			<KEYWORD1>header</KEYWORD1>
+			<KEYWORD1>hgroup</KEYWORD1>
+			<KEYWORD1>hr</KEYWORD1>
+			<KEYWORD1>html</KEYWORD1>
+			<KEYWORD1>i</KEYWORD1>
+			<KEYWORD1>iframe</KEYWORD1>
+			<KEYWORD1>img</KEYWORD1>
+			<KEYWORD1>input</KEYWORD1>
+			<KEYWORD1>ins</KEYWORD1>
+			<KEYWORD1>isindex</KEYWORD1>
+			<KEYWORD1>kbd</KEYWORD1>
+			<KEYWORD1>keygen</KEYWORD1>
+			<KEYWORD1>label</KEYWORD1>
+			<KEYWORD1>legend</KEYWORD1>
+			<KEYWORD1>li</KEYWORD1>
+			<KEYWORD1>link</KEYWORD1>
+			<KEYWORD1>map</KEYWORD1>
+			<KEYWORD1>mark</KEYWORD1>
+			<KEYWORD1>menu</KEYWORD1>
+			<KEYWORD1>meta</KEYWORD1>
+			<KEYWORD1>meter</KEYWORD1>
+			<KEYWORD1>nav</KEYWORD1>
+			<KEYWORD1>noframes</KEYWORD1>
+			<KEYWORD1>noscript</KEYWORD1>
+			<KEYWORD1>object</KEYWORD1>
+			<KEYWORD1>ol</KEYWORD1>
+			<KEYWORD1>optgroup</KEYWORD1>
+			<KEYWORD1>option</KEYWORD1>
+			<KEYWORD1>output</KEYWORD1>
+			<KEYWORD1>p</KEYWORD1>
+			<KEYWORD1>param</KEYWORD1>
+			<KEYWORD1>pre</KEYWORD1>
+			<KEYWORD1>progress</KEYWORD1>
+			<KEYWORD1>q</KEYWORD1>
+			<KEYWORD1>rp</KEYWORD1>
+			<KEYWORD1>rt</KEYWORD1>
+			<KEYWORD1>ruby</KEYWORD1>
+			<KEYWORD1>s</KEYWORD1>
+			<KEYWORD1>samp</KEYWORD1>
+			<KEYWORD1>script</KEYWORD1>
+			<KEYWORD1>section</KEYWORD1>
+			<KEYWORD1>select</KEYWORD1>
+			<KEYWORD1>small</KEYWORD1>
+			<KEYWORD1>code</KEYWORD1>
+			<KEYWORD1>span</KEYWORD1>
+			<KEYWORD1>strike</KEYWORD1>
+			<KEYWORD1>strong</KEYWORD1>
+			<KEYWORD1>style</KEYWORD1>
+			<KEYWORD1>sub</KEYWORD1>
+			<KEYWORD1>summary</KEYWORD1>
+			<KEYWORD1>sup</KEYWORD1>
+			<KEYWORD1>table</KEYWORD1>
+			<KEYWORD1>tbody</KEYWORD1>
+			<KEYWORD1>td</KEYWORD1>
+			<KEYWORD1>textarea</KEYWORD1>
+			<KEYWORD1>tfoot</KEYWORD1>
+			<KEYWORD1>th</KEYWORD1>
+			<KEYWORD1>thead</KEYWORD1>
+			<KEYWORD1>time</KEYWORD1>
+			<KEYWORD1>title</KEYWORD1>
+			<KEYWORD1>tr</KEYWORD1>
+			<KEYWORD1>track</KEYWORD1>
+			<KEYWORD1>tt</KEYWORD1>
+			<KEYWORD1>u</KEYWORD1>
+			<KEYWORD1>ul</KEYWORD1>
+			<KEYWORD1>var</KEYWORD1>
+			<KEYWORD1>video</KEYWORD1>
+			<KEYWORD1>wbr</KEYWORD1>
+		</KEYWORDS>
+	</RULES>
+
+	<!-- SCRIPT tag: Highlight tag and switch to language ruleset. -->
+	<RULES SET="JAVASCRIPT" DEFAULT="MARKUP">
+		<!--If the content of the TYPE attribute is recognized, switch to
+			language specific ruleset. -->
+		<SEQ_REGEXP TYPE="MARKUP" DELEGATE="COFFEESCRIPT_TAG"
+					HASH_CHAR="type">type(?=\s*=\s*['"]?text/coffeescript)</SEQ_REGEXP>
+		<SEQ_REGEXP TYPE="MARKUP" DELEGATE="VBSCRIPT_TAG"
+					HASH_CHAR="type">type(?=\s*=\s*['"]?text/vbscript)</SEQ_REGEXP>
+		<SEQ_REGEXP TYPE="MARKUP" DELEGATE="VBSCRIPT_TAG"
+					HASH_CHAR="language">language(?=\s*=\s*['"]?vbscript)</SEQ_REGEXP>
+		<SEQ_REGEXP TYPE="MARKUP" DELEGATE="PYTHON_SCRIPT_TAG"
+					HASH_CHAR="type">type(?=\s*=\s*['"]?\w+/python)</SEQ_REGEXP>
+		<SEQ_REGEXP TYPE="MARKUP" DELEGATE="RUBY_SCRIPT_TAG"
+					HASH_CHAR="type">type(?=\s*=\s*['"]?\w+/ruby)</SEQ_REGEXP>
+		<SEQ_REGEXP TYPE="MARKUP" DELEGATE="XML_SCRIPT_TAG"
+					HASH_CHAR="type">type(?=\s*=\s*['"]?application/xml)</SEQ_REGEXP>
+		<SEQ_REGEXP TYPE="MARKUP" DELEGATE="XQUERY_SCRIPT_TAG"
+					HASH_CHAR="type">type(?=\s*=\s*['"]?\w+/xquery)</SEQ_REGEXP>
+		<!-- Switch to JavaScript ruleset after the tag. -->
+		<SEQ TYPE="MARKUP" DELEGATE="javascript::MAIN">&gt;</SEQ>
+		<!-- Import rules for highlighting. -->
+		<IMPORT DELEGATE="TAGS"/>
+	</RULES>
+
+	<!-- CoffeeScript -->
+	<RULES SET="COFFEESCRIPT_TAG" DEFAULT="MARKUP">
+		<SEQ TYPE="MARKUP" DELEGATE="coffeescript::MAIN">&gt;</SEQ>
+		<IMPORT DELEGATE="TAGS"/>
+	</RULES>
+
+	<!-- Python - provided by Gestalt -->
+	<RULES SET="PYTHON_SCRIPT_TAG" DEFAULT="MARKUP">
+		<SEQ TYPE="MARKUP" DELEGATE="python::MAIN">&gt;</SEQ>
+		<IMPORT DELEGATE="TAGS"/>
+	</RULES>
+
+	<!-- Ruby - provided by Gestalt -->
+	<RULES SET="RUBY_SCRIPT_TAG" DEFAULT="MARKUP">
+		<SEQ TYPE="MARKUP" DELEGATE="ruby::MAIN">&gt;</SEQ>
+		<IMPORT DELEGATE="TAGS"/>
+	</RULES>
+
+	<!-- VBScript - provided by Internet Explorer -->
+	<RULES SET="VBSCRIPT_TAG" DEFAULT="MARKUP">
+		<SEQ TYPE="MARKUP" DELEGATE="vbscript::MAIN">&gt;</SEQ>
+		<IMPORT DELEGATE="TAGS"/>
+	</RULES>
+
+	<!-- XML - for XAML, provided by Gestalt -->
+	<RULES SET="XML_SCRIPT_TAG" DEFAULT="MARKUP">
+		<SEQ TYPE="MARKUP" DELEGATE="xml::MAIN">&gt;</SEQ>
+		<IMPORT DELEGATE="TAGS"/>
+	</RULES>
+
+	<!-- XQUERY - provided by XQIB -->
+	<RULES SET="XQUERY_SCRIPT_TAG" DEFAULT="MARKUP">
+		<SEQ TYPE="MARKUP" DELEGATE="xq::MAIN">&gt;</SEQ>
+		<IMPORT DELEGATE="TAGS"/>
+	</RULES>
+
+	<!-- STYLE tag: Highlight tag and delegate to CSS mode. -->
+	<RULES SET="CSS" DEFAULT="MARKUP">
+		<SEQ TYPE="MARKUP" DELEGATE="css::MAIN">&gt;</SEQ>
+		<IMPORT DELEGATE="TAGS"/>
+	</RULES>
+
+	<RULES SET="ATTRIBUTE" DEFAULT="LITERAL1">
+		<IMPORT DELEGATE="CHARACTER_ENTITIES" />
+	</RULES>
+
+	<!-- SGML character entities - to be used with IMPORT tag -->
+	<RULES SET="CHARACTER_ENTITIES">
+		<SEQ_REGEXP TYPE="LITERAL2"
+					HASH_CHAR="&amp;">&amp;(#\d+|#x\p{XDigit}+|\p{Alnum}+);</SEQ_REGEXP>
+		<SEQ TYPE="INVALID">&amp;</SEQ>
+	</RULES>
+</MODE>
diff --git a/qpython/src/main/assets/syntax/javascript.xml b/qpython/src/main/assets/syntax/javascript.xml
new file mode 100644
index 00000000..88cf935b
--- /dev/null
+++ b/qpython/src/main/assets/syntax/javascript.xml
@@ -0,0 +1,559 @@
+<?xml version="1.0"?>
+<!DOCTYPE MODE SYSTEM "xmode.dtd">
+
+<!-- JavaScript mode by Andre Kaplan -->
+<MODE>
+	<PROPS>
+		<PROPERTY NAME="commentStart" VALUE="/*" />
+		<PROPERTY NAME="commentEnd" VALUE="*/" />
+		<PROPERTY NAME="lineComment" VALUE="//" />
+		<PROPERTY NAME="wordBreakChars" VALUE=",+-=&lt;&gt;/?^&amp;*" />
+
+		<!-- Auto indent -->
+		<PROPERTY NAME="indentOpenBrackets" VALUE="{[" />
+		<PROPERTY NAME="indentCloseBrackets" VALUE="]}" />
+		<PROPERTY NAME="unalignedOpenBrackets" VALUE="(" />
+		<PROPERTY NAME="unalignedCloseBrackets" VALUE=")" />
+		<PROPERTY NAME="indentNextLine"
+			VALUE="\s*(((if|while)\s*\(|else\s*|else\s+if\s*\(|for\s*\(.*\))[^{;]*)" />
+		<PROPERTY NAME="unindentThisLine"
+			VALUE="^.*(default:\s*|case.*:.*)$" />
+		<PROPERTY NAME="electricKeys" VALUE=":" />
+	</PROPS>
+
+	<RULES
+		IGNORE_CASE="FALSE"
+		HIGHLIGHT_DIGITS="TRUE"
+		DIGIT_RE="(0x[\p{XDigit}]+[lL]?|[\p{Digit}]+(e[\p{Digit}]*)?[lLdDfF]?)">
+
+		<!-- The rest of the javascript info -->
+
+		<SPAN TYPE="COMMENT3">
+			<BEGIN>/**</BEGIN>
+			<END>*/</END>
+		</SPAN>
+
+		<SPAN TYPE="COMMENT1">
+			<BEGIN>/*</BEGIN>
+			<END>*/</END>
+		</SPAN>
+
+		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE" ESCAPE="\">
+			<BEGIN>"</BEGIN>
+			<END>"</END>
+		</SPAN>
+
+		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE" ESCAPE="\">
+			<BEGIN>'</BEGIN>
+			<END>'</END>
+		</SPAN>
+
+		<MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="OPERATOR">(</MARK_PREVIOUS>
+		<SEQ TYPE="OPERATOR">)</SEQ>
+
+		<SEQ TYPE="COMMENT2">//--&gt;</SEQ>
+		<EOL_SPAN TYPE="COMMENT2">//</EOL_SPAN>
+		<SEQ_REGEXP TYPE="MARKUP" HASH_CHAR="/" AT_WORD_START="TRUE">/[^\p{Blank}]*?/</SEQ_REGEXP>
+
+		<SEQ TYPE="COMMENT1">&lt;!--</SEQ>
+
+		<SEQ TYPE="OPERATOR">=</SEQ>
+		<SEQ TYPE="OPERATOR">!</SEQ>
+		<SEQ TYPE="OPERATOR">&gt;=</SEQ>
+		<SEQ TYPE="OPERATOR">&lt;=</SEQ>
+		<SEQ TYPE="OPERATOR">+</SEQ>
+		<SEQ TYPE="OPERATOR">-</SEQ>
+		<SEQ TYPE="OPERATOR">/</SEQ>
+		<SEQ TYPE="OPERATOR">*</SEQ>
+		<SEQ TYPE="OPERATOR">&gt;</SEQ>
+		<SEQ TYPE="OPERATOR">&lt;</SEQ>
+		<SEQ TYPE="OPERATOR">%</SEQ>
+		<SEQ TYPE="OPERATOR">&amp;</SEQ>
+		<SEQ TYPE="OPERATOR">|</SEQ>
+		<SEQ TYPE="OPERATOR">^</SEQ>
+		<SEQ TYPE="OPERATOR">~</SEQ>
+		<SEQ TYPE="OPERATOR">.</SEQ>
+		<SEQ TYPE="OPERATOR">}</SEQ>
+		<SEQ TYPE="OPERATOR">{</SEQ>
+		<SEQ TYPE="OPERATOR">,</SEQ>
+		<SEQ TYPE="OPERATOR">;</SEQ>
+		<SEQ TYPE="OPERATOR">]</SEQ>
+		<SEQ TYPE="OPERATOR">[</SEQ>
+		<SEQ TYPE="OPERATOR">?</SEQ>
+		<MARK_PREVIOUS AT_WHITESPACE_END="TRUE"
+			MATCH_TYPE="OPERATOR"
+			TYPE="LABEL">:</MARK_PREVIOUS>
+		<SEQ TYPE="OPERATOR">:</SEQ>
+
+		<KEYWORDS>
+			<!-- ECMAScript keywords -->
+			<KEYWORD1>break</KEYWORD1>
+			<KEYWORD1>continue</KEYWORD1>
+			<KEYWORD1>delete</KEYWORD1>
+			<KEYWORD1>else</KEYWORD1>
+			<KEYWORD1>for</KEYWORD1>
+			<KEYWORD1>function</KEYWORD1>
+			<KEYWORD1>if</KEYWORD1>
+			<KEYWORD1>in</KEYWORD1>
+			<KEYWORD1>new</KEYWORD1>
+			<KEYWORD1>return</KEYWORD1>
+			<LITERAL2>this</LITERAL2>
+			<KEYWORD1>typeof</KEYWORD1>
+			<KEYWORD1>var</KEYWORD1>
+			<KEYWORD3>void</KEYWORD3>
+			<KEYWORD1>while</KEYWORD1>
+			<KEYWORD1>with</KEYWORD1>
+
+			<!--ECMAScript keywords-->
+			<!-- Reserved for future use
+				(some are already used in some Javascript Engines)
+			-->
+			<KEYWORD1>abstract</KEYWORD1>
+			<KEYWORD3>boolean</KEYWORD3>
+			<KEYWORD3>byte</KEYWORD3>
+			<KEYWORD1>case</KEYWORD1>
+			<KEYWORD1>catch</KEYWORD1>
+			<KEYWORD3>char</KEYWORD3>
+			<KEYWORD1>class</KEYWORD1>
+			<KEYWORD1>const</KEYWORD1>
+			<KEYWORD1>debugger</KEYWORD1>
+			<KEYWORD1>default</KEYWORD1>
+
+			<KEYWORD1>do</KEYWORD1>
+			<KEYWORD3>double</KEYWORD3>
+			<KEYWORD1>enum</KEYWORD1>
+			<KEYWORD2>export</KEYWORD2>
+			<KEYWORD1>extends</KEYWORD1>
+			<KEYWORD1>final</KEYWORD1>
+			<KEYWORD1>finally</KEYWORD1>
+			<KEYWORD3>float</KEYWORD3>
+			<KEYWORD1>goto</KEYWORD1>
+			<KEYWORD1>implements</KEYWORD1>
+
+			<KEYWORD2>import</KEYWORD2>
+			<KEYWORD1>instanceof</KEYWORD1>
+			<KEYWORD3>int</KEYWORD3>
+			<KEYWORD1>interface</KEYWORD1>
+			<KEYWORD3>long</KEYWORD3>
+			<KEYWORD1>native</KEYWORD1>
+			<KEYWORD2>package</KEYWORD2>
+			<KEYWORD1>private</KEYWORD1>
+			<KEYWORD1>protected</KEYWORD1>
+			<KEYWORD1>public</KEYWORD1>
+
+			<KEYWORD3>short</KEYWORD3>
+			<KEYWORD1>static</KEYWORD1>
+			<LITERAL2>super</LITERAL2>
+			<KEYWORD1>switch</KEYWORD1>
+			<KEYWORD1>synchronized</KEYWORD1>
+			<KEYWORD1>throw</KEYWORD1>
+			<KEYWORD1>throws</KEYWORD1>
+			<KEYWORD1>transient</KEYWORD1>
+			<KEYWORD1>try</KEYWORD1>
+			<KEYWORD1>volatile</KEYWORD1>
+
+			<!-- Intrinsic Objects (Good idea not to use these names!!)-->
+			<KEYWORD3>Array</KEYWORD3>
+			<KEYWORD3>Boolean</KEYWORD3>
+			<KEYWORD3>Date</KEYWORD3>
+			<KEYWORD3>Function</KEYWORD3>
+			<KEYWORD3>Global</KEYWORD3>
+			<KEYWORD3>Math</KEYWORD3>
+			<KEYWORD3>Number</KEYWORD3>
+			<KEYWORD3>Object</KEYWORD3>
+			<KEYWORD3>RegExp</KEYWORD3><!-- Not ECMA -->
+			<KEYWORD3>String</KEYWORD3>
+
+			<!-- Literals -->
+			<LITERAL2>false</LITERAL2>
+			<LITERAL2>null</LITERAL2>
+			<LITERAL2>true</LITERAL2>
+
+			<LITERAL2>NaN</LITERAL2>
+			<LITERAL2>Infinity</LITERAL2>
+
+			<!-- Global functions -->
+			<LITERAL2>eval</LITERAL2>
+			<LITERAL2>parseInt</LITERAL2>
+			<LITERAL2>parseFloat</LITERAL2>
+			<LITERAL2>escape</LITERAL2>
+			<LITERAL2>unescape</LITERAL2>
+			<LITERAL2>isNaN</LITERAL2>
+			<LITERAL2>isFinite</LITERAL2>
+
+			<!-- Comment/Uncomment your favorite ADO Constants-->
+
+			<!-- ADO Constants-->
+
+			<!-- CursorTypeEnum Values -->
+			<LITERAL2>adOpenForwardOnly</LITERAL2>
+			<LITERAL2>adOpenKeyset</LITERAL2>
+			<LITERAL2>adOpenDynamic</LITERAL2>
+			<LITERAL2>adOpenStatic</LITERAL2>
+
+			<!-- CursorOptionEnum Values -->
+<!--		<LITERAL2>adHoldRecords</LITERAL2>
+			<LITERAL2>adMovePrevious</LITERAL2>
+			<LITERAL2>adAddNew</LITERAL2>
+			<LITERAL2>adDelete</LITERAL2>
+			<LITERAL2>adUpdate</LITERAL2>
+			<LITERAL2>adBookmark</LITERAL2>
+			<LITERAL2>adApproxPosition</LITERAL2>
+			<LITERAL2>adUpdateBatch</LITERAL2>
+			<LITERAL2>adResync</LITERAL2>
+			<LITERAL2>adNotify</LITERAL2>
+			<LITERAL2>adFind</LITERAL2>
+			<LITERAL2>adSeek</LITERAL2>
+			<LITERAL2>adIndex</LITERAL2>
+-->
+			<!-- LockTypeEnum Values -->
+			<LITERAL2>adLockReadOnly</LITERAL2>
+			<LITERAL2>adLockPessimistic</LITERAL2>
+			<LITERAL2>adLockOptimistic</LITERAL2>
+			<LITERAL2>adLockBatchOptimistic</LITERAL2>
+
+			<!-- ExecuteOptionEnum Values -->
+			<LITERAL2>adRunAsync</LITERAL2>
+			<LITERAL2>adAsyncExecute</LITERAL2>
+			<LITERAL2>adAsyncFetch</LITERAL2>
+			<LITERAL2>adAsyncFetchNonBlocking</LITERAL2>
+			<LITERAL2>adExecuteNoRecords</LITERAL2>
+
+			<!-- ConnectOptionEnum Values -->
+<!--			<LITERAL2>adAsyncConnect</LITERAL2>
+-->
+			<!-- ObjectStateEnum Values -->
+			<LITERAL2>adStateClosed</LITERAL2>
+			<LITERAL2>adStateOpen</LITERAL2>
+			<LITERAL2>adStateConnecting</LITERAL2>
+			<LITERAL2>adStateExecuting</LITERAL2>
+			<LITERAL2>adStateFetching</LITERAL2>
+
+			<!-- CursorLocationEnum Values -->
+			<LITERAL2>adUseServer</LITERAL2>
+			<LITERAL2>adUseClient</LITERAL2>
+
+			<!-- DataTypeEnum Values -->
+			<LITERAL2>adEmpty</LITERAL2>
+			<LITERAL2>adTinyInt</LITERAL2>
+			<LITERAL2>adSmallInt</LITERAL2>
+			<LITERAL2>adInteger</LITERAL2>
+			<LITERAL2>adBigInt</LITERAL2>
+			<LITERAL2>adUnsignedTinyInt</LITERAL2>
+			<LITERAL2>adUnsignedSmallInt</LITERAL2>
+			<LITERAL2>adUnsignedInt</LITERAL2>
+			<LITERAL2>adUnsignedBigInt</LITERAL2>
+			<LITERAL2>adSingle</LITERAL2>
+			<LITERAL2>adDouble</LITERAL2>
+			<LITERAL2>adCurrency</LITERAL2>
+			<LITERAL2>adDecimal</LITERAL2>
+			<LITERAL2>adNumeric</LITERAL2>
+			<LITERAL2>adBoolean</LITERAL2>
+			<LITERAL2>adError</LITERAL2>
+			<LITERAL2>adUserDefined</LITERAL2>
+			<LITERAL2>adVariant</LITERAL2>
+			<LITERAL2>adIDispatch</LITERAL2>
+			<LITERAL2>adIUnknown</LITERAL2>
+			<LITERAL2>adGUID</LITERAL2>
+			<LITERAL2>adDate</LITERAL2>
+			<LITERAL2>adDBDate</LITERAL2>
+			<LITERAL2>adDBTime</LITERAL2>
+			<LITERAL2>adDBTimeStamp</LITERAL2>
+			<LITERAL2>adBSTR</LITERAL2>
+			<LITERAL2>adChar</LITERAL2>
+			<LITERAL2>adVarChar</LITERAL2>
+			<LITERAL2>adLongVarChar</LITERAL2>
+			<LITERAL2>adWChar</LITERAL2>
+			<LITERAL2>adVarWChar</LITERAL2>
+			<LITERAL2>adLongVarWChar</LITERAL2>
+			<LITERAL2>adBinary</LITERAL2>
+			<LITERAL2>adVarBinary</LITERAL2>
+			<LITERAL2>adLongVarBinary</LITERAL2>
+			<LITERAL2>adChapter</LITERAL2>
+			<LITERAL2>adFileTime</LITERAL2>
+			<LITERAL2>adDBFileTime</LITERAL2>
+			<LITERAL2>adPropVariant</LITERAL2>
+			<LITERAL2>adVarNumeric</LITERAL2>
+
+			<!-- FieldAttributeEnum Values -->
+<!--			<LITERAL2>adFldMayDefer</LITERAL2>
+			<LITERAL2>adFldUpdatable</LITERAL2>
+			<LITERAL2>adFldUnknownUpdatable</LITERAL2>
+			<LITERAL2>adFldFixed</LITERAL2>
+			<LITERAL2>adFldIsNullable</LITERAL2>
+			<LITERAL2>adFldMayBeNull</LITERAL2>
+			<LITERAL2>adFldLong</LITERAL2>
+			<LITERAL2>adFldRowID</LITERAL2>
+			<LITERAL2>adFldRowVersion</LITERAL2>
+			<LITERAL2>adFldCacheDeferred</LITERAL2>
+			<LITERAL2>adFldKeyColumn</LITERAL2>
+-->
+
+			<!-- EditModeEnum Values -->
+<!--			<LITERAL2>adEditNone</LITERAL2>
+			<LITERAL2>adEditInProgress</LITERAL2>
+			<LITERAL2>adEditAdd</LITERAL2>
+			<LITERAL2>adEditDelete</LITERAL2>
+-->
+			<!-- RecordStatusEnum Values -->
+<!--			<LITERAL2>adRecOK</LITERAL2>
+			<LITERAL2>adRecNew</LITERAL2>
+			<LITERAL2>adRecModified</LITERAL2>
+			<LITERAL2>adRecDeleted</LITERAL2>
+			<LITERAL2>adRecUnmodified</LITERAL2>
+			<LITERAL2>adRecInvalid</LITERAL2>
+			<LITERAL2>adRecMultipleChanges</LITERAL2>
+			<LITERAL2>adRecPendingChanges</LITERAL2>
+			<LITERAL2>adRecCanceled</LITERAL2>
+			<LITERAL2>adRecCantRelease</LITERAL2>
+			<LITERAL2>adRecConcurrencyViolation</LITERAL2>
+			<LITERAL2>adRecIntegrityViolation</LITERAL2>
+			<LITERAL2>adRecMaxChangesExceeded</LITERAL2>
+			<LITERAL2>adRecObjectOpen</LITERAL2>
+			<LITERAL2>adRecOutOfMemory</LITERAL2>
+			<LITERAL2>adRecPermissionDenied</LITERAL2>
+			<LITERAL2>adRecSchemaViolation</LITERAL2>
+			<LITERAL2>adRecDBDeleted</LITERAL2>
+-->
+			<!-- GetRowsOptionEnum Values -->
+<!--			<LITERAL2>adGetRowsRest</LITERAL2>
+-->
+
+			<!-- PositionEnum Values -->
+<!--			<LITERAL2>adPosUnknown</LITERAL2>
+			<LITERAL2>adPosBOF</LITERAL2>
+			<LITERAL2>adPosEOF</LITERAL2>
+-->
+
+			<!-- enum Values -->
+<!--			<LITERAL2>adBookmarkCurrent</LITERAL2>
+			<LITERAL2>adBookmarkFirst</LITERAL2>
+			<LITERAL2>adBookmarkLast</LITERAL2>
+-->
+			<!-- MarshalOptionsEnum Values -->
+<!--			<LITERAL2>adMarshalAll</LITERAL2>
+			<LITERAL2>adMarshalModifiedOnly</LITERAL2>
+-->
+			<!-- AffectEnum Values -->
+<!--			<LITERAL2>adAffectCurrent</LITERAL2>
+			<LITERAL2>adAffectGroup</LITERAL2>
+			<LITERAL2>adAffectAll</LITERAL2>
+			<LITERAL2>adAffectAllChapters</LITERAL2>
+-->
+
+			<!-- ResyncEnum Values -->
+<!--			<LITERAL2>adResyncUnderlyingValues</LITERAL2>
+			<LITERAL2>adResyncAllValues</LITERAL2>
+-->
+			<!-- CompareEnum Values -->
+<!--			<LITERAL2>adCompareLessThan</LITERAL2>
+			<LITERAL2>adCompareEqual</LITERAL2>
+			<LITERAL2>adCompareGreaterThan</LITERAL2>
+			<LITERAL2>adCompareNotEqual</LITERAL2>
+			<LITERAL2>adCompareNotComparable</LITERAL2>
+-->
+			<!-- FilterGroupEnum Values -->
+<!--			<LITERAL2>adFilterNone</LITERAL2>
+			<LITERAL2>adFilterPendingRecords</LITERAL2>
+			<LITERAL2>adFilterAffectedRecords</LITERAL2>
+			<LITERAL2>adFilterFetchedRecords</LITERAL2>
+			<LITERAL2>adFilterPredicate</LITERAL2>
+			<LITERAL2>adFilterConflictingRecords</LITERAL2>
+-->
+			<!-- SearchDirectionEnum Values -->
+<!--			<LITERAL2>adSearchForward</LITERAL2>
+			<LITERAL2>adSearchBackward</LITERAL2>
+-->
+
+			<!-- PersistFormatEnum Values -->
+			<LITERAL2>adPersistADTG</LITERAL2>
+			<LITERAL2>adPersistXML</LITERAL2>
+
+			<!-- StringFormatEnum Values -->
+<!--			<LITERAL2>adStringXML</LITERAL2>
+			<LITERAL2>adStringHTML</LITERAL2>
+			<LITERAL2>adClipString</LITERAL2>
+-->
+			<!-- ConnectPromptEnum Values -->
+<!--			<LITERAL2>adPromptAlways</LITERAL2>
+			<LITERAL2>adPromptComplete</LITERAL2>
+			<LITERAL2>adPromptCompleteRequired</LITERAL2>
+			<LITERAL2>adPromptNever</LITERAL2>
+-->
+			<!-- ConnectModeEnum Values -->
+<!--			<LITERAL2>adModeUnknown</LITERAL2>
+			<LITERAL2>adModeRead</LITERAL2>
+			<LITERAL2>adModeWrite</LITERAL2>
+			<LITERAL2>adModeReadWrite</LITERAL2>
+			<LITERAL2>adModeShareDenyRead</LITERAL2>
+			<LITERAL2>adModeShareDenyWrite</LITERAL2>
+			<LITERAL2>adModeShareExclusive</LITERAL2>
+			<LITERAL2>adModeShareDenyNone</LITERAL2>
+-->
+			<!-- IsolationLevelEnum Values -->
+<!--			<LITERAL2>adXactUnspecified</LITERAL2>
+			<LITERAL2>adXactChaos</LITERAL2>
+			<LITERAL2>adXactReadUncommitted</LITERAL2>
+			<LITERAL2>adXactBrowse</LITERAL2>
+			<LITERAL2>adXactCursorStability</LITERAL2>
+			<LITERAL2>adXactReadCommitted</LITERAL2>
+			<LITERAL2>adXactRepeatableRead</LITERAL2>
+			<LITERAL2>adXactSerializable</LITERAL2>
+			<LITERAL2>adXactIsolated</LITERAL2>
+-->
+			<!-- XactAttributeEnum Values -->
+<!--			<LITERAL2>adXactCommitRetaining</LITERAL2>
+			<LITERAL2>adXactAbortRetaining</LITERAL2>
+-->
+			<!-- PropertyAttributesEnum Values -->
+<!--			<LITERAL2>adPropNotSupported</LITERAL2>
+			<LITERAL2>adPropRequired</LITERAL2>
+			<LITERAL2>adPropOptional</LITERAL2>
+			<LITERAL2>adPropRead</LITERAL2>
+			<LITERAL2>adPropWrite</LITERAL2>
+-->
+			<!-- ErrorValueEnum Values -->
+<!--			<LITERAL2>adErrInvalidArgument</LITERAL2>
+			<LITERAL2>adErrNoCurrentRecord</LITERAL2>
+			<LITERAL2>adErrIllegalOperation</LITERAL2>
+			<LITERAL2>adErrInTransaction</LITERAL2>
+			<LITERAL2>adErrFeatureNotAvailable</LITERAL2>
+			<LITERAL2>adErrItemNotFound</LITERAL2>
+			<LITERAL2>adErrObjectInCollection</LITERAL2>
+			<LITERAL2>adErrObjectNotSet</LITERAL2>
+			<LITERAL2>adErrDataConversion</LITERAL2>
+			<LITERAL2>adErrObjectClosed</LITERAL2>
+			<LITERAL2>adErrObjectOpen</LITERAL2>
+			<LITERAL2>adErrProviderNotFound</LITERAL2>
+			<LITERAL2>adErrBoundToCommand</LITERAL2>
+			<LITERAL2>adErrInvalidParamInfo</LITERAL2>
+			<LITERAL2>adErrInvalidConnection</LITERAL2>
+			<LITERAL2>adErrNotReentrant</LITERAL2>
+			<LITERAL2>adErrStillExecuting</LITERAL2>
+			<LITERAL2>adErrOperationCancelled</LITERAL2>
+			<LITERAL2>adErrStillConnecting</LITERAL2>
+			<LITERAL2>adErrNotExecuting</LITERAL2>
+			<LITERAL2>adErrUnsafeOperation</LITERAL2>
+-->
+			<!-- ParameterAttributesEnum Values -->
+			<LITERAL2>adParamSigned</LITERAL2>
+			<LITERAL2>adParamNullable</LITERAL2>
+			<LITERAL2>adParamLong</LITERAL2>
+
+			<!-- ParameterDirectionEnum Values -->
+			<LITERAL2>adParamUnknown</LITERAL2>
+			<LITERAL2>adParamInput</LITERAL2>
+			<LITERAL2>adParamOutput</LITERAL2>
+			<LITERAL2>adParamInputOutput</LITERAL2>
+			<LITERAL2>adParamReturnValue</LITERAL2>
+
+			<!-- CommandTypeEnum Values -->
+			<LITERAL2>adCmdUnknown</LITERAL2>
+			<LITERAL2>adCmdText</LITERAL2>
+			<LITERAL2>adCmdTable</LITERAL2>
+			<LITERAL2>adCmdStoredProc</LITERAL2>
+			<LITERAL2>adCmdFile</LITERAL2>
+			<LITERAL2>adCmdTableDirect</LITERAL2>
+
+			<!-- EventStatusEnum Values -->
+<!--			<LITERAL2>adStatusOK</LITERAL2>
+			<LITERAL2>adStatusErrorsOccurred</LITERAL2>
+			<LITERAL2>adStatusCantDeny</LITERAL2>
+			<LITERAL2>adStatusCancel</LITERAL2>
+			<LITERAL2>adStatusUnwantedEvent</LITERAL2>
+-->
+			<!-- EventReasonEnum Values -->
+<!--			<LITERAL2>adRsnAddNew</LITERAL2>
+			<LITERAL2>adRsnDelete</LITERAL2>
+			<LITERAL2>adRsnUpdate</LITERAL2>
+			<LITERAL2>adRsnUndoUpdate</LITERAL2>
+			<LITERAL2>adRsnUndoAddNew</LITERAL2>
+			<LITERAL2>adRsnUndoDelete</LITERAL2>
+			<LITERAL2>adRsnRequery</LITERAL2>
+			<LITERAL2>adRsnResynch</LITERAL2>
+			<LITERAL2>adRsnClose</LITERAL2>
+			<LITERAL2>adRsnMove</LITERAL2>
+			<LITERAL2>adRsnFirstChange</LITERAL2>
+			<LITERAL2>adRsnMoveFirst</LITERAL2>
+			<LITERAL2>adRsnMoveNext</LITERAL2>
+			<LITERAL2>adRsnMovePrevious</LITERAL2>
+			<LITERAL2>adRsnMoveLast</LITERAL2>
+-->
+			<!-- SchemaEnum Values -->
+<!--			<LITERAL2>adSchemaProviderSpecific</LITERAL2>
+			<LITERAL2>adSchemaAsserts</LITERAL2>
+			<LITERAL2>adSchemaCatalogs</LITERAL2>
+			<LITERAL2>adSchemaCharacterSets</LITERAL2>
+			<LITERAL2>adSchemaCollations</LITERAL2>
+			<LITERAL2>adSchemaColumns</LITERAL2>
+			<LITERAL2>adSchemaCheckConstraints</LITERAL2>
+			<LITERAL2>adSchemaConstraintColumnUsage</LITERAL2>
+			<LITERAL2>adSchemaConstraintTableUsage</LITERAL2>
+			<LITERAL2>adSchemaKeyColumnUsage</LITERAL2>
+			<LITERAL2>adSchemaReferentialConstraints</LITERAL2>
+			<LITERAL2>adSchemaTableConstraints</LITERAL2>
+			<LITERAL2>adSchemaColumnsDomainUsage</LITERAL2>
+			<LITERAL2>adSchemaIndexes</LITERAL2>
+			<LITERAL2>adSchemaColumnPrivileges</LITERAL2>
+			<LITERAL2>adSchemaTablePrivileges</LITERAL2>
+			<LITERAL2>adSchemaUsagePrivileges</LITERAL2>
+			<LITERAL2>adSchemaProcedures</LITERAL2>
+			<LITERAL2>adSchemaSchemata</LITERAL2>
+			<LITERAL2>adSchemaSQLLanguages</LITERAL2>
+			<LITERAL2>adSchemaStatistics</LITERAL2>
+			<LITERAL2>adSchemaTables</LITERAL2>
+			<LITERAL2>adSchemaTranslations</LITERAL2>
+			<LITERAL2>adSchemaProviderTypes</LITERAL2>
+			<LITERAL2>adSchemaViews</LITERAL2>
+			<LITERAL2>adSchemaViewColumnUsage</LITERAL2>
+			<LITERAL2>adSchemaViewTableUsage</LITERAL2>
+			<LITERAL2>adSchemaProcedureParameters</LITERAL2>
+			<LITERAL2>adSchemaForeignKeys</LITERAL2>
+			<LITERAL2>adSchemaPrimaryKeys</LITERAL2>
+			<LITERAL2>adSchemaProcedureColumns</LITERAL2>
+			<LITERAL2>adSchemaDBInfoKeywords</LITERAL2>
+			<LITERAL2>adSchemaDBInfoLiterals</LITERAL2>
+			<LITERAL2>adSchemaCubes</LITERAL2>
+			<LITERAL2>adSchemaDimensions</LITERAL2>
+			<LITERAL2>adSchemaHierarchies</LITERAL2>
+			<LITERAL2>adSchemaLevels</LITERAL2>
+			<LITERAL2>adSchemaMeasures</LITERAL2>
+			<LITERAL2>adSchemaProperties</LITERAL2>
+			<LITERAL2>adSchemaMembers</LITERAL2>
+-->
+			<!-- SeekEnum Values -->
+<!--			<LITERAL2>adSeekFirstEQ</LITERAL2>
+			<LITERAL2>adSeekLastEQ</LITERAL2>
+			<LITERAL2>adSeekAfterEQ</LITERAL2>
+			<LITERAL2>adSeekAfter</LITERAL2>
+			<LITERAL2>adSeekBeforeEQ</LITERAL2>
+			<LITERAL2>adSeekBefore</LITERAL2>
+-->
+			<!-- ADCPROP_UPDATECRITERIA_ENUM Values -->
+<!--			<LITERAL2>adCriteriaKey</LITERAL2>
+			<LITERAL2>adCriteriaAllCols</LITERAL2>
+			<LITERAL2>adCriteriaUpdCols</LITERAL2>
+			<LITERAL2>adCriteriaTimeStamp</LITERAL2>
+-->
+			<!-- ADCPROP_ASYNCTHREADPRIORITY_ENUM Values -->
+<!--			<LITERAL2>adPriorityLowest</LITERAL2>
+			<LITERAL2>adPriorityBelowNormal</LITERAL2>
+			<LITERAL2>adPriorityNormal</LITERAL2>
+			<LITERAL2>adPriorityAboveNormal</LITERAL2>
+			<LITERAL2>adPriorityHighest</LITERAL2>
+-->
+			<!-- CEResyncEnum Values -->
+<!--			<LITERAL2>adResyncNone</LITERAL2>
+			<LITERAL2>adResyncAutoIncrement</LITERAL2>
+			<LITERAL2>adResyncConflicts</LITERAL2>
+			<LITERAL2>adResyncUpdates</LITERAL2>
+			<LITERAL2>adResyncInserts</LITERAL2>
+			<LITERAL2>adResyncAll</LITERAL2>
+-->
+			<!-- ADCPROP_AUTORECALC_ENUM Values -->
+<!--			<LITERAL2>adRecalcUpFront</LITERAL2>
+			<LITERAL2>adRecalcAlways</LITERAL2>
+-->
+		</KEYWORDS>
+	</RULES>
+</MODE>
diff --git a/qpython/src/main/assets/syntax/json.xml b/qpython/src/main/assets/syntax/json.xml
new file mode 100644
index 00000000..e5c51ee1
--- /dev/null
+++ b/qpython/src/main/assets/syntax/json.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!DOCTYPE MODE SYSTEM "xmode.dtd">
+<MODE>
+	<PROPS>
+		<!-- auto indent -->
+		<PROPERTY NAME="indentOpenBrackets" VALUE="[{"/>
+		<PROPERTY NAME="indentCloseBrackets" VALUE="}]"/>
+		<PROPERTY NAME="contextInsensitive" VALUE="true"/>
+	</PROPS>
+
+	<RULES>
+		<!-- mark numbers as DIGIT -->
+		<SEQ_REGEXP HASH_CHARS="-0123456789." TYPE="DIGIT">[-]?\d+([.]\d*)?([eE][+-]?\d+)?</SEQ_REGEXP>
+
+		<!-- mark strings as LITERAL1 -->
+		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
+			<BEGIN>"</BEGIN>
+			<END>"</END>
+		</SPAN>
+
+		<!-- mark pair separator as OPERATOR -->
+		<SEQ TYPE="OPERATOR">:</SEQ>
+
+		<!-- mark these special values as LITERAL2 -->
+		<SEQ TYPE="LITERAL2">true</SEQ>
+		<SEQ TYPE="LITERAL2">false</SEQ>
+		<SEQ TYPE="LITERAL2">null</SEQ>
+	</RULES>
+</MODE>
\ No newline at end of file
diff --git a/qpython/src/main/assets/syntax/python.xml b/qpython/src/main/assets/syntax/python.xml
new file mode 100644
index 00000000..418c78ef
--- /dev/null
+++ b/qpython/src/main/assets/syntax/python.xml
@@ -0,0 +1,402 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE MODE SYSTEM "xmode.dtd">
+
+<!-- Python mode, by Slava Pestov. Based on PythonTokenMarker by -->
+<!-- Jonathan Revusky -->
+
+<!-- Modified 19-Jul-00 by Ivan Frohne to: -->
+<!--  (a) implement 'indentOnEnter'; -->
+<!--  (b) indent nPATTERN_LINEline automatically after control structures followed -->
+<!--	  by ':'; -->
+<!--  (c) make """ or ''' multiline quotes TYPE LITERAL2; -->
+<!--  (d) add TYPE FUNCTION identified by a following '(' -->
+<!--  (e) eliminate the '?' SEQ TYPE ('?' has no meaning in Python); -->
+<!--  (f) change the TYPE of 'and', 'or', and 'not' to KEYWORD1; and -->
+<!--  (g) add all builtin functions, builtin exceptions, -->
+<!--	  builtin type methods, File object methods, and special type -->
+<!--	  attributes as TYPE KEYWORD3. -->
+
+<MODE>
+	<PROPS>
+		<PROPERTY NAME="indentNextLines" VALUE="\s*[^#]{3,}:\s*(#.*)?" />
+		<PROPERTY NAME="indentOpenBrackets" VALUE="{[" />
+		<PROPERTY NAME="indentCloseBrackets" VALUE="}]" />
+		<PROPERTY NAME="unalignedOpenBrackets" VALUE="(" />
+		<PROPERTY NAME="unalignedCloseBrackets" VALUE=")" />
+		<PROPERTY NAME="unindentNextLines" VALUE="^\s*(pass|else\s*:|elif\s.*:|except(\s.*)?:|finally\s*:)\s*(#.*)?$" />
+		<PROPERTY NAME="unindentThisLine" VALUE="^\s*(else|elif\s.*|except(\s.*)?|finally)\s*:\s*(#.*)?" />
+		<PROPERTY NAME="lineComment" VALUE="#" />
+		<PROPERTY NAME="electricKeys" VALUE=":" />
+		<PROPERTY NAME="ignoreWhitespace" VALUE="false" />
+	</PROPS>
+	<RULES IGNORE_CASE="FALSE" HIGHLIGHT_DIGITS="TRUE">
+		<!-- Comment -->
+		<EOL_SPAN TYPE="COMMENT1">#</EOL_SPAN>
+
+		<!-- decorator -->
+		<SPAN_REGEXP HASH_CHAR="@" MATCH_TYPE="KEYWORD4" DELEGATE="python::MAIN">
+			<BEGIN>@\w+(?:\.\w+)*\(</BEGIN>
+			<END>\)</END>
+		</SPAN_REGEXP>
+		<MARK_FOLLOWING TYPE="KEYWORD4">@</MARK_FOLLOWING>
+
+		<!-- Triple-quotes -->
+		<SPAN TYPE="LITERAL2" DELEGATE="LITERAL_TWO">
+			<BEGIN>"""</BEGIN>
+			<END>"""</END>
+		</SPAN>
+
+		<SPAN TYPE="LITERAL2" DELEGATE="LITERAL_TWO">
+			<BEGIN>'''</BEGIN>
+			<END>'''</END>
+		</SPAN>
+
+		<!-- Standard literals -->
+		<SPAN TYPE="LITERAL1" DELEGATE="LITERAL_ONE">
+			<BEGIN>"</BEGIN>
+			<END>"</END>
+		</SPAN>
+		<SPAN TYPE="LITERAL1" DELEGATE="LITERAL_ONE">
+			<BEGIN>'</BEGIN>
+			<END>'</END>
+		</SPAN>
+
+		<SEQ TYPE="OPERATOR">=</SEQ>
+		<SEQ TYPE="OPERATOR">!</SEQ>
+		<SEQ TYPE="OPERATOR">&gt;=</SEQ>
+		<SEQ TYPE="OPERATOR">&lt;=</SEQ>
+		<SEQ TYPE="OPERATOR">+</SEQ>
+		<SEQ TYPE="OPERATOR">-</SEQ>
+		<SEQ TYPE="OPERATOR">/</SEQ>
+		<SEQ TYPE="OPERATOR">*</SEQ>
+		<SEQ TYPE="OPERATOR">&gt;</SEQ>
+		<SEQ TYPE="OPERATOR">&lt;</SEQ>
+		<SEQ TYPE="OPERATOR">%</SEQ>
+		<SEQ TYPE="OPERATOR">&amp;</SEQ>
+		<SEQ TYPE="OPERATOR">|</SEQ>
+		<SEQ TYPE="OPERATOR">^</SEQ>
+		<SEQ TYPE="OPERATOR">~</SEQ>
+		<SEQ TYPE="KEYWORD1">:</SEQ>
+
+		<MARK_PREVIOUS TYPE="FUNCTION"
+			MATCH_TYPE="OPERATOR">(</MARK_PREVIOUS>
+		<SEQ TYPE="OPERATOR">)</SEQ>
+
+		<KEYWORDS>
+			<!--  Reserved Words  -->
+			<KEYWORD1>and</KEYWORD1>
+			<KEYWORD1>as</KEYWORD1>
+			<KEYWORD1>assert</KEYWORD1>
+			<KEYWORD1>break</KEYWORD1>
+			<KEYWORD1>class</KEYWORD1>
+			<KEYWORD1>continue</KEYWORD1>
+			<KEYWORD1>def</KEYWORD1>
+			<KEYWORD1>del</KEYWORD1>
+			<KEYWORD1>elif</KEYWORD1>
+			<KEYWORD1>else</KEYWORD1>
+			<KEYWORD1>except</KEYWORD1>
+			<KEYWORD1>exec</KEYWORD1>
+			<KEYWORD1>finally</KEYWORD1>
+			<KEYWORD1>for</KEYWORD1>
+			<KEYWORD1>from</KEYWORD1>
+			<KEYWORD1>global</KEYWORD1>
+			<KEYWORD1>if</KEYWORD1>
+			<KEYWORD1>import</KEYWORD1>
+			<KEYWORD1>in</KEYWORD1>
+			<KEYWORD1>is</KEYWORD1>
+			<KEYWORD1>lambda</KEYWORD1>
+			<KEYWORD1>not</KEYWORD1>
+			<KEYWORD1>or</KEYWORD1>
+			<KEYWORD1>pass</KEYWORD1>
+			<KEYWORD1>print</KEYWORD1>
+			<KEYWORD1>raise</KEYWORD1>
+			<KEYWORD1>return</KEYWORD1>
+			<KEYWORD1>reversed</KEYWORD1>
+			<KEYWORD1>sorted</KEYWORD1>
+			<KEYWORD1>try</KEYWORD1>
+			<KEYWORD1>while</KEYWORD1>
+			<KEYWORD1>with</KEYWORD1>
+			<KEYWORD1>yield</KEYWORD1>
+			<KEYWORD1>self</KEYWORD1>
+
+			<!-- builtins -->
+			<KEYWORD2>abs</KEYWORD2>
+			<KEYWORD2>all</KEYWORD2>
+			<KEYWORD2>any</KEYWORD2>
+			<KEYWORD2>apply</KEYWORD2>
+			<KEYWORD2>bool</KEYWORD2>
+			<KEYWORD2>buffer</KEYWORD2>
+			<KEYWORD2>callable</KEYWORD2>
+			<KEYWORD2>chr</KEYWORD2>
+			<KEYWORD2>classmethod</KEYWORD2>
+			<KEYWORD2>cmp</KEYWORD2>
+			<KEYWORD2>coerce</KEYWORD2>
+			<KEYWORD2>compile</KEYWORD2>
+			<KEYWORD2>complex</KEYWORD2>
+			<KEYWORD2>delattr</KEYWORD2>
+			<KEYWORD2>dict</KEYWORD2>
+			<KEYWORD2>dir</KEYWORD2>
+			<KEYWORD2>divmod</KEYWORD2>
+			<KEYWORD2>enumerate</KEYWORD2>
+			<KEYWORD2>eval</KEYWORD2>
+			<KEYWORD2>execfile</KEYWORD2>
+			<KEYWORD2>file</KEYWORD2>
+			<KEYWORD2>filter</KEYWORD2>
+			<KEYWORD2>float</KEYWORD2>
+			<KEYWORD2>frozenset</KEYWORD2>
+			<KEYWORD2>getattr</KEYWORD2>
+			<KEYWORD2>globals</KEYWORD2>
+			<KEYWORD2>hasattr</KEYWORD2>
+			<KEYWORD2>hash</KEYWORD2>
+			<KEYWORD2>hex</KEYWORD2>
+			<KEYWORD2>id</KEYWORD2>
+			<KEYWORD2>input</KEYWORD2>
+			<KEYWORD2>int</KEYWORD2>
+			<KEYWORD2>intern</KEYWORD2>
+			<KEYWORD2>isinstance</KEYWORD2>
+			<KEYWORD2>issubclass</KEYWORD2>
+			<KEYWORD2>iter</KEYWORD2>
+			<KEYWORD2>len</KEYWORD2>
+			<KEYWORD2>list</KEYWORD2>
+			<KEYWORD2>locals</KEYWORD2>
+			<KEYWORD2>long</KEYWORD2>
+			<KEYWORD2>map</KEYWORD2>
+			<KEYWORD2>max</KEYWORD2>
+			<KEYWORD2>min</KEYWORD2>
+			<KEYWORD2>object</KEYWORD2>
+			<KEYWORD2>oct</KEYWORD2>
+			<KEYWORD2>open</KEYWORD2>
+			<KEYWORD2>ord</KEYWORD2>
+			<KEYWORD2>pow</KEYWORD2>
+			<KEYWORD2>property</KEYWORD2>
+			<KEYWORD2>range</KEYWORD2>
+			<KEYWORD2>raw_input</KEYWORD2>
+			<KEYWORD2>reduce</KEYWORD2>
+			<KEYWORD2>reload</KEYWORD2>
+			<KEYWORD2>repr</KEYWORD2>
+			<KEYWORD2>round</KEYWORD2>
+			<KEYWORD2>set</KEYWORD2>
+			<KEYWORD2>setattr</KEYWORD2>
+			<KEYWORD2>slice</KEYWORD2>
+			<KEYWORD2>staticmethod</KEYWORD2>
+			<KEYWORD2>str</KEYWORD2>
+			<KEYWORD2>sum</KEYWORD2>
+			<KEYWORD2>super</KEYWORD2>
+			<KEYWORD2>tuple</KEYWORD2>
+			<KEYWORD2>type</KEYWORD2>
+			<KEYWORD2>unichr</KEYWORD2>
+			<KEYWORD2>unicode</KEYWORD2>
+			<KEYWORD2>vars</KEYWORD2>
+			<KEYWORD2>xrange</KEYWORD2>
+			<KEYWORD2>zip</KEYWORD2>
+
+			<!-- exceptions -->
+			<KEYWORD3>ArithmeticError</KEYWORD3>
+			<KEYWORD3>AssertionError</KEYWORD3>
+			<KEYWORD3>AttributeError</KEYWORD3>
+			<KEYWORD3>DeprecationWarning</KEYWORD3>
+			<KEYWORD3>EOFError</KEYWORD3>
+			<KEYWORD3>EnvironmentError</KEYWORD3>
+			<KEYWORD3>Exception</KEYWORD3>
+			<KEYWORD3>FloatingPointError</KEYWORD3>
+			<KEYWORD3>IOError</KEYWORD3>
+			<KEYWORD3>ImportError</KEYWORD3>
+			<KEYWORD3>IndentationError</KEYWORD3>
+			<KEYWORD3>IndexError</KEYWORD3>
+			<KEYWORD3>KeyError</KEYWORD3>
+			<KEYWORD3>KeyboardInterrupt</KEYWORD3>
+			<KEYWORD3>LookupError</KEYWORD3>
+			<KEYWORD3>MemoryError</KEYWORD3>
+			<KEYWORD3>NameError</KEYWORD3>
+			<KEYWORD3>NotImplemented</KEYWORD3>
+			<KEYWORD3>NotImplementedError</KEYWORD3>
+			<KEYWORD3>OSError</KEYWORD3>
+			<KEYWORD3>OverflowError</KEYWORD3>
+			<KEYWORD3>OverflowWarning</KEYWORD3>
+			<KEYWORD3>ReferenceError</KEYWORD3>
+			<KEYWORD3>RuntimeError</KEYWORD3>
+			<KEYWORD3>RuntimeWarning</KEYWORD3>
+			<KEYWORD3>StandardError</KEYWORD3>
+			<KEYWORD3>StopIteration</KEYWORD3>
+			<KEYWORD3>SyntaxError</KEYWORD3>
+			<KEYWORD3>SyntaxWarning</KEYWORD3>
+			<KEYWORD3>SystemError</KEYWORD3>
+			<KEYWORD3>SystemExit</KEYWORD3>
+			<KEYWORD3>TabError</KEYWORD3>
+			<KEYWORD3>TypeError</KEYWORD3>
+			<KEYWORD3>UnboundLocalError</KEYWORD3>
+			<KEYWORD3>UnicodeError</KEYWORD3>
+			<KEYWORD3>UserWarning</KEYWORD3>
+			<KEYWORD3>ValueError</KEYWORD3>
+			<KEYWORD3>Warning</KEYWORD3>
+			<KEYWORD3>WindowsError</KEYWORD3>
+			<KEYWORD3>ZeroDivisionError</KEYWORD3>
+
+			<!-- types (from types module) -->
+			<KEYWORD3>BufferType</KEYWORD3>
+			<KEYWORD3>BuiltinFunctionType</KEYWORD3>
+			<KEYWORD3>BuiltinMethodType</KEYWORD3>
+			<KEYWORD3>ClassType</KEYWORD3>
+			<KEYWORD3>CodeType</KEYWORD3>
+			<KEYWORD3>ComplexType</KEYWORD3>
+			<KEYWORD3>DictProxyType</KEYWORD3>
+			<KEYWORD3>DictType</KEYWORD3>
+			<KEYWORD3>DictionaryType</KEYWORD3>
+			<KEYWORD3>EllipsisType</KEYWORD3>
+			<KEYWORD3>FileType</KEYWORD3>
+			<KEYWORD3>FloatType</KEYWORD3>
+			<KEYWORD3>FrameType</KEYWORD3>
+			<KEYWORD3>FunctionType</KEYWORD3>
+			<KEYWORD3>GeneratorType</KEYWORD3>
+			<KEYWORD3>InstanceType</KEYWORD3>
+			<KEYWORD3>IntType</KEYWORD3>
+			<KEYWORD3>LambdaType</KEYWORD3>
+			<KEYWORD3>ListType</KEYWORD3>
+			<KEYWORD3>LongType</KEYWORD3>
+			<KEYWORD3>MethodType</KEYWORD3>
+			<KEYWORD3>ModuleType</KEYWORD3>
+			<KEYWORD3>NoneType</KEYWORD3>
+			<KEYWORD3>ObjectType</KEYWORD3>
+			<KEYWORD3>SliceType</KEYWORD3>
+			<KEYWORD3>StringType</KEYWORD3>
+			<KEYWORD3>StringTypes</KEYWORD3>
+			<KEYWORD3>TracebackType</KEYWORD3>
+			<KEYWORD3>TupleType</KEYWORD3>
+			<KEYWORD3>TypeType</KEYWORD3>
+			<KEYWORD3>UnboundMethodType</KEYWORD3>
+			<KEYWORD3>UnicodeType</KEYWORD3>
+			<KEYWORD3>XRangeType</KEYWORD3>
+
+			<KEYWORD3>False</KEYWORD3>
+			<KEYWORD3>None</KEYWORD3>
+			<KEYWORD3>True</KEYWORD3>
+
+			<KEYWORD3>__abs__</KEYWORD3>
+			<KEYWORD3>__add__</KEYWORD3>
+			<KEYWORD3>__all__</KEYWORD3>
+			<KEYWORD3>__author__</KEYWORD3>
+			<KEYWORD3>__bases__</KEYWORD3>
+			<KEYWORD3>__builtins__</KEYWORD3>
+			<KEYWORD3>__call__</KEYWORD3>
+			<KEYWORD3>__class__</KEYWORD3>
+			<KEYWORD3>__cmp__</KEYWORD3>
+			<KEYWORD3>__coerce__</KEYWORD3>
+			<KEYWORD3>__contains__</KEYWORD3>
+			<KEYWORD3>__debug__</KEYWORD3>
+			<KEYWORD3>__del__</KEYWORD3>
+			<KEYWORD3>__delattr__</KEYWORD3>
+			<KEYWORD3>__delitem__</KEYWORD3>
+			<KEYWORD3>__delslice__</KEYWORD3>
+			<KEYWORD3>__dict__</KEYWORD3>
+			<KEYWORD3>__div__</KEYWORD3>
+			<KEYWORD3>__divmod__</KEYWORD3>
+			<KEYWORD3>__doc__</KEYWORD3>
+			<KEYWORD3>__docformat__</KEYWORD3>
+			<KEYWORD3>__eq__</KEYWORD3>
+			<KEYWORD3>__file__</KEYWORD3>
+			<KEYWORD3>__float__</KEYWORD3>
+			<KEYWORD3>__floordiv__</KEYWORD3>
+			<KEYWORD3>__future__</KEYWORD3>
+			<KEYWORD3>__ge__</KEYWORD3>
+			<KEYWORD3>__getattr__</KEYWORD3>
+			<KEYWORD3>__getattribute__</KEYWORD3>
+			<KEYWORD3>__getitem__</KEYWORD3>
+			<KEYWORD3>__getslice__</KEYWORD3>
+			<KEYWORD3>__gt__</KEYWORD3>
+			<KEYWORD3>__hash__</KEYWORD3>
+			<KEYWORD3>__hex__</KEYWORD3>
+			<KEYWORD3>__iadd__</KEYWORD3>
+			<KEYWORD3>__import__</KEYWORD3>
+			<KEYWORD3>__imul__</KEYWORD3>
+			<KEYWORD3>__init__</KEYWORD3>
+			<KEYWORD3>__int__</KEYWORD3>
+			<KEYWORD3>__invert__</KEYWORD3>
+			<KEYWORD3>__iter__</KEYWORD3>
+			<KEYWORD3>__le__</KEYWORD3>
+			<KEYWORD3>__len__</KEYWORD3>
+			<KEYWORD3>__long__</KEYWORD3>
+			<KEYWORD3>__lshift__</KEYWORD3>
+			<KEYWORD3>__lt__</KEYWORD3>
+			<KEYWORD3>__members__</KEYWORD3>
+			<KEYWORD3>__metaclass__</KEYWORD3>
+			<KEYWORD3>__mod__</KEYWORD3>
+			<KEYWORD3>__mro__</KEYWORD3>
+			<KEYWORD3>__mul__</KEYWORD3>
+			<KEYWORD3>__name__</KEYWORD3>
+			<KEYWORD3>__ne__</KEYWORD3>
+			<KEYWORD3>__neg__</KEYWORD3>
+			<KEYWORD3>__new__</KEYWORD3>
+			<KEYWORD3>__nonzero__</KEYWORD3>
+			<KEYWORD3>__oct__</KEYWORD3>
+			<KEYWORD3>__or__</KEYWORD3>
+			<KEYWORD3>__path__</KEYWORD3>
+			<KEYWORD3>__pos__</KEYWORD3>
+			<KEYWORD3>__pow__</KEYWORD3>
+			<KEYWORD3>__radd__</KEYWORD3>
+			<KEYWORD3>__rdiv__</KEYWORD3>
+			<KEYWORD3>__rdivmod__</KEYWORD3>
+			<KEYWORD3>__reduce__</KEYWORD3>
+			<KEYWORD3>__repr__</KEYWORD3>
+			<KEYWORD3>__rfloordiv__</KEYWORD3>
+			<KEYWORD3>__rlshift__</KEYWORD3>
+			<KEYWORD3>__rmod__</KEYWORD3>
+			<KEYWORD3>__rmul__</KEYWORD3>
+			<KEYWORD3>__ror__</KEYWORD3>
+			<KEYWORD3>__rpow__</KEYWORD3>
+			<KEYWORD3>__rrshift__</KEYWORD3>
+			<KEYWORD3>__rsub__</KEYWORD3>
+			<KEYWORD3>__rtruediv__</KEYWORD3>
+			<KEYWORD3>__rxor__</KEYWORD3>
+			<KEYWORD3>__setattr__</KEYWORD3>
+			<KEYWORD3>__setitem__</KEYWORD3>
+			<KEYWORD3>__setslice__</KEYWORD3>
+			<KEYWORD3>__self__</KEYWORD3>
+			<KEYWORD3>__slots__</KEYWORD3>
+			<KEYWORD3>__str__</KEYWORD3>
+			<KEYWORD3>__sub__</KEYWORD3>
+			<KEYWORD3>__truediv__</KEYWORD3>
+			<KEYWORD3>__version__</KEYWORD3>
+			<KEYWORD3>__xor__</KEYWORD3>
+		</KEYWORDS>
+	</RULES>
+
+	<!-- rulesets to syntax highlight string interpolation sequences -->
+	<RULES SET="LITERAL_ONE" DEFAULT="LITERAL1" ESCAPE="\">
+		<SEQ_REGEXP HASH_CHAR="%" TYPE="LITERAL4">%[.]?\d*[diouxXeEfFgGcrs]</SEQ_REGEXP>
+		<SEQ_REGEXP HASH_CHAR="%(" TYPE="LITERAL4">%\([^)]+\)[+ -]?\d*[diouxXeEfFgGcrs]</SEQ_REGEXP>
+	</RULES>
+	<!-- triple-quoted strings has its own, since it's LITERAL2 by default -->
+	<RULES SET="LITERAL_TWO" DEFAULT="LITERAL2" ESCAPE="\">
+		<SEQ_REGEXP HASH_CHAR="%" TYPE="LITERAL4">%\d*[diouxXeEfFgGcrs]</SEQ_REGEXP>
+		<SEQ_REGEXP HASH_CHAR="%(" TYPE="LITERAL4">%\([^)]+\)[+ -]?\d*[diouxXeEfFgGcrs]</SEQ_REGEXP>
+		<SPAN TYPE="LITERAL3">
+			<BEGIN>B{</BEGIN>
+			<END>}</END>
+		</SPAN>
+		<SPAN TYPE="LITERAL3">
+			<BEGIN>C{</BEGIN>
+			<END>}</END>
+		</SPAN>
+		<SPAN TYPE="LITERAL3">
+			<BEGIN>E{</BEGIN>
+			<END>}</END>
+		</SPAN>
+		<SPAN TYPE="LITERAL3">
+			<BEGIN>I{</BEGIN>
+			<END>}</END>
+		</SPAN>
+		<SPAN TYPE="LITERAL3">
+			<BEGIN>L{</BEGIN>
+			<END>}</END>
+		</SPAN>
+		<!--
+		<EOL_SPAN AT_WHITESPACE_END="TRUE" DELEGATE="python::MAIN" TYPE="LITERAL3">&gt;&gt;&gt;</EOL_SPAN>
+		<EOL_SPAN AT_WHITESPACE_END="TRUE" DELEGATE="python::MAIN" TYPE="LITERAL3">...</EOL_SPAN>
+		-->
+		<EOL_SPAN AT_WHITESPACE_END="TRUE" TYPE="LITERAL3">&gt;&gt;&gt;</EOL_SPAN>
+		<EOL_SPAN AT_WHITESPACE_END="TRUE" TYPE="LITERAL3">...</EOL_SPAN>
+		<MARK_FOLLOWING	TYPE="LITERAL3" AT_WHITESPACE_END="TRUE">@</MARK_FOLLOWING>
+	</RULES>
+</MODE>
+
diff --git a/qpython/src/main/assets/syntax/xml.xml b/qpython/src/main/assets/syntax/xml.xml
new file mode 100644
index 00000000..d7ec4654
--- /dev/null
+++ b/qpython/src/main/assets/syntax/xml.xml
@@ -0,0 +1,168 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE MODE SYSTEM "xmode.dtd">
+
+<MODE>
+	<PROPS>
+		<PROPERTY NAME="commentStart" VALUE="&lt;!--" />
+		<PROPERTY NAME="commentEnd" VALUE="--&gt;" />
+	</PROPS>
+	<RULES>
+		<!-- Sfrom_contentment -->
+		<SPAN TYPE="COMMENT1">
+			<BEGIN>&lt;!--</BEGIN>
+			<END>--&gt;</END>
+		</SPAN>
+
+		<!-- DTD Entity declarations -->
+		<SPAN TYPE="KEYWORD2" DELEGATE="ENTITY-TAGS">
+			<BEGIN>&lt;!ENTITY</BEGIN>
+			<END>&gt;</END>
+		</SPAN>
+
+		<!-- CDATA sections -->
+		<SPAN TYPE="KEYWORD2" DELEGATE="CDATA">
+			<BEGIN>&lt;![CDATA[</BEGIN>
+			<END>]]&gt;</END>
+		</SPAN>
+
+		<!-- DTD instructions -->
+		<SPAN TYPE="KEYWORD2" DELEGATE="DTD-TAGS">
+			<BEGIN>&lt;!</BEGIN>
+			<END>&gt;</END>
+		</SPAN>
+
+		<!-- PI directives -->
+		<SPAN TYPE="KEYWORD3">
+			<BEGIN>&lt;?</BEGIN>
+			<END>&gt;</END>
+		</SPAN>
+
+		<!-- markup tags -->
+		<SPAN TYPE="MARKUP" DELEGATE="TAGS">
+			<BEGIN>&lt;</BEGIN>
+			<END>&gt;</END>
+		</SPAN>
+
+		<!-- SGML entities -->
+		<SPAN TYPE="LITERAL2" NO_WORD_BREAK="TRUE">
+			<BEGIN>&amp;</BEGIN>
+			<END>;</END>
+		</SPAN>
+	</RULES>
+	<RULES SET="TAGS" DEFAULT="MARKUP" NO_WORD_SEP="-_">
+		<!-- Sfrom_contentment -->
+		<SPAN TYPE="COMMENT1">
+			<BEGIN>&lt;!--</BEGIN>
+			<END>--&gt;</END>
+		</SPAN>
+
+		<SPAN TYPE="LITERAL1" DELEGATE="STRING">
+			<BEGIN>"</BEGIN>
+			<END>"</END>
+		</SPAN>
+
+		<SPAN TYPE="LITERAL1" DELEGATE="STRING">
+			<BEGIN>'</BEGIN>
+			<END>'</END>
+		</SPAN>
+
+		<SEQ TYPE="MARKUP">/</SEQ>
+		<MARK_PREVIOUS TYPE="LABEL" MATCH_TYPE="OPERATOR">:</MARK_PREVIOUS>
+	</RULES>
+	<RULES SET="DTD-TAGS" DEFAULT="KEYWORD2" IGNORE_CASE="FALSE">
+		<!-- Sfrom_contentment -->
+		<SPAN TYPE="COMMENT1">
+			<BEGIN>&lt;!--</BEGIN>
+			<END>--&gt;</END>
+		</SPAN>
+
+		<!-- Sfrom_contentment -->
+		<SPAN TYPE="COMMENT1">
+			<BEGIN>--</BEGIN>
+			<END>--</END>
+		</SPAN>
+
+		<!-- Parameter entities -->
+		<SPAN TYPE="LITERAL2" NO_WORD_BREAK="TRUE">
+			<BEGIN>%</BEGIN>
+			<END>;</END>
+		</SPAN>
+
+		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="FALSE">
+			<BEGIN>"</BEGIN>
+			<END>"</END>
+		</SPAN>
+
+		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="FALSE">
+			<BEGIN>'</BEGIN>
+			<END>'</END>
+		</SPAN>
+
+		<!-- This appears in some SGML documents -->
+		<SPAN TYPE="KEYWORD2" DELEGATE="MAIN">
+			<BEGIN>[</BEGIN>
+			<END>]</END>
+		</SPAN>
+
+		<SEQ TYPE="OPERATOR">(</SEQ>
+		<SEQ TYPE="OPERATOR">)</SEQ>
+		<SEQ TYPE="OPERATOR">|</SEQ>
+		<SEQ TYPE="OPERATOR">?</SEQ>
+		<SEQ TYPE="OPERATOR">*</SEQ>
+		<SEQ TYPE="OPERATOR">+</SEQ>
+		<SEQ TYPE="OPERATOR">,</SEQ>
+
+		<KEYWORDS>
+			<KEYWORD1>CDATA</KEYWORD1>
+			<KEYWORD1>EMPTY</KEYWORD1>
+			<KEYWORD1>INCLUDE</KEYWORD1>
+			<KEYWORD1>IGNORE</KEYWORD1>
+			<KEYWORD1>NDATA</KEYWORD1>
+			<KEYWORD1>#IMPLIED</KEYWORD1>
+			<KEYWORD1>#PCDATA</KEYWORD1>
+			<KEYWORD1>#REQUIRED</KEYWORD1>
+		</KEYWORDS>
+	</RULES>
+ 	<RULES SET="STRING" DEFAULT="LITERAL1">
+ 		<SPAN TYPE="LITERAL2" NO_WORD_BREAK="TRUE">
+ 			<BEGIN>&amp;</BEGIN>
+ 			<END>;</END>
+ 		</SPAN>
+ 	</RULES>
+ 	<!-- }}} -->
+	<RULES SET="ENTITY-TAGS" DEFAULT="KEYWORD2">
+		<!-- Sfrom_contentment -->
+		<SPAN TYPE="COMMENT1">
+			<BEGIN>&lt;!--</BEGIN>
+			<END>--&gt;</END>
+		</SPAN>
+
+		<!-- Sfrom_contentment -->
+		<SPAN TYPE="COMMENT1">
+			<BEGIN>--</BEGIN>
+			<END>--</END>
+		</SPAN>
+
+		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="FALSE">
+			<BEGIN>"</BEGIN>
+			<END>"</END>
+		</SPAN>
+
+		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="FALSE">
+			<BEGIN>'</BEGIN>
+			<END>'</END>
+		</SPAN>
+
+		<SEQ TYPE="OPERATOR">=</SEQ>
+
+		<SEQ TYPE="OPERATOR">%</SEQ>
+
+		<KEYWORDS>
+			<KEYWORD1>SYSTEM</KEYWORD1>
+		</KEYWORDS>
+	</RULES>
+	<RULES SET="CDATA" DEFAULT="COMMENT2">
+		<!-- no rules -->
+	</RULES>
+</MODE>
diff --git a/qpython/src/main/assets/themes/Mac Classic.tmTheme b/qpython/src/main/assets/themes/Mac Classic.tmTheme
new file mode 100755
index 00000000..c407f0e3
--- /dev/null
+++ b/qpython/src/main/assets/themes/Mac Classic.tmTheme	
@@ -0,0 +1,450 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>author</key>
+	<string>Chris Thomas</string>
+	<key>name</key>
+	<string>Mac Classic</string>
+	<key>settings</key>
+	<array>
+		<dict>
+			<key>settings</key>
+			<dict>
+				<key>background</key>
+				<string>#FFFFFF</string>
+				<key>caret</key>
+				<string>#000000</string>
+				<key>foreground</key>
+				<string>#000000</string>
+				<key>invisibles</key>
+				<string>#BFBFBF</string>
+				<key>lineHighlight</key>
+				<string>#00000012</string>
+				<key>selection</key>
+				<string>#4D97FF54</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Comment</string>
+			<key>scope</key>
+			<string>from_content</string>
+			<key>settings</key>
+			<dict>
+				<key>fontStyle</key>
+				<string>italic</string>
+				<key>foreground</key>
+				<string>#0066FF</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Keyword</string>
+			<key>scope</key>
+			<string>keyword, storage</string>
+			<key>settings</key>
+			<dict>
+				<key>fontStyle</key>
+				<string>bold</string>
+				<key>foreground</key>
+				<string>#0000FF</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Number</string>
+			<key>scope</key>
+			<string>constant.numeric</string>
+			<key>settings</key>
+			<dict>
+				<key>fontStyle</key>
+				<string></string>
+				<key>foreground</key>
+				<string>#0000CD</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>User-defined constant</string>
+			<key>scope</key>
+			<string>constant</string>
+			<key>settings</key>
+			<dict>
+				<key>fontStyle</key>
+				<string>bold</string>
+				<key>foreground</key>
+				<string>#C5060B</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Built-in constant</string>
+			<key>scope</key>
+			<string>constant.language</string>
+			<key>settings</key>
+			<dict>
+				<key>fontStyle</key>
+				<string>bold</string>
+				<key>foreground</key>
+				<string>#585CF6</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Variable</string>
+			<key>scope</key>
+			<string>variable.language, variable.other</string>
+			<key>settings</key>
+			<dict>
+				<key>fontStyle</key>
+				<string></string>
+				<key>foreground</key>
+				<string>#318495</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>String</string>
+			<key>scope</key>
+			<string>string</string>
+			<key>settings</key>
+			<dict>
+				<key>fontStyle</key>
+				<string></string>
+				<key>foreground</key>
+				<string>#036A07</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>String interpolation</string>
+			<key>scope</key>
+			<string>constant.character.escape, string code</string>
+			<key>settings</key>
+			<dict>
+				<key>fontStyle</key>
+				<string></string>
+				<key>foreground</key>
+				<string>#26B31A</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Preprocessor line</string>
+			<key>scope</key>
+			<string>meta.preprocessor</string>
+			<key>settings</key>
+			<dict>
+				<key>fontStyle</key>
+				<string></string>
+				<key>foreground</key>
+				<string>#1A921C</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Preprocessor directive</string>
+			<key>scope</key>
+			<string>keyword.control.import</string>
+			<key>settings</key>
+			<dict>
+				<key>fontStyle</key>
+				<string>bold</string>
+				<key>foreground</key>
+				<string>#0C450D</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Function name</string>
+			<key>scope</key>
+			<string>entity.name.function, support.function.any-method</string>
+			<key>settings</key>
+			<dict>
+				<key>fontStyle</key>
+				<string>bold</string>
+				<key>foreground</key>
+				<string>#0000A2</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Type name</string>
+			<key>scope</key>
+			<string>entity.name.type</string>
+			<key>settings</key>
+			<dict>
+				<key>fontStyle</key>
+				<string>underline</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Inherited class name</string>
+			<key>scope</key>
+			<string>entity.other.inherited-class</string>
+			<key>settings</key>
+			<dict>
+				<key>fontStyle</key>
+				<string>italic</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Function parameter</string>
+			<key>scope</key>
+			<string>variable.parameter</string>
+			<key>settings</key>
+			<dict>
+				<key>fontStyle</key>
+				<string>italic</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Function argument and result types</string>
+			<key>scope</key>
+			<string>storage.type.method</string>
+			<key>settings</key>
+			<dict>
+				<key>fontStyle</key>
+				<string></string>
+				<key>foreground</key>
+				<string>#70727E</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Section</string>
+			<key>scope</key>
+			<string>meta.section entity.name.section, declaration.section entity.name.section</string>
+			<key>settings</key>
+			<dict>
+				<key>fontStyle</key>
+				<string>italic</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Library function</string>
+			<key>scope</key>
+			<string>support.function</string>
+			<key>settings</key>
+			<dict>
+				<key>fontStyle</key>
+				<string>bold</string>
+				<key>foreground</key>
+				<string>#3C4C72</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Library object</string>
+			<key>scope</key>
+			<string>support.class, support.type</string>
+			<key>settings</key>
+			<dict>
+				<key>fontStyle</key>
+				<string>bold</string>
+				<key>foreground</key>
+				<string>#6D79DE</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Library constant</string>
+			<key>scope</key>
+			<string>support.constant</string>
+			<key>settings</key>
+			<dict>
+				<key>fontStyle</key>
+				<string>bold</string>
+				<key>foreground</key>
+				<string>#06960E</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Library variable</string>
+			<key>scope</key>
+			<string>support.variable</string>
+			<key>settings</key>
+			<dict>
+				<key>fontStyle</key>
+				<string>bold</string>
+				<key>foreground</key>
+				<string>#21439C</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>JS: Operator</string>
+			<key>scope</key>
+			<string>keyword.operator.js</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#687687</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Invalid</string>
+			<key>scope</key>
+			<string>invalid</string>
+			<key>settings</key>
+			<dict>
+				<key>background</key>
+				<string>#990000</string>
+				<key>foreground</key>
+				<string>#FFFFFF</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Invalid trailing whitespace</string>
+			<key>scope</key>
+			<string>invalid.deprecated.trailing-whitespace</string>
+			<key>settings</key>
+			<dict>
+				<key>background</key>
+				<string>#FFD0D0</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Embedded code</string>
+			<key>scope</key>
+			<string>text code, string.unquoted</string>
+			<key>settings</key>
+			<dict>
+				<key>background</key>
+				<string>#0000000D</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Embedded embedded code</string>
+			<key>scope</key>
+			<string>text code string.unquoted, text code text code</string>
+			<key>settings</key>
+			<dict>
+				<key>background</key>
+				<string>#0000000F</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Markup XML declaration</string>
+			<key>scope</key>
+			<string>meta.tag.preprocessor.xml</string>
+			<key>settings</key>
+			<dict>
+				<key>fontStyle</key>
+				<string></string>
+				<key>foreground</key>
+				<string>#68685B</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Markup DOCTYPE</string>
+			<key>scope</key>
+			<string>meta.tag.sgml.doctype, meta.tag.sgml.doctype entity, meta.tag.sgml.doctype string, meta.tag.preprocessor.xml, meta.tag.preprocessor.xml entity, meta.tag.preprocessor.xml string</string>
+			<key>settings</key>
+			<dict>
+				<key>fontStyle</key>
+				<string></string>
+				<key>foreground</key>
+				<string>#888888</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Markup DTD</string>
+			<key>scope</key>
+			<string>string.quoted.docinfo.doctype.DTD</string>
+			<key>settings</key>
+			<dict>
+				<key>fontStyle</key>
+				<string>italic</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Markup tag</string>
+			<key>scope</key>
+			<string>meta.tag, declaration.tag</string>
+			<key>settings</key>
+			<dict>
+				<key>fontStyle</key>
+				<string></string>
+				<key>foreground</key>
+				<string>#1C02FF</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Markup name of tag</string>
+			<key>scope</key>
+			<string>entity.name.tag</string>
+			<key>settings</key>
+			<dict>
+				<key>fontStyle</key>
+				<string>bold</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Markup tag attribute</string>
+			<key>scope</key>
+			<string>entity.other.attribute-name</string>
+			<key>settings</key>
+			<dict>
+				<key>fontStyle</key>
+				<string>italic</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Markup: Heading</string>
+			<key>scope</key>
+			<string>markup.heading</string>
+			<key>settings</key>
+			<dict>
+				<key>fontStyle</key>
+				<string>bold</string>
+				<key>foreground</key>
+				<string>#0C07FF</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Markup: Quote</string>
+			<key>scope</key>
+			<string>markup.quote</string>
+			<key>settings</key>
+			<dict>
+				<key>fontStyle</key>
+				<string>italic</string>
+				<key>foreground</key>
+				<string>#000000</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Markup: List</string>
+			<key>scope</key>
+			<string>markup.list</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#B90690</string>
+			</dict>
+		</dict>
+	</array>
+	<key>uuid</key>
+	<string>71D40D9D-AE48-11D9-920A-000D93589AF6</string>
+</dict>
+</plist>
diff --git a/qpython/src/main/assets/themes/Monokai Bright.tmTheme b/qpython/src/main/assets/themes/Monokai Bright.tmTheme
new file mode 100755
index 00000000..f830fa8b
--- /dev/null
+++ b/qpython/src/main/assets/themes/Monokai Bright.tmTheme	
@@ -0,0 +1,390 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>name</key>
+	<string>Monokai Bright</string>
+	<key>settings</key>
+	<array>
+		<dict>
+			<key>settings</key>
+			<dict>
+				<key>background</key>
+				<string>#272822</string>
+				<key>caret</key>
+				<string>#F8F8F0</string>
+				<key>foreground</key>
+				<string>#F8F8F2</string>
+				<key>invisibles</key>
+				<string>#3B3A32</string>
+				<key>lineHighlight</key>
+				<string>#3E3D32</string>
+				<key>selection</key>
+				<string>#9D550F</string>
+				<key>selectionForeground</key>
+				<string>#fffff8</string>
+				<key>inactiveSelection</key>
+				<string>#bbbbbb</string>
+				<key>inactiveSelectionForeground</key>
+				<string>#222222</string>
+				<key>findHighlight</key>
+				<string>#FFE792</string>
+				<key>findHighlightForeground</key>
+				<string>#000000</string>
+				<key>activeGuide</key>
+				<string>#9D550FB0</string>
+
+				<key>bracketsForeground</key>
+				<string>#F8F8F2A5</string>
+				<key>bracketsOptions</key>
+				<string>underline</string>
+
+				<key>bracketContentsForeground</key>
+				<string>#F8F8F2A5</string>
+				<key>bracketContentsOptions</key>
+				<string>underline</string>
+
+				<key>tagsOptions</key>
+				<string>stippled_underline</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Comment</string>
+			<key>scope</key>
+			<string>from_content</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#75715E</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>String</string>
+			<key>scope</key>
+			<string>string</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#E6DB74</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Number</string>
+			<key>scope</key>
+			<string>constant.numeric</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#AE81FF</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Built-in constant</string>
+			<key>scope</key>
+			<string>constant.language</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#AE81FF</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>User-defined constant</string>
+			<key>scope</key>
+			<string>constant.character, constant.other</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#AE81FF</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Variable</string>
+			<key>scope</key>
+			<string>variable</string>
+			<key>settings</key>
+			<dict>
+				<key>fontStyle</key>
+				<string></string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Keyword</string>
+			<key>scope</key>
+			<string>keyword</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#F92672</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Storage</string>
+			<key>scope</key>
+			<string>storage</string>
+			<key>settings</key>
+			<dict>
+				<key>fontStyle</key>
+				<string></string>
+				<key>foreground</key>
+				<string>#F92672</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Storage type</string>
+			<key>scope</key>
+			<string>storage.type</string>
+			<key>settings</key>
+			<dict>
+				<key>fontStyle</key>
+				<string>italic</string>
+				<key>foreground</key>
+				<string>#66D9EF</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Class name</string>
+			<key>scope</key>
+			<string>entity.name.class</string>
+			<key>settings</key>
+			<dict>
+				<key>fontStyle</key>
+				<string>underline</string>
+				<key>foreground</key>
+				<string>#A6E22E</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Inherited class</string>
+			<key>scope</key>
+			<string>entity.other.inherited-class</string>
+			<key>settings</key>
+			<dict>
+				<key>fontStyle</key>
+				<string>italic underline</string>
+				<key>foreground</key>
+				<string>#A6E22E</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Function name</string>
+			<key>scope</key>
+			<string>entity.name.function</string>
+			<key>settings</key>
+			<dict>
+				<key>fontStyle</key>
+				<string></string>
+				<key>foreground</key>
+				<string>#A6E22E</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Function argument</string>
+			<key>scope</key>
+			<string>variable.parameter</string>
+			<key>settings</key>
+			<dict>
+				<key>fontStyle</key>
+				<string>italic</string>
+				<key>foreground</key>
+				<string>#FD971F</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Tag name</string>
+			<key>scope</key>
+			<string>entity.name.tag</string>
+			<key>settings</key>
+			<dict>
+				<key>fontStyle</key>
+				<string></string>
+				<key>foreground</key>
+				<string>#F92672</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Tag attribute</string>
+			<key>scope</key>
+			<string>entity.other.attribute-name</string>
+			<key>settings</key>
+			<dict>
+				<key>fontStyle</key>
+				<string></string>
+				<key>foreground</key>
+				<string>#A6E22E</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Library function</string>
+			<key>scope</key>
+			<string>support.function</string>
+			<key>settings</key>
+			<dict>
+				<key>fontStyle</key>
+				<string></string>
+				<key>foreground</key>
+				<string>#66D9EF</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Library constant</string>
+			<key>scope</key>
+			<string>support.constant</string>
+			<key>settings</key>
+			<dict>
+				<key>fontStyle</key>
+				<string></string>
+				<key>foreground</key>
+				<string>#66D9EF</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Library class/type</string>
+			<key>scope</key>
+			<string>support.type, support.class</string>
+			<key>settings</key>
+			<dict>
+				<key>fontStyle</key>
+				<string>italic</string>
+				<key>foreground</key>
+				<string>#66D9EF</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Library variable</string>
+			<key>scope</key>
+			<string>support.other.variable</string>
+			<key>settings</key>
+			<dict>
+				<key>fontStyle</key>
+				<string></string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Invalid</string>
+			<key>scope</key>
+			<string>invalid</string>
+			<key>settings</key>
+			<dict>
+				<key>background</key>
+				<string>#F92672</string>
+				<key>fontStyle</key>
+				<string></string>
+				<key>foreground</key>
+				<string>#F8F8F0</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Invalid deprecated</string>
+			<key>scope</key>
+			<string>invalid.deprecated</string>
+			<key>settings</key>
+			<dict>
+				<key>background</key>
+				<string>#AE81FF</string>
+				<key>foreground</key>
+				<string>#F8F8F0</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>JSON String</string>
+			<key>scope</key>
+			<string>meta.structure.dictionary.json string.quoted.double.json</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#CFCFC2</string>
+			</dict>
+		</dict>
+
+		<dict>
+			<key>name</key>
+			<string>diff.header</string>
+			<key>scope</key>
+			<string>meta.diff, meta.diff.header</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#75715E</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>diff.deleted</string>
+			<key>scope</key>
+			<string>markup.deleted</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#F92672</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>diff.inserted</string>
+			<key>scope</key>
+			<string>markup.inserted</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#A6E22E</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>diff.changed</string>
+			<key>scope</key>
+			<string>markup.changed</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#E6DB74</string>
+			</dict>
+		</dict>
+
+		<dict>
+			<key>scope</key>
+			<string>constant.numeric.line-number.find-in-files - match</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#AE81FFA0</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>scope</key>
+			<string>entity.name.filename.find-in-files</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#E6DB74</string>
+			</dict>
+		</dict>
+
+	</array>
+	<key>uuid</key>
+	<string>D8D5E82E-3D5B-46B5-B38E-8C841C21347E</string>
+</dict>
+</plist>
diff --git a/qpython/src/main/assets/xmode.dtd b/qpython/src/main/assets/xmode.dtd
new file mode 100644
index 00000000..d0050707
--- /dev/null
+++ b/qpython/src/main/assets/xmode.dtd
@@ -0,0 +1,167 @@
+<!-- Syntax tokens -->
+<!ENTITY % token_values "NULL | COMMENT1 | COMMENT2 | COMMENT3 | COMMENT4 |
+	DIGIT | FUNCTION | INVALID | KEYWORD1 | KEYWORD2 | KEYWORD3 | KEYWORD4 |
+	LABEL | LITERAL1 | LITERAL2 | LITERAL3 | LITERAL4 | MARKUP | OPERATOR" >
+<!ENTITY % tokens "( %token_values; )" >
+
+<!-- Entities for attributes shared by multiple rules -->
+<!ENTITY % att-bool '( TRUE | FALSE ) #IMPLIED' >
+<!ENTITY % att-type 'TYPE %tokens; #IMPLIED' >
+<!ENTITY % att-position-mix 'AT_LINE_START %att-bool;
+	AT_WHITESPACE_END %att-bool;
+	AT_WORD_START %att-bool; ' >
+<!ENTITY % att-match-type 'MATCH_TYPE ( %token_values; | CONTEXT | RULE ) #IMPLIED' >
+<!ENTITY % att-delegate 'DELEGATE CDATA #IMPLIED' >
+<!ENTITY % att-span-mix 'NO_LINE_BREAK %att-bool;
+	NO_WORD_BREAK %att-bool;
+    ESCAPE CDATA #IMPLIED '>
+<!ENTITY % att-hash-char 'HASH_CHAR CDATA #IMPLIED
+	HASH_CHARS CDATA #IMPLIED' >
+
+<!-- MODE element -->
+<!ELEMENT MODE ( PROPS?, RULES* ) >
+
+<!-- MODE children -->
+<!-- PROPS element -->
+<!ELEMENT PROPS ( PROPERTY+ ) >
+
+<!-- PROPS children -->
+<!ELEMENT PROPERTY EMPTY >
+<!ATTLIST PROPERTY
+	NAME CDATA #REQUIRED
+	VALUE CDATA #REQUIRED >
+
+<!-- RULES element -->
+<!ELEMENT RULES ( PROPS?, ( IMPORT | TERMINATE | SEQ | SEQ_REGEXP | SPAN
+	| SPAN_REGEXP | EOL_SPAN | EOL_SPAN_REGEXP | MARK_PREVIOUS
+	| MARK_FOLLOWING )*, KEYWORDS? ) >
+
+<!-- RULES attributes -->
+<!ATTLIST RULES
+	SET CDATA #IMPLIED
+	IGNORE_CASE %att-bool;
+	HIGHLIGHT_DIGITS %att-bool;
+	DIGIT_RE CDATA #IMPLIED
+	ESCAPE CDATA #IMPLIED
+	DEFAULT %tokens; #IMPLIED
+	NO_WORD_SEP CDATA #IMPLIED >
+
+<!-- IMPORT element -->
+<!ELEMENT IMPORT EMPTY >
+<!ATTLIST IMPORT DELEGATE CDATA #REQUIRED >
+
+<!-- TERMINATE element -->
+<!ELEMENT TERMINATE EMPTY >
+<!ATTLIST TERMINATE AT_CHAR CDATA #REQUIRED >
+
+<!-- SEQ element -->
+<!ELEMENT SEQ ( #PCDATA ) >
+
+<!-- SEQ attributes -->
+<!ATTLIST SEQ
+	%att-type;
+	%att-position-mix;
+	%att-delegate; >
+
+<!-- SEQ_REGEXP element -->
+<!ELEMENT SEQ_REGEXP ( #PCDATA ) >
+
+<!-- SEQ_REGEXP attributes -->
+<!ATTLIST SEQ_REGEXP
+	%att-hash-char;
+	%att-type;
+	%att-position-mix;
+	%att-delegate; >
+
+<!-- SPAN element -->
+<!ELEMENT SPAN ( BEGIN, END ) >
+
+<!-- SPAN attributes -->
+<!ATTLIST SPAN
+	%att-type;
+	%att-position-mix;
+	%att-span-mix;
+	%att-match-type;
+	%att-delegate; >
+
+<!-- SPAN_REGEXP element -->
+<!ELEMENT SPAN_REGEXP ( BEGIN, END ) >
+
+<!-- SPAN_REGEXP attributes -->
+<!ATTLIST SPAN_REGEXP
+	%att-hash-char;
+	%att-type;
+	%att-position-mix;
+	%att-span-mix;
+	%att-match-type;
+	%att-delegate; >
+
+<!-- SPAN and SPAN_REGEXP children -->
+<!ELEMENT BEGIN ( #PCDATA ) >
+<!ELEMENT END ( #PCDATA ) >
+<!ATTLIST END
+	%att-position-mix;
+	REGEXP %att-bool; >
+
+<!-- EOL_SPAN element -->
+<!ELEMENT EOL_SPAN ( #PCDATA ) >
+
+<!-- EOL_SPAN attributes -->
+<!ATTLIST EOL_SPAN
+	%att-type;
+	%att-position-mix;
+	%att-match-type;
+	%att-delegate; >
+
+<!-- EOL_SPAN_REGEXP element -->
+<!ELEMENT EOL_SPAN_REGEXP ( #PCDATA ) >
+
+<!-- EOL_SPAN_REGEXP attributes -->
+<!ATTLIST EOL_SPAN_REGEXP
+	%att-hash-char;
+	%att-type;
+	%att-position-mix;
+	%att-match-type;
+	%att-delegate; >
+
+<!-- MARK_FOLLOWING element -->
+<!ELEMENT MARK_FOLLOWING ( #PCDATA ) >
+
+<!-- MARK_FOLLOWING attributes -->
+<!ATTLIST MARK_FOLLOWING
+	%att-type;
+	%att-position-mix;
+	%att-match-type; >
+
+<!-- MARK_PREVIOUS element -->
+<!ELEMENT MARK_PREVIOUS ( #PCDATA ) >
+
+<!-- MARK_PREVIOUS attributes -->
+<!ATTLIST MARK_PREVIOUS
+	%att-type;
+	%att-position-mix;
+	%att-match-type; >
+
+<!-- KEYWORDS element -->
+<!ELEMENT KEYWORDS (%tokens;)+ >
+
+<!-- KEYWORDS children -->
+<!ELEMENT COMMENT1 ( #PCDATA ) >
+<!ELEMENT COMMENT2 ( #PCDATA ) >
+<!ELEMENT COMMENT3 ( #PCDATA ) >
+<!ELEMENT COMMENT4 ( #PCDATA ) >
+<!ELEMENT DIGIT ( #PCDATA ) >
+<!ELEMENT FUNCTION ( #PCDATA ) >
+<!ELEMENT KEYWORD1 ( #PCDATA ) >
+<!ELEMENT KEYWORD2 ( #PCDATA ) >
+<!ELEMENT KEYWORD3 ( #PCDATA ) >
+<!ELEMENT KEYWORD4 ( #PCDATA ) >
+<!ELEMENT LABEL ( #PCDATA ) >
+<!ELEMENT LITERAL1 ( #PCDATA ) >
+<!ELEMENT LITERAL2 ( #PCDATA ) >
+<!ELEMENT LITERAL3 ( #PCDATA ) >
+<!ELEMENT LITERAL4 ( #PCDATA ) >
+<!ELEMENT MARKUP ( #PCDATA ) >
+<!ELEMENT NULL ( #PCDATA ) >
+<!ELEMENT OPERATOR ( #PCDATA ) >
+<!ELEMENT INVALID ( #PCDATA ) >
diff --git a/qpython/src/main/java/org/qpython/qpy/codeshare/CONSTANT.java b/qpython/src/main/java/org/qpython/qpy/codeshare/CONSTANT.java
new file mode 100644
index 00000000..e878b621
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/codeshare/CONSTANT.java
@@ -0,0 +1,9 @@
+package org.qpython.qpy.codeshare;
+
+
+public class CONSTANT {
+    public static final String IS_UPLOAD_INIT = "is_upload_init";// 是否同步了云端文件名
+    public static final String CLOUDED_MAP    = "clouded_map";// 云端文件名路径MAP
+    public static final String DOT_REPLACE    = "_%"; // Firebase Database中"." & "/" 等为非法字符无法上传, 需转义
+    public static final String SLASH_REPLACE  = "-%";
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/codeshare/Clouded.java b/qpython/src/main/java/org/qpython/qpy/codeshare/Clouded.java
new file mode 100644
index 00000000..73055c29
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/codeshare/Clouded.java
@@ -0,0 +1,54 @@
+package org.qpython.qpy.codeshare;
+
+import android.app.Activity;
+import android.content.SharedPreferences;
+
+import com.google.gson.reflect.TypeToken;
+
+import org.qpython.qpy.main.app.App;
+
+import java.lang.reflect.Type;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.qpython.qpy.codeshare.CONSTANT.CLOUDED_MAP;
+import static org.qpython.qpy.codeshare.CONSTANT.IS_UPLOAD_INIT;
+
+/**
+ * 已上传云端的文件列表
+ * Created by Hmei on 17/9/7.
+ */
+
+public class Clouded {
+    SharedPreferences sp;
+    private Map<String, Boolean> clouded;
+
+    private Clouded() {
+    }
+
+    public static Clouded getInstance() {
+        return CloudedHolder.INSTANCE;
+    }
+
+    public Map<String, Boolean> getClouded() {
+        return clouded;
+    }
+
+    public void setClouded(Map<String, Boolean> clouded) {
+        this.clouded = clouded;
+    }
+
+    public void writeToSP(Activity context) {
+        if (clouded.size() > 0) {
+            Type type = new TypeToken<HashMap<String, Boolean>>() {
+            }.getType();
+            sp.edit().putBoolean(IS_UPLOAD_INIT, true)
+                    .putString(CLOUDED_MAP, App.getGson().toJson(clouded, type)).apply();
+        }
+    }
+
+    private static class CloudedHolder {
+        private static final Clouded INSTANCE = new Clouded();
+    }
+
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/codeshare/IShareCode.java b/qpython/src/main/java/org/qpython/qpy/codeshare/IShareCode.java
new file mode 100644
index 00000000..6cb6fb7c
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/codeshare/IShareCode.java
@@ -0,0 +1,137 @@
+//package org.qpython.qpy.codeshare;
+//
+//import android.app.Activity;
+//
+//import org.qpython.qpy.codeshare.pojo.CloudFile;
+//import org.qpython.qpy.codeshare.pojo.Gist;
+//
+//import java.util.List;
+//
+///**
+// * Created by Hmei
+// * 11/30/17
+// */
+//public interface IShareCode {
+//
+//    /**
+//     * @return single instance
+//     */
+//    static IShareCode getInstance() {
+//        return null;
+//    }
+//
+//    /**
+//     * 新建脚本Gist
+//     *
+//     * @param title    Gist标题
+//     * @param desc     Gist描述
+//     * @param msg      Commit message
+//     * @param content  File content
+//     * @param listener 上传成功后的监听
+//     */
+//    void createScriptGist(String title, String desc, String msg, String content, Object listener);
+//
+//    /**
+//     * 新建项目Gist
+//     *
+//     * @param projectName        项目名
+//     * @param desc               上传描述
+//     * @param msg                Commit message
+//     * @param paths              项目文件路径列表
+//     * @param completionListener 上传成功后的监听
+//     */
+//    void createProjectGist(String projectName, String desc, String msg, List<String> paths, Object completionListener);
+//
+//    /**
+//     * 提交Commit
+//     *
+//     * @param gist_id   Gist id
+//     * @param msg      Commit message
+//     * @param content  File content
+//     * @param projName project name
+//     * @param fileName file name
+//     */
+//    void commitGist(String gist_id, String msg, String content, String projName, String fileName);
+//
+//    /**
+//     * 对某个Gist提交评论
+//     *
+//     * @param gist_id   Gist Id
+//     * @param comment  Commit message
+//     * @param isProj   is project?
+//     * @param callback callback
+//     */
+//    void sendComment(String gist_id, String comment, boolean isProj, CommentCallback callback);
+//
+//    /**
+//     * 回复某个Gist下的评论
+//     *
+//     * @param gist_id    Gist Id
+//     * @param to        回复给to
+//     * @param comment   Commit message
+//     * @param reComment 回复的内容
+//     * @param isProj    is project?
+//     * @param callback  callback
+//     */
+//    void sendComment(String gist_id, String to, String comment, String reComment, boolean isProj, CommentCallback callback);
+//
+//    /**
+//     * Add bookmark
+//     *
+//     * @param gist_id gist id
+//     */
+//    void bookmark(String gist_id);
+//
+//    /**
+//     * Cancel bookmark
+//     *
+//     * @param gist_id gist id
+//     */
+//    void cancelBookmark(String gist_id);
+//
+//    /**
+//     * 获取上传的Scripts列表
+//     *
+//     * @param callback callback
+//     */
+//    void getBaseScriptGistList(ShareCodeCallback callback);
+//
+//    /**
+//     * 获取上传的Projects列表
+//     *
+//     * @param callback
+//     */
+//    void getBaseProjectGistList(ShareCodeCallback callback);
+//
+//    /**
+//     * @param gist_id
+//     * @param isProj
+//     * @param callback
+//     */
+//    void getGistDetail(String gist_id, boolean isProj, ShareCodeCallback callback);
+//
+//    /**
+//     * @param callback
+//     */
+//    void getMyGistList(ShareCodeCallback callback);
+//
+//    void getMyBookmarkList(ShareCodeCallback callback);
+//
+//    void getGistCommentList(String gist_id, ShareCodeCallback callback);
+//
+//    boolean uploadFolder(String path, long size, Object completionListener);
+//
+//    boolean uploadFile(String path, long size, Object completionListener);
+//
+//    boolean checkSpace(long size);
+//
+//    void getUploadedScripts(boolean forceRefresh, Activity context, ShareCodeCallback callback);
+//
+//    void locateUsage(long usage, Activity context);
+//
+//    void deleteUploadScript(CloudFile cloudFile, Object listener);
+//
+//    public interface CommentCallback {
+//        void commentBean(Gist.CommentBean comment);
+//    }
+//}
diff --git a/qpython/src/main/java/org/qpython/qpy/codeshare/pojo/BookmarkerList.java b/qpython/src/main/java/org/qpython/qpy/codeshare/pojo/BookmarkerList.java
new file mode 100644
index 00000000..f2e1b840
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/codeshare/pojo/BookmarkerList.java
@@ -0,0 +1,100 @@
+package org.qpython.qpy.codeshare.pojo;
+
+import java.util.List;
+
+/**
+ * Created by Hmei on 2017-08-10.
+ */
+
+public class BookmarkerList {
+
+    /**
+     * id :
+     * name :
+     * bookmaker : [{"id":"","date":"","comment_cout":100,"bookmaker_cout":200,"titile":""},{"id":"","date":"","comment_cout":100,"bookmaker_cout":200,"titile":""}]
+     */
+
+    private String id;
+    private String              name;
+    private List<BookmakerBean> bookmaker;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public List<BookmakerBean> getBookmaker() {
+        return bookmaker;
+    }
+
+    public void setBookmaker(List<BookmakerBean> bookmaker) {
+        this.bookmaker = bookmaker;
+    }
+
+    public static class BookmakerBean {
+        /**
+         * id :
+         * date :
+         * comment_cout : 100
+         * bookmaker_cout : 200
+         * titile :
+         */
+
+        private String id;
+        private String date;
+        private int    comment_cout;
+        private int    bookmaker_cout;
+        private String titile;
+
+        public String getId() {
+            return id;
+        }
+
+        public void setId(String id) {
+            this.id = id;
+        }
+
+        public String getDate() {
+            return date;
+        }
+
+        public void setDate(String date) {
+            this.date = date;
+        }
+
+        public int getComment_cout() {
+            return comment_cout;
+        }
+
+        public void setComment_cout(int comment_cout) {
+            this.comment_cout = comment_cout;
+        }
+
+        public int getBookmaker_cout() {
+            return bookmaker_cout;
+        }
+
+        public void setBookmaker_cout(int bookmaker_cout) {
+            this.bookmaker_cout = bookmaker_cout;
+        }
+
+        public String getTitile() {
+            return titile;
+        }
+
+        public void setTitile(String titile) {
+            this.titile = titile;
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/codeshare/pojo/Gist.java b/qpython/src/main/java/org/qpython/qpy/codeshare/pojo/Gist.java
new file mode 100644
index 00000000..d9d027fc
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/codeshare/pojo/Gist.java
@@ -0,0 +1,281 @@
+package org.qpython.qpy.codeshare.pojo;
+
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * Gist detail bean
+ * Created by Hmei on 2017-08-10.
+ */
+
+public class Gist {
+
+    /**
+     * author : String
+     * id : String
+     * title : String
+     * describe : String
+     * history : [{"data":"String","content":"String"},{"data":"String","content":"String"},{"data":"String","content":"String"}]
+     * comment : [{"id":"String","from":"User name","re":"User name(nullable)","content":"String","data":"String"}]
+     * bookmarker : [{"name":"User name","id":"User id"}]
+     */
+
+    private String author;
+    private String avatar;
+    private String id;
+    private String title;
+    private String describe;
+    private String date;
+
+    private transient List<HistoryBean>    history;
+    private transient List<CommentBean>    comment;
+    private transient List<BookmarkerBean> bookmarker;
+
+    public String getAuthor() {
+        return author;
+    }
+
+    public void setAuthor(String author) {
+        this.author = author;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getDescribe() {
+        return describe;
+    }
+
+    public void setDescribe(String describe) {
+        this.describe = describe;
+    }
+
+    public String getDate() {
+        return date;
+    }
+
+    public void setDate(String date) {
+        this.date = date;
+    }
+
+    public List<HistoryBean> getHistory() {
+        return history;
+    }
+
+    public void setHistory(List<HistoryBean> history) {
+        this.history = history;
+    }
+
+    public List<CommentBean> getComment() {
+        return comment;
+    }
+
+    public void setComment(List<CommentBean> comment) {
+        this.comment = comment;
+    }
+
+    public List<BookmarkerBean> getBookmarker() {
+        return bookmarker;
+    }
+
+    public void setBookmarker(List<BookmarkerBean> bookmarker) {
+        this.bookmarker = bookmarker;
+    }
+
+    public String getHistoryCount() {
+        return history == null ? "0" : history.size() + "";
+    }
+
+    public String getCommentCount() {
+        return comment == null ? "0" : "" + comment.size();
+    }
+
+    public String getBookmarkerCount() {
+        return bookmarker == null ? "0" : "" + bookmarker.size();
+    }
+
+    public String getLastCommitCode() {
+        return history == null ? "" : history.get(history.size() - 1).getContent();
+    }
+
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public void setAvatar(String avatar) {
+        this.avatar = avatar;
+    }
+
+    public static class HistoryBean {
+        /**
+         * data : String
+         * content : String
+         * massage : String
+         */
+
+        private String historyId;
+        private String data;
+        private String content;
+        private String massage;
+
+        public String getData() {
+            return data;
+        }
+
+        public void setData(String data) {
+            this.data = data;
+        }
+
+        public String getContent() {
+            return content;
+        }
+
+        public void setContent(String content) {
+            this.content = content;
+        }
+
+        public String getMassage() {
+            return massage;
+        }
+
+        public void setMassage(String massage) {
+            this.massage = massage;
+        }
+
+        public String getHistoryId() {
+            return historyId;
+        }
+
+        public void setHistoryId(String historyId) {
+            this.historyId = historyId;
+        }
+    }
+
+    public static class CommentBean implements Serializable{
+        /**
+         * id : String
+         * avatar : http://www.qqu.cc/uploads/allimg/161214/1-1612141141550-L.jpg
+         * from : User name
+         * re : User name(nullable)
+         * re_content : String
+         * from_content : String
+         * data : String
+         */
+
+        private String id;
+        private String avatar;
+        private String from;
+        private String re;
+        private String re_content;
+        private String from_content;
+        private String data;
+
+        public String getId() {
+            return id;
+        }
+
+        public void setId(String id) {
+            this.id = id;
+        }
+
+        public String getAvatar() {
+            return avatar;
+        }
+
+        public void setAvatar(String avatar) {
+            this.avatar = avatar;
+        }
+
+        public String getFrom() {
+            return from;
+        }
+
+        public void setFrom(String from) {
+            this.from = from;
+        }
+
+        public String getRe() {
+            return re;
+        }
+
+        public void setRe(String re) {
+            this.re = re;
+        }
+
+        public String getRe_content() {
+            return re_content;
+        }
+
+        public void setRe_content(String re_content) {
+            this.re_content = re_content;
+        }
+
+        public String getFrom_content() {
+            return from_content;
+        }
+
+        public void setFrom_content(String from_content) {
+            this.from_content = from_content;
+        }
+
+        public String getData() {
+            return data;
+        }
+
+        public void setData(String data) {
+            this.data = data;
+        }
+    }
+
+    public static class BookmarkerBean {
+        /**
+         * name : User name
+         * id : User id
+         */
+
+        private String name;
+        private String id;
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public String getId() {
+            return id;
+        }
+
+        public void setId(String id) {
+            this.id = id;
+        }
+    }
+
+//    public void addHistory(HistoryBean historyBean) {
+//        history.add(historyBean);
+//    }
+//
+//    public void addComment(CommentBean commentBean) {
+//        comment.add(commentBean);
+//    }
+//
+//    public void addBookmarker(BookmarkerBean bookmarkerBean) {
+//        bookmarker.add(bookmarkerBean);
+//    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/codeshare/pojo/GistBase.java b/qpython/src/main/java/org/qpython/qpy/codeshare/pojo/GistBase.java
new file mode 100644
index 00000000..bad2ecd5
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/codeshare/pojo/GistBase.java
@@ -0,0 +1,80 @@
+package org.qpython.qpy.codeshare.pojo;
+
+/**
+ * Created by Hmei on 2017-08-10.
+ */
+
+public class GistBase {
+
+    /**
+     * id :
+     * date :
+     * comment_count : 100
+     * bookmaker_count : 200
+     * title :
+     */
+
+    private String id;
+    private String author;
+    private String date;
+    private String title;
+    private String avatar;
+    private int    comment_count;
+    private int    bookmaker_count;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getDate() {
+        return date;
+    }
+
+    public void setDate(String date) {
+        this.date = date;
+    }
+
+    public int getComment_count() {
+        return comment_count;
+    }
+
+    public void setComment_count(int comment_count) {
+        this.comment_count = comment_count;
+    }
+
+    public int getBookmaker_count() {
+        return bookmaker_count;
+    }
+
+    public void setBookmaker_count(int bookmaker_count) {
+        this.bookmaker_count = bookmaker_count;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getAuthor() {
+        return author;
+    }
+
+    public void setAuthor(String author) {
+        this.author = author;
+    }
+
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public void setAvatar(String avatar) {
+        this.avatar = avatar;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/codeshare/pojo/UploadedProject.java b/qpython/src/main/java/org/qpython/qpy/codeshare/pojo/UploadedProject.java
new file mode 100644
index 00000000..ed005fe0
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/codeshare/pojo/UploadedProject.java
@@ -0,0 +1,46 @@
+package org.qpython.qpy.codeshare.pojo;
+
+
+import java.util.List;
+
+public class UploadedProject {
+    private String name;
+    private int    allFilesCount, uploadFilesCount;
+    private List<String> subFilePath;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public int getAllFilesCount() {
+        return allFilesCount;
+    }
+
+    public void setAllFilesCount(int allFilesCount) {
+        this.allFilesCount = allFilesCount;
+    }
+
+    public int getUploadFilesCount() {
+        return uploadFilesCount;
+    }
+
+    public void setUploadFilesCount(int uploadFilesCount) {
+        this.uploadFilesCount = uploadFilesCount;
+    }
+
+    public List<String> getSubFilePath() {
+        return subFilePath;
+    }
+
+    public void setSubFilePath(List<String> subFilePath) {
+        this.subFilePath = subFilePath;
+    }
+
+    public boolean isAllUpload() {
+        return allFilesCount == uploadFilesCount;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/console/BoundSession.java b/qpython/src/main/java/org/qpython/qpy/console/BoundSession.java
new file mode 100644
index 00000000..317a0305
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/console/BoundSession.java
@@ -0,0 +1,40 @@
+package org.qpython.qpy.console;
+
+import android.os.ParcelFileDescriptor;
+import android.text.TextUtils;
+
+import org.qpython.qpy.console.util.TermSettings;
+
+
+class BoundSession extends GenericTermSession {
+    private final String issuerTitle;
+
+    private boolean fullyInitialized;
+
+    BoundSession(ParcelFileDescriptor ptmxFd, TermSettings settings, String issuerTitle) {
+        super(ptmxFd, settings, true);
+        this.issuerTitle = issuerTitle;
+        setTermIn(new ParcelFileDescriptor.AutoCloseInputStream(ptmxFd));
+        setTermOut(new ParcelFileDescriptor.AutoCloseOutputStream(ptmxFd));
+    }
+
+    @Override
+    public String getTitle() {
+        final String extraTitle = super.getTitle();
+
+        return TextUtils.isEmpty(extraTitle)
+                ? issuerTitle
+                : issuerTitle + " — " + extraTitle;
+    }
+
+    @Override
+    public void initializeEmulator(int columns, int rows) {
+        super.initializeEmulator(columns, rows);
+        fullyInitialized = true;
+    }
+
+    @Override
+    boolean isFailFast() {
+        return !fullyInitialized;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/console/Exec.java b/qpython/src/main/java/org/qpython/qpy/console/Exec.java
new file mode 100644
index 00000000..82eb036c
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/console/Exec.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.qpython.qpy.console;
+
+import java.io.IOException;
+
+/**
+ * Utility methods for managing a pty file descriptor.
+ */
+public class Exec {
+    // Warning: bump the library revision, when an incompatible change happens
+    static {
+        System.loadLibrary("androidterm");
+    }
+
+    static native void setPtyWindowSizeInternal(int fd, int row, int col, int xpixel, int ypixel) throws IOException;
+
+    static native void setPtyUTF8ModeInternal(int fd, boolean utf8Mode) throws IOException;
+}
+
diff --git a/qpython/src/main/java/org/qpython/qpy/console/GenericTermSession.java b/qpython/src/main/java/org/qpython/qpy/console/GenericTermSession.java
new file mode 100644
index 00000000..f85228fc
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/console/GenericTermSession.java
@@ -0,0 +1,230 @@
+/*
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.qpython.qpy.console;
+
+import android.os.Build;
+import android.os.ParcelFileDescriptor;
+import android.util.Log;
+
+import org.qpython.qpy.console.util.TermSettings;
+
+import java.io.FileDescriptor;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.lang.reflect.Field;
+
+import jackpal.androidterm.emulatorview.ColorScheme;
+import jackpal.androidterm.emulatorview.TermSession;
+import jackpal.androidterm.emulatorview.UpdateCallback;
+
+/**
+ * A terminal session, consisting of a TerminalEmulator, a TranscriptScreen,
+ * and the I/O streams used to talk to the process.
+ */
+class GenericTermSession extends TermSession {
+    //** Set to true to force into 80 x 24 for testing with vttest. */
+    private static final boolean VTTEST_MODE = false;
+
+    private static Field descriptorField;
+
+    private final long createdAt;
+
+    // A cookie which uniquely identifies this session.
+    private String mHandle;
+
+    final ParcelFileDescriptor mTermFd;
+
+    TermSettings mSettings;
+
+    public static final int PROCESS_EXIT_FINISHES_SESSION = 0;
+    public static final int PROCESS_EXIT_DISPLAYS_MESSAGE = 1;
+
+    private String mProcessExitMessage;
+
+    private UpdateCallback mUTF8ModeNotify = () -> setPtyUTF8Mode(getUTF8Mode());
+
+    GenericTermSession(ParcelFileDescriptor mTermFd, TermSettings settings, boolean exitOnEOF) {
+        super(exitOnEOF);
+
+        this.mTermFd = mTermFd;
+
+        this.createdAt = System.currentTimeMillis();
+
+        updatePrefs(settings);
+    }
+
+    public void updatePrefs(TermSettings settings) {
+        mSettings = settings;
+        setColorScheme(new ColorScheme(settings.getColorScheme()));
+        setDefaultUTF8Mode(settings.defaultToUTF8Mode());
+    }
+
+    @Override
+    public void initializeEmulator(int columns, int rows) {
+        if (VTTEST_MODE) {
+            columns = 80;
+            rows = 24;
+        }
+        super.initializeEmulator(columns, rows);
+
+        setPtyUTF8Mode(getUTF8Mode());
+        setUTF8ModeUpdateCallback(mUTF8ModeNotify);
+    }
+
+    @Override
+    public void updateSize(int columns, int rows) {
+        if (VTTEST_MODE) {
+            columns = 80;
+            rows = 24;
+        }
+        // Inform the attached pty of our new size:
+        setPtyWindowSize(rows, columns, 0, 0);
+        super.updateSize(columns, rows);
+    }
+
+    /* XXX We should really get this ourselves from the resource bundle, but
+       we cannot hold a context */
+    public void setProcessExitMessage(String message) {
+        mProcessExitMessage = message;
+    }
+
+    @Override
+    protected void onProcessExit() {
+        if (mSettings.closeWindowOnProcessExit()) {
+            finish();
+        } else if (mProcessExitMessage != null) {
+            try {
+                byte[] msg = ("\r\n[" + mProcessExitMessage + "]").getBytes("UTF-8");
+                appendToEmulator(msg, 0, msg.length);
+                notifyUpdate();
+            } catch (UnsupportedEncodingException e) {
+                // Never happens
+            }
+        }
+    }
+
+    @Override
+    public void finish() {
+        try {
+            mTermFd.close();
+        } catch (IOException e) {
+            // ok
+        }
+
+        super.finish();
+    }
+
+    /**
+     * Gets the terminal session's title.  Unlike the superclass's getTitle(),
+     * if the title is null or an empty string, the provided default title will
+     * be returned instead.
+     *
+     * @param defaultTitle The default title to use if this session's title is
+     *                     unset or an empty string.
+     */
+    public String getTitle(String defaultTitle) {
+        String title = getTitle();
+        if (title != null && title.length() > 0) {
+            return title;
+        } else {
+            return defaultTitle;
+        }
+    }
+
+    public void setHandle(String handle) {
+        if (mHandle != null) {
+            throw new IllegalStateException("Cannot change handle once set");
+        }
+        mHandle = handle;
+    }
+
+    public String getHandle() {
+        return mHandle;
+    }
+
+    @Override
+    public String toString() {
+        return getClass().getSimpleName() + '(' + createdAt + ',' + mHandle + ')';
+    }
+
+    /**
+     * Set the widow size for a given pty. Allows programs
+     * connected to the pty learn how large their screen is.
+     */
+    void setPtyWindowSize(int row, int col, int xpixel, int ypixel) {
+        // If the tty goes away too quickly, this may get called after it's descriptor is closed
+        if (!mTermFd.getFileDescriptor().valid())
+            return;
+
+        try {
+            Exec.setPtyWindowSizeInternal(getIntFd(mTermFd), row, col, xpixel, ypixel);
+        } catch (IOException e) {
+            Log.e("exec", "Failed to set window size: " + e.getMessage());
+
+            if (isFailFast())
+                throw new IllegalStateException(e);
+        }
+    }
+
+    /**
+     * Set or clear UTF-8 mode for a given pty.  Used by the terminal driver
+     * to implement correct erase behavior in cooked mode (Linux >= 2.6.4).
+     */
+    void setPtyUTF8Mode(boolean utf8Mode) {
+        // If the tty goes away too quickly, this may get called after it's descriptor is closed
+        if (!mTermFd.getFileDescriptor().valid())
+            return;
+
+        try {
+            Exec.setPtyUTF8ModeInternal(getIntFd(mTermFd), utf8Mode);
+        } catch (IOException e) {
+            Log.e("exec", "Failed to set UTF mode: " + e.getMessage());
+
+            if (isFailFast())
+                throw new IllegalStateException(e);
+        }
+    }
+
+    /**
+     * @return true, if failing to operate on file descriptor deserves an exception (never the case for ATE own shell)
+     */
+    boolean isFailFast() {
+        return false;
+    }
+
+    private static void cacheDescField() throws NoSuchFieldException {
+        if (descriptorField != null)
+            return;
+
+        descriptorField = FileDescriptor.class.getDeclaredField("descriptor");
+        descriptorField.setAccessible(true);
+    }
+
+    private static int getIntFd(ParcelFileDescriptor parcelFd) throws IOException {
+        if (Build.VERSION.SDK_INT >= 12)
+          /*  return FdHelperHoneycomb.getFd(parcelFd);*/
+            return parcelFd.getFd();
+        else {
+            try {
+                cacheDescField();
+
+                return descriptorField.getInt(parcelFd.getFileDescriptor());
+            } catch (Exception e) {
+                throw new IOException("Unable to obtain file descriptor on this OS version: " + e.getMessage());
+            }
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/console/RemoteInterface.java b/qpython/src/main/java/org/qpython/qpy/console/RemoteInterface.java
new file mode 100644
index 00000000..ef9e775d
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/console/RemoteInterface.java
@@ -0,0 +1,217 @@
+/*
+ * Copyright (C) 2012 Steven Luo
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.qpython.qpy.console;
+
+import android.app.Activity;
+import android.content.ComponentName;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.content.SharedPreferences;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.IBinder;
+import android.preference.PreferenceManager;
+import android.util.Log;
+
+import org.qpython.qpy.console.util.SessionList;
+import org.qpython.qpy.console.util.TermSettings;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.UUID;
+
+import jackpal.androidterm.emulatorview.TermSession;
+
+
+public class RemoteInterface extends Activity {
+    protected static final String PRIVACT_OPEN_NEW_WINDOW = "jackpal.androidterm.private.OPEN_NEW_WINDOW";
+    protected static final String PRIVACT_SWITCH_WINDOW = "jackpal.androidterm.private.SWITCH_WINDOW";
+
+    protected static final String PRIVEXTRA_TARGET_WINDOW = "jackpal.androidterm.private.target_window";
+
+    protected static final String PRIVACT_ACTIVITY_ALIAS = "jackpal.androidterm.TermInternal";
+
+    private TermSettings mSettings;
+
+    private TermService mTermService;
+    private Intent mTSIntent;
+    private ServiceConnection mTSConnection = new ServiceConnection() {
+        public void onServiceConnected(ComponentName className, IBinder service) {
+            TermService.TSBinder binder = (TermService.TSBinder) service;
+            mTermService = binder.getService();
+            handleIntent();
+        }
+
+        public void onServiceDisconnected(ComponentName className) {
+            mTermService = null;
+        }
+    };
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+        mSettings = new TermSettings(getResources(), prefs);
+
+        Intent TSIntent = new Intent(this, TermService.class);
+        mTSIntent = TSIntent;
+        startService(TSIntent);
+        if (!bindService(TSIntent, mTSConnection, BIND_AUTO_CREATE)) {
+            Log.e(TermDebug.LOG_TAG, "bind to service failed!");
+            finish();
+        }
+    }
+
+    @Override
+    public void finish() {
+        ServiceConnection conn = mTSConnection;
+        if (conn != null) {
+            unbindService(conn);
+
+            // Stop the service if no terminal sessions are running
+            TermService service = mTermService;
+            if (service != null) {
+                SessionList sessions = service.getSessions();
+                if (sessions == null || sessions.size() == 0) {
+                    stopService(mTSIntent);
+                }
+            }
+
+            mTSConnection = null;
+            mTermService = null;
+        }
+        super.finish();
+    }
+
+    protected TermService getTermService() {
+        return mTermService;
+    }
+
+    protected void handleIntent() {
+        TermService service = getTermService();
+        if (service == null) {
+            finish();
+            return;
+        }
+
+        Intent myIntent = getIntent();
+        String action = myIntent.getAction();
+        if (action.equals(Intent.ACTION_SEND)
+                && myIntent.hasExtra(Intent.EXTRA_STREAM)) {
+          /* "permission.RUN_SCRIPT" not required as this is merely opening a new window. */
+            Object extraStream = myIntent.getExtras().get(Intent.EXTRA_STREAM);
+            if (extraStream instanceof Uri) {
+                String path = ((Uri) extraStream).getPath();
+                File file = new File(path);
+                String dirPath = file.isDirectory() ? path : file.getParent();
+                openNewWindow("cd " + quoteForBash(dirPath));
+            }
+        } else {
+            // Intent sender may not have permissions, ignore any extras
+            openNewWindow(null);
+        }
+
+        finish();
+    }
+
+    /**
+     * Quote a string so it can be used as a parameter in bash and similar shells.
+     */
+    public static String quoteForBash(String s) {
+        StringBuilder builder = new StringBuilder();
+        String specialChars = "\"\\$`!";
+        builder.append('"');
+        int length = s.length();
+        for (int i = 0; i < length; i++) {
+            char c = s.charAt(i);
+            if (specialChars.indexOf(c) >= 0) {
+                builder.append('\\');
+            }
+            builder.append(c);
+        }
+        builder.append('"');
+        return builder.toString();
+    }
+
+    protected String openNewWindow(String iInitialCommand) {
+        TermService service = getTermService();
+
+        String initialCommand = mSettings.getInitialCommand();
+        if (iInitialCommand != null) {
+            if (initialCommand != null) {
+                initialCommand += "\r" + iInitialCommand;
+            } else {
+                initialCommand = iInitialCommand;
+            }
+        }
+
+        try {
+            TermSession session = TermActivity.createTermSession(this, mSettings, initialCommand, "");
+
+            session.setFinishCallback(service);
+            service.getSessions().add(session);
+
+            String handle = UUID.randomUUID().toString();
+            ((GenericTermSession) session).setHandle(handle);
+
+            Intent intent = new Intent(PRIVACT_OPEN_NEW_WINDOW);
+            intent.addCategory(Intent.CATEGORY_DEFAULT);
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            startActivity(intent);
+
+            return handle;
+        } catch (IOException e) {
+            return null;
+        }
+    }
+
+    protected String appendToWindow(String handle, String iInitialCommand) {
+        TermService service = getTermService();
+
+        // Find the target window
+        SessionList sessions = service.getSessions();
+        GenericTermSession target = null;
+        int index;
+        for (index = 0; index < sessions.size(); ++index) {
+            GenericTermSession session = (GenericTermSession) sessions.get(index);
+            String h = session.getHandle();
+            if (h != null && h.equals(handle)) {
+                target = session;
+                break;
+            }
+        }
+
+        if (target == null) {
+            // Target window not found, open a new one
+            return openNewWindow(iInitialCommand);
+        }
+
+        if (iInitialCommand != null) {
+            target.write(iInitialCommand);
+            target.write('\r');
+        }
+
+        Intent intent = new Intent(PRIVACT_SWITCH_WINDOW);
+        intent.addCategory(Intent.CATEGORY_DEFAULT);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        intent.putExtra(PRIVEXTRA_TARGET_WINDOW, index);
+        startActivity(intent);
+
+        return handle;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/console/RunScript.java b/qpython/src/main/java/org/qpython/qpy/console/RunScript.java
new file mode 100644
index 00000000..c94c6d7b
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/console/RunScript.java
@@ -0,0 +1,84 @@
+package org.qpython.qpy.console;/*
+ * Copyright (C) 2012 Steven Luo
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+import android.content.Intent;
+import android.net.Uri;
+
+/*
+ * New procedure for launching a command in ATE.
+ * Build the path and arguments into a Uri and set that into Intent.data.
+ * intent.data(new Uri.Builder().setScheme("file").setPath(path).setFragment(arguments))
+ *
+ * The old procedure of using Intent.Extra is still available but is discouraged.
+ */
+public final class RunScript extends RemoteInterface {
+    private static final String ACTION_RUN_SCRIPT = "jackpal.androidterm.RUN_SCRIPT";
+
+    private static final String EXTRA_WINDOW_HANDLE = "jackpal.androidterm.window_handle";
+    private static final String EXTRA_INITIAL_COMMAND = "jackpal.androidterm.iInitialCommand";
+
+    @Override
+    protected void handleIntent() {
+        TermService service = getTermService();
+        if (service == null) {
+            finish();
+            return;
+        }
+
+        Intent myIntent = getIntent();
+        String action = myIntent.getAction();
+        if (action.equals(ACTION_RUN_SCRIPT)) {
+            /* Someone with the appropriate permissions has asked us to
+               run a script */
+            String handle = myIntent.getStringExtra(EXTRA_WINDOW_HANDLE);
+            String command = null;
+            /*
+             * First look in Intent.data for the path; if not there, revert to
+             * the EXTRA_INITIAL_COMMAND location.
+             */
+            Uri uri = myIntent.getData();
+            if (uri != null) // scheme[path][arguments]
+            {
+                String s = uri.getScheme();
+                if (s != null && s.toLowerCase().equals("file")) {
+                    command = uri.getPath();
+                    // Allow for the command to be contained within the arguments string.
+                    if (command == null) command = "";
+                    if (!command.equals("")) command = quoteForBash(command);
+                    // Append any arguments.
+                    if (null != (s = uri.getFragment())) command += " " + s;
+                }
+            }
+            // If Intent.data not used then fall back to old method.
+            if (command == null) command = myIntent.getStringExtra(EXTRA_INITIAL_COMMAND);
+            if (handle != null) {
+                // Target the request at an existing window if open
+                handle = appendToWindow(handle, command);
+            } else {
+                // Open a new window
+                handle = openNewWindow(command);
+            }
+            Intent result = new Intent();
+            result.putExtra(EXTRA_WINDOW_HANDLE, handle);
+            setResult(RESULT_OK, result);
+
+            finish();
+        } else {
+            super.handleIntent();
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/console/RunShortcut.java b/qpython/src/main/java/org/qpython/qpy/console/RunShortcut.java
new file mode 100644
index 00000000..c5c6d09f
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/console/RunShortcut.java
@@ -0,0 +1,82 @@
+package org.qpython.qpy.console;/*
+ * Copyright (C) 2015 Steven Luo
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+import android.content.Intent;
+import android.util.Log;
+
+import org.qpython.qpy.console.util.ShortcutEncryption;
+
+import java.security.GeneralSecurityException;
+
+
+public final class RunShortcut extends RemoteInterface {
+    public static final String ACTION_RUN_SHORTCUT = "jackpal.androidterm.RUN_SHORTCUT";
+
+    public static final String EXTRA_WINDOW_HANDLE = "jackpal.androidterm.window_handle";
+    public static final String EXTRA_SHORTCUT_COMMAND = "jackpal.androidterm.iShortcutCommand";
+
+    @Override
+    protected void handleIntent() {
+        TermService service = getTermService();
+        if (service == null) {
+            finish();
+            return;
+        }
+
+        Intent myIntent = getIntent();
+        String action = myIntent.getAction();
+        if (action.equals(ACTION_RUN_SHORTCUT)) {
+            String encCommand = myIntent.getStringExtra(EXTRA_SHORTCUT_COMMAND);
+            if (encCommand == null) {
+                Log.e(TermDebug.LOG_TAG, "No command provided in shortcut!");
+                finish();
+                return;
+            }
+
+            // Decrypt and verify the command
+            ShortcutEncryption.Keys keys = ShortcutEncryption.getKeys(this);
+            if (keys == null) {
+                // No keys -- no valid shortcuts can exist
+                Log.e(TermDebug.LOG_TAG, "No shortcut encryption keys found!");
+                finish();
+                return;
+            }
+            String command;
+            try {
+                command = ShortcutEncryption.decrypt(encCommand, keys);
+            } catch (GeneralSecurityException e) {
+                Log.e(TermDebug.LOG_TAG, "Invalid shortcut: " + e.toString());
+                finish();
+                return;
+            }
+
+            String handle = myIntent.getStringExtra(EXTRA_WINDOW_HANDLE);
+            if (handle != null) {
+                // Target the request at an existing window if open
+                handle = appendToWindow(handle, command);
+            } else {
+                // Open a new window
+                handle = openNewWindow(command);
+            }
+            Intent result = new Intent();
+            result.putExtra(EXTRA_WINDOW_HANDLE, handle);
+            setResult(RESULT_OK, result);
+        }
+
+        finish();
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/console/ScriptExec.java b/qpython/src/main/java/org/qpython/qpy/console/ScriptExec.java
new file mode 100644
index 00000000..9a23d02d
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/console/ScriptExec.java
@@ -0,0 +1,554 @@
+package org.qpython.qpy.console;
+
+import android.app.Activity;
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Environment;
+import android.os.Message;
+import android.preference.PreferenceManager;
+import android.support.v4.app.ActivityCompat;
+import android.support.v4.content.ContextCompat;
+import android.support.v4.util.ArrayMap;
+import android.support.v7.app.AlertDialog;
+import android.text.TextUtils;
+import android.util.Log;
+
+import org.qpython.qpysdk.Exec;
+import com.quseit.util.FileUtils;
+import com.quseit.util.NAction;
+
+import org.greenrobot.eventbus.EventBus;
+import org.qpython.qpy.R;
+import org.qpython.qpysdk.QPyConstants;
+import org.qpython.qpysdk.utils.AndroidCompat;
+import org.qpython.qpy.console.util.TermSettings;
+import org.qpython.qpy.main.activity.LogActivity;
+import org.qpython.qpy.main.utils.Utils;
+import org.qpython.qpysdk.utils.FileHelper;
+import org.qpython.qpysdk.utils.StreamGobbler;
+import org.qpython.qsl4a.QPyScriptService;
+import org.qpython.qsl4a.qsl4a.util.SPFUtils;
+import org.renpy.android.PythonSDLActivity;
+
+import java.io.File;
+import java.io.FileDescriptor;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class ScriptExec {
+
+    private static final String TAG                 = "ScriptExec";
+    private static final int    SCRIPT_CONSOLE_CODE = 1237;
+    private static final int    PID_INIT_VALUE      = -1;
+    private static final int    DEFAULT_BUFFER_SIZE = 8192;
+    private static final int    LOG_NOTIFICATION_ID = (int) System.currentTimeMillis();
+    private InputStream  mIn;
+    private OutputStream mOut;
+
+    private ScriptExec() { }
+
+    public static ScriptExec getInstance() {
+        return ScriptExecHolder.INSTANCE;
+    }
+
+    public void playScript(Context context, String script, String arg, boolean notify) {
+
+        // confirm the SL4A Service is started
+        context.startService(new Intent(context, QPyScriptService.class));
+
+        String header_512 = FileHelper.getFileContents(script,512);
+        boolean isWeb   = header_512.contains("#qpy:webapp");
+        boolean isQApp  = header_512.contains("#qpy:quiet");
+        boolean isKivy  = header_512.contains("#qpy:kivy");
+        boolean isGame  = header_512.contains("#qpy:pygame");
+        boolean isDaemon = header_512.contains("#qpy:daemon");
+
+        Log.d(TAG, "playScript:" + script+"|isWeb:"+isWeb+"|isQapp:"+isQApp+"|isKivy:"+isKivy+"|isGame:"+isGame+"|isDaemon:"+isDaemon);
+
+        if (isWeb) {
+            playWebApp(context,  script, arg);
+        } else if (isKivy) {
+            playKScript(context, script, arg, notify);
+        } else if (isQApp) {
+            playQScript(context, script, arg, notify);
+        } else if (isGame) {
+            playGScript(context, script, arg, notify);
+        } else if (isDaemon) {
+            playDScript(context, script, arg, notify);
+        } else {
+            playCScript(context, script, arg);
+        }
+    }
+
+    /*
+        Play project Without args
+     */
+    public void playProject(Context context, String project, boolean notify) {
+        playProject(context, project, null, notify);
+    }
+
+    /*
+        Play project with args
+     */
+
+    public void playProject(Context context, String project, String args, boolean notify) {
+        Log.d(TAG, "playProject:" + project);
+
+        String script = project + "/main.py";
+        File sf = new File(script);
+        if (sf.exists()) {
+
+            playScript(context, script, args, notify);
+
+        } else {
+
+            new AlertDialog.Builder(context, R.style.MyDialog)
+                    .setTitle(R.string.notice)
+                    .setMessage(R.string.project_main_error)
+                    .setPositiveButton(R.string.close, (dialog1, which) ->  dialog1.dismiss())
+                    .create()
+                    .show();
+        }
+    }
+
+
+
+    public String getLastLog() {
+        File logFile = new File(QPyConstants.ABSOLUTE_LOG);
+
+        if (!logFile.getAbsoluteFile().getParentFile().exists()) {
+            logFile.getAbsoluteFile().getParentFile().mkdirs();
+        }
+        if (logFile.exists()) {    // clear log
+            logFile.delete();
+        }
+
+        return logFile.getAbsolutePath();
+    }
+
+
+    public String[] getPyEnv(Context context, String path, String term, String pyPath) {
+        boolean isQPy3 =  NAction.isQPy3(context);
+
+        File filesDir = context.getFilesDir();
+        File externalStorage = new File(QPyConstants.ABSOLUTE_PATH);
+
+        String[] env = new String[24];
+
+        env[0] = "TERM=" + term;
+        env[1] = "PATH=" + context.getFilesDir()+"/bin"+":"+path;
+
+        if (!isQPy3) {
+            File py27so = new File(filesDir+"/lib/libpython2.7.so.1.0");
+            File py27soorg = new File(filesDir.getParentFile()+"/lib/libpython2.7.so");
+
+
+            if (!py27so.exists()) {
+                if (py27soorg.exists()) {
+                    try {
+                        FileUtils.lnOrcopy(py27soorg, py27so, AndroidCompat.SDK);
+                    } catch (Exception e) {
+
+                    }
+
+                }
+            }
+        }
+        env[2] = "LD_LIBRARY_PATH=.:" + filesDir + "/lib/" + ":" + filesDir + "/:" + filesDir.getParentFile() + "/lib/";
+
+        env[3] = "PYTHONHOME="+filesDir;
+        env[4] = "ANDROID_PRIVATE="+filesDir;
+
+
+        // HACKED FOR QPython
+
+        if (!externalStorage.exists()) {
+            externalStorage.mkdir();
+        }
+
+        if (isQPy3) {
+            String pyVer = new File(context.getFilesDir()+"/lib/python37.zip").exists()?"3.7":"3.6";
+            env[5] = "PYTHONPATH="
+                    +filesDir+"/lib/python"+pyVer+"/site-packages/:"
+                    +filesDir+"/lib/python"+pyVer+"/:"
+                    +filesDir+"/lib/python"+pyVer.replace(".","")+".zip:"
+                    +filesDir+"/lib/notebook.zip:"
+                    +filesDir+"/lib/python"+pyVer+"/qpyutil.zip:"
+                    +filesDir+"/lib/python"+pyVer+"/lib-dynload/:"
+                    +externalStorage+"/lib/python"+pyVer+"/site-packages/:"
+                    +pyPath;
+
+            env[14] = "PYTHONSTARTUP="+filesDir+"/lib/python"+pyVer+"/site-packages/qpy.py";
+
+
+        } else {
+
+            env[5] = "PYTHONPATH="
+                    +filesDir+"/lib/python2.7/site-packages/:"
+                    +filesDir+"/lib/python2.7/:"
+                    +filesDir+"/lib/python27.zip:"
+                    +filesDir+"/lib/notebook.zip:"
+                    +filesDir+"/lib/python2.7/qpyutil.zip:"
+                    +filesDir+"/lib/python2.7/lib-dynload/:"
+                    +externalStorage+"/lib/python2.7/site-packages/:"
+                    +pyPath;
+
+            //env[14] = "IS_QPY2=1";
+            env[14] = "PYTHONSTARTUP="+filesDir+"/lib/python2.7/site-packages/qpy.py";
+        }
+
+        env[6] = "PYTHONOPTIMIZE=2";
+
+        File td = new File(externalStorage+"/cache");
+        if (!td.exists()) {
+            td.mkdir();
+        }
+        env[7] = "TMPDIR="+td.getAbsolutePath();
+
+
+        env[8] = "AP_HOST="+SPFUtils.getSP(context, "sl4a.hostname");
+        env[9] = "AP_PORT="+SPFUtils.getSP(context, "sl4a.port");
+        env[10] = "AP_HANDSHAKE="+SPFUtils.getSP(context, "sl4a.secue");
+
+        env[11] = "ANDROID_PUBLIC="+externalStorage;
+        env[12] = "ANDROID_PRIVATE="+context.getFilesDir().getAbsolutePath();
+        env[13] = "ANDROID_ARGUMENT="+pyPath;
+
+        env[15] = "QPY_USERNO="+ NAction.getUserNoId(context);
+        env[16] = "QPY_ARGUMENT="+NAction.getExtConf(context);
+        env[17] = "PYTHONDONTWRITEBYTECODE=1";
+        env[18] = "TMP="+externalStorage+"/cache";
+        env[19] = "ANDROID_APP_PATH="+externalStorage+"";
+        env[20] = "LANG=en_US.UTF-8";
+        env[21] = "HOME="+context.getFilesDir();
+        env[22] = "ANDROID_DATA="+System.getenv("ANDROID_DATA");
+        env[23] = "ANDROID_ROOT="+System.getenv("ANDROID_ROOT");
+        return env;
+    }
+
+    public String getPyBin(Context context, boolean bin) {
+        String scmd = "";
+        String v = NAction.isQPy3(context) ? "3" : "";
+        boolean isRootEnable = NAction.isRootEnable(context);
+        if (Build.VERSION.SDK_INT >= 20) {
+            if (bin) {
+                scmd = context.getFilesDir() + "/bin/python" + v + "-android5";
+            } else {
+                if (isRootEnable) {
+                    scmd = context.getFilesDir() + "/bin/qpython" + v + "-android5-root.sh";
+                } else {
+                    scmd = context.getFilesDir() + "/bin/qpython" + v + "-android5.sh";
+                }
+            }
+        } else {
+            if (bin) {
+                scmd = context.getFilesDir() + "/bin/python" + v;
+            } else {
+                if (isRootEnable) {
+                    scmd = context.getFilesDir() + "/bin/qpython" + v + "-root.sh";
+                } else {
+                    scmd = context.getFilesDir() + "/bin/qpython" + v + ".sh";
+                }
+            }
+        }
+        return scmd;
+    }
+
+    private void createWebTermSession(Context context, String[] mArgs) {
+        SharedPreferences mPrefs = PreferenceManager.getDefaultSharedPreferences(context);
+        TermSettings mSettings = new TermSettings(context.getResources(), mPrefs);
+
+        String scmd = getPyBin(context, false);
+
+        ShellTermSession session = createTermSession(context, mSettings, scmd + " \"" + mArgs[0] + "\"  " + mArgs[1] + " > \"" + mArgs[2] + "\" 2>&1", "");
+
+        session.setFinishCallback(null);
+        session.shellRun();
+    }
+
+    protected static ShellTermSession createTermSession(Context context, TermSettings settings, String initialCommand, String path) {
+        ShellTermSession session = null;
+        try {
+            session = new ShellTermSession(context, settings, initialCommand, path);
+            session.setProcessExitMessage(context.getString(R.string.process_exit_message));
+
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        return session;
+    }
+
+
+    /*
+    Run WEBAPP
+     */
+    private void playWebApp(Context context, String script, String argv) {
+        String header_512 = FileHelper.getFileContents(script, 512);
+
+        boolean isNoHead = header_512.contains("#qpy:fullscreen");
+        boolean isDrawer = header_512.contains("#qpy:drawer");
+
+        String title = "QWebApp";
+        Pattern titlePattern = Pattern.compile("#qpy:webapp:(.+)", Pattern.CASE_INSENSITIVE);
+        Matcher matcher0 = titlePattern.matcher(header_512);
+        if (matcher0.find()) {
+            title = matcher0.group(1);
+        }
+
+        String srv = "http://localhost";
+        Pattern srvPattern = Pattern.compile("#qpy://(.+)[\\s]+", Pattern.CASE_INSENSITIVE);
+        Matcher matcher1 = srvPattern.matcher(header_512);
+
+        if (matcher1.find()) {
+            srv = "http://" + matcher1.group(1);
+        }
+
+        playDScript(context, script, argv, false);
+        Utils.startWebActivityWithUrl(context, title, srv, script, isNoHead, isDrawer);
+//        QWebViewActivity.start(context, "main", title, srv, script);
+    }
+
+
+    /*
+        Run KIVY Script
+     */
+    public void playKScript(Context context, final String script, String argv, boolean notify) {
+        if (Utils.isOpenGL2supported(context)) {
+            File scriptParent = new File(script).getParentFile();
+            String proj, log;
+            log = QPyConstants.ABSOLUTE_LOG;
+
+            if (scriptParent.getName().startsWith("scripts")) {
+                proj = new File(script).getName();
+            } else {
+                proj = scriptParent.getName();
+            }
+            Intent intent = new Intent(context, PythonSDLActivity.class);
+            intent.setData(Uri.fromFile(new File(script)));
+            context.startActivity(intent);
+            LogDialog event = new LogDialog(proj, log);
+            EventBus.getDefault().post(event);
+
+        } else {
+
+            new AlertDialog.Builder(context, R.style.MyDialog)
+                    .setTitle(R.string.notice)
+                    .setMessage(R.string.open_gl2_is_not_supported)
+                    .setPositiveButton(R.string.close, (dialog1, which) ->  dialog1.dismiss())
+                    .create()
+                    .show();
+
+        }
+    }
+
+    /*
+        Run Game Script
+     */
+    public void playGScript(Context context, final String script, String argv, boolean notify) {
+        playKScript(context,script,argv,notify);
+    }
+
+
+    /*
+        Run Console Script
+     */
+    public void playCScript(Context context, final String scriptPath, String arg) {
+        String[] args;
+        if (TextUtils.isEmpty(arg)) {
+            args = new String[]{scriptPath, scriptPath};
+        } else {
+            args = new String[]{scriptPath, scriptPath, arg};
+        }
+
+        execPyInConsole((Activity)context, args);
+
+    }
+
+    /*
+        Run Daemon Script
+     */
+
+    public void playDScript(Context context, final String scriptPath, String argv1, boolean notify) {
+        String logFile = getLastLog();
+
+        String[] mArgs = {scriptPath, " " + (argv1 != null ? argv1 : ""), logFile};
+
+        Log.d(TAG, "playDScript:" + scriptPath + ":argv1:" + argv1 + " >" + logFile + " 2>&1");
+        createWebTermSession(context, mArgs);
+    }
+
+    /*
+        Run Quiet Script
+     */
+    FileDescriptor mFd;
+    public int playQScript(Context context, final String script, String argv, boolean notify) {
+        ArrayList<String> mArguments = new ArrayList<>();
+
+        String binaryPath = getPyBin(context, true);
+
+        Log.d(TAG, "playQScript:" + binaryPath + "|" + script + "|" + argv);
+
+        File f = new File(script);
+
+        int[] pid = new int[1];
+
+        mArguments.add(script);
+        mArguments.add(argv);
+
+        String[] argumentsArray = mArguments.toArray(new String[mArguments.size()]);
+
+        final File mLog = new File(QPyConstants.ABSOLUTE_LOG);
+
+        mFd = Exec.createSubprocess(binaryPath, argumentsArray, getPyEnv(context, System.getenv("PATH"), System.getenv("TERM"),f.getParentFile() + ""), Environment.getExternalStorageDirectory() + "/", pid);
+        final AtomicInteger mPid = new AtomicInteger(PID_INIT_VALUE);
+
+        mPid.set(pid[0]);
+        mOut = new FileOutputStream(mFd);
+        mIn = new StreamGobbler(new FileInputStream(mFd), mLog, DEFAULT_BUFFER_SIZE);
+        long mStartTime = System.currentTimeMillis();
+
+        new Thread(new Runnable() {
+            public void run() {
+                int returnValue = Exec.waitFor(mPid.get());
+
+                //long mEndTime = System.currentTimeMillis();
+                int pid = mPid.getAndSet(PID_INIT_VALUE);
+                Log.d("", "out:" + mFd.out.toString());
+
+                Message msg = new Message();
+                msg.what = returnValue;
+                msg.obj = mArguments.get(0);
+
+                Log.d(TAG, "Process " + pid + " exited with result code " + returnValue + ".");
+
+                try {
+                    mIn.close();
+                } catch (IOException e) {
+                    Log.e(TAG, e.getMessage());
+                }
+
+                try {
+                    mOut.close();
+                } catch (IOException e) {
+                    Log.e(TAG, e.getMessage());
+                }
+                //context.updateNotify(msg);
+            }
+        }).start();
+
+        return mPid.getAndSet(PID_INIT_VALUE);
+    }
+    
+
+    public void execPyInConsole(Activity context, String[] args) {
+        Intent intent = new Intent(context, TermActivity.class);
+        intent.putExtra(TermActivity.ARGS, args);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        context.startActivityForResult(intent, SCRIPT_CONSOLE_CODE);
+    }
+
+
+/*    public void sendLogNotifiy(Context context, String filePath) {
+        if (!PreferenceManager.getDefaultSharedPreferences(context).getBoolean(context.getString(R.string.key_hide_noti), true)) {
+            return;
+        }
+        String title = FileHelper.getFileName(filePath);
+
+        Intent resultIntent = new Intent(context, LogActivity.class);
+        if (filePath.contains("/scripts/")) {
+            String proj = new File(filePath).getName();
+
+            resultIntent.putExtra(LogActivity.LOG_PATH, filePath.replace(title, "last.log"));
+            resultIntent.putExtra(LogActivity.LOG_TITLE, proj);
+        } else {
+            String proj = new File(filePath).getParentFile().getName();
+            resultIntent.putExtra(LogActivity.LOG_PATH, filePath.replace("main.py", "last.log"));
+            resultIntent.putExtra(LogActivity.LOG_TITLE, proj);
+        }
+
+        PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, resultIntent, PendingIntent.FLAG_ONE_SHOT);
+
+//        PendingIntent resultPendingIntent = PendingIntent.getActivity(
+//                this, 0, resultIntent, 0);
+
+        Notification.Builder builder = new Notification.Builder(context)
+                .setSmallIcon(R.drawable.img_home_logo)
+                .setContentTitle(context.getString(R.string.app_name))
+                .setContentText(context.getString(R.string.runtime_log, title))
+                .setContentIntent(pendingIntent)
+                .setAutoCancel(true);
+
+        Notification notification;
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN) {
+            notification = builder.build();
+        } else {
+            notification = builder.getNotification();
+        }
+        NotificationManager mNotifyMgr = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+        mNotifyMgr.notify(LOG_NOTIFICATION_ID, notification);
+    }
+*/
+    public final void checkPermissionDo(Context context, String[] permissions, PermissionAction action) {
+        Map<Integer, PermissionAction> mActionMap = new ArrayMap<>();
+        if (Build.VERSION.SDK_INT >= 23) {
+            boolean granted = true;
+            for (int i = 0; i < permissions.length; i++) {
+                String permission = permissions[i];
+                int checkPermission = ContextCompat.checkSelfPermission(context, permission);
+                if (checkPermission != PackageManager.PERMISSION_GRANTED) {
+                    granted = false;
+
+                } else {
+                    granted = true;
+                }
+            }
+            if (!granted) {
+                int code = permissions.hashCode() & 0xffff;
+                mActionMap.put(code, action);
+                ActivityCompat.requestPermissions((Activity) context, permissions, code);
+            } else {
+                action.onGrant();
+            }
+        } else {
+            action.onGrant();
+        }
+    }
+
+
+    public interface PermissionAction {
+        void onGrant();
+
+        void onDeny();
+    }
+
+    private static class ScriptExecHolder {
+        private static final ScriptExec INSTANCE = new ScriptExec();
+    }
+
+    public static class LogDialog {
+        public LogDialog(String title, String path) {
+            Log.e("EditorActivity", "LogUtil dialog event init");
+            this.title = title;
+            this.path = path;
+        }
+
+        public String title;
+        public String path;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/console/ShellTermSession.java b/qpython/src/main/java/org/qpython/qpy/console/ShellTermSession.java
new file mode 100644
index 00000000..94c31a83
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/console/ShellTermSession.java
@@ -0,0 +1,251 @@
+package org.qpython.qpy.console;/*
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+import android.content.Context;
+import android.os.Handler;
+import android.os.Message;
+import android.os.ParcelFileDescriptor;
+import android.util.Log;
+
+import com.quseit.util.FileHelper;
+import com.quseit.util.FileUtils;
+
+import org.qpython.qpy.console.compont.FileCompat;
+import org.qpython.qpy.console.util.TermSettings;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.ArrayList;
+
+import jackpal.androidterm.TermExec;
+
+/**
+ * A terminal session, controlling the process attached to the session (usually
+ * a shell). It keeps track of process PID and destroys it's process group
+ * upon stopping.
+ */
+public class ShellTermSession extends GenericTermSession {
+    private int mProcId;
+    private Thread mWatcherThread;
+
+    private String mInitialCommand;
+
+    private static final int PROCESS_EXITED = 1;
+    private Handler mMsgHandler = new Handler() {
+        @Override
+        public void handleMessage(Message msg) {
+            if (!isRunning()) {
+                return;
+            }
+            if (msg.what == PROCESS_EXITED) {
+                onProcessExit((Integer) msg.obj);
+            }
+        }
+    };
+
+    private Context context;
+    private String pyPath;
+    public ShellTermSession(Context context, TermSettings settings, String initialCommand,String pyPath) throws IOException {
+        super(ParcelFileDescriptor.open(new File("/dev/ptmx"), ParcelFileDescriptor.MODE_READ_WRITE),
+                settings, false);
+
+        this.context = context;
+        this.pyPath = pyPath;
+
+        initializeSession();
+
+        setTermOut(new ParcelFileDescriptor.AutoCloseOutputStream(mTermFd));
+        setTermIn(new ParcelFileDescriptor.AutoCloseInputStream(mTermFd));
+
+        mInitialCommand = initialCommand;
+
+        mWatcherThread = new Thread() {
+            @Override
+            public void run() {
+                Log.i(TermDebug.LOG_TAG, "waiting for: " + mProcId);
+                int result = TermExec.waitFor(mProcId);
+                Log.i(TermDebug.LOG_TAG, "Subprocess exited: " + result);
+                mMsgHandler.sendMessage(mMsgHandler.obtainMessage(PROCESS_EXITED, result));
+            }
+        };
+        mWatcherThread.setName("Process watcher");
+    }
+
+    private void initializeSession() throws IOException {
+        Log.d("TAG","initializeSession");
+        TermSettings settings = mSettings;
+
+        String path = System.getenv("PATH");
+        if (settings.doPathExtensions()) {
+            String appendPath = settings.getAppendPath();
+            if (appendPath != null && appendPath.length() > 0) {
+                path = path + ":" + appendPath;
+            }
+
+            if (settings.allowPathPrepend()) {
+                String prependPath = settings.getPrependPath();
+                if (prependPath != null && prependPath.length() > 0) {
+                    path = prependPath + ":" + path;
+                }
+            }
+        }
+        if (settings.verifyPath()) {
+            path = checkPath(path);
+        }
+
+
+        String[] env = ScriptExec.getInstance().getPyEnv(context, path, settings.getTermType(), pyPath);
+
+        File enf = new File(context.getFilesDir()+"/bin/init.sh");
+        //if (! enf.exists()) {
+        String content = "#!/system/bin/sh";
+        for (int i=0;i<env.length;i++) {
+            content += "\nexport "+env[i];
+        }
+        FileHelper.putFileContents(context, enf.getAbsolutePath(), content.trim());
+        try {
+            FileUtils.chmod(enf, 0755);
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+        }
+
+
+        mProcId = createSubprocess(settings.getShell(), env);
+
+    }
+
+    private String checkPath(String path) {
+        String[] dirs = path.split(":");
+        StringBuilder checkedPath = new StringBuilder(path.length());
+        for (String dirname : dirs) {
+            File dir = new File(dirname);
+            if (dir.isDirectory() && FileCompat.canExecute(dir)) {
+                checkedPath.append(dirname);
+                checkedPath.append(":");
+            }
+        }
+        return checkedPath.substring(0, checkedPath.length() - 1);
+    }
+
+    @Override
+    public void initializeEmulator(int columns, int rows) {
+        super.initializeEmulator(columns, rows);
+
+        mWatcherThread.start();
+        sendInitialCommand(mInitialCommand);
+    }
+
+    private void sendInitialCommand(String initialCommand) {
+        if (initialCommand.length() > 0) {
+            write(initialCommand + '\r');
+        }
+    }
+
+    private int createSubprocess(String shell, String[] env) throws IOException {
+        ArrayList<String> argList = parse(shell);
+        String arg0;
+        String[] args;
+
+        try {
+            arg0 = argList.get(0);
+            File file = new File(arg0);
+            if (!file.exists()) {
+                Log.e(TermDebug.LOG_TAG, "Shell " + arg0 + " not found!");
+                throw new FileNotFoundException(arg0);
+            } else if (!FileCompat.canExecute(file)) {
+                Log.e(TermDebug.LOG_TAG, "Shell " + arg0 + " not executable!");
+                throw new FileNotFoundException(arg0);
+            }
+            args = argList.toArray(new String[1]);
+        } catch (Exception e) {
+            argList = parse(mSettings.getFailsafeShell());
+            arg0 = argList.get(0);
+            args = argList.toArray(new String[1]);
+        }
+
+        return TermExec.createSubprocess(mTermFd, arg0, args, env);
+    }
+
+    private ArrayList<String> parse(String cmd) {
+        final int PLAIN = 0;
+        final int WHITESPACE = 1;
+        final int INQUOTE = 2;
+        int state = WHITESPACE;
+        ArrayList<String> result = new ArrayList<String>();
+        int cmdLen = cmd.length();
+        StringBuilder builder = new StringBuilder();
+        for (int i = 0; i < cmdLen; i++) {
+            char c = cmd.charAt(i);
+            if (state == PLAIN) {
+                if (Character.isWhitespace(c)) {
+                    result.add(builder.toString());
+                    builder.delete(0, builder.length());
+                    state = WHITESPACE;
+                } else if (c == '"') {
+                    state = INQUOTE;
+                } else {
+                    builder.append(c);
+                }
+            } else if (state == WHITESPACE) {
+                if (Character.isWhitespace(c)) {
+                    // do nothing
+                } else if (c == '"') {
+                    state = INQUOTE;
+                } else {
+                    state = PLAIN;
+                    builder.append(c);
+                }
+            } else if (state == INQUOTE) {
+                if (c == '\\') {
+                    if (i + 1 < cmdLen) {
+                        i += 1;
+                        builder.append(cmd.charAt(i));
+                    }
+                } else if (c == '"') {
+                    state = PLAIN;
+                } else {
+                    builder.append(c);
+                }
+            }
+        }
+        if (builder.length() > 0) {
+            result.add(builder.toString());
+        }
+        return result;
+    }
+
+    private void onProcessExit(int result) {
+        onProcessExit();
+    }
+
+    @Override
+    public void finish() {
+        hangupProcessGroup();
+        super.finish();
+    }
+
+    /**
+     * Send SIGHUP to a process group, SIGHUP notifies a terminal client, that the terminal have been disconnected,
+     * and usually results in client's death, unless it's process is a daemon or have been somehow else detached
+     * from the terminal (for example, by the "nohup" utility).
+     */
+    void hangupProcessGroup() {
+        TermExec.sendSignal(-mProcId, 1);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/console/TermActivity.java b/qpython/src/main/java/org/qpython/qpy/console/TermActivity.java
new file mode 100644
index 00000000..bf2f1f01
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/console/TermActivity.java
@@ -0,0 +1,1311 @@
+/*
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.qpython.qpy.console;
+
+import android.annotation.SuppressLint;
+import android.content.ActivityNotFoundException;
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.content.SharedPreferences;
+import android.content.pm.ActivityInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.net.Uri;
+import android.net.wifi.WifiManager;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.IBinder;
+import android.os.PowerManager;
+import android.preference.PreferenceManager;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.design.widget.AppBarLayout;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.text.TextUtils;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.view.ContextMenu;
+import android.view.ContextMenu.ContextMenuInfo;
+import android.view.GestureDetector.SimpleOnGestureListener;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.Spinner;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.quseit.util.KeyboardUtils;
+import com.quseit.util.NAction;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.console.compont.ActivityCompat;
+import org.qpython.qpysdk.utils.AndroidCompat;
+import org.qpython.qpy.console.compont.FileCompat;
+import org.qpython.qpy.console.compont.MenuItemCompat;
+import org.qpython.qpy.console.util.SessionList;
+import org.qpython.qpy.console.util.TermSettings;
+import org.qpython.qpy.main.activity.NotebookActivity;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.texteditor.ui.adapter.bean.PopupItemBean;
+import org.qpython.qpy.texteditor.ui.view.EditorPopUp;
+import org.qpython.qsl4a.qsl4a.StringUtils;
+
+import java.io.File;
+import java.io.IOException;
+import java.text.Collator;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+
+import jackpal.androidterm.emulatorview.EmulatorView;
+import jackpal.androidterm.emulatorview.TermSession;
+import jackpal.androidterm.emulatorview.TermShortcutLayout;
+import jackpal.androidterm.emulatorview.UpdateCallback;
+import jackpal.androidterm.emulatorview.compat.ClipboardManagerCompat;
+import jackpal.androidterm.emulatorview.compat.ClipboardManagerCompatFactory;
+import jackpal.androidterm.emulatorview.compat.KeycodeConstants;
+
+
+/**
+ * A terminal emulator activity.
+ */
+
+public class TermActivity extends AppCompatActivity implements UpdateCallback, SharedPreferences.OnSharedPreferenceChangeListener {
+
+
+    public static final  int    REQUEST_CHOOSE_WINDOW             = 1;
+    public static final  String EXTRA_WINDOW_ID                   = "jackpal.androidterm.window_id";
+    public static final  String ARGS                              = "PYTHONARGS";
+    /**
+     * The name of the ViewFlipper in the resources.
+     */
+    private static final int    VIEW_FLIPPER                      = R.id.view_flipper;
+    private final static int    SELECT_TEXT_ID                    = 0;
+    private final static int    COPY_ALL_ID                       = 1;
+    private final static int    PASTE_ID                          = 2;
+    private final static int    SEND_CONTROL_KEY_ID               = 3;
+    private final static int    SEND_FN_KEY_ID                    = 4;
+    // Available on API 12 and later
+    private static final int    WIFI_MODE_FULL_HIGH_PERF          = 3;
+    private static final String ACTION_PATH_BROADCAST             = "jackpal.androidterm.broadcast.APPEND_TO_PATH";
+    private static final String ACTION_PATH_PREPEND_BROADCAST     = "jackpal.androidterm.broadcast.PREPEND_TO_PATH";
+    private static final String PERMISSION_PATH_BROADCAST         = "jackpal.androidterm.permission.APPEND_TO_PATH";
+    private static final String PERMISSION_PATH_PREPEND_BROADCAST = "jackpal.androidterm.permission.PREPEND_TO_PATH";
+    // Available on API 12 and later
+    private static final int    FLAG_INCLUDE_STOPPED_PACKAGES     = 0x20;
+    /**
+     * The ViewFlipper which holds the collection of EmulatorView widgets.
+     */
+    private TermViewFlipper mViewFlipper;
+    private SessionList     mTermSessions;
+    private TermSettings    mSettings;
+    private boolean mStopServiceOnFinish = false;
+    private Intent TSIntent;
+    private int onResumeSelectWindow = -1;
+    private ComponentName         mPrivateAlias;
+    private PowerManager.WakeLock mWakeLock;
+    private WifiManager.WifiLock  mWifiLock;
+    private boolean               mBackKeyPressed;
+    private int mPendingPathBroadcasts = 0;
+    private TermService        mTermService;
+    //    private ActionBarCompat mActionBar;
+    private Toolbar            toolbar;
+    private AppBarLayout       toolbarLayout;
+    private Spinner            spinner;
+    private WindowTitleAdapter adapter;
+    private ArrayList<String> windowTitle    = new ArrayList<>();
+    private int               mActionBarMode = TermSettings.ACTION_BAR_MODE_ALWAYS_VISIBLE;
+    private AlertDialog dialog;
+    private EditorPopUp popUp;
+    private boolean mHaveFullHwKeyboard = false;
+    /**
+     * Should we use keyboard shortcuts?
+     */
+    private boolean mUseKeyboardShortcuts;
+    /**
+     * Intercepts keys before the view/terminal gets it.
+     */
+    private View.OnKeyListener mKeyListener = new View.OnKeyListener() {
+        public boolean onKey(View v, int keyCode, KeyEvent event) {
+            return backkeyInterceptor(keyCode, event) || keyboardShortcuts(keyCode, event);
+        }
+
+        /**
+         * Keyboard shortcuts (tab management, paste)
+         */
+        private boolean keyboardShortcuts(int keyCode, KeyEvent event) {
+            if (event.getAction() != KeyEvent.ACTION_DOWN) {
+                return false;
+            }
+            if (!mUseKeyboardShortcuts) {
+                return false;
+            }
+            boolean isCtrlPressed = (event.getMetaState() & KeycodeConstants.META_CTRL_ON) != 0;
+            boolean isShiftPressed = (event.getMetaState() & KeycodeConstants.META_SHIFT_ON) != 0;
+
+            if (keyCode == KeycodeConstants.KEYCODE_TAB && isCtrlPressed) {
+                if (isShiftPressed) {
+                    mViewFlipper.showPrevious();
+                } else {
+                    mViewFlipper.showNext();
+                }
+
+                return true;
+            } else if (keyCode == KeycodeConstants.KEYCODE_N && isCtrlPressed && isShiftPressed) {
+                doCreateNewWindow();
+
+                return true;
+            } else if (keyCode == KeycodeConstants.KEYCODE_V && isCtrlPressed && isShiftPressed) {
+                doPaste();
+                return true;
+            } else {
+                return false;
+            }
+        }
+
+        /**
+         * Make sure the back button always leaves the application.
+         */
+        private boolean backkeyInterceptor(int keyCode, KeyEvent event) {
+            if (keyCode == KeyEvent.KEYCODE_BACK /*&& mActionBarMode == TermSettings.ACTION_BAR_MODE_HIDES && mActionBar != null && mActionBar.isShowing()*/) {
+                /* We need to intercept the key event before the view sees it,
+                   otherwise the view will handle it before we get it */
+                onKeyUp(keyCode, event);
+                return true;
+            } else {
+                return false;
+            }
+        }
+    };
+
+    private BroadcastReceiver mPathReceiver = new BroadcastReceiver() {
+        public void onReceive(Context context, Intent intent) {
+            String path = makePathFromBundle(getResultExtras(false));
+            if (intent.getAction().equals(ACTION_PATH_PREPEND_BROADCAST)) {
+                mSettings.setPrependPath(path);
+            } else {
+                mSettings.setAppendPath(path);
+            }
+            mPendingPathBroadcasts--;
+
+            if (mPendingPathBroadcasts <= 0 && mTermService != null) {
+                try {
+                    populateViewFlipper();
+                    populateWindowList();
+                } catch (IOException e) {
+                    Toast.makeText(context, R.string.fail_resume_console, Toast.LENGTH_SHORT).show();
+                }
+
+            }
+        }
+    };
+    private ServiceConnection mTSConnection = new ServiceConnection() {
+        public void onServiceConnected(ComponentName className, IBinder service) {
+            Log.i(TermDebug.LOG_TAG, "Bound to TermService");
+            TermService.TSBinder binder = (TermService.TSBinder) service;
+            mTermService = binder.getService();
+            if (mPendingPathBroadcasts <= 0) {
+                try {
+                    populateViewFlipper();
+                    populateWindowList();
+                } catch (IOException e) {
+                    Toast.makeText(binder.getService().getApplicationContext(), R.string.fail_resume_console, Toast.LENGTH_SHORT).show();
+                }
+            }
+        }
+
+        public void onServiceDisconnected(ComponentName arg0) {
+            mTermService = null;
+        }
+    };
+
+    private Handler mHandler = new Handler();
+
+    public static void startActivity(Context context) {
+        Intent intent = new Intent(context, TermActivity.class);
+        context.startActivity(intent);
+    }
+
+    public static void startShell(Context context) {
+        Intent intent = new Intent(context, TermActivity.class);
+        intent.putExtra("shell_type","shell");
+        context.startActivity(intent);
+    }
+
+    protected static TermSession createTermSession(Context context, TermSettings settings, String initialCommand, String path) throws IOException {
+        GenericTermSession session = new ShellTermSession(context, settings, initialCommand, path);
+        session.setProcessExitMessage(context.getString(R.string.process_exit_message));
+        return session;
+    }
+
+    @Override
+    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String s) {
+        mSettings.readPrefs(sharedPreferences);
+    }
+
+    @SuppressLint({"WrongConstant", "InvalidWakeLockTag"})
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
+
+        // Check if need to hide status bar
+        final SharedPreferences mPrefs = PreferenceManager.getDefaultSharedPreferences(this);
+        mPrefs.registerOnSharedPreferenceChangeListener(this);
+        mSettings = new TermSettings(getResources(), mPrefs);
+        if (Build.VERSION.SDK_INT < 16 && mSettings.showStatusBar()) {
+            getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
+                    WindowManager.LayoutParams.FLAG_FULLSCREEN);
+        }
+        setContentView(R.layout.term_activity);
+        initView();
+        mPrivateAlias = new ComponentName(this, RemoteInterface.PRIVACT_ACTIVITY_ALIAS);
+        if (icicle == null)
+            onNewIntent(getIntent());
+
+
+        Intent broadcast = new Intent(ACTION_PATH_BROADCAST);
+        if (AndroidCompat.SDK >= 12) {
+            broadcast.addFlags(FLAG_INCLUDE_STOPPED_PACKAGES);
+        }
+        mPendingPathBroadcasts++;
+        sendOrderedBroadcast(broadcast, PERMISSION_PATH_BROADCAST, mPathReceiver, null, RESULT_OK, null, null);
+
+        broadcast = new Intent(broadcast);
+        broadcast.setAction(ACTION_PATH_PREPEND_BROADCAST);
+        mPendingPathBroadcasts++;
+        sendOrderedBroadcast(broadcast, PERMISSION_PATH_PREPEND_BROADCAST, mPathReceiver, null, RESULT_OK, null, null);
+
+        TSIntent = new Intent(this, TermService.class);
+        startService(TSIntent);
+
+        PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
+        mWakeLock = pm.newWakeLock(PowerManager.SCREEN_BRIGHT_WAKE_LOCK | PowerManager.ACQUIRE_CAUSES_WAKEUP, TermDebug.LOG_TAG);
+        WifiManager wm = (WifiManager) getApplicationContext().getSystemService(Context.WIFI_SERVICE);
+        int wifiLockMode = WifiManager.WIFI_MODE_FULL;
+        if (AndroidCompat.SDK >= 12) {
+            wifiLockMode = WIFI_MODE_FULL_HIGH_PERF;
+        }
+        mWifiLock = wm.createWifiLock(wifiLockMode, TermDebug.LOG_TAG);
+        mHaveFullHwKeyboard = checkHaveFullHwKeyboard(getResources().getConfiguration());
+        updatePrefs();
+        if (!bindService(TSIntent, mTSConnection, BIND_AUTO_CREATE)) {
+            throw new IllegalStateException(getString(R.string.failed_bind_term));
+        }
+        KeyboardUtils.addKeyboardToggleListener(this, isVisible -> setStatusBarVisible(mSettings.showStatusBar()));
+    }
+
+    private void initView() {
+        toolbar = (Toolbar) findViewById(R.id.toolbar);
+        toolbarLayout = (AppBarLayout) findViewById(R.id.toolbar_layout);
+        setSupportActionBar(toolbar);
+        getSupportActionBar().setDisplayShowTitleEnabled(false);
+        toolbar.setNavigationIcon(R.drawable.ic_back);
+        toolbar.setNavigationOnClickListener(v -> closeActivity());
+
+        spinner = (Spinner) findViewById(R.id.spinner_toolbar);
+        mViewFlipper = (TermViewFlipper) findViewById(VIEW_FLIPPER);
+
+        spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+                int oldPosition = mViewFlipper.getDisplayedChild();
+                if (position != oldPosition) {
+                    if (position >= mViewFlipper.getChildCount()) {
+                        mViewFlipper.addView(createEmulatorView(mTermSessions.get(position)));
+                    }
+                    mViewFlipper.setDisplayedChild(position);
+                }
+            }
+
+
+            @Override
+            public void onNothingSelected(AdapterView<?> parent) {
+                spinner.setSelection(0);
+            }
+        });
+
+        TermShortcutLayout shortcutLayout = (TermShortcutLayout) findViewById(R.id.term_shortcut);
+        shortcutLayout.setCallback(this::setTextToEmulator);
+
+        findViewById(R.id.notebook).setOnClickListener(v -> {
+            NotebookActivity.start(this, null, false);
+        });
+
+        //findViewById(R.id.history).setOnClickListener(v -> showHistory());
+        findViewById(R.id.switch_notebook_img).setOnClickListener(v -> openNotebook());
+    }
+
+    private void openNotebook() {
+        startActivity(new Intent(this, NotebookActivity.class));
+    }
+
+    @Override
+    public void onPause() {
+        Log.d("TermActivity", "onPause");
+        if (dialog != null) {
+            dialog.dismiss();
+        }
+        super.onPause();
+
+        if (AndroidCompat.SDK < 5) {
+            /* If we lose focus between a back key down and a back key up,
+               we shouldn't respond to the next back key up event unless
+               we get another key down first */
+            mBackKeyPressed = false;
+        }
+
+        /* Explicitly close the input method
+           Otherwise, the soft keyboard could cover up whatever activity takes
+           our place */
+        final IBinder token = mViewFlipper.getWindowToken();
+        new Thread() {
+            @Override
+            public void run() {
+                InputMethodManager imm = (InputMethodManager) getSystemService(INPUT_METHOD_SERVICE);
+                imm.hideSoftInputFromWindow(token, 0);
+            }
+        }.start();
+    }
+
+    @Override
+    public void onDestroy() {
+        Log.d("TermActivity", "onDestroy");
+        PreferenceManager.getDefaultSharedPreferences(this)
+                .unregisterOnSharedPreferenceChangeListener(this);
+
+        if (mTermSessions != null) {
+            mTermSessions.removeCallback(this);
+
+            if (adapter != null) {
+                mTermSessions.removeCallback(adapter);
+                mTermSessions.removeTitleChangedListener(adapter);
+                mViewFlipper.removeCallback(adapter);
+            }
+        }
+
+        mViewFlipper.removeAllViews();
+
+        unbindService(mTSConnection);
+        //LogUtil.d("TermActivity", "mStopServiceOnFinish:"+mStopServiceOnFinish);
+
+        if (mStopServiceOnFinish) {
+            stopService(TSIntent);
+        }
+        //LogUtil.d("TermActivity", "HERE");
+        mTermService = null;
+        mTSConnection = null;
+        if (mWakeLock.isHeld()) {
+            mWakeLock.release();
+        }
+        if (mWifiLock.isHeld()) {
+            mWifiLock.release();
+        }
+
+        mTermSessions = null;
+
+        if (dialog != null) {
+            if (dialog.isShowing()) {
+                dialog.cancel();
+            } else {
+            }
+            dialog.dismiss();
+
+        }
+        if (popUp!=null) {
+            popUp.dismiss();
+        }
+
+        KeyboardUtils.removeAllKeyboardToggleListeners();
+
+        super.onDestroy();
+    }
+
+
+    private String makePathFromBundle(Bundle extras) {
+        if (extras == null || extras.size() == 0) {
+            return "";
+        }
+
+        String[] keys = new String[extras.size()];
+        keys = extras.keySet().toArray(keys);
+        Collator collator = Collator.getInstance(Locale.US);
+        Arrays.sort(keys, collator);
+
+        StringBuilder path = new StringBuilder();
+        for (String key : keys) {
+            String dir = extras.getString(key);
+            if (dir != null && !dir.equals("")) {
+                path.append(dir);
+                path.append(":");
+            }
+        }
+
+        return path.substring(0, path.length() - 1);
+    }
+
+    private void populateViewFlipper() throws IOException {
+        Log.d("TermActivity", "populateViewFlipper");
+        if (mTermService != null) {
+            mTermSessions = mTermService.getSessions();
+            String[] mArgs = this.getIntent().getStringArrayExtra(ARGS);
+            if (mArgs != null) {
+                mTermSessions.add(createPyTermSession(mArgs));
+            } else {
+                mArgs = this.getIntent().getStringArrayExtra("ARGS");
+                if (mArgs != null) {
+                    mTermSessions.add(createPyTermSession(mArgs));
+
+                } else if (mTermSessions.size() == 0) {
+                    mTermSessions.add(createPyTermSession(null));
+                }
+            }
+            //存在内存泄漏
+            mTermSessions.addCallback(this);
+            for (TermSession session : mTermSessions) {
+                Log.d("TermActivity", "createEmulatorView:" + session);
+                EmulatorView view = createEmulatorView(session);
+                mViewFlipper.addView(view);
+            }
+            mViewFlipper.setDisplayedChild(mTermSessions.size() - 1);
+            updatePrefs();
+
+            if (onResumeSelectWindow >= 0) {
+                mViewFlipper.setDisplayedChild(onResumeSelectWindow);
+                onResumeSelectWindow = -1;
+            }
+            mViewFlipper.onResume();
+        }
+    }
+
+    private void populateWindowList() {
+        if (mTermSessions != null) {
+            int position = mViewFlipper.getDisplayedChild();
+            for (int i = 0; i < mTermSessions.size(); i++) {
+                windowTitle.add(getString(R.string.window_title, i));
+            }
+            adapter = new WindowTitleAdapter(this, mTermSessions);
+            spinner.setAdapter(adapter);
+            adapter.notifyDataSetChanged();
+            mViewFlipper.addCallback(adapter);
+            spinner.setSelection(position);
+        }
+    }
+
+    private TermView createEmulatorView(TermSession session) {
+        DisplayMetrics metrics = new DisplayMetrics();
+        getWindowManager().getDefaultDisplay().getMetrics(metrics);
+        TermView emulatorView = new TermView(this, session, metrics);
+
+        emulatorView.setExtGestureListener(new EmulatorViewGestureListener(emulatorView));
+        emulatorView.setOnKeyListener(mKeyListener);
+        registerForContextMenu(emulatorView);
+
+        return emulatorView;
+    }
+
+    private TermSession getCurrentTermSession() {
+        SessionList sessions = mTermSessions;
+        if (sessions == null) {
+            return null;
+        } else {
+            return sessions.get(mViewFlipper.getDisplayedChild());
+        }
+    }
+
+    private EmulatorView getCurrentEmulatorView() {
+        return (EmulatorView) mViewFlipper.getCurrentView();
+    }
+
+    private void updatePrefs() {
+        mUseKeyboardShortcuts = mSettings.getUseKeyboardShortcutsFlag();
+
+        DisplayMetrics metrics = new DisplayMetrics();
+        getWindowManager().getDefaultDisplay().getMetrics(metrics);
+
+        mViewFlipper.updatePrefs(mSettings);
+
+        for (View v : mViewFlipper) {
+            ((EmulatorView) v).setDensity(metrics);
+            ((TermView) v).updatePrefs(mSettings);
+        }
+
+        if (mTermSessions != null) {
+            for (TermSession session : mTermSessions) {
+                ((GenericTermSession) session).updatePrefs(mSettings);
+            }
+        }
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN) {
+            setStatusBarVisible(mSettings.showStatusBar());
+        } else {
+            Toast.makeText(App.getContext(), R.string.under_16_status_bar_hint, Toast.LENGTH_SHORT).show();
+        }
+        mActionBarMode = mSettings.actionBarMode();
+        switch (mActionBarMode) {
+            case TermSettings.ACTION_BAR_MODE_ALWAYS_VISIBLE:
+                toolbarLayout.setVisibility(View.VISIBLE);
+                break;
+            case TermSettings.ACTION_BAR_MODE_HIDES:
+                toolbarLayout.setVisibility(View.GONE);
+                break;
+        }
+        int orientation = mSettings.getScreenOrientation();
+        int o = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;
+        if (orientation == 0) {
+            o = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
+        } else if (orientation == 1) {
+            o = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;
+        } else if (orientation == 2) {
+            o = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
+        } else {
+            /* Shouldn't be happened. */
+        }
+        setRequestedOrientation(o);
+    }
+
+    private void setStatusBarVisible(boolean visible) {
+        View decorView = getWindow().getDecorView();
+        decorView.setSystemUiVisibility(visible ? View.SYSTEM_UI_FLAG_VISIBLE : View.SYSTEM_UI_FLAG_FULLSCREEN);
+    }
+
+    private boolean checkHaveFullHwKeyboard(Configuration c) {
+        return (c.keyboard == Configuration.KEYBOARD_QWERTY) &&
+                (c.hardKeyboardHidden == Configuration.HARDKEYBOARDHIDDEN_NO);
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+
+        mHaveFullHwKeyboard = checkHaveFullHwKeyboard(newConfig);
+
+        EmulatorView v = (EmulatorView) mViewFlipper.getCurrentView();
+        if (v != null) {
+            v.updateSize(false);
+        }
+
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.activity_console_menu, menu);
+        MenuItemCompat.setShowAsAction(menu.findItem(R.id.menu_new_window), MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        int id = item.getItemId();
+        switch (id) {
+            case R.id.menu_new_window:
+                doCreateNewWindow();
+                break;
+            case R.id.menu_new_more:
+                if (popUp == null) {
+                    List<PopupItemBean> popupItemBeans = new ArrayList<>();
+                    popupItemBeans.add(new PopupItemBean(getString(R.string.window_list), v ->
+                            startActivityForResult(new Intent(this, WindowList.class), REQUEST_CHOOSE_WINDOW)));
+                    popupItemBeans.add(new PopupItemBean(getString(R.string.preferences), v -> doPreferences()));
+                    popupItemBeans.add(new PopupItemBean(getString(R.string.send_email), v -> doEmailTranscript()));
+                    popupItemBeans.add(new PopupItemBean(getString(R.string.enable_wakelock), v -> doToggleWakeLock())
+                            .setTitle2(getString(R.string.disable_wakelock)));
+                    popupItemBeans.add(new PopupItemBean(getString(R.string.enable_wifilock), v -> doToggleWifiLock())
+                            .setTitle2(getString(R.string.disable_wifilock)));
+                    popUp = new EditorPopUp(this, popupItemBeans);
+                }
+                popUp.show(findViewById(R.id.toolbar));
+                break;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    private void doCreateNewWindow() {
+        Log.d("TermActivity", "doCreateNewWindow");
+
+        if (mTermSessions == null) {
+            Log.w(TermDebug.LOG_TAG, "Couldn't create new window because mTermSessions == null");
+            return;
+        }
+
+        try {
+            TermSession session = createPyTermSession(null);
+
+            mTermSessions.add(session);
+
+            TermView view = createEmulatorView(session);
+            view.updatePrefs(mSettings);
+
+            mViewFlipper.addView(view);
+            int position = mViewFlipper.getChildCount() - 1;
+            mViewFlipper.setDisplayedChild(position);
+            spinner.setSelection(position);
+        } catch (IOException e) {
+            Toast.makeText(this, "Failed to create a session", Toast.LENGTH_SHORT).show();
+        }
+    }
+
+    private void confirmCloseWindow() {
+        AlertDialog.Builder b = new AlertDialog.Builder(this);
+        b.setIcon(android.R.drawable.ic_dialog_alert);
+        b.setMessage(R.string.confirm_window_close_message);
+        final Runnable closeWindow = this::doCloseWindow;
+        b.setPositiveButton(android.R.string.yes, (dialog1, id) -> {
+            dialog1.dismiss();
+            mHandler.post(closeWindow);
+        });
+        b.setNegativeButton(android.R.string.no, (dialog1, id) -> {
+            dialog1.dismiss();
+        });
+        dialog = b.create();
+        dialog.show();
+    }
+
+    private void doCloseWindow() {
+        if (mTermSessions == null) {
+            return;
+        }
+
+        EmulatorView view = getCurrentEmulatorView();
+        if (view == null) {
+            return;
+        }
+        TermSession session = mTermSessions.remove(mViewFlipper.getDisplayedChild());
+        view.onPause();
+        session.finish();
+        mViewFlipper.removeView(view);
+        if (mTermSessions.size() != 0) {
+            mViewFlipper.showNext();
+        }
+    }
+
+    @Override
+    protected void onActivityResult(int request, int result, Intent data) {
+        switch (request) {
+            case REQUEST_CHOOSE_WINDOW:
+                if (result == RESULT_OK && data != null) {
+                    int position = data.getIntExtra(EXTRA_WINDOW_ID, -2);
+                    if (position >= 0) {
+                        // Switch windows after session list is in sync, not here
+                        onResumeSelectWindow = position;
+                    } else if (position == -1) {
+                        doCreateNewWindow();
+                        if (mTermSessions == null) {
+                            Log.w(TermDebug.LOG_TAG, "Couldn't create new window because mTermSessions == null");
+                            return;
+                        }
+                        onResumeSelectWindow = mTermSessions.size() - 1;
+                    }
+                } else {
+                    // Close the activity if user closed all sessions
+                    // TODO the left path will be invoked when nothing happened, but this Activity was destroyed!
+                    if (mTermSessions == null || mTermSessions.size() == 0) {
+                        mStopServiceOnFinish = true;
+                        finish();
+                    }
+                }
+                break;
+        }
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        updatePrefs();
+    }
+
+    private void setTextToEmulator(String text) {
+        if (mViewFlipper.getCurrentView() != null) {
+            if (text!=null && text.equals("[tab]")) {
+                Log.d("TermAcity", "setTextToEmulator:"+text);
+
+                //((EmulatorView) mViewFlipper.getCurrentView()).sendTabKey();
+
+                ((EmulatorView) mViewFlipper.getCurrentView()).setTextBuff("\t");
+                ((EmulatorView) mViewFlipper.getCurrentView()).getTermSession().write("\t");
+                ((EmulatorView) mViewFlipper.getCurrentView()).getTermSession().notifyUpdate();
+
+
+            } else {
+                ((EmulatorView) mViewFlipper.getCurrentView()).setTextBuff(text);
+                ((EmulatorView) mViewFlipper.getCurrentView()).getTermSession().write(text);
+                ((EmulatorView) mViewFlipper.getCurrentView()).getTermSession().notifyUpdate();
+            }
+        }
+    }
+/*
+    private void showHistory() {
+        if (mViewFlipper.getCurrentView() != null) {
+            //LinkedList<String> history = ((EmulatorView) mViewFlipper.getCurrentView()).getEmulator().getHistory();
+            LinkedList<String> history = ((EmulatorView) mViewFlipper.getCurrentView()).getHistoryCmd();
+            if (history == null || history.size() == 0) {
+                Toast.makeText(mTermService, R.string.history_emp, Toast.LENGTH_SHORT).show();
+            } else {
+                new AlertDialog.Builder(this)
+                        .setTitle(R.string.enter_history)
+                        .setNegativeButton(R.string.close, (dialog1, which) -> dialog1.dismiss())
+                        .setAdapter(new ArrayAdapter<>(this, R.layout.dialog_history, history), (dialog1, which) -> {
+                            dialog1.dismiss();
+                            ((EmulatorView) mViewFlipper.getCurrentView()).setTextBuff(history.get(which));
+                            ((EmulatorView) mViewFlipper.getCurrentView()).getTermSession().write(history.get(which));
+                            ((EmulatorView) mViewFlipper.getCurrentView()).getTermSession().notifyUpdate();
+                        })
+                        .show();
+            }
+        }
+    }
+*/
+    @Override
+    protected void onNewIntent(Intent intent) {
+        if ((intent.getFlags() & Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY) != 0) {
+            // Don't repeat action if intent comes from history
+            return;
+        }
+
+        String action = intent.getAction();
+        if (TextUtils.isEmpty(action) || !mPrivateAlias.equals(intent.getComponent())) {
+            return;
+        }
+
+        // huge number simply opens new window
+        // TODO: add a way to restrict max number of windows per caller (possibly via reusing BoundSession)
+        switch (action) {
+            case RemoteInterface.PRIVACT_OPEN_NEW_WINDOW:
+                onResumeSelectWindow = Integer.MAX_VALUE;
+                break;
+            case RemoteInterface.PRIVACT_SWITCH_WINDOW:
+                int target = intent.getIntExtra(RemoteInterface.PRIVEXTRA_TARGET_WINDOW, -1);
+                if (target >= 0) {
+                    onResumeSelectWindow = target;
+                }
+                break;
+        }
+    }
+
+    @Override
+    public void onCreateContextMenu(ContextMenu menu, View v,
+                                    ContextMenuInfo menuInfo) {
+        super.onCreateContextMenu(menu, v, menuInfo);
+        menu.setHeaderTitle(R.string.edit_text);
+        menu.add(0, SELECT_TEXT_ID, 0, R.string.select_text);
+        menu.add(0, COPY_ALL_ID, 0, R.string.copy_all);
+        menu.add(0, PASTE_ID, 0, R.string.paste);
+        menu.add(0, SEND_CONTROL_KEY_ID, 0, R.string.send_control_key);
+        menu.add(0, SEND_FN_KEY_ID, 0, R.string.send_fn_key);
+        if (!canPaste()) {
+            menu.getItem(PASTE_ID).setEnabled(false);
+        }
+    }
+
+    @Override
+    public boolean onContextItemSelected(MenuItem item) {
+        Log.d("TermActivity", "onContextItemSelected:"+item.getItemId());
+        switch (item.getItemId()) {
+            case SELECT_TEXT_ID:
+                getCurrentEmulatorView().toggleSelectingText();
+                return true;
+            case COPY_ALL_ID:
+                doCopyAll();
+                return true;
+            case PASTE_ID:
+                doPaste();
+                return true;
+            case SEND_CONTROL_KEY_ID:
+                doSendControlKey();
+                return true;
+            case SEND_FN_KEY_ID:
+                doSendFnKey();
+                return true;
+            default:
+                return super.onContextItemSelected(item);
+        }
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        Log.d("TermActivity", "onKeyDown");
+        /* The pre-Eclair default implementation of onKeyDown() would prevent
+           our handling of the Back key in onKeyUp() from taking effect, so
+           ignore it here */
+        if (AndroidCompat.SDK < 5 && keyCode == KeyEvent.KEYCODE_BACK) {
+            /* Android pre-Eclair has no key event tracking, and a back key
+               down event delivered to an activity above us in the back stack
+               could be succeeded by a back key up event to us, so we need to
+               keep track of our own back key presses */
+            mBackKeyPressed = true;
+            return true;
+        } else {
+            return super.onKeyDown(keyCode, event);
+        }
+    }
+
+    @Override
+    public boolean onKeyUp(int keyCode, KeyEvent event) {
+        Log.d("TermActivity", "onKeyUp:"+keyCode);
+
+        switch (keyCode) {
+            case KeyEvent.KEYCODE_BACK:
+                if (AndroidCompat.SDK < 5) {
+                    if (!mBackKeyPressed) {
+                    /* This key up event might correspond to a key down
+                       delivered to another activity -- ignore */
+                        return false;
+                    }
+                    mBackKeyPressed = false;
+                }
+//                if (mActionBarMode == TermSettings.ACTION_BAR_MODE_HIDES && mActionBar != null && mActionBar.isShowing()) {
+//                    mActionBar.hide();
+//                    return true;
+//                }
+                switch (mSettings.getBackKeyAction()) {
+                    case TermSettings.BACK_KEY_STOPS_SERVICE:
+                        mStopServiceOnFinish = true;
+                        break;
+                    case TermSettings.BACK_KEY_CLOSES_ACTIVITY:
+                        closeActivity();
+                        return true;
+                    case TermSettings.BACK_KEY_CLOSES_WINDOW:
+                        doCloseWindow();
+                        return true;
+                    default:
+                        return false;
+                }
+                break;
+            case KeyEvent.KEYCODE_MENU:
+                return super.onKeyUp(keyCode, event);
+            default:
+                return super.onKeyUp(keyCode, event);
+        }
+        return super.onKeyUp(keyCode, event);
+
+    }
+
+    private void closeActivity() {
+        //LogUtil.d("TermActivity", "closeActivity");
+        try {
+            if (dialog!=null) {
+                dialog.dismiss();
+            }
+            dialog = new AlertDialog.Builder(this, R.style.MyDialog)
+                    .setTitle(R.string.run_bg_title)
+                    .setMessage(R.string.terminal_bg_hint)
+                    .setPositiveButton(R.string.yes, ((dialog1, which) -> {
+                        dialog1.dismiss();
+                        finish();
+                    }))
+                    .setNegativeButton(R.string.no, ((dialog1, which) -> {
+                        dialog1.dismiss();
+//                        //在关闭当前窗口时mTermSessions可能还未初始化完成
+                        if (mTermSessions != null) {
+                            for (int i = mTermSessions.size(); i > 0; i--) {
+
+                                mTermSessions.get(i - 1).finish();
+
+                            }
+                        }
+                        finish();
+                    }))
+                    .create();
+            dialog.show();
+        } catch (Exception e) {
+
+        }
+    }
+
+    // Called when the list of sessions changes
+    public void onUpdate() {
+        SessionList sessions = mTermSessions;
+        if (sessions == null) {
+            return;
+        }
+
+        if (sessions.size() == 0) {
+            mStopServiceOnFinish = true;
+            finish();
+        } else if (sessions.size() < mViewFlipper.getChildCount()) {
+            for (int i = 0; i < mViewFlipper.getChildCount(); ++i) {
+                EmulatorView v = (EmulatorView) mViewFlipper.getChildAt(i);
+                if (!sessions.contains(v.getTermSession())) {
+                    v.onPause();
+                    mViewFlipper.removeView(v);
+                    --i;
+                }
+            }
+        }
+    }
+
+    private boolean canPaste() {
+        ClipboardManagerCompat clip = ClipboardManagerCompatFactory
+                .getManager(getApplicationContext());
+        if (clip.hasText()) {
+            return true;
+        }
+        return false;
+    }
+
+    private void doPreferences() {
+        startActivity(new Intent(this, TermPreferences.class));
+    }
+
+    private void doResetTerminal() {
+        TermSession session = getCurrentTermSession();
+        if (session != null) {
+            session.reset();
+        }
+    }
+
+    private void doEmailTranscript() {
+        TermSession session = getCurrentTermSession();
+        if (session != null) {
+            // Don't really want to supply an address, but
+            // currently it's required, otherwise nobody
+            // wants to handle the intent.
+            String addr = "support@qpython.org";
+            Intent intent =
+                    new Intent(Intent.ACTION_SENDTO, Uri.parse("mailto:"
+                            + addr));
+
+            String subject = getString(R.string.email_transcript_subject);
+            String title = session.getTitle();
+            if (title != null) {
+                subject = subject + " - " + title;
+            }
+            intent.putExtra(Intent.EXTRA_SUBJECT, subject);
+            intent.putExtra(Intent.EXTRA_TEXT,
+                    session.getTranscriptText().trim());
+            try {
+                startActivity(Intent.createChooser(intent,
+                        getString(R.string.email_transcript_chooser_title)));
+            } catch (ActivityNotFoundException e) {
+                Toast.makeText(this,
+                        R.string.email_transcript_no_email_activity_found,
+                        Toast.LENGTH_LONG).show();
+            }
+        }
+    }
+
+    private void doCopyAll() {
+        ClipboardManagerCompat clip = ClipboardManagerCompatFactory
+                .getManager(getApplicationContext());
+        clip.setText(getCurrentTermSession().getTranscriptText().trim());
+    }
+
+    private void doPaste() {
+        if (!canPaste()) {
+            return;
+        }
+        ClipboardManagerCompat clip = ClipboardManagerCompatFactory
+                .getManager(getApplicationContext());
+        CharSequence paste = clip.getText();
+        getCurrentTermSession().write(paste.toString());
+    }
+
+    private void doSendTabKey() {
+        getCurrentEmulatorView().sendTabKey();
+    }
+
+    private void doSendControlKey() {
+        getCurrentEmulatorView().sendControlKey();
+    }
+
+    private void doSendFnKey() {
+        getCurrentEmulatorView().sendFnKey();
+    }
+
+    private void doDocumentKeys() {
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        Resources r = getResources();
+        builder.setTitle(r.getString(R.string.control_key_dialog_title));
+        builder.setMessage(
+                formatMessage(mSettings.getControlKeyId(), TermSettings.CONTROL_KEY_ID_NONE,
+                        r, R.array.control_keys_short_names,
+                        R.string.control_key_dialog_control_text,
+                        R.string.control_key_dialog_control_disabled_text, "CTRLKEY")
+                        + "\n\n" +
+                        formatMessage(mSettings.getFnKeyId(), TermSettings.FN_KEY_ID_NONE,
+                                r, R.array.fn_keys_short_names,
+                                R.string.control_key_dialog_fn_text,
+                                R.string.control_key_dialog_fn_disabled_text, "FNKEY"));
+        dialog = builder.create();
+        dialog.show();
+    }
+
+    private String formatMessage(int keyId, int disabledKeyId,
+                                 Resources r, int arrayId,
+                                 int enabledId,
+                                 int disabledId, String regex) {
+        if (keyId == disabledKeyId) {
+            return r.getString(disabledId);
+        }
+        String[] keyNames = r.getStringArray(arrayId);
+        String keyName = keyNames[keyId];
+        String template = r.getString(enabledId);
+        String result = template.replaceAll(regex, keyName);
+        return result;
+    }
+
+    private void doToggleSoftKeyboard() {
+        if (!mViewFlipper.getCurrentView().hasFocus()) {
+            mViewFlipper.getCurrentView().requestFocus();
+            InputMethodManager imm = (InputMethodManager)
+                    getSystemService(Context.INPUT_METHOD_SERVICE);
+            imm.showSoftInput(mViewFlipper.getCurrentView(), 0);
+        } else {
+            mViewFlipper.getCurrentView().clearFocus();
+            InputMethodManager imm = (InputMethodManager)
+                    getSystemService(Context.INPUT_METHOD_SERVICE);
+            imm.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0);
+        }
+
+    }
+
+    private void doToggleWakeLock() {
+        if (mWakeLock.isHeld()) {
+            mWakeLock.release();
+        } else {
+            mWakeLock.acquire();
+        }
+        ActivityCompat.invalidateOptionsMenu(this);
+    }
+
+    private void doToggleWifiLock() {
+        if (mWifiLock.isHeld()) {
+            mWifiLock.release();
+        } else {
+            mWifiLock.acquire();
+        }
+        ActivityCompat.invalidateOptionsMenu(this);
+    }
+
+    private void doToggleActionBar() {
+        if (toolbarLayout.getVisibility() == View.VISIBLE) {
+            toolbarLayout.setVisibility(View.GONE);
+        } else {
+            toolbarLayout.setVisibility(View.VISIBLE);
+        }
+    }
+
+    private void doUIToggle(int x, int y, int width, int height) {
+        switch (mActionBarMode) {
+            case TermSettings.ACTION_BAR_MODE_NONE:
+                if (AndroidCompat.SDK >= 11 && (mHaveFullHwKeyboard || y < height / 2)) {
+                    openOptionsMenu();
+                    return;
+                } else {
+                    doToggleSoftKeyboard();
+                }
+                break;
+            case TermSettings.ACTION_BAR_MODE_ALWAYS_VISIBLE:
+                if (!mHaveFullHwKeyboard) {
+                    doToggleSoftKeyboard();
+                }
+                break;
+            case TermSettings.ACTION_BAR_MODE_HIDES:
+                if (mHaveFullHwKeyboard || y < height / 2) {
+                    doToggleActionBar();
+                    return;
+                } else {
+                    doToggleSoftKeyboard();
+                }
+                break;
+        }
+        getCurrentEmulatorView().requestFocus();
+    }
+
+    /**
+     * Send a URL up to Android to be handled by a browser.
+     *
+     * @param link The URL to be opened.
+     */
+    private void execURL(String link) {
+        Uri webLink = Uri.parse(link);
+        Intent openLink = new Intent(Intent.ACTION_VIEW, webLink);
+        PackageManager pm = getPackageManager();
+        List<ResolveInfo> handlers = pm.queryIntentActivities(openLink, 0);
+        if (handlers.size() > 0)
+            startActivity(openLink);
+    }
+
+    private TermSession createPyTermSession(String[] mArgs) throws IOException {
+        Log.d("TermActivity", "createPyTermSession:" + mArgs);
+        TermSettings settings = mSettings;
+        TermSession session;
+        Intent intent = this.getIntent();
+        String shell_type = intent.getStringExtra("shell_type");
+        if (shell_type!=null && shell_type.equals("shell")) {
+
+            session = createTermSession(this, settings, "cd $HOME && cat SHELL", this.getFilesDir().getAbsolutePath());
+
+        } else {
+
+            if (mArgs == null) {
+                String scmd = getScmd() + " && exit";
+                session = createTermSession(this, settings, scmd, "");
+            } else {
+                //String content = FileHelper.getFileContents(mArgs[0]);
+                //String cmd = settings.getInitialCommand().equals("")?scmd:settings.getInitialCommand();
+                String scmd = getScmd();
+                if (mArgs.length < 3) {
+                    session = createTermSession(this, settings, scmd + " \"" + StringUtils.addSlashes(mArgs[0]) + "\" && exit", mArgs[1]);
+                } else {
+                    StringBuilder cm = new StringBuilder();
+                    for (int i = 0; i < mArgs.length; i++) {
+                        if (i == 1 && mArgs[0].contains(mArgs[i])) continue;
+                        cm.append(" ").append(mArgs[i]).append(" ");
+                    }
+                    session = createTermSession(this, settings, scmd + " " + cm + " && exit", mArgs[1]);
+                }
+            }
+        }
+        // TODO: INIT.SH
+        //initPyInit();
+
+        session.setFinishCallback(mTermService);
+        return session;
+    }
+
+    private String getScmd() {
+        boolean isRootEnable = NAction.isRootEnable(this);
+        String scmd;
+        if (Build.VERSION.SDK_INT >= 20) {
+            if (isRootEnable) {
+                scmd = getApplicationContext().getFilesDir() + "/bin/qpython" + (NAction.isQPy3(this) ? "3" : "") + "-android5-root.sh";
+            } else {
+                scmd = getApplicationContext().getFilesDir() + "/bin/qpython" + (NAction.isQPy3(this) ? "3" : "") + "-android5.sh";
+            }
+        } else {
+            if (isRootEnable) {
+                scmd = getApplicationContext().getFilesDir() + "/bin/qpython" + (NAction.isQPy3(this) ? "3" : "") + "-root.sh";
+            } else {
+                scmd = getApplicationContext().getFilesDir() + "/bin/qpython" + (NAction.isQPy3(this) ? "3" : "") + ".sh";
+
+            }
+        }
+        return scmd;
+    }
+
+    private String checkPath(String path) {
+        String[] dirs = path.split(":");
+        StringBuilder checkedPath = new StringBuilder(path.length());
+        for (String dirname : dirs) {
+            File dir = new File(dirname);
+            if (dir.isDirectory() && FileCompat.canExecute(dir)) {
+                checkedPath.append(dirname);
+                checkedPath.append(":");
+            }
+        }
+        return checkedPath.substring(0, checkedPath.length() - 1);
+    }
+
+    private class EmulatorViewGestureListener extends SimpleOnGestureListener {
+        private EmulatorView view;
+
+        EmulatorViewGestureListener(EmulatorView view) {
+            this.view = view;
+        }
+
+        @Override
+        public boolean onSingleTapUp(MotionEvent e) {
+            // Let the EmulatorView handle taps if mouse tracking is active
+            if (view.isMouseTrackingActive()) return false;
+
+            //Check for link at tap location
+            String link = view.getURLat(e.getX(), e.getY());
+            if (link != null)
+                execURL(link);
+            else
+                doUIToggle((int) e.getX(), (int) e.getY(), view.getVisibleWidth(), view.getVisibleHeight());
+            return true;
+        }
+
+        @Override
+        public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
+            float absVelocityX = Math.abs(velocityX);
+            float absVelocityY = Math.abs(velocityY);
+            if (absVelocityX > Math.max(1000.0f, 2.0 * absVelocityY)) {
+                // Assume user wanted side to side movement
+                int windowCount = spinner.getCount();
+                int index = spinner.getSelectedItemPosition();
+                if (velocityX > 0) {
+                    // Left to right swipe -- previous window
+                    mViewFlipper.showPrevious();
+                    spinner.setSelection(index - 1 >= 0 ? spinner.getSelectedItemPosition() - 1 : windowCount);
+                } else {
+                    // Right to left swipe -- next window
+                    mViewFlipper.showNext();
+                    spinner.setSelection(index + 1 < windowCount ? index + 1 : 0);
+                }
+                return true;
+            } else {
+                return false;
+            }
+        }
+    }
+
+    private class WindowTitleAdapter extends ArrayAdapter<TermSession> implements UpdateCallback {
+
+        WindowTitleAdapter(@NonNull Context context, List<TermSession> dataList) {
+            super(context, android.R.layout.simple_spinner_item, dataList);
+        }
+
+        @NonNull
+        @Override
+        public View getView(int position, @Nullable View convertView, @NonNull ViewGroup parent) {
+            TextView tv = new TextView(parent.getContext());
+            tv.setText(getString(R.string.window_title, position + 1));
+            tv.setTextAppearance(parent.getContext(), R.style.toolbar_text);
+            return tv;
+        }
+
+        @Override
+        public View getDropDownView(int position, @Nullable View convertView, @NonNull ViewGroup parent) {
+            convertView = LayoutInflater.from(parent.getContext()).inflate(R.layout.window_list_item, null);
+            TextView tv = (TextView) convertView.findViewById(R.id.window_list_label);
+            tv.setText(getString(R.string.window_title, position + 1));
+            convertView.findViewById(R.id.window_list_close).setOnClickListener(v -> {
+                TermSession session = mTermSessions.remove(position);
+                if (session != null) {
+                    session.finish();
+                    notifyDataSetChanged();
+                }
+            });
+            return convertView;
+        }
+
+        @Override
+        public void onUpdate() {
+            notifyDataSetChanged();
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/console/TermDebug.java b/qpython/src/main/java/org/qpython/qpy/console/TermDebug.java
new file mode 100644
index 00000000..9c1cfc07
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/console/TermDebug.java
@@ -0,0 +1,34 @@
+package org.qpython.qpy.console;/*
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+/**
+ * Debug settings.
+ */
+
+public class TermDebug {
+    /**
+     * Set to true to add debugging code and logging.
+     */
+    public static final boolean DEBUG = true;
+
+    /**
+     * The tag we use when logging, so that our messages can be distinguished
+     * from other messages in the log. Public because it's used by several
+     * classes.
+     */
+    public static final String LOG_TAG = "TermActivity";
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/console/TermPreferences.java b/qpython/src/main/java/org/qpython/qpy/console/TermPreferences.java
new file mode 100644
index 00000000..158f111e
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/console/TermPreferences.java
@@ -0,0 +1,72 @@
+package org.qpython.qpy.console;/*
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+import android.os.Bundle;
+import android.preference.Preference;
+import android.preference.PreferenceActivity;
+import android.preference.PreferenceCategory;
+import android.view.MenuItem;
+
+import org.qpython.qpy.R;
+
+import org.qpython.qpy.console.compont.ActionBarCompat;
+import org.qpython.qpy.console.compont.ActivityCompat;
+import org.qpython.qpysdk.utils.AndroidCompat;
+
+
+public class TermPreferences extends PreferenceActivity {
+    private static final String ACTIONBAR_KEY = "actionbar";
+    private static final String CATEGORY_SCREEN_KEY = "screen";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        // Load the console_preferences from an XML resource
+        addPreferencesFromResource(R.xml.console_preferences);
+
+        // Remove the action bar pref on older platforms without an action bar
+        if (AndroidCompat.SDK < 11) {
+            Preference actionBarPref = findPreference(ACTIONBAR_KEY);
+            PreferenceCategory screenCategory =
+                    (PreferenceCategory) findPreference(CATEGORY_SCREEN_KEY);
+            if ((actionBarPref != null) && (screenCategory != null)) {
+                screenCategory.removePreference(actionBarPref);
+            }
+        }
+
+        // Display up indicator on action bar home button
+        if (AndroidCompat.V11ToV20) {
+            ActionBarCompat bar = ActivityCompat.getActionBar(this);
+            if (bar != null) {
+                bar.setDisplayOptions(ActionBarCompat.DISPLAY_HOME_AS_UP, ActionBarCompat.DISPLAY_HOME_AS_UP);
+            }
+        }
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case ActionBarCompat.ID_HOME:
+                // Action bar home button selected
+                finish();
+                return true;
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/console/TermService.java b/qpython/src/main/java/org/qpython/qpy/console/TermService.java
new file mode 100644
index 00000000..9674b508
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/console/TermService.java
@@ -0,0 +1,267 @@
+package org.qpython.qpy.console;/*
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.app.Service;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentSender;
+import android.content.SharedPreferences;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.graphics.Color;
+import android.net.Uri;
+import android.os.Binder;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.IBinder;
+import android.os.Looper;
+import android.os.ParcelFileDescriptor;
+import android.os.ResultReceiver;
+import android.preference.PreferenceManager;
+import android.support.annotation.RequiresApi;
+import android.text.TextUtils;
+import android.util.Log;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.console.compont.ServiceForegroundCompat;
+import org.qpython.qpy.console.util.SessionList;
+import org.qpython.qpy.console.util.TermSettings;
+
+import java.util.UUID;
+
+import jackpal.androidterm.TermExec;
+import jackpal.androidterm.emulatorview.TermSession;
+import jackpal.androidterm.libtermexec.v1.ITerminal;
+
+
+public class TermService extends Service implements TermSession.FinishCallback {
+    /* Parallels the value of START_STICKY on API Level >= 5 */
+    public static final  int NOTIFICATION_ID      = 40530;
+    private static final int RUNNING_NOTIFICATION = 1;
+    private ServiceForegroundCompat compat;
+
+    private SessionList mTermSessions;
+
+    public class TSBinder extends Binder {
+        TermService getService() {
+            Log.i("TermService", "Activity binding to service");
+            return TermService.this;
+        }
+    }
+
+    private final IBinder mTSBinder = new TSBinder();
+
+    @Override
+    public void onStart(Intent intent, int flags) {
+    }
+
+    /* This should be @Override if building with API Level >=5 */
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        Intent resultIntent = new Intent(this, TermActivity.class);
+        resultIntent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
+        PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, resultIntent, PendingIntent.FLAG_ONE_SHOT);
+
+        Notification.Builder builder;
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
+            builder = new Notification.Builder(this, createNotificationChannel());
+        } else {
+            builder = new Notification.Builder(this);
+        }
+
+        builder.setContentTitle(getString(R.string.qpy_console))
+                .setContentIntent(pendingIntent)
+                .setContentText(getString(R.string.console_running))
+                .setSmallIcon(R.drawable.terminal_mini_icon);
+        Notification notification;
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN) {
+            notification = builder.build();
+        } else {
+            notification = builder.getNotification();
+        }
+        startForeground(NOTIFICATION_ID, notification);
+        return START_STICKY;
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.O)
+    private String createNotificationChannel() {
+        String channelId = "my_service";
+        String channelName = "My Background Service";
+        NotificationChannel chan = new NotificationChannel(channelId, channelName,
+                NotificationManager.IMPORTANCE_NONE);
+        chan.setLightColor(Color.BLUE);
+        chan.setLockscreenVisibility(Notification.VISIBILITY_PRIVATE);
+        NotificationManager service = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+        service.createNotificationChannel(chan);
+        return channelId;
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        if (TermExec.SERVICE_ACTION_V1.equals(intent.getAction())) {
+            Log.i("TermService", "Outside process called onBind()");
+
+            return new RBinder();
+        } else {
+            Log.i("TermService", "Activity called onBind()");
+
+            return mTSBinder;
+        }
+    }
+
+    @Override
+    public void onCreate() {
+        // should really belong to the Application class, but we don't use one...
+        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+        SharedPreferences.Editor editor = prefs.edit();
+        String defValue = getDir("HOME", MODE_PRIVATE).getAbsolutePath();
+        String homePath = prefs.getString("home_path", defValue);
+        editor.putString("home_path", homePath);
+        editor.apply();
+        compat = new ServiceForegroundCompat(this);
+        mTermSessions = new SessionList();
+
+        /* Put the service in the foreground. */
+      /*  Notification notification = new Notification(R.drawable.ic_stat_service_notification_icon, getText(R.string.service_notify_text), System.currentTimeMillis());
+        notification.flags |= Notification.FLAG_ONGOING_EVENT;
+        Intent notifyIntent = new Intent(this, TermActivity.class);
+        notifyIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, notifyIntent, 0);
+        notification.setLatestEventInfo(this, getText(R.string.application_terminal), getText(R.string.service_notify_text), pendingIntent);
+        compat.startForeground(RUNNING_NOTIFICATION, notification);*/
+
+        Log.d(TermDebug.LOG_TAG, "TermService started");
+        return;
+    }
+
+    @Override
+    public void onDestroy() {
+        compat.stopForeground(true);
+        for (TermSession session : mTermSessions) {
+            /* Don't automatically remove from list of sessions -- we clear the
+             * list below anyway and we could trigger
+             * ConcurrentModificationException if we do */
+            session.setFinishCallback(null);
+            session.finish();
+        }
+        mTermSessions.clear();
+        return;
+    }
+
+    public SessionList getSessions() {
+        return mTermSessions;
+    }
+
+    public void onSessionFinish(TermSession session) {
+        mTermSessions.remove(session);
+    }
+
+    private final class RBinder extends ITerminal.Stub {
+        @Override
+        public IntentSender startSession(final ParcelFileDescriptor pseudoTerminalMultiplexerFd,
+                                         final ResultReceiver callback) {
+            final String sessionHandle = UUID.randomUUID().toString();
+
+            // distinct Intent Uri and PendingIntent requestCode must be sufficient to avoid collisions
+            final Intent switchIntent = new Intent(RemoteInterface.PRIVACT_OPEN_NEW_WINDOW)
+                    .setData(Uri.parse(sessionHandle))
+                    .addCategory(Intent.CATEGORY_DEFAULT)
+                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                    .putExtra(RemoteInterface.PRIVEXTRA_TARGET_WINDOW, sessionHandle);
+
+            final PendingIntent result = PendingIntent.getActivity(getApplicationContext(), sessionHandle.hashCode(),
+                    switchIntent, 0);
+
+            final PackageManager pm = getPackageManager();
+            final String[] pkgs = pm.getPackagesForUid(getCallingUid());
+            if (pkgs == null || pkgs.length == 0)
+                return null;
+
+            for (String packageName : pkgs) {
+                try {
+                    final PackageInfo pkgInfo = pm.getPackageInfo(packageName, 0);
+
+                    final ApplicationInfo appInfo = pkgInfo.applicationInfo;
+                    if (appInfo == null)
+                        continue;
+
+                    final CharSequence label = pm.getApplicationLabel(appInfo);
+
+                    if (!TextUtils.isEmpty(label)) {
+                        final String niceName = label.toString();
+
+                        new Handler(Looper.getMainLooper()).post(new Runnable() {
+                            @Override
+                            public void run() {
+                                GenericTermSession session = null;
+                                try {
+                                    final TermSettings settings = new TermSettings(getResources(),
+                                            PreferenceManager.getDefaultSharedPreferences(getApplicationContext()));
+
+                                    session = new BoundSession(pseudoTerminalMultiplexerFd, settings, niceName);
+
+                                    mTermSessions.add(session);
+
+                                    session.setHandle(sessionHandle);
+                                    session.setFinishCallback(new RBinderCleanupCallback(result, callback));
+                                    session.setTitle("");
+
+                                    session.initializeEmulator(72, 24);
+                                } catch (Exception whatWentWrong) {
+                                    Log.e("TermService", "Failed to bootstrap AIDL session: "
+                                            + whatWentWrong.getMessage());
+
+                                    if (session != null)
+                                        session.finish();
+                                }
+                            }
+                        });
+
+                        return result.getIntentSender();
+                    }
+                } catch (PackageManager.NameNotFoundException ignore) {
+                }
+            }
+
+            return null;
+        }
+    }
+
+    private final class RBinderCleanupCallback implements TermSession.FinishCallback {
+        private final PendingIntent  result;
+        private final ResultReceiver callback;
+
+        public RBinderCleanupCallback(PendingIntent result, ResultReceiver callback) {
+            this.result = result;
+            this.callback = callback;
+        }
+
+        @Override
+        public void onSessionFinish(TermSession session) {
+            result.cancel();
+
+            callback.send(0, new Bundle());
+
+            mTermSessions.remove(session);
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/console/TermView.java b/qpython/src/main/java/org/qpython/qpy/console/TermView.java
new file mode 100644
index 00000000..c619d32a
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/console/TermView.java
@@ -0,0 +1,56 @@
+package org.qpython.qpy.console;/*
+ * Copyright (C) 2012 Steven Luo
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+import android.content.Context;
+import android.util.DisplayMetrics;
+
+import org.qpython.qpy.console.util.TermSettings;
+
+import jackpal.androidterm.emulatorview.ColorScheme;
+import jackpal.androidterm.emulatorview.EmulatorView;
+import jackpal.androidterm.emulatorview.TermSession;
+
+public class TermView extends EmulatorView {
+    public TermView(Context context, TermSession session, DisplayMetrics metrics) {
+        super(context, session, metrics);
+    }
+
+    public void updatePrefs(TermSettings settings, ColorScheme scheme) {
+        if (scheme == null) {
+            scheme = new ColorScheme(settings.getColorScheme());
+        }
+
+        setTextSize(settings.getFontSize());
+        setUseCookedIME(settings.useCookedIME());
+        setColorScheme(scheme);
+        setBackKeyCharacter(settings.getBackKeyCharacter());
+        setAltSendsEsc(settings.getAltSendsEscFlag());
+        setControlKeyCode(settings.getControlKeyCode());
+        setFnKeyCode(settings.getFnKeyCode());
+        setTermType(settings.getTermType());
+        setMouseTracking(settings.getMouseTrackingFlag());
+    }
+
+    public void updatePrefs(TermSettings settings) {
+        updatePrefs(settings, null);
+    }
+
+    @Override
+    public String toString() {
+        return getClass().toString() + '(' + getTermSession() + ')';
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/console/TermViewFlipper.java b/qpython/src/main/java/org/qpython/qpy/console/TermViewFlipper.java
new file mode 100644
index 00000000..8c7dcd71
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/console/TermViewFlipper.java
@@ -0,0 +1,314 @@
+package org.qpython.qpy.console;/*
+ * Copyright (C) 2011 Steven Luo
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.Canvas;
+import android.graphics.Rect;
+import android.os.Handler;
+import android.util.AttributeSet;
+import android.util.TypedValue;
+import android.view.Gravity;
+import android.view.View;
+import android.widget.Toast;
+import android.widget.ViewFlipper;
+
+import org.qpython.qpy.R;
+
+import org.qpython.qpy.console.util.TermSettings;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+
+import jackpal.androidterm.emulatorview.EmulatorView;
+import jackpal.androidterm.emulatorview.TermSession;
+import jackpal.androidterm.emulatorview.UpdateCallback;
+import jackpal.androidterm.emulatorview.compat.AndroidCompat;
+
+
+public class TermViewFlipper extends ViewFlipper implements Iterable<View> {
+    private Context                    context;
+    private Toast                      mToast;
+    private LinkedList<UpdateCallback> callbacks;
+    private boolean mStatusBarVisible = false;
+
+    private int mCurWidth;
+    private int mCurHeight;
+    private Rect         mVisibleRect = new Rect();
+    private Rect         mWindowRect  = new Rect();
+    private LayoutParams mChildParams = null;
+    private boolean      mRedoLayout  = false;
+
+    /**
+     * True if we must poll to discover if the view has changed size.
+     * This is the only known way to detect the view changing size due to
+     * the IME being shown or hidden in API level <= 7.
+     */
+    private final        boolean  mbPollForWindowSizeChange = (AndroidCompat.SDK < 8);
+    private static final int      SCREEN_CHECK_PERIOD       = 1000;
+    private final        Handler  mHandler                  = new Handler();
+    private              Runnable mCheckSize                = new Runnable() {
+        public void run() {
+            adjustChildSize();
+            mHandler.postDelayed(this, SCREEN_CHECK_PERIOD);
+        }
+    };
+
+    class ViewFlipperIterator implements Iterator<View> {
+        int pos = 0;
+
+        public boolean hasNext() {
+            return (pos < getChildCount());
+        }
+
+        public View next() {
+            return getChildAt(pos++);
+        }
+
+        public void remove() {
+            throw new UnsupportedOperationException();
+        }
+    }
+
+    public TermViewFlipper(Context context) {
+        super(context);
+        commonConstructor(context);
+    }
+
+    public TermViewFlipper(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        commonConstructor(context);
+    }
+
+    private void commonConstructor(Context context) {
+        this.context = context;
+        callbacks = new LinkedList<UpdateCallback>();
+
+        updateVisibleRect();
+        Rect visible = mVisibleRect;
+        mChildParams = new LayoutParams(visible.width(), visible.height(),
+                Gravity.TOP | Gravity.LEFT);
+    }
+
+    public void updatePrefs(TermSettings settings) {
+        boolean statusBarVisible = settings.showStatusBar();
+        int[] colorScheme = settings.getColorScheme();
+        setBackgroundColor(colorScheme[1]);
+        mStatusBarVisible = statusBarVisible;
+    }
+
+    public Iterator<View> iterator() {
+        return new ViewFlipperIterator();
+    }
+
+    public void addCallback(UpdateCallback callback) {
+        callbacks.add(callback);
+    }
+
+    public void removeCallback(UpdateCallback callback) {
+        callbacks.remove(callback);
+    }
+
+    private void notifyChange() {
+        for (UpdateCallback callback : callbacks) {
+            callback.onUpdate();
+        }
+    }
+
+    public void onPause() {
+        if (mbPollForWindowSizeChange) {
+            mHandler.removeCallbacks(mCheckSize);
+        }
+        pauseCurrentView();
+    }
+
+    public void onResume() {
+        if (mbPollForWindowSizeChange) {
+            mCheckSize.run();
+        }
+        resumeCurrentView();
+    }
+
+    public void pauseCurrentView() {
+        EmulatorView view = (EmulatorView) getCurrentView();
+        if (view == null) {
+            return;
+        }
+        view.onPause();
+    }
+
+    public void resumeCurrentView() {
+        EmulatorView view = (EmulatorView) getCurrentView();
+        if (view == null) {
+            return;
+        }
+        view.onResume();
+        view.requestFocus();
+    }
+
+    private void showTitle() {
+        if (getChildCount() == 0) {
+            return;
+        }
+
+        EmulatorView view = (EmulatorView) getCurrentView();
+        if (view == null) {
+            return;
+        }
+        TermSession session = view.getTermSession();
+        if (session == null) {
+            return;
+        }
+
+        String title = context.getString(R.string.window_title, getDisplayedChild() + 1);
+        if (session instanceof GenericTermSession) {
+            title = ((GenericTermSession) session).getTitle(title);
+        }
+
+//        if (mToast == null) {
+//            mToast = Toast.makeText(context, title, Toast.LENGTH_SHORT);
+//            mToast.setGravity(Gravity.CENTER, 0, 0);
+//        } else {
+//            mToast.setText(title);
+//        }
+//        mToast.show();
+    }
+
+    @Override
+    public void showPrevious() {
+        pauseCurrentView();
+        super.showPrevious();
+        showTitle();
+        resumeCurrentView();
+        notifyChange();
+    }
+
+    @Override
+    public void showNext() {
+        pauseCurrentView();
+        super.showNext();
+        showTitle();
+        resumeCurrentView();
+        notifyChange();
+    }
+
+    @Override
+    public void setDisplayedChild(int position) {
+        pauseCurrentView();
+        super.setDisplayedChild(position);
+        showTitle();
+        resumeCurrentView();
+        notifyChange();
+    }
+
+    @Override
+    public void addView(View v, int index) {
+        super.addView(v, index, mChildParams);
+    }
+
+    @Override
+    public void addView(View v) {
+        super.addView(v, mChildParams);
+    }
+
+    private void updateVisibleRect() {
+        Rect visible = mVisibleRect;
+        Rect window = mWindowRect;
+
+        /* Get rectangle representing visible area of this view, as seen by
+           the activity (takes other views in the layout into account, but
+           not space used by the IME) */
+        getGlobalVisibleRect(visible);
+
+        /* Get rectangle representing visible area of this window (takes
+           IME into account, but not other views in the layout) */
+        getWindowVisibleDisplayFrame(window);
+        /* Work around bug in getWindowVisibleDisplayFrame on API < 10, and
+           avoid a distracting height change as status bar hides otherwise */
+        if (!mStatusBarVisible) {
+            window.top = 0;
+        }
+
+        // Clip visible rectangle's top to the visible portion of the window
+        if (visible.width() == 0 && visible.height() == 0) {
+            visible.left = window.left;
+            visible.top = window.top;
+        } else {
+            if (visible.left < window.left) {
+                visible.left = window.left;
+            }
+            if (visible.top < window.top) {
+                visible.top = window.top;
+            }
+        }
+        // Always set the bottom of the rectangle to the window bottom
+        /* XXX This breaks with a split action bar, but if we don't do this,
+           it's possible that the view won't resize correctly on IME hide */
+        visible.right = window.right;
+        visible.bottom = (int) (window.bottom - getShortcutMenu());
+    }
+
+    private float getShortcutMenu() {
+        Resources r = Resources.getSystem();
+        // 45 means shortcutMenu's dimension
+        return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 45, r.getDisplayMetrics());
+    }
+
+    private void adjustChildSize() {
+        updateVisibleRect();
+        Rect visible = mVisibleRect;
+        int width = visible.width();
+        int height = visible.height();
+
+        if (mCurWidth != width || mCurHeight != height) {
+            mCurWidth = width;
+            mCurHeight = height;
+
+            LayoutParams params = mChildParams;
+            params.width = width;
+            params.height = height;
+            for (View v : this) {
+                updateViewLayout(v, params);
+            }
+            mRedoLayout = true;
+
+            EmulatorView currentView = (EmulatorView) getCurrentView();
+            if (currentView != null) {
+                currentView.updateSize(false);
+            }
+        }
+    }
+
+    /**
+     * Called when the view changes size.
+     * (Note: Not always called on Android < 2.2)
+     */
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        adjustChildSize();
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        if (mRedoLayout) {
+            requestLayout();
+            mRedoLayout = false;
+        }
+        super.onDraw(canvas);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/console/WindowList.java b/qpython/src/main/java/org/qpython/qpy/console/WindowList.java
new file mode 100644
index 00000000..d4b83ca2
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/console/WindowList.java
@@ -0,0 +1,166 @@
+package org.qpython.qpy.console;/*
+ * Copyright (C) 2011 Steven Luo
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+import android.app.ListActivity;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.os.Bundle;
+import android.os.IBinder;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.ListView;
+
+import org.qpython.qpy.R;
+
+import org.qpython.qpy.console.compont.ActionBarCompat;
+import org.qpython.qpy.console.compont.ActivityCompat;
+import org.qpython.qpy.console.util.SessionList;
+
+import jackpal.androidterm.emulatorview.compat.AndroidCompat;
+
+
+public class WindowList extends ListActivity {
+    private SessionList sessions;
+    private WindowListAdapter mWindowListAdapter;
+    private TermService mTermService;
+
+    /**
+     * View which isn't automatically in the pressed state if its parent is
+     * pressed.  This allows the window's entry to be pressed without the close
+     * button being triggered.
+     * Idea and code shamelessly borrowed from the Android browser's tabs list.
+     * <p>
+     * Used by layout xml.
+     */
+    public static class CloseButton extends ImageView {
+        public CloseButton(Context context) {
+            super(context);
+        }
+
+        public CloseButton(Context context, AttributeSet attrs) {
+            super(context, attrs);
+        }
+
+        public CloseButton(Context context, AttributeSet attrs, int style) {
+            super(context, attrs, style);
+        }
+
+        @Override
+        public void setPressed(boolean pressed) {
+            if (pressed && ((View) getParent()).isPressed()) {
+                return;
+            }
+            super.setPressed(pressed);
+        }
+    }
+
+    private ServiceConnection mTSConnection = new ServiceConnection() {
+        public void onServiceConnected(ComponentName className, IBinder service) {
+            TermService.TSBinder binder = (TermService.TSBinder) service;
+            mTermService = binder.getService();
+            populateList();
+        }
+
+        public void onServiceDisconnected(ComponentName arg0) {
+            mTermService = null;
+        }
+    };
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        ListView listView = getListView();
+        View newWindow = getLayoutInflater().inflate(R.layout.window_list_new_window, listView, false);
+        listView.addHeaderView(newWindow, null, true);
+
+        setResult(RESULT_CANCELED);
+
+        // Display up indicator on action bar home button
+        if (AndroidCompat.SDK >= 11) {
+            ActionBarCompat bar = ActivityCompat.getActionBar(this);
+            if (bar != null) {
+                bar.setDisplayOptions(ActionBarCompat.DISPLAY_HOME_AS_UP, ActionBarCompat.DISPLAY_HOME_AS_UP);
+            }
+        }
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+
+        Intent TSIntent = new Intent(this, TermService.class);
+        if (!bindService(TSIntent, mTSConnection, BIND_AUTO_CREATE)) {
+            Log.w(TermDebug.LOG_TAG, "bind to service failed!");
+        }
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+
+        WindowListAdapter adapter = mWindowListAdapter;
+        if (sessions != null) {
+            sessions.removeCallback(adapter);
+            sessions.removeTitleChangedListener(adapter);
+        }
+        if (adapter != null) {
+            adapter.setSessions(null);
+        }
+        unbindService(mTSConnection);
+    }
+
+    private void populateList() {
+        sessions = mTermService.getSessions();
+        WindowListAdapter adapter = mWindowListAdapter;
+
+        if (adapter == null) {
+            adapter = new WindowListAdapter(sessions);
+            setListAdapter(adapter);
+            mWindowListAdapter = adapter;
+        } else {
+            adapter.setSessions(sessions);
+        }
+        sessions.addCallback(adapter);
+        sessions.addTitleChangedListener(adapter);
+    }
+
+    @Override
+    protected void onListItemClick(ListView l, View v, int position, long id) {
+        Intent data = new Intent();
+        data.putExtra(TermActivity.EXTRA_WINDOW_ID, position - 1);
+        setResult(RESULT_OK, data);
+        finish();
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case ActionBarCompat.ID_HOME:
+                // Action bar home button selected
+                finish();
+                return true;
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/console/WindowListAdapter.java b/qpython/src/main/java/org/qpython/qpy/console/WindowListAdapter.java
new file mode 100644
index 00000000..681ec204
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/console/WindowListAdapter.java
@@ -0,0 +1,115 @@
+package org.qpython.qpy.console;/*
+ * Copyright (C) 2011 Steven Luo
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.ContextWrapper;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.TextView;
+
+import org.qpython.qpy.R;
+
+import org.qpython.qpy.console.util.SessionList;
+
+import jackpal.androidterm.emulatorview.TermSession;
+import jackpal.androidterm.emulatorview.UpdateCallback;
+
+public class WindowListAdapter extends BaseAdapter implements UpdateCallback {
+    private SessionList mSessions;
+
+    public WindowListAdapter(SessionList sessions) {
+        setSessions(sessions);
+    }
+
+    public void setSessions(SessionList sessions) {
+        mSessions = sessions;
+
+        if (sessions != null) {
+            sessions.addCallback(this);
+            sessions.addTitleChangedListener(this);
+        } else {
+            onUpdate();
+        }
+    }
+
+    public int getCount() {
+        if (mSessions != null) {
+            return mSessions.size();
+        } else {
+            return 0;
+        }
+    }
+
+    public Object getItem(int position) {
+        return mSessions.get(position);
+    }
+
+    public long getItemId(int position) {
+        return position;
+    }
+
+    protected String getSessionTitle(int position, String defaultTitle) {
+        TermSession session = mSessions.get(position);
+        if (session != null && session instanceof GenericTermSession) {
+            return ((GenericTermSession) session).getTitle(defaultTitle);
+        } else {
+            return defaultTitle;
+        }
+    }
+
+    public View getView(int position, View convertView, ViewGroup parent) {
+        Activity act = findActivityFromContext(parent.getContext());
+        View child = act.getLayoutInflater().inflate(R.layout.window_list_item, parent, false);
+        View close = child.findViewById(R.id.window_list_close);
+
+        TextView label = (TextView) child.findViewById(R.id.window_list_label);
+        String defaultTitle = act.getString(R.string.window_title, position + 1);
+        label.setText(getSessionTitle(position, defaultTitle));
+
+        final SessionList sessions = mSessions;
+        final int closePosition = position;
+        close.setOnClickListener(new View.OnClickListener() {
+            public void onClick(View v) {
+                TermSession session = sessions.remove(closePosition);
+                if (session != null) {
+                    session.finish();
+                    notifyDataSetChanged();
+                }
+            }
+        });
+
+        return child;
+    }
+
+    public void onUpdate() {
+        notifyDataSetChanged();
+    }
+
+    private static Activity findActivityFromContext(Context context) {
+        if (context == null) {
+            return null;
+        } else if (context instanceof Activity) {
+            return (Activity) context;
+        } else if (context instanceof ContextWrapper) {
+            ContextWrapper cw = (ContextWrapper) context;
+            return findActivityFromContext(cw.getBaseContext());
+        }
+        return null;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/console/compont/ActionBarCompat.java b/qpython/src/main/java/org/qpython/qpy/console/compont/ActionBarCompat.java
new file mode 100644
index 00000000..8d900607
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/console/compont/ActionBarCompat.java
@@ -0,0 +1,164 @@
+package org.qpython.qpy.console.compont;/*
+ * Copyright (C) 2011 Steven Luo
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+import android.app.ActionBar;
+import android.widget.SpinnerAdapter;
+
+import org.qpython.qpysdk.utils.AndroidCompat;
+
+/**
+ * Provides ActionBar APIs.
+ */
+public abstract class ActionBarCompat {
+    public static final int NAVIGATION_MODE_STANDARD = 0;
+    public static final int NAVIGATION_MODE_LIST = 1;
+    public static final int NAVIGATION_MODE_TABS = 2;
+    public static final int DISPLAY_USE_LOGO = 1;
+    public static final int DISPLAY_SHOW_HOME = 2;
+    public static final int DISPLAY_HOME_AS_UP = 4;
+    public static final int DISPLAY_SHOW_TITLE = 8;
+    public static final int DISPLAY_SHOW_CUSTOM = 16;
+
+    // Provides android.R.id.home from API 11 and up
+    public static final int ID_HOME = 0x0102002c;
+
+    public interface OnNavigationListener {
+        public abstract boolean onNavigationItemSelected(int position, long id);
+    }
+
+    public static ActionBarCompat wrap(Object actionBar) {
+        if (actionBar != null) {
+            if (AndroidCompat.SDK >= 11) {
+                return new ActionBarApi11OrLater(actionBar);
+            }
+        }
+        return null;
+    }
+
+    public abstract int getDisplayOptions();
+
+    public abstract int getHeight();
+
+    public abstract int getNavigationItemCount();
+
+    public abstract int getNavigationMode();
+
+    public abstract int getSelectedNavigationIndex();
+
+    public abstract CharSequence getTitle();
+
+    public abstract void hide();
+
+    public abstract boolean isShowing();
+
+    public abstract void setDisplayOptions(int options);
+
+    public abstract void setDisplayOptions(int options, int mask);
+
+    public abstract void setListNavigationCallbacks(SpinnerAdapter adapter, OnNavigationListener callback);
+
+    public abstract void setNavigationMode(int mode);
+
+    public abstract void setSelectedNavigationItem(int position);
+
+    public abstract void setTitle(int resId);
+
+    public abstract void setTitle(CharSequence title);
+
+    public abstract void show();
+}
+
+class ActionBarApi11OrLater extends ActionBarCompat {
+    private ActionBar bar;
+
+    ActionBarApi11OrLater(Object bar) {
+        this.bar = (ActionBar) bar;
+    }
+
+    private ActionBar.OnNavigationListener wrapOnNavigationCallback(OnNavigationListener callback) {
+        final OnNavigationListener cb = callback;
+        return new ActionBar.OnNavigationListener() {
+            public boolean onNavigationItemSelected(int position, long id) {
+                return cb.onNavigationItemSelected(position, id);
+            }
+        };
+    }
+
+    public int getDisplayOptions() {
+        return bar.getDisplayOptions();
+    }
+
+    public int getHeight() {
+        return bar.getHeight();
+    }
+
+    public int getNavigationItemCount() {
+        return bar.getNavigationItemCount();
+    }
+
+    public int getNavigationMode() {
+        return bar.getNavigationMode();
+    }
+
+    public int getSelectedNavigationIndex() {
+        return bar.getSelectedNavigationIndex();
+    }
+
+    public CharSequence getTitle() {
+        return bar.getTitle();
+    }
+
+    public void hide() {
+        bar.hide();
+    }
+
+    public boolean isShowing() {
+        return bar.isShowing();
+    }
+
+    public void setDisplayOptions(int options) {
+        bar.setDisplayOptions(options);
+    }
+
+    public void setDisplayOptions(int options, int mask) {
+        bar.setDisplayOptions(options, mask);
+    }
+
+    public void setListNavigationCallbacks(SpinnerAdapter adapter, OnNavigationListener callback) {
+        bar.setListNavigationCallbacks(adapter, wrapOnNavigationCallback(callback));
+    }
+
+    public void setNavigationMode(int mode) {
+        bar.setNavigationMode(mode);
+    }
+
+    public void setSelectedNavigationItem(int position) {
+        bar.setSelectedNavigationItem(position);
+    }
+
+    public void setTitle(int resId) {
+        bar.setTitle(resId);
+    }
+
+    public void setTitle(CharSequence title) {
+        bar.setTitle(title);
+    }
+
+    public void show() {
+        bar.show();
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/console/compont/ActivityCompat.java b/qpython/src/main/java/org/qpython/qpy/console/compont/ActivityCompat.java
new file mode 100644
index 00000000..e4d518e6
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/console/compont/ActivityCompat.java
@@ -0,0 +1,49 @@
+package org.qpython.qpy.console.compont;/*
+ * Copyright (C) 2011 Steven Luo
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+import android.app.Activity;
+
+import org.qpython.qpysdk.utils.AndroidCompat;
+
+
+/**
+ * Compatibility class for android.app.Activity
+ */
+public class ActivityCompat {
+    private static class Api11OrLater {
+        public static void invalidateOptionsMenu(Activity activity) {
+            activity.invalidateOptionsMenu();
+        }
+
+        public static Object getActionBar(Activity activity) {
+            return activity.getActionBar();
+        }
+    }
+
+    public static void invalidateOptionsMenu(Activity activity) {
+        if (AndroidCompat.SDK >= 11) {
+            Api11OrLater.invalidateOptionsMenu(activity);
+        }
+    }
+
+    public static ActionBarCompat getActionBar(Activity activity) {
+        if (AndroidCompat.SDK < 11) {
+            return null;
+        }
+        return ActionBarCompat.wrap(Api11OrLater.getActionBar(activity));
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/console/compont/AlertDialogCompat.java b/qpython/src/main/java/org/qpython/qpy/console/compont/AlertDialogCompat.java
new file mode 100644
index 00000000..47f4b0f4
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/console/compont/AlertDialogCompat.java
@@ -0,0 +1,87 @@
+package org.qpython.qpy.console.compont;
+
+import android.support.v7.app.AlertDialog;
+import android.content.Context;
+
+import org.qpython.qpysdk.utils.AndroidCompat;
+
+public class AlertDialogCompat extends AlertDialog {
+    // API 11
+    public static int THEME_HOLO_TRADITIONAL = 1;
+    public static int THEME_HOLO_DARK = 2;
+    public static int THEME_HOLO_LIGHT = 3;
+    // API 14
+    public static int THEME_DEVICE_DEFAULT_DARK = 4;
+    public static int THEME_DEVICE_DEFAULT_LIGHT = 5;
+
+    ////////////////////////////////////////////////////////////
+    private AlertDialogCompat(Context context) {
+        super(context);
+    }
+
+    private AlertDialogCompat(Context context, boolean cancelable, OnCancelListener cancelListener) {
+        super(context, cancelable, cancelListener);
+    }
+
+    ////////////////////////////////////////////////////////////
+    public static AlertDialog newInstance(Context context) {
+        return (new AlertDialogCompat(context));
+    }
+
+    ////////////////////////////////////////////////////////////
+    public static AlertDialog newInstance(Context context, int theme) {
+        if (AndroidCompat.SDK >= 14) {
+            return (new Api14OrLater(context, theme));
+        }
+        if (AndroidCompat.SDK >= 11) {
+            return (new Api11OrLater(context, theme));
+        }
+        return (new AlertDialogCompat(context));
+    }
+
+    ////////////////////////////////////////////////////////////
+    public static AlertDialog newInstance(Context context, boolean cancelable, OnCancelListener cancelListener) {
+        return (new AlertDialogCompat(context, cancelable, cancelListener));
+    }
+
+    public static Builder newInstanceBuilder(Context context, int theme) {
+        if (AndroidCompat.SDK >= 11) {
+            return new Api11OrLaterBuilder(context, theme);
+        } else {
+            return new Builder(context);
+        }
+    }
+
+    ////////////////////////////////////////////////////////////
+    private static class Api11OrLater extends AlertDialog {
+        public Api11OrLater(Context context, int theme) {
+            super(context, theme);
+        }
+
+        public Api11OrLater(Context context, boolean cancelable, OnCancelListener cancelListener) {
+            super(context, cancelable, cancelListener);
+        }
+    }
+    ////////////////////////////////////////////////////////////
+
+    ////////////////////////////////////////////////////////////
+    private static class Api14OrLater extends AlertDialog {
+        public Api14OrLater(Context context, int theme) {
+            super(context, theme);
+        }
+
+        public Api14OrLater(Context context, boolean cancelable, OnCancelListener cancelListener) {
+            super(context, cancelable, cancelListener);
+        }
+    }
+
+    private static class Api11OrLaterBuilder extends Builder {
+        public Api11OrLaterBuilder(Context context) {
+            super(context);
+        }
+
+        public Api11OrLaterBuilder(Context context, int theme) {
+            super(context, theme);
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/console/compont/Base64.java b/qpython/src/main/java/org/qpython/qpy/console/compont/Base64.java
new file mode 100644
index 00000000..5f945d36
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/console/compont/Base64.java
@@ -0,0 +1,754 @@
+package org.qpython.qpy.console.compont;/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+/**
+ * Copied from
+ * <p>
+ * https://android.googlesource.com/platform/frameworks/base/+/android-5.0.0_r6/core/java/android/util/Base64.java
+ * <p>
+ * to provide a Base64 implementation on Android API < 8 (where Base64 is not
+ * a part of the public API).
+ */
+
+import java.io.UnsupportedEncodingException;
+
+/**
+ * Utilities for encoding and decoding the Base64 representation of
+ * binary data.  See RFCs <a
+ * href="http://www.ietf.org/rfc/rfc2045.txt">2045</a> and <a
+ * href="http://www.ietf.org/rfc/rfc3548.txt">3548</a>.
+ */
+public class Base64 {
+    /**
+     * Default values for encoder/decoder flags.
+     */
+    public static final int DEFAULT = 0;
+
+    /**
+     * Encoder flag bit to omit the padding '=' characters at the end
+     * of the output (if any).
+     */
+    public static final int NO_PADDING = 1;
+
+    /**
+     * Encoder flag bit to omit all PATTERN_LINE terminators (i.e., the output
+     * will be on one long PATTERN_LINE).
+     */
+    public static final int NO_WRAP = 2;
+
+    /**
+     * Encoder flag bit to indicate lines should be terminated with a
+     * CRLF pair instead of just an LF.  Has no effect if {@code
+     * NO_WRAP} is specified as well.
+     */
+    public static final int CRLF = 4;
+
+    /**
+     * Encoder/decoder flag bit to indicate using the "URL and
+     * filename safe" variant of Base64 (see RFC 3548 section 4) where
+     * {@code -} and {@code _} are used in place of {@code +} and
+     * {@code /}.
+     */
+    public static final int URL_SAFE = 8;
+
+    /**
+     * Flag to pass to {@link Base64OutputStream} to indicate that it
+     * should not close the output stream it is wrapping when it
+     * itself is closed.
+     */
+    public static final int NO_CLOSE = 16;
+
+    //  --------------------------------------------------------
+    //  shared code
+    //  --------------------------------------------------------
+
+    /* package */ static abstract class Coder {
+        public byte[] output;
+        public int op;
+
+        /**
+         * Encode/decode another block of input data.  this.output is
+         * provided by the caller, and must be big enough to hold all
+         * the coded data.  On exit, this.opwill be set to the length
+         * of the coded data.
+         *
+         * @param finish true if this is the final call to process for
+         *               this object.  Will finalize the coder state and
+         *               include any final bytes in the output.
+         * @return true if the input so far is good; false if some
+         * error has been detected in the input stream..
+         */
+        public abstract boolean process(byte[] input, int offset, int len, boolean finish);
+
+        /**
+         * @return the maximum number of bytes a call to process()
+         * could produce for the given number of input bytes.  This may
+         * be an overestimate.
+         */
+        public abstract int maxOutputSize(int len);
+    }
+
+    //  --------------------------------------------------------
+    //  decoding
+    //  --------------------------------------------------------
+
+    /**
+     * Decode the Base64-encoded data in input and return the data in
+     * a new byte array.
+     * <p>
+     * <p>The padding '=' characters at the end are considered optional, but
+     * if any are present, there must be the correct number of them.
+     *
+     * @param str   the input String to decode, which is converted to
+     *              bytes using the default charset
+     * @param flags controls certain features of the decoded output.
+     *              Pass {@code DEFAULT} to decode standard Base64.
+     * @throws IllegalArgumentException if the input contains
+     *                                  incorrect padding
+     */
+    public static byte[] decode(String str, int flags) {
+        return decode(str.getBytes(), flags);
+    }
+
+    /**
+     * Decode the Base64-encoded data in input and return the data in
+     * a new byte array.
+     * <p>
+     * <p>The padding '=' characters at the end are considered optional, but
+     * if any are present, there must be the correct number of them.
+     *
+     * @param input the input array to decode
+     * @param flags controls certain features of the decoded output.
+     *              Pass {@code DEFAULT} to decode standard Base64.
+     * @throws IllegalArgumentException if the input contains
+     *                                  incorrect padding
+     */
+    public static byte[] decode(byte[] input, int flags) {
+        return decode(input, 0, input.length, flags);
+    }
+
+    /**
+     * Decode the Base64-encoded data in input and return the data in
+     * a new byte array.
+     * <p>
+     * <p>The padding '=' characters at the end are considered optional, but
+     * if any are present, there must be the correct number of them.
+     *
+     * @param input  the data to decode
+     * @param offset the position within the input array at which to start
+     * @param len    the number of bytes of input to decode
+     * @param flags  controls certain features of the decoded output.
+     *               Pass {@code DEFAULT} to decode standard Base64.
+     * @throws IllegalArgumentException if the input contains
+     *                                  incorrect padding
+     */
+    public static byte[] decode(byte[] input, int offset, int len, int flags) {
+        // Allocate space for the most data the input could represent.
+        // (It could contain less if it contains whitespace, etc.)
+        Decoder decoder = new Decoder(flags, new byte[len * 3 / 4]);
+
+        if (!decoder.process(input, offset, len, true)) {
+            throw new IllegalArgumentException("bad base-64");
+        }
+
+        // Maybe we got lucky and allocated exactly enough output space.
+        if (decoder.op == decoder.output.length) {
+            return decoder.output;
+        }
+
+        // Need to shorten the array, so allocate a new one of the
+        // right size and copy.
+        byte[] temp = new byte[decoder.op];
+        System.arraycopy(decoder.output, 0, temp, 0, decoder.op);
+        return temp;
+    }
+
+    /* package */ static class Decoder extends Coder {
+        /**
+         * Lookup table for turning bytes into their position in the
+         * Base64 alphabet.
+         */
+        private static final int DECODE[] = {
+                -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+                -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+                -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63,
+                52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -2, -1, -1,
+                -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
+                15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1,
+                -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
+                41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1,
+                -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+                -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+                -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+                -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+                -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+                -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+                -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+                -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+        };
+
+        /**
+         * Decode lookup table for the "web safe" variant (RFC 3548
+         * sec. 4) where - and _ replace + and /.
+         */
+        private static final int DECODE_WEBSAFE[] = {
+                -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+                -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+                -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1,
+                52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -2, -1, -1,
+                -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
+                15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, 63,
+                -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
+                41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1,
+                -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+                -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+                -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+                -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+                -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+                -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+                -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+                -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+        };
+
+        /**
+         * Non-data values in the DECODE arrays.
+         */
+        private static final int SKIP = -1;
+        private static final int EQUALS = -2;
+
+        /**
+         * States 0-3 are reading through the next input tuple.
+         * State 4 is having read one '=' and expecting exactly
+         * one more.
+         * State 5 is expecting no more data or padding characters
+         * in the input.
+         * State 6 is the error state; an error has been detected
+         * in the input and no future input can "fix" it.
+         */
+        private int state;   // state number (0 to 6)
+        private int value;
+
+        final private int[] alphabet;
+
+        public Decoder(int flags, byte[] output) {
+            this.output = output;
+
+            alphabet = ((flags & URL_SAFE) == 0) ? DECODE : DECODE_WEBSAFE;
+            state = 0;
+            value = 0;
+        }
+
+        /**
+         * @return an overestimate for the number of bytes {@code
+         * len} bytes could decode to.
+         */
+        public int maxOutputSize(int len) {
+            return len * 3 / 4 + 10;
+        }
+
+        /**
+         * Decode another block of input data.
+         *
+         * @return true if the state machine is still healthy.  false if
+         * bad base-64 data has been detected in the input stream.
+         */
+        public boolean process(byte[] input, int offset, int len, boolean finish) {
+            if (this.state == 6) return false;
+
+            int p = offset;
+            len += offset;
+
+            // Using local variables makes the decoder about 12%
+            // faster than if we manipulate the member variables in
+            // the loop.  (Even alphabet makes a measurable
+            // difference, which is somewhat surprising to me since
+            // the member variable is final.)
+            int state = this.state;
+            int value = this.value;
+            int op = 0;
+            final byte[] output = this.output;
+            final int[] alphabet = this.alphabet;
+
+            while (p < len) {
+                // Try the fast path:  we're starting a new tuple and the
+                // next four bytes of the input stream are all data
+                // bytes.  This corresponds to going through states
+                // 0-1-2-3-0.  We expect to use this method for most of
+                // the data.
+                //
+                // If any of the next four bytes of input are non-data
+                // (whitespace, etc.), value will end up negative.  (All
+                // the non-data values in decode are small negative
+                // PATTERN_NUMBER, so shifting any of them up and or'ing them
+                // together will result in a value with its top bit set.)
+                //
+                // You can remove this whole block and the output should
+                // be the same, just slower.
+                if (state == 0) {
+                    while (p + 4 <= len &&
+                            (value = ((alphabet[input[p] & 0xff] << 18) |
+                                    (alphabet[input[p + 1] & 0xff] << 12) |
+                                    (alphabet[input[p + 2] & 0xff] << 6) |
+                                    (alphabet[input[p + 3] & 0xff]))) >= 0) {
+                        output[op + 2] = (byte) value;
+                        output[op + 1] = (byte) (value >> 8);
+                        output[op] = (byte) (value >> 16);
+                        op += 3;
+                        p += 4;
+                    }
+                    if (p >= len) break;
+                }
+
+                // The fast path isn't available -- either we've read a
+                // partial tuple, or the next four input bytes aren't all
+                // data, or whatever.  Fall back to the slower state
+                // machine implementation.
+
+                int d = alphabet[input[p++] & 0xff];
+
+                switch (state) {
+                    case 0:
+                        if (d >= 0) {
+                            value = d;
+                            ++state;
+                        } else if (d != SKIP) {
+                            this.state = 6;
+                            return false;
+                        }
+                        break;
+
+                    case 1:
+                        if (d >= 0) {
+                            value = (value << 6) | d;
+                            ++state;
+                        } else if (d != SKIP) {
+                            this.state = 6;
+                            return false;
+                        }
+                        break;
+
+                    case 2:
+                        if (d >= 0) {
+                            value = (value << 6) | d;
+                            ++state;
+                        } else if (d == EQUALS) {
+                            // Emit the last (partial) output tuple;
+                            // expect exactly one more padding character.
+                            output[op++] = (byte) (value >> 4);
+                            state = 4;
+                        } else if (d != SKIP) {
+                            this.state = 6;
+                            return false;
+                        }
+                        break;
+
+                    case 3:
+                        if (d >= 0) {
+                            // Emit the output triple and return to state 0.
+                            value = (value << 6) | d;
+                            output[op + 2] = (byte) value;
+                            output[op + 1] = (byte) (value >> 8);
+                            output[op] = (byte) (value >> 16);
+                            op += 3;
+                            state = 0;
+                        } else if (d == EQUALS) {
+                            // Emit the last (partial) output tuple;
+                            // expect no further data or padding characters.
+                            output[op + 1] = (byte) (value >> 2);
+                            output[op] = (byte) (value >> 10);
+                            op += 2;
+                            state = 5;
+                        } else if (d != SKIP) {
+                            this.state = 6;
+                            return false;
+                        }
+                        break;
+
+                    case 4:
+                        if (d == EQUALS) {
+                            ++state;
+                        } else if (d != SKIP) {
+                            this.state = 6;
+                            return false;
+                        }
+                        break;
+
+                    case 5:
+                        if (d != SKIP) {
+                            this.state = 6;
+                            return false;
+                        }
+                        break;
+                }
+            }
+
+            if (!finish) {
+                // We're out of input, but a future call could provide
+                // more.
+                this.state = state;
+                this.value = value;
+                this.op = op;
+                return true;
+            }
+
+            // Done reading input.  Now figure out where we are left in
+            // the state machine and finish up.
+
+            switch (state) {
+                case 0:
+                    // Output length is a multiple of three.  Fine.
+                    break;
+                case 1:
+                    // Read one extra input byte, which isn't enough to
+                    // make another output byte.  Illegal.
+                    this.state = 6;
+                    return false;
+                case 2:
+                    // Read two extra input bytes, enough to emit 1 more
+                    // output byte.  Fine.
+                    output[op++] = (byte) (value >> 4);
+                    break;
+                case 3:
+                    // Read three extra input bytes, enough to emit 2 more
+                    // output bytes.  Fine.
+                    output[op++] = (byte) (value >> 10);
+                    output[op++] = (byte) (value >> 2);
+                    break;
+                case 4:
+                    // Read one padding '=' when we expected 2.  Illegal.
+                    this.state = 6;
+                    return false;
+                case 5:
+                    // Read all the padding '='s we expected and no more.
+                    // Fine.
+                    break;
+            }
+
+            this.state = state;
+            this.op = op;
+            return true;
+        }
+    }
+
+    //  --------------------------------------------------------
+    //  encoding
+    //  --------------------------------------------------------
+
+    /**
+     * Base64-encode the given data and return a newly allocated
+     * String with the result.
+     *
+     * @param input the data to encode
+     * @param flags controls certain features of the encoded output.
+     *              Passing {@code DEFAULT} results in output that
+     *              adheres to RFC 2045.
+     */
+    public static String encodeToString(byte[] input, int flags) {
+        try {
+            return new String(encode(input, flags), "US-ASCII");
+        } catch (UnsupportedEncodingException e) {
+            // US-ASCII is guaranteed to be available.
+            throw new AssertionError(e);
+        }
+    }
+
+    /**
+     * Base64-encode the given data and return a newly allocated
+     * String with the result.
+     *
+     * @param input  the data to encode
+     * @param offset the position within the input array at which to
+     *               start
+     * @param len    the number of bytes of input to encode
+     * @param flags  controls certain features of the encoded output.
+     *               Passing {@code DEFAULT} results in output that
+     *               adheres to RFC 2045.
+     */
+    public static String encodeToString(byte[] input, int offset, int len, int flags) {
+        try {
+            return new String(encode(input, offset, len, flags), "US-ASCII");
+        } catch (UnsupportedEncodingException e) {
+            // US-ASCII is guaranteed to be available.
+            throw new AssertionError(e);
+        }
+    }
+
+    /**
+     * Base64-encode the given data and return a newly allocated
+     * byte[] with the result.
+     *
+     * @param input the data to encode
+     * @param flags controls certain features of the encoded output.
+     *              Passing {@code DEFAULT} results in output that
+     *              adheres to RFC 2045.
+     */
+    public static byte[] encode(byte[] input, int flags) {
+        return encode(input, 0, input.length, flags);
+    }
+
+    /**
+     * Base64-encode the given data and return a newly allocated
+     * byte[] with the result.
+     *
+     * @param input  the data to encode
+     * @param offset the position within the input array at which to
+     *               start
+     * @param len    the number of bytes of input to encode
+     * @param flags  controls certain features of the encoded output.
+     *               Passing {@code DEFAULT} results in output that
+     *               adheres to RFC 2045.
+     */
+    public static byte[] encode(byte[] input, int offset, int len, int flags) {
+        Encoder encoder = new Encoder(flags, null);
+
+        // Compute the exact length of the array we will produce.
+        int output_len = len / 3 * 4;
+
+        // Account for the tail of the data and the padding bytes, if any.
+        if (encoder.do_padding) {
+            if (len % 3 > 0) {
+                output_len += 4;
+            }
+        } else {
+            switch (len % 3) {
+                case 0:
+                    break;
+                case 1:
+                    output_len += 2;
+                    break;
+                case 2:
+                    output_len += 3;
+                    break;
+            }
+        }
+
+        // Account for the newlines, if any.
+        if (encoder.do_newline && len > 0) {
+            output_len += (((len - 1) / (3 * Encoder.LINE_GROUPS)) + 1) *
+                    (encoder.do_cr ? 2 : 1);
+        }
+
+        encoder.output = new byte[output_len];
+        encoder.process(input, offset, len, true);
+
+        assert encoder.op == output_len;
+
+        return encoder.output;
+    }
+
+    /* package */ static class Encoder extends Coder {
+        /**
+         * Emit a new PATTERN_LINE every this many output tuples.  Corresponds to
+         * a 76-character PATTERN_LINE length (the maximum allowable according to
+         * <a href="http://www.ietf.org/rfc/rfc2045.txt">RFC 2045</a>).
+         */
+        public static final int LINE_GROUPS = 19;
+
+        /**
+         * Lookup table for turning Base64 alphabet positions (6 bits)
+         * into output bytes.
+         */
+        private static final byte ENCODE[] = {
+                'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P',
+                'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f',
+                'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
+                'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '+', '/',
+        };
+
+        /**
+         * Lookup table for turning Base64 alphabet positions (6 bits)
+         * into output bytes.
+         */
+        private static final byte ENCODE_WEBSAFE[] = {
+                'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P',
+                'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f',
+                'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
+                'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '-', '_',
+        };
+
+        final private byte[] tail;
+        /* package */ int tailLen;
+        private int count;
+
+        final public boolean do_padding;
+        final public boolean do_newline;
+        final public boolean do_cr;
+        final private byte[] alphabet;
+
+        public Encoder(int flags, byte[] output) {
+            this.output = output;
+
+            do_padding = (flags & NO_PADDING) == 0;
+            do_newline = (flags & NO_WRAP) == 0;
+            do_cr = (flags & CRLF) != 0;
+            alphabet = ((flags & URL_SAFE) == 0) ? ENCODE : ENCODE_WEBSAFE;
+
+            tail = new byte[2];
+            tailLen = 0;
+
+            count = do_newline ? LINE_GROUPS : -1;
+        }
+
+        /**
+         * @return an overestimate for the number of bytes {@code
+         * len} bytes could encode to.
+         */
+        public int maxOutputSize(int len) {
+            return len * 8 / 5 + 10;
+        }
+
+        public boolean process(byte[] input, int offset, int len, boolean finish) {
+            // Using local variables makes the encoder about 9% faster.
+            final byte[] alphabet = this.alphabet;
+            final byte[] output = this.output;
+            int op = 0;
+            int count = this.count;
+
+            int p = offset;
+            len += offset;
+            int v = -1;
+
+            // First we need to concatenate the tail of the previous call
+            // with any input bytes available now and see if we can empty
+            // the tail.
+
+            switch (tailLen) {
+                case 0:
+                    // There was no tail.
+                    break;
+
+                case 1:
+                    if (p + 2 <= len) {
+                        // A 1-byte tail with at least 2 bytes of
+                        // input available now.
+                        v = ((tail[0] & 0xff) << 16) |
+                                ((input[p++] & 0xff) << 8) |
+                                (input[p++] & 0xff);
+                        tailLen = 0;
+                    }
+                    ;
+                    break;
+
+                case 2:
+                    if (p + 1 <= len) {
+                        // A 2-byte tail with at least 1 byte of input.
+                        v = ((tail[0] & 0xff) << 16) |
+                                ((tail[1] & 0xff) << 8) |
+                                (input[p++] & 0xff);
+                        tailLen = 0;
+                    }
+                    break;
+            }
+
+            if (v != -1) {
+                output[op++] = alphabet[(v >> 18) & 0x3f];
+                output[op++] = alphabet[(v >> 12) & 0x3f];
+                output[op++] = alphabet[(v >> 6) & 0x3f];
+                output[op++] = alphabet[v & 0x3f];
+                if (--count == 0) {
+                    if (do_cr) output[op++] = '\r';
+                    output[op++] = '\n';
+                    count = LINE_GROUPS;
+                }
+            }
+
+            // At this point either there is no tail, or there are fewer
+            // than 3 bytes of input available.
+
+            // The main loop, turning 3 input bytes into 4 output bytes on
+            // each iteration.
+            while (p + 3 <= len) {
+                v = ((input[p] & 0xff) << 16) |
+                        ((input[p + 1] & 0xff) << 8) |
+                        (input[p + 2] & 0xff);
+                output[op] = alphabet[(v >> 18) & 0x3f];
+                output[op + 1] = alphabet[(v >> 12) & 0x3f];
+                output[op + 2] = alphabet[(v >> 6) & 0x3f];
+                output[op + 3] = alphabet[v & 0x3f];
+                p += 3;
+                op += 4;
+                if (--count == 0) {
+                    if (do_cr) output[op++] = '\r';
+                    output[op++] = '\n';
+                    count = LINE_GROUPS;
+                }
+            }
+
+            if (finish) {
+                // Finish up the tail of the input.  Note that we need to
+                // consume any bytes in tail before any bytes
+                // remaining in input; there should be at most two bytes
+                // total.
+
+                if (p - tailLen == len - 1) {
+                    int t = 0;
+                    v = ((tailLen > 0 ? tail[t++] : input[p++]) & 0xff) << 4;
+                    tailLen -= t;
+                    output[op++] = alphabet[(v >> 6) & 0x3f];
+                    output[op++] = alphabet[v & 0x3f];
+                    if (do_padding) {
+                        output[op++] = '=';
+                        output[op++] = '=';
+                    }
+                    if (do_newline) {
+                        if (do_cr) output[op++] = '\r';
+                        output[op++] = '\n';
+                    }
+                } else if (p - tailLen == len - 2) {
+                    int t = 0;
+                    v = (((tailLen > 1 ? tail[t++] : input[p++]) & 0xff) << 10) |
+                            (((tailLen > 0 ? tail[t++] : input[p++]) & 0xff) << 2);
+                    tailLen -= t;
+                    output[op++] = alphabet[(v >> 12) & 0x3f];
+                    output[op++] = alphabet[(v >> 6) & 0x3f];
+                    output[op++] = alphabet[v & 0x3f];
+                    if (do_padding) {
+                        output[op++] = '=';
+                    }
+                    if (do_newline) {
+                        if (do_cr) output[op++] = '\r';
+                        output[op++] = '\n';
+                    }
+                } else if (do_newline && op > 0 && count != LINE_GROUPS) {
+                    if (do_cr) output[op++] = '\r';
+                    output[op++] = '\n';
+                }
+
+                assert tailLen == 0;
+                assert p == len;
+            } else {
+                // Save the leftovers in tail to be consumed on the next
+                // call to encodeInternal.
+
+                if (p == len - 1) {
+                    tail[tailLen++] = input[p];
+                } else if (p == len - 2) {
+                    tail[tailLen++] = input[p];
+                    tail[tailLen++] = input[p + 1];
+                }
+            }
+
+            this.op = op;
+            this.count = count;
+
+            return true;
+        }
+    }
+
+    private Base64() {
+    }   // don't instantiate
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/console/compont/FileCompat.java b/qpython/src/main/java/org/qpython/qpy/console/compont/FileCompat.java
new file mode 100644
index 00000000..af8ff8e5
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/console/compont/FileCompat.java
@@ -0,0 +1,51 @@
+package org.qpython.qpy.console.compont;/*
+ * Copyright (C) 2012 Steven Luo
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+import org.qpython.qpysdk.utils.AndroidCompat;
+
+import java.io.File;
+
+/**
+ * Compatibility class for java.io.File
+ */
+public class FileCompat {
+    private static class Api9OrLater {
+        public static boolean canExecute(File file) {
+            return file.canExecute();
+        }
+    }
+
+    private static class Api8OrEarlier {
+        static {
+            System.loadLibrary("androidterm");
+        }
+
+        public static boolean canExecute(File file) {
+            return testExecute(file.getAbsolutePath());
+        }
+
+        private static native boolean testExecute(String pathname);
+    }
+
+    public static boolean canExecute(File file) {
+        if (AndroidCompat.SDK < 9) {
+            return Api8OrEarlier.canExecute(file);
+        } else {
+            return Api9OrLater.canExecute(file);
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/console/compont/MenuItemCompat.java b/qpython/src/main/java/org/qpython/qpy/console/compont/MenuItemCompat.java
new file mode 100644
index 00000000..306e6085
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/console/compont/MenuItemCompat.java
@@ -0,0 +1,27 @@
+package org.qpython.qpy.console.compont;
+
+import android.view.MenuItem;
+
+import org.qpython.qpysdk.utils.AndroidCompat;
+
+/**
+ * Definitions related to android.view.MenuItem
+ */
+public class MenuItemCompat {
+    public static final int SHOW_AS_ACTION_NEVER = 0;
+    public static final int SHOW_AS_ACTION_IF_ROOM = 1;
+    public static final int SHOW_AS_ACTION_ALWAYS = 2;
+    public static final int SHOW_AS_ACTION_WITH_TEXT = 4;
+
+    private static class Api11OrLater {
+        public static void setShowAsAction(MenuItem item, int actionEnum) {
+            item.setShowAsAction(actionEnum);
+        }
+    }
+
+    public static void setShowAsAction(MenuItem item, int actionEnum) {
+        if (AndroidCompat.SDK >= 11) {
+            Api11OrLater.setShowAsAction(item, actionEnum);
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/console/compont/PRNGFixes.java b/qpython/src/main/java/org/qpython/qpy/console/compont/PRNGFixes.java
new file mode 100644
index 00000000..6ecf0f17
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/console/compont/PRNGFixes.java
@@ -0,0 +1,349 @@
+package org.qpython.qpy.console.compont;/*
+ * This software is provided 'as-is', without any express or implied
+ * warranty.  In no event will Google be held liable for any damages
+ * arising from the use of this software.
+ *
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, as long as the origin is not misrepresented.
+ */
+
+
+/**
+ * Copied from
+ * <p>
+ * http://android-developers.blogspot.com/2013/08/some-securerandom-thoughts.html
+ * <p>
+ * to work around entropy-quality problems with Android's SecureRandom
+ * implementations before 4.4.
+ */
+
+import android.os.Build;
+import android.os.Process;
+import android.util.Log;
+
+import org.qpython.qpysdk.utils.AndroidCompat;
+
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.security.NoSuchAlgorithmException;
+import java.security.Provider;
+import java.security.SecureRandom;
+import java.security.SecureRandomSpi;
+import java.security.Security;
+
+/**
+ * Fixes for the output of the default PRNG having low entropy.
+ * <p>
+ * The fixes need to be applied via {@link #apply()} before any use of Java
+ * Cryptography Architecture primitives. A good place to invoke them is in the
+ * application's {@code onCreate}.
+ */
+public final class PRNGFixes {
+
+    private static final int VERSION_CODE_JELLY_BEAN = 16;
+    private static final int VERSION_CODE_JELLY_BEAN_MR2 = 18;
+    private static final byte[] BUILD_FINGERPRINT_AND_DEVICE_SERIAL =
+            getBuildFingerprintAndDeviceSerial();
+
+    /**
+     * Hidden constructor to prevent instantiation.
+     */
+    private PRNGFixes() {
+    }
+
+    /**
+     * Applies all fixes.
+     *
+     * @throws SecurityException if a fix is needed but could not be applied.
+     */
+    public static void apply() {
+        applyOpenSSLFix();
+        installLinuxPRNGSecureRandom();
+    }
+
+    /**
+     * Applies the fix for OpenSSL PRNG having low entropy. Does nothing if the
+     * fix is not needed.
+     *
+     * @throws SecurityException if the fix is needed but could not be applied.
+     */
+    private static void applyOpenSSLFix() throws SecurityException {
+        if ((AndroidCompat.SDK < VERSION_CODE_JELLY_BEAN)
+                || (AndroidCompat.SDK > VERSION_CODE_JELLY_BEAN_MR2)) {
+            // No need to apply the fix
+            return;
+        }
+
+        try {
+            // Mix in the device- and invocation-specific seed.
+            Class.forName("org.apache.harmony.xnet.provider.jsse.NativeCrypto")
+                    .getMethod("RAND_seed", byte[].class)
+                    .invoke(null, generateSeed());
+
+            // Mix output of Linux PRNG into OpenSSL's PRNG
+            int bytesRead = (Integer) Class.forName(
+                    "org.apache.harmony.xnet.provider.jsse.NativeCrypto")
+                    .getMethod("RAND_load_file", String.class, long.class)
+                    .invoke(null, "/dev/urandom", 1024);
+            if (bytesRead != 1024) {
+                throw new IOException(
+                        "Unexpected number of bytes read from Linux PRNG: "
+                                + bytesRead);
+            }
+        } catch (Exception e) {
+            throw new SecurityException("Failed to seed OpenSSL PRNG", e);
+        }
+    }
+
+    /**
+     * Installs a Linux PRNG-backed {@code SecureRandom} implementation as the
+     * default. Does nothing if the implementation is already the default or if
+     * there is not need to install the implementation.
+     *
+     * @throws SecurityException if the fix is needed but could not be applied.
+     */
+    private static void installLinuxPRNGSecureRandom()
+            throws SecurityException {
+        if (AndroidCompat.SDK > VERSION_CODE_JELLY_BEAN_MR2) {
+            // No need to apply the fix
+            return;
+        }
+
+        // Install a Linux PRNG-based SecureRandom implementation as the
+        // default, if not yet installed.
+        Provider[] secureRandomProviders =
+                Security.getProviders("SecureRandom.SHA1PRNG");
+        if ((secureRandomProviders == null)
+                || (secureRandomProviders.length < 1)
+                || (!LinuxPRNGSecureRandomProvider.class.equals(
+                secureRandomProviders[0].getClass()))) {
+            Security.insertProviderAt(new LinuxPRNGSecureRandomProvider(), 1);
+        }
+
+        // Assert that new SecureRandom() and
+        // SecureRandom.getInstance("SHA1PRNG") return a SecureRandom backed
+        // by the Linux PRNG-based SecureRandom implementation.
+        SecureRandom rng1 = new SecureRandom();
+        if (!LinuxPRNGSecureRandomProvider.class.equals(
+                rng1.getProvider().getClass())) {
+            throw new SecurityException(
+                    "new SecureRandom() backed by wrong Provider: "
+                            + rng1.getProvider().getClass());
+        }
+
+        SecureRandom rng2;
+        try {
+            rng2 = SecureRandom.getInstance("SHA1PRNG");
+        } catch (NoSuchAlgorithmException e) {
+            throw new SecurityException("SHA1PRNG not available", e);
+        }
+        if (!LinuxPRNGSecureRandomProvider.class.equals(
+                rng2.getProvider().getClass())) {
+            throw new SecurityException(
+                    "SecureRandom.getInstance(\"SHA1PRNG\") backed by wrong"
+                            + " Provider: " + rng2.getProvider().getClass());
+        }
+    }
+
+    /**
+     * {@code Provider} of {@code SecureRandom} engines which pass through
+     * all requests to the Linux PRNG.
+     */
+    private static class LinuxPRNGSecureRandomProvider extends Provider {
+
+        public LinuxPRNGSecureRandomProvider() {
+            super("LinuxPRNG",
+                    1.0,
+                    "A Linux-specific random number provider that uses"
+                            + " /dev/urandom");
+            // Although /dev/urandom is not a SHA-1 PRNG, some apps
+            // explicitly request a SHA1PRNG SecureRandom and we thus need to
+            // prevent them from getting the default implementation whose output
+            // may have low entropy.
+            put("SecureRandom.SHA1PRNG", LinuxPRNGSecureRandom.class.getName());
+            put("SecureRandom.SHA1PRNG ImplementedIn", "Software");
+        }
+    }
+
+    /**
+     * {@link SecureRandomSpi} which passes all requests to the Linux PRNG
+     * ({@code /dev/urandom}).
+     */
+    public static class LinuxPRNGSecureRandom extends SecureRandomSpi {
+
+        /*
+         * IMPLEMENTATION NOTE: Requests to generate bytes and to mix in a seed
+         * are passed through to the Linux PRNG (/dev/urandom). Instances of
+         * this class seed themselves by mixing in the current time, PID, UID,
+         * build fingerprint, and hardware serial number (where available) into
+         * Linux PRNG.
+         *
+         * Concurrency: Read requests to the underlying Linux PRNG are
+         * serialized (on sLock) to ensure that multiple threads do not get
+         * duplicated PRNG output.
+         */
+
+        private static final File URANDOM_FILE = new File("/dev/urandom");
+
+        private static final Object sLock = new Object();
+
+        /**
+         * Input stream for reading from Linux PRNG or {@code null} if not yet
+         * opened.
+         *
+         * @GuardedBy("sLock")
+         */
+        private static DataInputStream sUrandomIn;
+
+        /**
+         * Output stream for writing to Linux PRNG or {@code null} if not yet
+         * opened.
+         *
+         * @GuardedBy("sLock")
+         */
+        private static OutputStream sUrandomOut;
+
+        /**
+         * Whether this engine instance has been seeded. This is needed because
+         * each instance needs to seed itself if the client does not explicitly
+         * seed it.
+         */
+        private boolean mSeeded;
+
+        @Override
+        protected void engineSetSeed(byte[] bytes) {
+            try {
+                OutputStream out;
+                synchronized (sLock) {
+                    out = getUrandomOutputStream();
+                }
+                out.write(bytes);
+                out.flush();
+            } catch (IOException e) {
+                // On a small fraction of devices /dev/urandom is not writable.
+                // LogUtil and ignore.
+                Log.w(PRNGFixes.class.getSimpleName(),
+                        "Failed to mix seed into " + URANDOM_FILE);
+            } finally {
+                mSeeded = true;
+            }
+        }
+
+        @Override
+        protected void engineNextBytes(byte[] bytes) {
+            if (!mSeeded) {
+                // Mix in the device- and invocation-specific seed.
+                engineSetSeed(generateSeed());
+            }
+
+            try {
+                DataInputStream in;
+                synchronized (sLock) {
+                    in = getUrandomInputStream();
+                }
+                synchronized (in) {
+                    in.readFully(bytes);
+                }
+            } catch (IOException e) {
+                throw new SecurityException(
+                        "Failed to read from " + URANDOM_FILE, e);
+            }
+        }
+
+        @Override
+        protected byte[] engineGenerateSeed(int size) {
+            byte[] seed = new byte[size];
+            engineNextBytes(seed);
+            return seed;
+        }
+
+        private DataInputStream getUrandomInputStream() {
+            synchronized (sLock) {
+                if (sUrandomIn == null) {
+                    // NOTE: Consider inserting a BufferedInputStream between
+                    // DataInputStream and FileInputStream if you need higher
+                    // PRNG output performance and can live with future PRNG
+                    // output being pulled into this process prematurely.
+                    try {
+                        sUrandomIn = new DataInputStream(
+                                new FileInputStream(URANDOM_FILE));
+                    } catch (IOException e) {
+                        throw new SecurityException("Failed to open "
+                                + URANDOM_FILE + " for reading", e);
+                    }
+                }
+                return sUrandomIn;
+            }
+        }
+
+        private OutputStream getUrandomOutputStream() throws IOException {
+            synchronized (sLock) {
+                if (sUrandomOut == null) {
+                    sUrandomOut = new FileOutputStream(URANDOM_FILE);
+                }
+                return sUrandomOut;
+            }
+        }
+    }
+
+    /**
+     * Generates a device- and invocation-specific seed to be mixed into the
+     * Linux PRNG.
+     */
+    private static byte[] generateSeed() {
+        try {
+            ByteArrayOutputStream seedBuffer = new ByteArrayOutputStream();
+            DataOutputStream seedBufferOut =
+                    new DataOutputStream(seedBuffer);
+            seedBufferOut.writeLong(System.currentTimeMillis());
+            seedBufferOut.writeLong(System.nanoTime());
+            seedBufferOut.writeInt(Process.myPid());
+            seedBufferOut.writeInt(Process.myUid());
+            seedBufferOut.write(BUILD_FINGERPRINT_AND_DEVICE_SERIAL);
+            seedBufferOut.close();
+            return seedBuffer.toByteArray();
+        } catch (IOException e) {
+            throw new SecurityException("Failed to generate seed", e);
+        }
+    }
+
+    /**
+     * Gets the hardware serial number of this device.
+     *
+     * @return serial number or {@code null} if not available.
+     */
+    private static String getDeviceSerialNumber() {
+        // We're using the Reflection API because Build.SERIAL is only available
+        // since API Level 9 (Gingerbread, Android 2.3).
+        try {
+            return (String) Build.class.getField("SERIAL").get(null);
+        } catch (Exception ignored) {
+            return null;
+        }
+    }
+
+    private static byte[] getBuildFingerprintAndDeviceSerial() {
+        StringBuilder result = new StringBuilder();
+        String fingerprint = Build.FINGERPRINT;
+        if (fingerprint != null) {
+            result.append(fingerprint);
+        }
+        String serial = getDeviceSerialNumber();
+        if (serial != null) {
+            result.append(serial);
+        }
+        try {
+            return result.toString().getBytes("UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            throw new RuntimeException("UTF-8 encoding not supported");
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/console/compont/ServiceForegroundCompat.java b/qpython/src/main/java/org/qpython/qpy/console/compont/ServiceForegroundCompat.java
new file mode 100644
index 00000000..1a754855
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/console/compont/ServiceForegroundCompat.java
@@ -0,0 +1,107 @@
+package org.qpython.qpy.console.compont;/*
+ * Copyright (C) 2011 Steven Luo
+ * Copyright (C) 2011 Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.Service;
+import android.content.Context;
+import android.util.Log;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+/* Provide startForeground() and stopForeground() compatibility, using the
+   current interfaces where available and the deprecated setForeground()
+   interface where necessary
+   The idea for the implementation comes from an example in the documentation of
+   android.app.Service */
+public class ServiceForegroundCompat {
+    private static Class<?>[] mSetForegroundSig = new Class[]{
+            boolean.class};
+    private static Class<?>[] mStartForegroundSig = new Class[]{
+            int.class, Notification.class};
+    private static Class<?>[] mStopForegroundSig = new Class[]{
+            boolean.class};
+
+    private Service service;
+    private NotificationManager mNM;
+    private Method mSetForeground;
+    private Method mStartForeground;
+    private Method mStopForeground;
+    private int notifyId;
+
+    private void invokeMethod(Object receiver, Method method, Object... args) {
+        try {
+            method.invoke(receiver, args);
+        } catch (IllegalAccessException e) {
+            // Shouldn't happen, but we have to catch this
+            Log.w("ServiceCompat", "Unable to invoke method", e);
+        } catch (InvocationTargetException e) {
+            /* The methods we call don't throw exceptions -- in general,
+               we should throw e.getCause() */
+            Log.w("ServiceCompat", "Method threw exception", e.getCause());
+        }
+    }
+
+    public void startForeground(int id, Notification notification) {
+        if (mStartForeground != null) {
+            invokeMethod(service, mStartForeground, id, notification);
+            return;
+        }
+
+        invokeMethod(service, mSetForeground, Boolean.TRUE);
+        mNM.notify(id, notification);
+        notifyId = id;
+    }
+
+    public void stopForeground(boolean removeNotify) {
+        if (mStopForeground != null) {
+            invokeMethod(service, mStopForeground, removeNotify);
+            return;
+        }
+
+        if (removeNotify) {
+            mNM.cancel(notifyId);
+        }
+        invokeMethod(service, mSetForeground, Boolean.FALSE);
+    }
+
+    public ServiceForegroundCompat(Service service) {
+        this.service = service;
+        mNM = (NotificationManager) service.getSystemService(Context.NOTIFICATION_SERVICE);
+
+        Class<?> clazz = service.getClass();
+
+        try {
+            mStartForeground = clazz.getMethod("startForeground", mStartForegroundSig);
+            mStopForeground = clazz.getMethod("stopForeground", mStopForegroundSig);
+        } catch (NoSuchMethodException e) {
+            mStartForeground = mStopForeground = null;
+        }
+
+        try {
+            mSetForeground = clazz.getMethod("setForeground", mSetForegroundSig);
+        } catch (NoSuchMethodException e) {
+            mSetForeground = null;
+        }
+
+        if (mStartForeground == null && mSetForeground == null) {
+            throw new IllegalStateException("Neither startForeground() or setForeground() present!");
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/console/shortcuts/AddShortcut.java b/qpython/src/main/java/org/qpython/qpy/console/shortcuts/AddShortcut.java
new file mode 100644
index 00000000..566eaaa5
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/console/shortcuts/AddShortcut.java
@@ -0,0 +1,255 @@
+package org.qpython.qpy.console.shortcuts;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.graphics.Typeface;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Environment;
+import android.preference.PreferenceManager;
+import android.util.Log;
+import android.view.Gravity;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.ScrollView;
+import android.widget.TextView;
+
+import org.qpython.qpy.R;
+
+import org.qpython.qpy.console.RemoteInterface;
+import org.qpython.qpy.console.RunShortcut;
+import org.qpython.qpy.console.TermDebug;
+import org.qpython.qpy.console.compont.AlertDialogCompat;
+import org.qpython.qpy.console.compont.PRNGFixes;
+import org.qpython.qpy.console.util.ShortcutEncryption;
+
+import java.io.File;
+import java.security.GeneralSecurityException;
+
+
+public class AddShortcut extends android.app.Activity {
+    private final int OP_MAKE_SHORTCUT = 1;
+    private final Context context = this;
+    private SharedPreferences SP;
+    private int ix = 0;
+    private final int PATH = ix++, ARGS = ix++, NAME = ix++;
+    private final EditText et[] = new EditText[5];
+    private String path;
+    private String name = "";
+    private String iconText[] = {"", null};
+
+    //////////////////////////////////////////////////////////////////////
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        SP = PreferenceManager.getDefaultSharedPreferences(context);
+        String action = getIntent().getAction();
+        if (action != null && action.equals("android.intent.action.CREATE_SHORTCUT"))
+            makeShortcut();
+        else finish();
+    }
+
+    //////////////////////////////////////////////////////////////////////
+    void makeShortcut() {
+        if (path == null) path = "";
+        final AlertDialogCompat.Builder alert =
+                AlertDialogCompat.newInstanceBuilder(context, AlertDialogCompat.THEME_HOLO_DARK);
+        LinearLayout lv = new LinearLayout(context);
+        lv.setOrientation(LinearLayout.VERTICAL);
+        for (int i = 0, n = et.length; i < n; i++) {
+            et[i] = new EditText(context);
+            et[i].setSingleLine(true);
+        }
+        if (!path.equals("")) et[0].setText(path);
+        et[PATH].setHint(getString(R.string.addshortcut_command_hint));//"command");
+        et[NAME].setText(name);
+        et[ARGS].setHint(getString(R.string.addshortcut_example_hint));//"--example=\"a\"");
+        et[ARGS].setOnFocusChangeListener(
+                (view, focus) -> {
+                    if (!focus) {
+                        String s;
+                        if (et[NAME].getText().toString().equals("") && !(s = et[ARGS].getText().toString()).equals(""))
+                            et[NAME].setText(s.split("\\s")[0]);
+                    }
+                }
+        );
+
+        Button btn_path = new Button(context);
+        btn_path.setText(getString(R.string.addshortcut_button_find_command));//"Find command");
+        btn_path.setOnClickListener(p1 -> {
+                    String lastPath = SP.getString("lastPath", null);
+                    File get = (lastPath == null)
+                            ? Environment.getExternalStorageDirectory()
+                            : new File(lastPath).getParentFile();
+                    Intent pickerIntent = new Intent();
+                    if (SP.getBoolean("useInternalScriptFinder", false)) {
+                        pickerIntent.setClass(getApplicationContext(), FSNavigator.class)
+                                .setData(Uri.fromFile(get))
+                                .putExtra("title", getString(R.string.addshortcut_navigator_title));//"SELECT SHORTCUT TARGET")
+                    } else {
+                        pickerIntent
+                                .putExtra("CONTENT_TYPE", "*/*")
+                                .setAction(Intent.ACTION_PICK);
+                    }
+                    startActivityForResult(pickerIntent, OP_MAKE_SHORTCUT);
+                }
+        );
+        lv.addView(
+                layoutTextViewH(
+                        getString(R.string.addshortcut_command_window_instructions)//"Command window requires full path, no arguments. For other commands use Arguments window (ex: cd /sdcard)."
+                        , null
+                        , false
+                )
+        );
+        lv.addView(layoutViewViewH(btn_path, et[PATH]));
+        lv.addView(layoutTextViewH(getString(R.string.addshortcut_arguments_label), et[ARGS]));
+        lv.addView(layoutTextViewH(getString(R.string.addshortcut_shortcut_label), et[NAME]));
+
+        final ImageView img = new ImageView(context);
+        img.setImageResource(R.drawable.ic_launcher);
+        img.setMaxHeight(100);
+        img.setTag(0xFFFFFFFF);
+        img.setMaxWidth(100);
+        img.setAdjustViewBounds(true);
+        img.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
+        final Button btn_color = new Button(context);
+        btn_color.setText(getString(R.string.addshortcut_button_text_icon));//"Text icon");
+        btn_color.setOnClickListener(p1 -> new ColorValue(context, img, iconText));
+        lv.addView(layoutTextViewH(
+                getString(R.string.addshortcut_text_icon_instructions)//"Optionally create a text icon:"
+                , null
+                , false));
+        lv.addView(layoutViewViewH(btn_color, img));
+        final ScrollView sv = new ScrollView(context);
+        sv.setFillViewport(true);
+        sv.addView(lv);
+
+        alert.setView(sv);
+        alert.setTitle(getString(R.string.addshortcut_title));//"TermActivity Shortcut");
+        alert.setPositiveButton(
+                android.R.string.yes
+                , (dialog, which) -> buildShortcut(
+                        path
+                        , et[ARGS].getText().toString()
+                        , et[NAME].getText().toString()
+                        , iconText[1]
+                        , (Integer) img.getTag()
+                )
+        );
+        alert.setNegativeButton(android.R.string.cancel, (dialog, which) -> finish());
+        alert.show();
+    }
+
+    //////////////////////////////////////////////////////////////////////
+    LinearLayout layoutTextViewH(String text, View vw) {
+        return (layoutTextViewH(text, vw, true));
+    }
+
+    LinearLayout layoutTextViewH(String text, View vw, boolean attributes) {
+        LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.FILL_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT, 1);
+        TextView tv = new TextView(context);
+        tv.setText(text);
+        if (attributes) tv.setTypeface(Typeface.DEFAULT_BOLD);
+        if (attributes) tv.setGravity(Gravity.RIGHT | Gravity.CENTER_VERTICAL);
+        tv.setPadding(10, tv.getPaddingTop(), 10, tv.getPaddingBottom());
+        LinearLayout lh = new LinearLayout(context);
+        lh.setOrientation(LinearLayout.HORIZONTAL);
+        lh.addView(tv, lp);
+        if (vw != null) lh.addView(vw, lp);
+        return (lh);
+    }
+
+    //////////////////////////////////////////////////////////////////////
+    LinearLayout layoutViewViewH(View vw1, View vw2) {
+        LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.FILL_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT, 1);
+        LinearLayout lh = new LinearLayout(context);
+        lh.setOrientation(LinearLayout.HORIZONTAL);
+        lh.addView(vw1, lp);
+        if (vw2 != null) lh.addView(vw2, lp);
+        return (lh);
+    }
+
+    //////////////////////////////////////////////////////////////////////
+    void buildShortcut(
+            String path
+            , String arguments
+            , String shortcutName
+            , String shortcutText
+            , int shortcutColor
+    ) {
+        // Apply workarounds for SecureRandom bugs in Android < 4.4
+        PRNGFixes.apply();
+        ShortcutEncryption.Keys keys = ShortcutEncryption.getKeys(context);
+        if (keys == null) {
+            try {
+                keys = ShortcutEncryption.generateKeys();
+            } catch (GeneralSecurityException e) {
+                Log.e(TermDebug.LOG_TAG, "Generating shortcut encryption keys failed: " + e.toString());
+                throw new RuntimeException(e);
+            }
+            ShortcutEncryption.saveKeys(context, keys);
+        }
+        StringBuilder cmd = new StringBuilder();
+        if (path != null && !path.equals("")) cmd.append(RemoteInterface.quoteForBash(path));
+        if (arguments != null && !arguments.equals("")) cmd.append(" " + arguments);
+        String cmdStr = cmd.toString();
+        String cmdEnc = null;
+        try {
+            cmdEnc = ShortcutEncryption.encrypt(cmdStr, keys);
+        } catch (GeneralSecurityException e) {
+            Log.e(TermDebug.LOG_TAG, "Shortcut encryption failed: " + e.toString());
+            throw new RuntimeException(e);
+        }
+        Intent target = new Intent().setClass(context, RunShortcut.class);
+        target.setAction(RunShortcut.ACTION_RUN_SHORTCUT);
+        target.putExtra(RunShortcut.EXTRA_SHORTCUT_COMMAND, cmdEnc);
+        target.putExtra(RunShortcut.EXTRA_WINDOW_HANDLE, shortcutName);
+        target.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        Intent wrapper = new Intent();
+        wrapper.setAction("com.android.launcher.action.INSTALL_SHORTCUT");
+        wrapper.putExtra(Intent.EXTRA_SHORTCUT_INTENT, target);
+        if (shortcutName != null && !shortcutName.equals("")) {
+            wrapper.putExtra(Intent.EXTRA_SHORTCUT_NAME, shortcutName);
+        }
+        if (shortcutText != null && !shortcutText.equals("")) {
+            wrapper.putExtra(
+                    Intent.EXTRA_SHORTCUT_ICON
+                    , TextIcon.getTextIcon(
+                            shortcutText
+                            , shortcutColor
+                            , 96
+                            , 96
+                    )
+            );
+        } else {
+            wrapper.putExtra(
+                    Intent.EXTRA_SHORTCUT_ICON_RESOURCE
+                    , Intent.ShortcutIconResource.fromContext(context, R.drawable.ic_launcher)
+            );
+        }
+        setResult(RESULT_OK, wrapper);
+        finish();
+    }
+
+    //////////////////////////////////////////////////////////////////////
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        Uri uri = null;
+        path = null;
+        switch (requestCode) {
+            case OP_MAKE_SHORTCUT:
+                if (data != null && (uri = data.getData()) != null && (path = uri.getPath()) != null) {
+                    SP.edit().putString("lastPath", path).commit();
+                    et[PATH].setText(path);
+                    name = path.replaceAll(".*/", "");
+                    if (et[NAME].getText().toString().equals("")) et[NAME].setText(name);
+                    if (iconText[0] != null && iconText[0].equals("")) iconText[0] = name;
+                } else finish();
+                break;
+        }
+    }
+    //////////////////////////////////////////////////////////////////////
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/console/shortcuts/ColorValue.java b/qpython/src/main/java/org/qpython/qpy/console/shortcuts/ColorValue.java
new file mode 100644
index 00000000..48e94249
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/console/shortcuts/ColorValue.java
@@ -0,0 +1,202 @@
+package org.qpython.qpy.console.shortcuts;
+
+import android.support.v7.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.graphics.Typeface;
+import android.view.Gravity;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.ScrollView;
+import android.widget.SeekBar;
+import android.widget.TextView;
+
+import org.qpython.qpy.R;
+
+import org.qpython.qpy.console.compont.AlertDialogCompat;
+
+
+//////////////////////////////////////////////////////////////////////
+public class ColorValue implements CompoundButton.OnCheckedChangeListener {
+    private final Context context;
+    private final int[] color = {0xFF, 0, 0, 0};
+    private final boolean[] locks = {false, false, false, false};
+    private final int FP = LinearLayout.LayoutParams.FILL_PARENT;
+    private final int WC = LinearLayout.LayoutParams.WRAP_CONTENT;
+    private final ImageView imgview;
+    private final String result[];
+    private EditText value;
+    private boolean started = false;
+    private AlertDialogCompat.Builder builder;
+    private boolean barLock = false;
+    private String imgtext = "";
+
+    ////////////////////////////////////////////////////////////
+    public ColorValue(Context context, final ImageView imgview, final String result[]) {
+        this.context = context;
+        this.imgtext = result[0];
+        this.imgview = imgview;
+        this.result = result;
+        colorValue();
+    }
+
+    public void colorValue() {
+        final int arraySizes = 4;
+        builder = AlertDialogCompat.newInstanceBuilder(context, AlertDialogCompat.THEME_HOLO_DARK);
+        LinearLayout lv = new LinearLayout(context);
+        lv.setOrientation(LinearLayout.VERTICAL);
+        String lab[] = {
+                context.getString(R.string.colorvalue_letter_alpha) + " " //"α "
+                , context.getString(R.string.colorvalue_letter_red) + " " //"R "
+                , context.getString(R.string.colorvalue_letter_green) + " " //"G "
+                , context.getString(R.string.colorvalue_letter_blue) + " " //"B "
+        };
+        int clr[] = {0xFFFFFFFF, 0xFFFF0000, 0xFF00FF00, 0xFF0000FF};
+        for (int i = 0, n = (Integer) imgview.getTag(); i < arraySizes; i++)
+            color[i] = (n >> (24 - i * 8)) & 0xFF;
+        TextView lt = new TextView(context);
+        lt.setText(context.getString(R.string.colorvalue_label_lock_button_column));//"LOCK");
+        lt.setPadding(lt.getPaddingLeft(), lt.getPaddingTop(), 5, lt.getPaddingBottom());
+        lt.setGravity(Gravity.RIGHT);
+        value = new EditText(context);
+        value.setText(imgtext);
+        value.setSingleLine(false);
+        value.setGravity(Gravity.CENTER);
+        value.setTextColor((Integer) imgview.getTag());
+        value.setBackgroundColor((0xFF << 24) | 0x007799);
+        LinearLayout vh = new LinearLayout(context);
+        vh.setOrientation(LinearLayout.HORIZONTAL);
+        vh.setGravity(Gravity.CENTER_HORIZONTAL);
+        vh.addView(value);
+        value.setHint(context.getString(R.string.colorvalue_icon_text_entry_hint));//"Enter icon text");
+        lv.addView(vh);
+        lv.addView(lt);
+        final SeekBar sb[] = new SeekBar[arraySizes + 1];
+        final CheckBox lk[] = new CheckBox[arraySizes];
+        final TextView hexWindow[] = new TextView[arraySizes];
+        for (int i = 0; i < arraySizes; i++) {
+            LinearLayout lh = new LinearLayout(context);
+            lh.setGravity(Gravity.CENTER_VERTICAL);
+            final TextView tv = new TextView(context);
+            tv.setTypeface(Typeface.MONOSPACE);
+            tv.setText(lab[i]);
+            tv.setTextColor(clr[i]);
+            sb[i] = new SeekBar(context);
+            sb[i].setMax(0xFF);
+            sb[i].setProgress(color[i]);
+            sb[i].setSecondaryProgress(color[i]);
+            sb[i].setTag(i);
+            sb[i].setBackgroundColor(0xFF << 24 | (color[i] << (24 - i * 8)));
+            sb[i].setLayoutParams(new LinearLayout.LayoutParams(WC, WC, 1));
+            sb[i].setOnSeekBarChangeListener(
+                    new SeekBar.OnSeekBarChangeListener() {
+                        public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
+                            doProgressChanged(seekBar, progress, fromUser);
+                        }
+
+                        private void doProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
+                            if (fromUser && started) {
+                                int me = (Integer) seekBar.getTag();
+                                int k = (color[0] << 24) | (color[1] << 16) | (color[2] << 8) | color[3];
+                                value.setTextColor(k);
+                                int start, end;
+                                if (barLock && locks[me]) {
+                                    start = 0;
+                                    end = arraySizes - 1;
+                                } else start = end = (Integer) seekBar.getTag();
+                                for (int i = start; i <= end; i++) {
+                                    if (i == me || (barLock && locks[i])) {
+                                        color[i] = progress;
+                                        toHexWindow(hexWindow[i], color[i]);
+                                        sb[i].setBackgroundColor(0xFF << 24 | (progress << (24 - i * 8)));
+                                        sb[i].setProgress(progress);
+                                    }
+                                }
+                            }
+                        }
+
+                        public void onStartTrackingTouch(SeekBar seekBar) {
+                            doProgressChanged(seekBar, seekBar.getProgress(), true);
+                        }
+
+                        public void onStopTrackingTouch(SeekBar seekBar) {
+                            doProgressChanged(seekBar, seekBar.getProgress(), true);
+                        }
+                    }
+            );
+            lk[i] = new CheckBox(context);
+            lk[i].setLayoutParams(new LinearLayout.LayoutParams(WC, WC, 0));
+            lk[i].setOnCheckedChangeListener(this);
+            lk[i].setTag(i);
+            lh.addView(tv);
+            lh.addView(sb[i]);
+            lh.addView(lk[i]);
+            lv.addView(lh, FP, WC);
+        }
+        {//Evaluating hex windows.
+            LinearLayout lh = new LinearLayout(context);
+            lh.setGravity(Gravity.CENTER);
+            for (int i = 0; i < arraySizes; i++) {
+                hexWindow[i] = new TextView(context);
+                toHexWindow(hexWindow[i], color[i]);
+                lh.addView(hexWindow[i]);
+            }
+            lv.addView(lh);
+        }//Evaluating hex windows.
+        ScrollView sv = new ScrollView(context);
+        sv.addView(lv);
+        builder.setView(sv);
+        DialogInterface.OnClickListener ocl = (dialog, which) -> buttonHit(which, (color[0] << 24) | (color[1] << 16) | (color[2] << 8) | color[3]);
+        String Title = context.getString(R.string.addshortcut_make_text_icon);
+        builder.setTitle(Title);
+        builder.setPositiveButton(android.R.string.yes, ocl);
+        builder.setNegativeButton(android.R.string.cancel, ocl);
+        builder.show();
+        started = true;
+    }
+
+    //////////////////////////////////////////////////////////////////////
+    public void toHexWindow(TextView tv, int k) {
+        String HEX = "0123456789ABCDEF";
+        String s = "";
+        int n = 8;
+        k &= (1L << 8) - 1L;
+        for (n -= 4; n >= 0; n -= 4) s += HEX.charAt((k >> n) & 0xF);
+        tv.setText(s);
+    }
+
+    ////////////////////////////////////////////////////////////
+    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+        int view = (Integer) buttonView.getTag();
+        locks[view] = isChecked;
+        barLock = false;
+        for (int i = 0; i < locks.length; i++) if (locks[i]) barLock = true;
+    }
+
+    ////////////////////////////////////////////////////////////
+    private void buttonHit(int hit, int color) {
+        switch (hit) {
+            case AlertDialog.BUTTON_NEGATIVE:  //  CANCEL
+                return;
+            case AlertDialog.BUTTON_POSITIVE:  //  OK == set
+                imgtext = value.getText().toString();
+                result[1] = imgtext;
+                imgview.setTag(color);
+                if (!imgtext.equals("")) {
+                    imgview.setImageBitmap(
+                            TextIcon.getTextIcon(
+                                    imgtext
+                                    , color
+                                    , 96
+                                    , 96
+                            )
+                    );
+                }
+                return;
+        }
+    }
+    ////////////////////////////////////////////////////////////
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/console/shortcuts/FSNavigator.java b/qpython/src/main/java/org/qpython/qpy/console/shortcuts/FSNavigator.java
new file mode 100644
index 00000000..3a95584c
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/console/shortcuts/FSNavigator.java
@@ -0,0 +1,513 @@
+package org.qpython.qpy.console.shortcuts;
+
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.graphics.Typeface;
+import android.net.Uri;
+import android.os.Environment;
+import android.preference.PreferenceManager;
+import android.view.Gravity;
+import android.view.KeyEvent;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.HorizontalScrollView;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.ScrollView;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import org.qpython.qpy.R;
+
+
+import java.io.File;
+import java.io.IOException;
+import java.util.HashMap;
+
+
+public class FSNavigator extends android.app.Activity {
+    private final int ACTION_THEME_SWAP = 0x00000100;
+    private final int BUTTON_SIZE = 150;
+    private android.content.Context context = this;
+    private float textLg = 24;
+    private int theme = android.R.style.Theme;
+    private SharedPreferences SP;
+    private File cd;
+    private File extSdCardFile;
+    private String extSdCard;
+    private HashMap<Integer, LinearLayout> cachedFileView;
+    private HashMap<Integer, LinearLayout> cachedDirectoryView;
+    private HashMap<Integer, TextView> cachedDividerView;
+    private int countFileView;
+    private int countDirectoryView;
+    private int countDividerView;
+    private LinearLayout contentView;
+    private LinearLayout titleView;
+    private LinearLayout pathEntryView;
+
+    ////////////////////////////////////////////////////////////
+    public void onCreate(android.os.Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setTitle(getString(R.string.fsnavigator_title));//"File Selector");
+        SP = PreferenceManager.getDefaultSharedPreferences(context);
+        theme = SP.getInt("theme", theme);
+        setTheme(theme);
+        getWindow().setSoftInputMode(android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);
+
+        Intent intent = getIntent();
+        extSdCardFile = Environment.getExternalStorageDirectory();
+        extSdCard = getCanonicalPath(extSdCardFile);
+        Uri uri = intent.getData();
+        String path = uri == null ? null : uri.getPath();
+        if (null == path || null == (chdir(path))) chdir(extSdCard);
+        if (intent.hasExtra("title")) setTitle(intent.getStringExtra("title"));
+
+        titleView = directoryEntry("..");
+        pathEntryView = fileEntry(null);
+        contentView = makeContentView();
+        cachedDirectoryView = new HashMap<Integer, LinearLayout>();
+        cachedFileView = new HashMap<Integer, LinearLayout>();
+        cachedDividerView = new HashMap<Integer, TextView>();
+    }
+
+    ////////////////////////////////////////////////////////////
+    public void onPause() {
+        super.onPause();
+        doPause();
+    }
+
+    ////////////////////////////////////////////////////////////
+    private void doPause() {
+        SP.edit().putString("lastDirectory", getCanonicalPath(cd)).commit();
+    }
+
+    ////////////////////////////////////////////////////////////
+    public void onResume() {
+        super.onResume();
+        doResume();
+    }
+
+    ////////////////////////////////////////////////////////////
+    private void doResume() {
+        makeView();
+    }
+
+    ////////////////////////////////////////////////////////////
+    private void swapTheme() {
+        switch (theme) {
+            case android.R.style.Theme:
+                theme = android.R.style.Theme_Light;
+                break;
+            case android.R.style.Theme_Light:
+                theme = android.R.style.Theme;
+                break;
+            default:
+                return;
+        }
+        SP.edit().putInt("theme", theme).commit();
+        startActivityForResult(getIntent().addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT), -1);
+        finish();
+    }
+
+    ////////////////////////////////////////////////////////////
+    private String ifAvailable(String goTo) {
+        if (goTo.startsWith(extSdCard)) {
+            String s = Environment.getExternalStorageState();
+            if (s.equals(Environment.MEDIA_MOUNTED)
+                    || s.equals(Environment.MEDIA_MOUNTED_READ_ONLY)
+                    ) {
+                return (goTo);
+            }
+            toast(getString(R.string.fsnavigator_no_external_storage), 1);//"External storage not available", 1);
+            return (extSdCard);
+        }
+        return (goTo);
+    }
+
+    ////////////////////////////////////////////////////////////
+    private File chdir(File file) {
+        String path = ifAvailable(getCanonicalPath(file));
+        System.setProperty("user.dir", path);
+        return (cd = new File(path));
+    }
+
+    private File chdir(String path) {
+        return (chdir(new File(path)));
+    }
+
+    ////////////////////////////////////////////////////////////
+    private TextView entryDividerH() {
+        TextView tv;
+        if (countDividerView < cachedDividerView.size()) {
+            tv = cachedDividerView.get(countDividerView);
+        } else {
+            tv = new TextView(context);
+            tv.setLayoutParams(
+                    new LinearLayout.LayoutParams(
+                            LinearLayout.LayoutParams.FILL_PARENT
+                            , 1
+                            , 1
+                    )
+            );
+            cachedDividerView.put(countDividerView, tv);
+        }
+        ++countDividerView;
+        return (tv);
+    }
+
+    ////////////////////////////////////////////////////////////
+    View.OnClickListener fileListener = new View.OnClickListener() {
+        public void onClick(View view) {
+            String path = (String) view.getTag();
+            if (path != null) {
+                setResult(RESULT_OK, getIntent().setData(Uri.fromFile(new File(cd, path))));
+                finish();
+            }
+        }
+    };
+
+    ////////////////////////////////////////////////////////////
+    private LinearLayout fileView(boolean entryWindow) {
+        LinearLayout ll = new LinearLayout(context);
+        ll.setLayoutParams(
+                new LinearLayout.LayoutParams(
+                        LinearLayout.LayoutParams.MATCH_PARENT
+                        , LinearLayout.LayoutParams.WRAP_CONTENT
+                        , 1
+                )
+        );
+        ll.setOrientation(LinearLayout.HORIZONTAL);
+        ll.setGravity(Gravity.FILL);
+        final TextView tv;
+        if (entryWindow) {
+            tv = new EditText(context);
+            tv.setHint(getString(R.string.fsnavigator_optional_enter_path));
+            tv.setLayoutParams(
+                    new LinearLayout.LayoutParams(
+                            LinearLayout.LayoutParams.MATCH_PARENT
+                            , LinearLayout.LayoutParams.MATCH_PARENT
+                            , 2
+                    )
+            );
+            tv.setOnKeyListener((v, keyCode, event) -> {
+                if (keyCode == KeyEvent.KEYCODE_ENTER) {
+                    String path = tv.getText().toString();
+                    File file = new File(getCanonicalPath(path));
+                    chdir(file.getParentFile() == null ? file : file.getParentFile());
+                    if (file.isFile()) {
+                        setResult(RESULT_OK, getIntent().setData(Uri.fromFile(file)));
+                        finish();
+                    } else {
+                        chdir(file);
+                        makeView();
+                    }
+                    return true;
+                }
+                return false;
+            });
+            ll.addView(tv);
+        } else {
+            tv = new TextView(context);
+            tv.setClickable(true);
+            tv.setLongClickable(true);
+            tv.setOnClickListener(fileListener);
+            tv.setLayoutParams(
+                    new LinearLayout.LayoutParams(
+                            LinearLayout.LayoutParams.MATCH_PARENT
+                            , LinearLayout.LayoutParams.MATCH_PARENT
+                            , 1
+                    )
+            );
+            HorizontalScrollView hv = new HorizontalScrollView(context);
+            hv.setFillViewport(true);
+            hv.setLayoutParams(
+                    new LinearLayout.LayoutParams(
+                            LinearLayout.LayoutParams.MATCH_PARENT
+                            , BUTTON_SIZE
+                            , 7
+                    )
+            );
+            hv.addView(tv);
+            ll.addView(hv);
+        }
+        tv.setFocusable(true);
+        tv.setSingleLine();
+        tv.setTextSize(textLg);
+        tv.setTypeface(Typeface.SERIF, Typeface.BOLD);
+        tv.setGravity(Gravity.CENTER_VERTICAL | Gravity.LEFT);
+        tv.setPadding(10, 5, 10, 5);
+        tv.setId(R.id.textview);//1);
+
+        return (ll);
+    }
+
+    ////////////////////////////////////////////////////////////
+    private LinearLayout fileEntry(final String entry) {
+        LinearLayout ll;
+        if (entry == null) ll = fileView(entry == null);
+        else {
+            if (countFileView < cachedFileView.size()) ll = cachedFileView.get(countFileView);
+            else cachedFileView.put(countFileView, ll = fileView(entry == null));
+            ++countFileView;
+        }
+        TextView tv = (TextView) ll.findViewById(R.id.textview);
+        tv.setText(entry == null ? "" : entry);
+        tv.setTag(entry == null ? "" : entry);
+        return (ll);
+    }
+
+    ////////////////////////////////////////////////////////////
+    private ImageView imageViewFolder(boolean up) {
+        ImageView b1 = new ImageView(context);
+        b1.setClickable(true);
+        b1.setFocusable(true);
+        b1.setId(R.id.imageview);
+        b1.setLayoutParams(
+                new LinearLayout.LayoutParams(
+                        120
+                        , 120
+                        , 1
+                )
+        );
+        b1.setImageResource(up ? R.drawable.prev : R.drawable.ic_editor_folder);
+        b1.setOnClickListener(directoryListener);
+        b1.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
+        return (b1);
+    }
+
+    ////////////////////////////////////////////////////////////
+    View.OnClickListener directoryListener = view -> {
+        String path = (String) view.getTag();
+        if (path != null) {
+            File file = new File(path);
+            if (file.isFile()) {
+                setResult(RESULT_OK, getIntent().setData(Uri.fromFile(file)));
+                finish();
+            } else chdir(file);
+            makeView();
+        }
+    };
+
+    ////////////////////////////////////////////////////////////
+    private LinearLayout directoryView(boolean up) {
+        ImageView b1 = imageViewFolder(up);
+        TextView tv = new TextView(context);
+        if (up) tv.setGravity(Gravity.CENTER_VERTICAL | Gravity.LEFT);//Gravity.CENTER);
+        else tv.setGravity(Gravity.CENTER_VERTICAL | Gravity.LEFT);
+        tv.setClickable(true);
+        tv.setLongClickable(true);
+        tv.setFocusable(true);
+        tv.setOnClickListener(directoryListener);
+        tv.setMaxLines(1);
+        tv.setTextSize(textLg);
+        tv.setPadding(10, 5, 10, 5);
+        tv.setId(R.id.textview);
+        tv.setLayoutParams(
+                new LinearLayout.LayoutParams(
+                        LinearLayout.LayoutParams.MATCH_PARENT
+                        , BUTTON_SIZE
+                        , 1
+                )
+        );
+        HorizontalScrollView hv = new HorizontalScrollView(context);
+        hv.addView(tv);
+        hv.setFillViewport(true);
+        hv.setFocusable(true);
+        hv.setOnClickListener(directoryListener);
+        hv.setLayoutParams(
+                new LinearLayout.LayoutParams(
+                        LinearLayout.LayoutParams.MATCH_PARENT
+                        , BUTTON_SIZE
+                        , 7
+                )
+        );
+        LinearLayout ll = new LinearLayout(context);
+        ll.setLayoutParams(
+                new LinearLayout.LayoutParams(
+                        LinearLayout.LayoutParams.MATCH_PARENT
+                        , BUTTON_SIZE
+                        , 2
+                )
+        );
+        ll.setOrientation(LinearLayout.HORIZONTAL);
+        ll.setGravity(Gravity.FILL);
+        ll.setOnClickListener(directoryListener);
+        ll.addView(b1);
+        ll.addView(hv);
+
+        return (ll);
+    }
+
+    ////////////////////////////////////////////////////////////
+    private LinearLayout directoryEntry(final String name) {
+        boolean up = name.equals("..");
+        LinearLayout ll;
+        if (up) {
+            ll = directoryView(up);
+        } else {
+            if (countDirectoryView < cachedDirectoryView.size()) {
+                ll = cachedDirectoryView.get(countDirectoryView);
+            } else {
+                ll = directoryView(up);
+                cachedDirectoryView.put(countDirectoryView, ll);
+            }
+            ++countDirectoryView;
+        }
+
+        TextView tv = ((TextView) ll.findViewById(R.id.textview));
+        tv.setTag(name);
+        tv.setText(up ? "[" + cd.getPath() + "]"
+                : name
+        );
+        ((ImageView) ll.findViewById(R.id.imageview)).setTag(name);
+        return (ll);
+    }
+
+    ////////////////////////////////////////////////////////////
+    public boolean onKeyUp(int keyCode, KeyEvent event) {
+        if ((keyCode == KeyEvent.KEYCODE_BACK)) {
+            finish();
+            return (true);
+        } else return (super.onKeyUp(keyCode, event));
+    }
+
+    ////////////////////////////////////////////////////////////
+    private LinearLayout makeContentView() {
+        final LinearLayout ll = new LinearLayout(context);
+        ll.setLayoutParams(
+                new LinearLayout.LayoutParams(
+                        LinearLayout.LayoutParams.MATCH_PARENT
+                        , LinearLayout.LayoutParams.WRAP_CONTENT
+                        , 1
+                )
+        );
+        ll.setId(R.id.mainview);
+        ll.setOrientation(LinearLayout.VERTICAL);
+        ll.setGravity(Gravity.FILL);
+        final ScrollView sv = new ScrollView(context);
+        sv.setId(R.id.scrollview);
+        sv.setLayoutParams(
+                new LinearLayout.LayoutParams(
+                        LinearLayout.LayoutParams.MATCH_PARENT
+                        , LinearLayout.LayoutParams.WRAP_CONTENT
+                        , 1
+                )
+        );
+        sv.addView(ll);
+        final LinearLayout bg = new LinearLayout(context);
+        bg.setLayoutParams(
+                new LinearLayout.LayoutParams(
+                        LinearLayout.LayoutParams.MATCH_PARENT
+                        , LinearLayout.LayoutParams.WRAP_CONTENT
+                        , 1
+                )
+        );
+        bg.setOrientation(LinearLayout.VERTICAL);
+        bg.setGravity(Gravity.FILL);
+        bg.setTag(ll);
+        bg.addView(
+                titleView
+                , android.view.ViewGroup.LayoutParams.MATCH_PARENT, android.view.ViewGroup.LayoutParams.WRAP_CONTENT
+        );
+        bg.addView(sv);
+        bg.addView(
+                pathEntryView
+                , android.view.ViewGroup.LayoutParams.MATCH_PARENT, android.view.ViewGroup.LayoutParams.WRAP_CONTENT
+        );
+        return (bg);
+    }
+
+    ////////////////////////////////////////////////////////////
+    private void makeView() {
+        countDirectoryView = countFileView = 0;
+        ScrollView sv = (ScrollView) contentView.findViewById(R.id.scrollview);
+        LinearLayout ll = (LinearLayout) sv.findViewById(R.id.mainview);
+        ll.removeAllViews();
+        if (cd == null) chdir("/");
+        String path = getCanonicalPath(cd);
+
+        if (path.equals("")) {
+            chdir(path = "/");
+        }
+        if (path.equals("/")) {
+            titleView.setVisibility(View.GONE);
+        } else {
+            titleView.setVisibility(View.VISIBLE);
+            titleView.requestLayout();
+            ((TextView) titleView.findViewById(R.id.textview)).setText("[" + cd.getPath() + "]");
+        }
+
+        String zd[] = cd.list((file, name) -> (new File(file, name).isDirectory()));
+        if (zd != null) {
+            java.util.Arrays.sort(zd, 0, zd.length, stringSortComparator);
+            for (int i = 0, n = zd.length; i < n; i++) {
+                if (zd[i].equals(".")) continue;
+                ll.addView(directoryEntry(zd[i]));
+                ll.addView(entryDividerH());
+            }
+        }
+        String zf[] = cd.list((file, name) -> (!(new File(file, name).isDirectory())));
+        if (zf != null) {
+            java.util.Arrays.sort(zf, 0, zf.length, stringSortComparator);
+            for (int i = 0, n = zf.length; i < n; i++) {
+                ll.addView(fileEntry(zf[i]));
+                ll.addView(entryDividerH());
+            }
+        }
+        ((TextView) pathEntryView.findViewById(R.id.textview)).setText("");
+        sv.scrollTo(0, 0);
+//    titleView.setSelected(true);
+        setContentView(contentView);
+    }
+
+    //////////////////////////////////////////////////////////////////////
+    java.util.Comparator<String> stringSortComparator = (a, b) -> (a.toLowerCase().compareTo(b.toLowerCase()));
+
+    //////////////////////////////////////////////////////////////////////
+    String getCanonicalPath(String path) {
+        return (getCanonicalPath(new File(path)));
+    }
+
+    String getCanonicalPath(File file) {
+        try {
+            return (file.getCanonicalPath());
+        } catch (IOException e) {
+            return (file.getPath());
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////
+    public boolean onCreateOptionsMenu(Menu menu)
+//  public boolean onPrepareOptionsMenu(Menu menu)
+    {
+        super.onCreateOptionsMenu(menu);
+//    super.onPrepareOptionsMenu(menu);    menu.clear();
+        menu.add(0, ACTION_THEME_SWAP, 0, getString(R.string.fsnavigator_change_theme));//"Change theme");
+        return (true);
+    }
+
+    //////////////////////////////////////////////////////////////////////
+    public boolean onOptionsItemSelected(MenuItem item) {
+        super.onOptionsItemSelected(item);
+        return (doOptionsItem(item.getItemId()));
+    }
+
+    //////////////////////////////////////////////////////////////////////
+    private boolean doOptionsItem(int itemId) {
+        switch (itemId) {
+            case ACTION_THEME_SWAP:
+                swapTheme();
+                return (true);
+        }
+        return (false);
+    }
+
+    //////////////////////////////////////////////////////////////////////
+//  private void toast(final String message){toast(message, 0);}
+    private void toast(final String message, final int duration) {
+        runOnUiThread(() -> Toast.makeText(context, message, duration == 0 ? Toast.LENGTH_SHORT : Toast.LENGTH_LONG).show());
+    }
+    //////////////////////////////////////////////////////////////////////
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/console/shortcuts/TextIcon.java b/qpython/src/main/java/org/qpython/qpy/console/shortcuts/TextIcon.java
new file mode 100644
index 00000000..2b541fee
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/console/shortcuts/TextIcon.java
@@ -0,0 +1,67 @@
+package org.qpython.qpy.console.shortcuts;
+
+import android.graphics.Bitmap;
+import android.graphics.Bitmap.Config;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.Paint.Align;
+import android.graphics.Rect;
+
+public class TextIcon {
+    ////////////////////////////////////////////////////////////
+    public static Bitmap getTextIcon(String text, int color, int width, int height) {
+        text = text.trim();
+        String lines[] = text.split("\\s*\n\\s*");
+        int nLines = lines.length;
+        Rect R = new Rect();
+        Paint p = new Paint(Paint.ANTI_ALIAS_FLAG);
+        p.setShadowLayer(2, 10, 10, 0xFF000000);
+        p.setColor(color);
+        p.setSubpixelText(true);
+        p.setTextSize(256);
+        p.setTextAlign(Align.CENTER);
+        float HH[] = new float[nLines];
+        float H = 0f;
+        float W = 0f;
+        for (int i = 0; i < nLines; ++i) {
+            p.getTextBounds(lines[i], 0, lines[i].length(), R);
+            float h = Float.valueOf(Math.abs(R.top - R.bottom));
+            float w = Float.valueOf(Math.abs(R.right - R.left));
+            if (nLines > 1) h += 0.1f * h; // Add space between lines.
+            HH[i] = h;
+            H += h;
+            if (w > W) W = w;
+        }
+        float f = ((float) width) * H / ((float) height);
+        int hBitmap;
+        int wBitmap;
+        if (W < f) {
+            wBitmap = (int) Math.ceil(f);
+            hBitmap = (int) Math.ceil(H);
+        } else {
+            wBitmap = (int) Math.ceil(W);
+            hBitmap = (int) Math.ceil(height * wBitmap / width);
+        }
+
+        Bitmap b = Bitmap.createBitmap(wBitmap, hBitmap, Config.ARGB_8888);
+        b.setDensity(Bitmap.DENSITY_NONE);
+        Canvas c = new Canvas(b);
+
+        W = wBitmap / 2f;
+        float top = hBitmap / 2f - H / 2f + HH[0] / 2f;
+        for (int i = 0; i < nLines; ++i) {
+            top += HH[i] / 2f;
+            c.drawText(lines[i], W, top, p);
+            top += HH[i] / 2f;
+        }
+        return (
+                Bitmap.createScaledBitmap(
+                        b
+                        , width
+                        , height
+                        , true
+                )
+        );
+    }
+    ////////////////////////////////////////////////////////////
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/console/util/SessionList.java b/qpython/src/main/java/org/qpython/qpy/console/util/SessionList.java
new file mode 100644
index 00000000..0b1ff3b9
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/console/util/SessionList.java
@@ -0,0 +1,147 @@
+package org.qpython.qpy.console.util;/*
+ * Copyright (C) 2011 Steven Luo
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedList;
+
+import jackpal.androidterm.emulatorview.TermSession;
+import jackpal.androidterm.emulatorview.UpdateCallback;
+
+/**
+ * An ArrayList of TermSessions which allows users to register callbacks in
+ * order to be notified when the list is changed.
+ */
+@SuppressWarnings("serial")
+public class SessionList extends ArrayList<TermSession> {
+    LinkedList<UpdateCallback> callbacks = new LinkedList<>();
+    LinkedList<UpdateCallback> titleChangedListeners = new LinkedList<>();
+    UpdateCallback mTitleChangedListener = () -> notifyTitleChanged();
+
+    public SessionList() {
+        super();
+    }
+
+    public SessionList(int capacity) {
+        super(capacity);
+    }
+
+    public void addCallback(UpdateCallback callback) {
+        callbacks.add(callback);
+        callback.onUpdate();
+    }
+
+    public boolean removeCallback(UpdateCallback callback) {
+        return callbacks.remove(callback);
+    }
+
+    private void notifyChange() {
+        for (UpdateCallback callback : callbacks) {
+            callback.onUpdate();
+        }
+    }
+
+    public void addTitleChangedListener(UpdateCallback listener) {
+        titleChangedListeners.add(listener);
+        listener.onUpdate();
+    }
+
+    public boolean removeTitleChangedListener(UpdateCallback listener) {
+        return titleChangedListeners.remove(listener);
+    }
+
+    private void notifyTitleChanged() {
+        for (UpdateCallback listener : titleChangedListeners) {
+            listener.onUpdate();
+        }
+    }
+
+    @Override
+    public boolean add(TermSession object) {
+        boolean result = super.add(object);
+        object.setTitleChangedListener(mTitleChangedListener);
+        notifyChange();
+        return result;
+    }
+
+    @Override
+    public void add(int index, TermSession object) {
+        super.add(index, object);
+        object.setTitleChangedListener(mTitleChangedListener);
+        notifyChange();
+    }
+
+    @Override
+    public boolean addAll(Collection<? extends TermSession> collection) {
+        boolean result = super.addAll(collection);
+        for (TermSession session : collection) {
+            session.setTitleChangedListener(mTitleChangedListener);
+        }
+        notifyChange();
+        return result;
+    }
+
+    @Override
+    public boolean addAll(int index, Collection<? extends TermSession> collection) {
+        boolean result = super.addAll(index, collection);
+        for (TermSession session : collection) {
+            session.setTitleChangedListener(mTitleChangedListener);
+        }
+        notifyChange();
+        return result;
+    }
+
+    @Override
+    public void clear() {
+        for (TermSession session : this) {
+            session.setTitleChangedListener(null);
+        }
+        super.clear();
+        notifyChange();
+    }
+
+    @Override
+    public TermSession remove(int index) {
+        TermSession object = super.remove(index);
+        if (object != null) {
+            object.setTitleChangedListener(null);
+            notifyChange();
+        }
+        return object;
+    }
+
+    @Override
+    public boolean remove(Object object) {
+        boolean result = super.remove(object);
+        if (result && object instanceof TermSession) {
+            ((TermSession) object).setTitleChangedListener(null);
+            notifyChange();
+        }
+        return result;
+    }
+
+    @Override
+    public TermSession set(int index, TermSession object) {
+        TermSession old = super.set(index, object);
+        object.setTitleChangedListener(mTitleChangedListener);
+        if (old != null) {
+            old.setTitleChangedListener(null);
+        }
+        notifyChange();
+        return old;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/console/util/ShortcutEncryption.java b/qpython/src/main/java/org/qpython/qpy/console/util/ShortcutEncryption.java
new file mode 100644
index 00000000..095cc805
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/console/util/ShortcutEncryption.java
@@ -0,0 +1,312 @@
+package org.qpython.qpy.console.util;/*
+ * Copyright (C) 2015 Steven Luo
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+
+import org.qpython.qpy.console.compont.Base64;
+
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetDecoder;
+import java.nio.charset.CoderResult;
+import java.nio.charset.CodingErrorAction;
+import java.security.GeneralSecurityException;
+import java.security.SecureRandom;
+import java.util.regex.Pattern;
+
+import javax.crypto.Cipher;
+import javax.crypto.KeyGenerator;
+import javax.crypto.Mac;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+
+
+/**
+ * Implementation of a simple authenticated encryption scheme suitable for
+ * TEA shortcuts.
+ * <p>
+ * The goals of the encryption are as follows:
+ * <p>
+ * (1) An unauthorized actor must not be able to create a valid text with
+ * contents of his choice;
+ * (2) An unauthorized actor must not be able to modify an existing text to
+ * change its contents in any way;
+ * (3) An unauthorized actor must not be able to discover the contents of
+ * an existing text.
+ * <p>
+ * Conditions (1) and (2) ensure that an attacker cannot send commands of his
+ * choosing to TEA via the shortcut mechanism, while condition (3) ensures that
+ * an attacker cannot learn what commands are being sent via shortcuts even if
+ * he can read saved shortcuts or sniff Android intents.
+ * <p>
+ * We ensure these conditions using two cryptographic building blocks:
+ * <p>
+ * * a symmetric cipher (currently AES in CBC mode using PKCS#5 padding),
+ * which prevents someone without the encryption key from reading the
+ * contents of the shortcut; and
+ * * a message authentication code (currently HMAC-SHA256), which proves that
+ * the shortcut was created by someone with the MAC key.
+ * <p>
+ * The security of these depends on the security of the keys, which must be
+ * kept secret.  In this application, the keys are randomly generated and stored
+ * in the application's private shared console_preferences.
+ * <p>
+ * The encrypted string output by this scheme is of the form:
+ * <p>
+ * mac + ":" + iv + ":" cipherText
+ * <p>
+ * where:
+ * <p>
+ * * cipherText is the Base64-encoded result of encrypting the data
+ * using the encryption key;
+ * * iv is a Base64-encoded, non-secret random number used as an
+ * initialization vector for the encryption algorithm;
+ * * mac is the Base64 encoding of MAC(MAC-key, iv + ":" + cipherText).
+ */
+public final class ShortcutEncryption {
+    public static final String ENC_ALGORITHM = "AES";
+    public static final String ENC_SYSTEM = ENC_ALGORITHM + "/CBC/PKCS5Padding";
+    public static final int ENC_BLOCKSIZE = 16;
+    public static final String MAC_ALGORITHM = "HmacSHA256";
+    public static final int KEYLEN = 128;
+    public static final int BASE64_DFLAGS = Base64.DEFAULT;
+    public static final int BASE64_EFLAGS = Base64.NO_PADDING | Base64.NO_WRAP;
+
+    private static final String SHORTCUT_KEYS_PREF = "shortcut_keys";
+
+    private static final Pattern COLON = Pattern.compile(":");
+
+    public static final class Keys {
+        private final SecretKey encKey;
+        private final SecretKey macKey;
+
+        public Keys(SecretKey encKey, SecretKey macKey) {
+            this.encKey = encKey;
+            this.macKey = macKey;
+        }
+
+        public SecretKey getEncKey() {
+            return encKey;
+        }
+
+        public SecretKey getMacKey() {
+            return macKey;
+        }
+
+        /**
+         * Outputs the keys as a string of the form
+         * <p>
+         * encKey + ":" + macKey
+         * <p>
+         * where encKey and macKey are the Base64-encoded encryption and MAC
+         * keys.
+         */
+        public String encode() {
+            return encodeToBase64(encKey.getEncoded()) + ":" + encodeToBase64(macKey.getEncoded());
+        }
+
+        /**
+         * Creates a new Keys object by decoding a string of the form output
+         * from encode().
+         */
+        public static Keys decode(String encodedKeys) {
+            String[] keys = COLON.split(encodedKeys);
+            if (keys.length != 2) {
+                throw new IllegalArgumentException("Invalid encoded keys!");
+            }
+
+            SecretKey encKey = new SecretKeySpec(decodeBase64(keys[0]), ENC_ALGORITHM);
+            SecretKey macKey = new SecretKeySpec(decodeBase64(keys[1]), MAC_ALGORITHM);
+            return new Keys(encKey, macKey);
+        }
+    }
+
+    /**
+     * Retrieves the shortcut encryption keys from console_preferences.
+     */
+    public static Keys getKeys(Context ctx) {
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ctx);
+        String keyEnc = prefs.getString(SHORTCUT_KEYS_PREF, null);
+        if (keyEnc == null) {
+            return null;
+        }
+
+        try {
+            return Keys.decode(keyEnc);
+        } catch (IllegalArgumentException e) {
+            return null;
+        }
+    }
+
+    /**
+     * Saves shortcut encryption keys to console_preferences.
+     */
+    public static void saveKeys(Context ctx, Keys keys) {
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ctx);
+
+        SharedPreferences.Editor edit = prefs.edit();
+        edit.putString(SHORTCUT_KEYS_PREF, keys.encode());
+        edit.commit();
+    }
+
+    /**
+     * Generates new secret keys suitable for the encryption scheme described
+     * above.
+     *
+     * @throws GeneralSecurityException if an error occurs during key generation.
+     */
+    public static Keys generateKeys() throws GeneralSecurityException {
+        KeyGenerator gen = KeyGenerator.getInstance(ENC_ALGORITHM);
+        gen.init(KEYLEN);
+        SecretKey encKey = gen.generateKey();
+
+        /* XXX: It's probably unnecessary to create a different keygen for the
+         * MAC, but JCA's API design suggests we should just in case ... */
+        gen = KeyGenerator.getInstance(MAC_ALGORITHM);
+        gen.init(KEYLEN);
+        SecretKey macKey = gen.generateKey();
+
+        return new Keys(encKey, macKey);
+    }
+
+    /**
+     * Decrypts a string encrypted using this algorithm and verifies that the
+     * contents have not been tampered with.
+     *
+     * @param encrypted The string to decrypt, in the format described above.
+     * @param keys      The keys to verify and decrypt with.
+     * @return The decrypted data.
+     * @throws GeneralSecurityException if the data is invalid, verification fails, or an error occurs during decryption.
+     */
+    public static String decrypt(String encrypted, Keys keys) throws GeneralSecurityException {
+        Cipher cipher = Cipher.getInstance(ENC_SYSTEM);
+        String[] data = COLON.split(encrypted);
+        if (data.length != 3) {
+            throw new GeneralSecurityException("Invalid encrypted data!");
+        }
+        String mac = data[0];
+        String iv = data[1];
+        String cipherText = data[2];
+
+        // Verify that the ciphertext and IV haven't been tampered with first
+        String dataToAuth = iv + ":" + cipherText;
+        if (!computeMac(dataToAuth, keys.getMacKey()).equals(mac)) {
+            throw new GeneralSecurityException("Incorrect MAC!");
+        }
+
+        // Decrypt the ciphertext
+        byte[] ivBytes = decodeBase64(iv);
+        cipher.init(Cipher.DECRYPT_MODE, keys.getEncKey(), new IvParameterSpec(ivBytes));
+        byte[] bytes = cipher.doFinal(decodeBase64(cipherText));
+
+        // Decode the plaintext bytes into a String
+        CharsetDecoder decoder = Charset.defaultCharset().newDecoder();
+        decoder.onMalformedInput(CodingErrorAction.REPORT);
+        decoder.onUnmappableCharacter(CodingErrorAction.REPORT);
+        /*
+         * We are coding UTF-8 (guaranteed to be the default charset on
+         * Android) to Java chars (UTF-16, 2 bytes per char).  For valid UTF-8
+         * sequences, then:
+         *     1 byte in UTF-8 (US-ASCII) -> 1 char in UTF-16
+         *     2-3 bytes in UTF-8 (BMP)   -> 1 char in UTF-16
+         *     4 bytes in UTF-8 (non-BMP) -> 2 chars in UTF-16 (surrogate pair)
+         * The decoded output is therefore guaranteed to fit into a char
+         * array the same length as the input byte array.
+         */
+        CharBuffer out = CharBuffer.allocate(bytes.length);
+        CoderResult result = decoder.decode(ByteBuffer.wrap(bytes), out, true);
+        if (result.isError()) {
+            /* The input was supposed to be the result of encrypting a String,
+             * so something is very wrong if it cannot be decoded into one! */
+            throw new GeneralSecurityException("Corrupt decrypted data!");
+        }
+        decoder.flush(out);
+        return out.flip().toString();
+    }
+
+    /**
+     * Encrypts and authenticates a string using the algorithm described above.
+     *
+     * @param data The string containing the data to encrypt.
+     * @param keys The keys to encrypt and authenticate with.
+     * @return The encrypted data.
+     * @throws GeneralSecurityException if an error occurs during encryption.
+     */
+    public static String encrypt(String data, Keys keys) throws GeneralSecurityException {
+        Cipher cipher = Cipher.getInstance(ENC_SYSTEM);
+
+        // Generate a random IV
+        SecureRandom rng = new SecureRandom();
+        byte[] ivBytes = new byte[ENC_BLOCKSIZE];
+        rng.nextBytes(ivBytes);
+        String iv = encodeToBase64(ivBytes);
+
+        // Encrypt
+        cipher.init(Cipher.ENCRYPT_MODE, keys.getEncKey(), new IvParameterSpec(ivBytes));
+        byte[] bytes = data.getBytes();
+        String cipherText = encodeToBase64(cipher.doFinal(bytes));
+
+        // Calculate the MAC for the ciphertext and IV
+        String dataToAuth = iv + ":" + cipherText;
+        String mac = computeMac(dataToAuth, keys.getMacKey());
+
+        return mac + ":" + dataToAuth;
+    }
+
+    /**
+     * Computes the Base64-encoded Message Authentication Code for the
+     * data using the provided key.
+     *
+     * @throws GeneralSecurityException if an error occurs during MAC computation.
+     */
+    private static String computeMac(String data, SecretKey key) throws GeneralSecurityException {
+        Mac mac = Mac.getInstance(MAC_ALGORITHM);
+        mac.init(key);
+        byte[] macBytes = mac.doFinal(data.getBytes());
+        return encodeToBase64(macBytes);
+    }
+
+    /**
+     * Encodes binary data to Base64 using the settings specified by
+     * BASE64_EFLAGS.
+     *
+     * @return A String with the Base64-encoded data.
+     */
+    private static String encodeToBase64(byte[] data) {
+        return Base64.encodeToString(data, BASE64_EFLAGS);
+    }
+
+    /**
+     * Decodes Base64-encoded binary data using the settings specified by
+     * BASE64_DFLAGS.
+     *
+     * @param data A String with the Base64-encoded data.
+     * @return A newly-allocated byte[] array with the decoded data.
+     */
+    private static byte[] decodeBase64(String data) {
+        return Base64.decode(data, BASE64_DFLAGS);
+    }
+
+    // Prevent instantiation
+    private ShortcutEncryption() {
+        throw new UnsupportedOperationException();
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/console/util/TermSettings.java b/qpython/src/main/java/org/qpython/qpy/console/util/TermSettings.java
new file mode 100644
index 00000000..f466ca4a
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/console/util/TermSettings.java
@@ -0,0 +1,377 @@
+package org.qpython.qpy.console.util;/*
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+import android.content.SharedPreferences;
+import android.content.res.Resources;
+import android.view.KeyEvent;
+
+import org.qpython.qpy.R;
+
+
+/**
+ * Terminal emulator settings
+ */
+public class TermSettings {
+    private SharedPreferences mPrefs;
+
+    private int mStatusBar;
+    private int mActionBarMode;
+    private int mOrientation;
+    private int mCursorStyle;
+    private int mCursorBlink;
+    private int mFontSize;
+    private int mColorId;
+    private boolean mUTF8ByDefault;
+    private int mBackKeyAction;
+    private int mControlKeyId;
+    private int mFnKeyId;
+    private int mUseCookedIME;
+    private String mShell;
+    private String mFailsafeShell;
+    private String mInitialCommand;
+    private String mTermType;
+    private boolean mCloseOnExit;
+    private boolean mVerifyPath;
+    private boolean mDoPathExtensions;
+    private boolean mAllowPathPrepend;
+    private String mHomePath;
+
+    private String mPrependPath = null;
+    private String mAppendPath = null;
+
+    private boolean mAltSendsEsc;
+
+    private boolean mMouseTracking;
+
+    private boolean mUseKeyboardShortcuts;
+
+    private static final String STATUSBAR_KEY = "statusbar";
+    private static final String ACTIONBAR_KEY = "actionbar";
+    private static final String ORIENTATION_KEY = "orientation";
+    private static final String FONTSIZE_KEY = "fontsize";
+    private static final String COLOR_KEY = "color";
+    private static final String UTF8_KEY = "utf8_by_default";
+    private static final String BACKACTION_KEY = "backaction";
+    private static final String CONTROLKEY_KEY = "controlkey";
+    private static final String FNKEY_KEY = "fnkey";
+    private static final String IME_KEY = "ime";
+    private static final String SHELL_KEY = "shell";
+    private static final String INITIALCOMMAND_KEY = "initialcommand";
+    private static final String TERMTYPE_KEY = "termtype";
+    private static final String CLOSEONEXIT_KEY = "close_window_on_process_exit";
+    private static final String VERIFYPATH_KEY = "verify_path";
+    private static final String PATHEXTENSIONS_KEY = "do_path_extensions";
+    private static final String PATHPREPEND_KEY = "allow_prepend_path";
+    private static final String HOMEPATH_KEY = "home_path";
+    private static final String ALT_SENDS_ESC = "alt_sends_esc";
+    private static final String MOUSE_TRACKING = "mouse_tracking";
+    private static final String USE_KEYBOARD_SHORTCUTS = "use_keyboard_shortcuts";
+
+    public static final int WHITE = 0xffffffff;
+    public static final int BLACK = 0xff000000;
+    public static final int BLUE = 0xff344ebd;
+    public static final int GREEN = 0xff00ff00;
+    public static final int AMBER = 0xffffb651;
+    public static final int RED = 0xffff0113;
+    public static final int HOLO_BLUE = 0xff33b5e5;
+    public static final int SOLARIZED_FG = 0xff657b83;
+    public static final int SOLARIZED_BG = 0xfffdf6e3;
+    public static final int SOLARIZED_DARK_FG = 0xff839496;
+    public static final int SOLARIZED_DARK_BG = 0xff002b36;
+    public static final int LINUX_CONSOLE_WHITE = 0xffaaaaaa;
+
+    // foreground color, background color
+    public static final int[][] COLOR_SCHEMES = {
+            {BLACK, WHITE},
+            {WHITE, BLACK},
+            {WHITE, BLUE},
+            {GREEN, BLACK},
+            {AMBER, BLACK},
+            {RED, BLACK},
+            {HOLO_BLUE, BLACK},
+            {SOLARIZED_FG, SOLARIZED_BG},
+            {SOLARIZED_DARK_FG, SOLARIZED_DARK_BG},
+            {LINUX_CONSOLE_WHITE, BLACK}
+    };
+
+    public static final int ACTION_BAR_MODE_NONE = 0;
+    public static final int ACTION_BAR_MODE_ALWAYS_VISIBLE = 1;
+    public static final int ACTION_BAR_MODE_HIDES = 2;
+    private static final int ACTION_BAR_MODE_MAX = 2;
+
+    public static final int ORIENTATION_UNSPECIFIED = 0;
+    public static final int ORIENTATION_LANDSCAPE = 1;
+    public static final int ORIENTATION_PORTRAIT = 2;
+
+    /**
+     * An integer not in the range of real key codes.
+     */
+    public static final int KEYCODE_NONE = -1;
+
+    public static final int CONTROL_KEY_ID_NONE = 7;
+    public static final int[] CONTROL_KEY_SCHEMES = {
+            KeyEvent.KEYCODE_DPAD_CENTER,
+            KeyEvent.KEYCODE_AT,
+            KeyEvent.KEYCODE_ALT_LEFT,
+            KeyEvent.KEYCODE_ALT_RIGHT,
+            KeyEvent.KEYCODE_VOLUME_UP,
+            KeyEvent.KEYCODE_VOLUME_DOWN,
+            KeyEvent.KEYCODE_CAMERA,
+            KEYCODE_NONE
+    };
+
+    public static final int FN_KEY_ID_NONE = 7;
+    public static final int[] FN_KEY_SCHEMES = {
+            KeyEvent.KEYCODE_DPAD_CENTER,
+            KeyEvent.KEYCODE_AT,
+            KeyEvent.KEYCODE_ALT_LEFT,
+            KeyEvent.KEYCODE_ALT_RIGHT,
+            KeyEvent.KEYCODE_VOLUME_UP,
+            KeyEvent.KEYCODE_VOLUME_DOWN,
+            KeyEvent.KEYCODE_CAMERA,
+            KEYCODE_NONE
+    };
+
+    public static final int BACK_KEY_STOPS_SERVICE = 0;
+    public static final int BACK_KEY_CLOSES_WINDOW = 1;
+    public static final int BACK_KEY_CLOSES_ACTIVITY = 2;
+    public static final int BACK_KEY_SENDS_ESC = 3;
+    public static final int BACK_KEY_SENDS_TAB = 4;
+    private static final int BACK_KEY_MAX = 4;
+
+    public TermSettings(Resources res, SharedPreferences prefs) {
+        readDefaultPrefs(res);
+        readPrefs(prefs);
+    }
+
+    private void readDefaultPrefs(Resources res) {
+        mStatusBar = Integer.parseInt(res.getString(R.string.pref_statusbar_default));
+        mActionBarMode = res.getInteger(R.integer.pref_actionbar_default);
+        mOrientation = res.getInteger(R.integer.pref_orientation_default);
+        mCursorStyle = Integer.parseInt(res.getString(R.string.pref_cursorstyle_default));
+        mCursorBlink = Integer.parseInt(res.getString(R.string.pref_cursorblink_default));
+        mFontSize = Integer.parseInt(res.getString(R.string.pref_fontsize_default));
+        mColorId = Integer.parseInt(res.getString(R.string.pref_color_default));
+        mUTF8ByDefault = res.getBoolean(R.bool.pref_utf8_by_default_default);
+        mBackKeyAction = Integer.parseInt(res.getString(R.string.pref_backaction_default));
+        mControlKeyId = Integer.parseInt(res.getString(R.string.pref_controlkey_default));
+        mFnKeyId = Integer.parseInt(res.getString(R.string.pref_fnkey_default));
+        mUseCookedIME = Integer.parseInt(res.getString(R.string.pref_ime_default));
+        mFailsafeShell = res.getString(R.string.pref_shell_default);
+        mShell = mFailsafeShell;
+        mInitialCommand = res.getString(R.string.pref_initialcommand_default_qpython);
+        mTermType = res.getString(R.string.pref_termtype_default);
+        mCloseOnExit = res.getBoolean(R.bool.pref_close_window_on_process_exit_default);
+        mVerifyPath = res.getBoolean(R.bool.pref_verify_path_default);
+        mDoPathExtensions = res.getBoolean(R.bool.pref_do_path_extensions_default);
+        mAllowPathPrepend = res.getBoolean(R.bool.pref_allow_prepend_path_default);
+        // the mHomePath default is set dynamically in readPrefs()
+        mAltSendsEsc = res.getBoolean(R.bool.pref_alt_sends_esc_default);
+        mMouseTracking = res.getBoolean(R.bool.pref_mouse_tracking_default);
+        mUseKeyboardShortcuts = res.getBoolean(R.bool.pref_use_keyboard_shortcuts_default);
+    }
+
+    public void readPrefs(SharedPreferences prefs) {
+        mPrefs = prefs;
+        mStatusBar = readIntPref(STATUSBAR_KEY, mStatusBar, 1);
+        mActionBarMode = readIntPref(ACTIONBAR_KEY, mActionBarMode, ACTION_BAR_MODE_MAX);
+        mOrientation = readIntPref(ORIENTATION_KEY, mOrientation, 2);
+        // mCursorStyle = readIntPref(CURSORSTYLE_KEY, mCursorStyle, 2);
+        // mCursorBlink = readIntPref(CURSORBLINK_KEY, mCursorBlink, 1);
+        mFontSize = readIntPref(FONTSIZE_KEY, mFontSize, 288);
+        mColorId = readIntPref(COLOR_KEY, mColorId, COLOR_SCHEMES.length - 1);
+        mUTF8ByDefault = readBooleanPref(UTF8_KEY, mUTF8ByDefault);
+        mBackKeyAction = readIntPref(BACKACTION_KEY, mBackKeyAction, BACK_KEY_MAX);
+        mControlKeyId = readIntPref(CONTROLKEY_KEY, mControlKeyId,
+                CONTROL_KEY_SCHEMES.length - 1);
+        mFnKeyId = readIntPref(FNKEY_KEY, mFnKeyId,
+                FN_KEY_SCHEMES.length - 1);
+        mUseCookedIME = readIntPref(IME_KEY, mUseCookedIME, 1);
+        mShell = readStringPref(SHELL_KEY, mShell);
+        mInitialCommand = readStringPref(INITIALCOMMAND_KEY, mInitialCommand);
+        mTermType = readStringPref(TERMTYPE_KEY, mTermType);
+        mCloseOnExit = readBooleanPref(CLOSEONEXIT_KEY, mCloseOnExit);
+        mVerifyPath = readBooleanPref(VERIFYPATH_KEY, mVerifyPath);
+        mDoPathExtensions = readBooleanPref(PATHEXTENSIONS_KEY, mDoPathExtensions);
+        mAllowPathPrepend = readBooleanPref(PATHPREPEND_KEY, mAllowPathPrepend);
+        mHomePath = readStringPref(HOMEPATH_KEY, mHomePath);
+        mAltSendsEsc = readBooleanPref(ALT_SENDS_ESC, mAltSendsEsc);
+        mMouseTracking = readBooleanPref(MOUSE_TRACKING, mMouseTracking);
+        mUseKeyboardShortcuts = readBooleanPref(USE_KEYBOARD_SHORTCUTS,
+                mUseKeyboardShortcuts);
+        mPrefs = null;  // we leak a Context if we hold on to this
+    }
+
+    private int readIntPref(String key, int defaultValue, int maxValue) {
+        int val;
+        try {
+            val = Integer.parseInt(
+                    mPrefs.getString(key, Integer.toString(defaultValue)));
+        } catch (NumberFormatException e) {
+            val = defaultValue;
+        }
+        val = Math.max(0, Math.min(val, maxValue));
+        return val;
+    }
+
+    private String readStringPref(String key, String defaultValue) {
+        return mPrefs.getString(key, defaultValue);
+    }
+
+    private boolean readBooleanPref(String key, boolean defaultValue) {
+        return mPrefs.getBoolean(key, defaultValue);
+    }
+
+    public boolean showStatusBar() {
+        return (mStatusBar != 0);
+    }
+
+    public int actionBarMode() {
+        return mActionBarMode;
+    }
+
+    public int getScreenOrientation() {
+        return mOrientation;
+    }
+
+    public int getCursorStyle() {
+        return mCursorStyle;
+    }
+
+    public int getCursorBlink() {
+        return mCursorBlink;
+    }
+
+    public int getFontSize() {
+        return mFontSize;
+    }
+
+    public int[] getColorScheme() {
+        return COLOR_SCHEMES[mColorId];
+    }
+
+    public boolean defaultToUTF8Mode() {
+        return mUTF8ByDefault;
+    }
+
+    public int getBackKeyAction() {
+        return mBackKeyAction;
+    }
+
+    public boolean backKeySendsCharacter() {
+        return mBackKeyAction >= BACK_KEY_SENDS_ESC;
+    }
+
+    public boolean getAltSendsEscFlag() {
+        return mAltSendsEsc;
+    }
+
+    public boolean getMouseTrackingFlag() {
+        return mMouseTracking;
+    }
+
+    public boolean getUseKeyboardShortcutsFlag() {
+        return mUseKeyboardShortcuts;
+    }
+
+    public int getBackKeyCharacter() {
+        switch (mBackKeyAction) {
+            case BACK_KEY_SENDS_ESC:
+                return 27;
+            case BACK_KEY_SENDS_TAB:
+                return 9;
+            default:
+                return 0;
+        }
+    }
+
+    public int getControlKeyId() {
+        return mControlKeyId;
+    }
+
+    public int getFnKeyId() {
+        return mFnKeyId;
+    }
+
+    public int getControlKeyCode() {
+        return CONTROL_KEY_SCHEMES[mControlKeyId];
+    }
+
+    public int getFnKeyCode() {
+        return FN_KEY_SCHEMES[mFnKeyId];
+    }
+
+    public boolean useCookedIME() {
+        return (mUseCookedIME != 0);
+    }
+
+    public String getShell() {
+        return mShell;
+    }
+
+    public String getFailsafeShell() {
+        return mFailsafeShell;
+    }
+
+    public String getInitialCommand() {
+        return mInitialCommand;
+    }
+
+    public String getTermType() {
+        return mTermType;
+    }
+
+    public boolean closeWindowOnProcessExit() {
+        return mCloseOnExit;
+    }
+
+    public boolean verifyPath() {
+        return mVerifyPath;
+    }
+
+    public boolean doPathExtensions() {
+        return mDoPathExtensions;
+    }
+
+    public boolean allowPathPrepend() {
+        return mAllowPathPrepend;
+    }
+
+    public void setPrependPath(String prependPath) {
+        mPrependPath = prependPath;
+    }
+
+    public String getPrependPath() {
+        return mPrependPath;
+    }
+
+    public void setAppendPath(String appendPath) {
+        mAppendPath = appendPath;
+    }
+
+    public String getAppendPath() {
+        return mAppendPath;
+    }
+
+    public void setHomePath(String homePath) {
+        mHomePath = homePath;
+    }
+
+    public String getHomePath() {
+        return mHomePath;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/activity/AboutActivity.java b/qpython/src/main/java/org/qpython/qpy/main/activity/AboutActivity.java
new file mode 100644
index 00000000..ad5a7853
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/activity/AboutActivity.java
@@ -0,0 +1,162 @@
+package org.qpython.qpy.main.activity;
+
+import android.app.ProgressDialog;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.databinding.DataBindingUtil;
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.widget.Toolbar;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.widget.Toast;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ActivityAboutBinding;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.server.MySubscriber;
+import org.qpython.qpy.main.server.model.UpdateModel;
+import org.qpython.qpy.texteditor.androidlib.common.MiscUtils;
+
+
+/**
+ * About page
+ * Created by Hmei on 2017-05-27.
+ */
+
+public class AboutActivity extends BaseActivity {
+    ActivityAboutBinding binding;
+    ProgressDialog       progressDialog;
+
+    public static void start(Context context) {
+        Intent starter = new Intent(context, AboutActivity.class);
+        context.startActivity(starter);
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_about);
+        try {
+            PackageInfo pInfo = this.getPackageManager().getPackageInfo(getPackageName(), 0);
+            String version = pInfo.versionName;
+            binding.version.setText(getString(R.string.v_version, version));
+        } catch (PackageManager.NameNotFoundException e) {
+            e.printStackTrace();
+        }
+        progressDialog = new ProgressDialog(this);
+        progressDialog.setMessage(getString(R.string.checking_update));
+        Toolbar myToolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(myToolbar);
+        setTitle(R.string.about);
+        myToolbar.setNavigationIcon(R.drawable.ic_back);
+        myToolbar.setNavigationOnClickListener(view -> finish());
+
+        initListener();
+        checkUpdate(true);
+    }
+
+    private void initListener() {
+        binding.tvStar.setOnClickListener(v -> {
+            Intent viewIntent = new Intent("android.intent.action.VIEW",
+                    Uri.parse("market://details?id=" + getPackageName()));
+            startActivity(viewIntent);
+        });
+
+        binding.tvPrivacy.setOnClickListener(v -> {
+            Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.privacy_html)));
+            startActivity(browserIntent);
+        });
+
+        binding.tvFeedback.setOnClickListener(v -> onFeedback(""));
+
+        binding.tvUpdate.setOnClickListener(v -> {
+            checkUpdate(false);
+            progressDialog.show();
+        });
+
+        binding.tvThanks.setOnClickListener(v ->
+            startActivity(new Intent(Intent.ACTION_VIEW,Uri.parse(getString(R.string.thanks_link))))
+        );
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.about_menu, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.menu_mail:
+//                MiscUtils.sendEMailTo(getString(R.string.ui_mail), getPackageManager().getApplicationLabel(getApplicationInfo()).toString());
+                onFeedback("");
+                break;
+            case R.id.menu_share:
+                MiscUtils.share(this, getString(R.string.share_text));
+                break;
+        }
+        return true;
+    }
+
+    private void checkUpdate(boolean open) {
+        App.getService().checkUpdate(new MySubscriber<UpdateModel>() {
+            @Override
+            public void onCompleted() {
+                if (progressDialog.isShowing()) {
+                    progressDialog.dismiss();
+                }
+            }
+
+            @Override
+            public void onError(Throwable e) {
+                super.onError(e);
+                if (progressDialog.isShowing()) {
+                    progressDialog.dismiss();
+                }
+            }
+
+            @Override
+            public void onNext(UpdateModel updateModel) {
+                PackageInfo pInfo;
+                try {
+                    pInfo = getPackageManager().getPackageInfo(getPackageName(), 0);
+                    int verCode = pInfo.versionCode;
+                    String verName = pInfo.versionName;
+                    if (verCode < updateModel.getApp().getVer()) {
+                        binding.tvNewHint.setText("");
+                        binding.tvNewHint.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_about_new, 0);
+                        if (open) {
+                            return;// 打开界面无需显示dialog
+                        }
+                        AlertDialog alertDialog = new AlertDialog.Builder(AboutActivity.this, R.style.MyDialog)
+                                .setTitle(R.string.download_apk)
+                                .setMessage(R.string.download_apk_hint)
+                                .setPositiveButton(R.string.confirm,
+                                        ((dialog, which) ->
+                                                App.getService().downloadFile(
+                                                        updateModel.getApp().getLink(),
+                                                        getString(R.string.app_name),
+                                                        getString(R.string.downloading_new_apk))))
+                                .setNegativeButton(R.string.cancel, null)
+                                .create();
+                        alertDialog.show();
+                    } else {
+                        binding.tvNewHint.setText(R.string.already_newest);
+                        if (open) {
+                            return;
+                        }
+                        Toast.makeText(AboutActivity.this, getString(R.string.already_newest_current_version) + " " + verName, Toast.LENGTH_LONG).show();
+                    }
+                } catch (PackageManager.NameNotFoundException e) {
+                    e.printStackTrace();
+                }
+            }
+        });
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/activity/AppListActivity.java b/qpython/src/main/java/org/qpython/qpy/main/activity/AppListActivity.java
new file mode 100644
index 00000000..e964f622
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/activity/AppListActivity.java
@@ -0,0 +1,197 @@
+package org.qpython.qpy.main.activity;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.LoaderManager;
+import android.content.Context;
+import android.content.Intent;
+import android.content.Loader;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.GridLayoutManager;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.widget.TextView;
+
+import com.quseit.util.FileHelper;
+import com.quseit.util.FolderUtils;
+import com.quseit.util.NAction;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+import org.qpython.qpy.R;
+import org.qpython.qpy.console.ScriptExec;
+import org.qpython.qpy.main.adapter.AppListAdapter;
+import org.qpython.qpy.main.event.AppsLoader;
+import org.qpython.qpy.main.model.AppModel;
+import org.qpython.qpy.main.model.QPyScriptModel;
+import org.qpython.qpysdk.QPyConstants;
+import org.qpython.qpysdk.utils.Utils;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Local App list
+ * Created by Hmei on 2017-05-22.
+ */
+
+public class AppListActivity extends BaseActivity implements LoaderManager.LoaderCallbacks<ArrayList<AppModel>> {
+    public static final String TYPE_SCRIPT = "script";
+
+    private List<AppModel> dataList;
+    private AppListAdapter adapter;
+
+    public static void start(Context context, String type) {
+        Intent starter = new Intent(context, AppListActivity.class);
+        starter.putExtra("type", type);
+        context.startActivity(starter);
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        runShortcut();
+        setContentView(R.layout.activity_local_app);
+        initView();
+        EventBus.getDefault().register(this);
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        if (needLog && event != null) {
+            showLogDialog(event);
+            needLog = false;
+        }
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        EventBus.getDefault().unregister(this);
+    }
+
+    private void runShortcut() {
+        if (Intent.ACTION_VIEW.equals(getIntent().getAction())) {
+            String path = getIntent().getStringExtra("path");
+            boolean isProj = getIntent().getBooleanExtra("isProj", false);
+            if (isProj) {
+                ScriptExec.getInstance().playProject(this, path, false);
+            } else {
+                ScriptExec.getInstance().playScript(this, path, null, false);
+            }
+            finish();
+        }
+    }
+
+    private void initView() {
+        dataList = new ArrayList<>();
+        adapter = new AppListAdapter(dataList, getIntent().getStringExtra("type"), this);
+        adapter.setCallback(new AppListAdapter.Callback() {
+            @Override
+            public void runScript(QPyScriptModel item) {
+                ScriptExec.getInstance().playScript(AppListActivity.this, item.getPath(), null, false);
+            }
+
+            @Override
+            public void runProject(QPyScriptModel item) {
+                ScriptExec.getInstance().playProject(AppListActivity.this, item.getPath(), false);
+            }
+
+            @Override
+            public void exit() {
+                AppListActivity.this.finish();
+            }
+        });
+
+        RecyclerView appsView = findViewById(R.id.rv_app);
+        GridLayoutManager mLayoutManager = new GridLayoutManager(this, 3, LinearLayoutManager.VERTICAL, false);
+        appsView.setLayoutManager(mLayoutManager);
+        appsView.setAdapter(adapter);
+
+        ((TextView) findViewById(R.id.tv_folder_name)).setText(R.string.qpy_app);
+        getScriptList();
+    }
+
+
+    private void getScriptList() {
+        try {
+            String projectPath = NAction.isQPy3(this.getApplicationContext())? QPyConstants.DFROM_PRJ3:QPyConstants.DFROM_PRJ2;
+            File[] projectFiles = FileHelper.getABSPath(QPyConstants.ABSOLUTE_PATH + "/" + projectPath).listFiles();
+            if (projectFiles != null) {
+                Arrays.sort(projectFiles, FolderUtils.sortByName);
+                dataList.clear();
+                for (File file : projectFiles) {
+                    if (file.isDirectory()) {
+                        dataList.add(new QPyScriptModel(file));
+                    }
+                }
+            }
+            String scriptPath = NAction.isQPy3(this.getApplicationContext())?QPyConstants.DFROM_QPY3:QPyConstants.DFROM_QPY2;
+
+            File[] files = FileHelper.getFilesByType(FileHelper.getABSPath(QPyConstants.ABSOLUTE_PATH + "/" + scriptPath));
+            if (files!=null && files.length > 0) {
+                Arrays.sort(files, FolderUtils.sortByName);
+                for (File file : files) {
+                    dataList.add(new QPyScriptModel(file));
+                }
+            }
+            adapter.notifyDataSetChanged();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public Loader<ArrayList<AppModel>> onCreateLoader(int id, Bundle args) {
+        return new AppsLoader(this);
+    }
+
+    @Override
+    public void onLoadFinished(Loader<ArrayList<AppModel>> loader, ArrayList<AppModel> data) {
+        dataList.addAll(data);
+        adapter.notifyDataSetChanged();
+    }
+
+    @Override
+    public void onLoaderReset(Loader<ArrayList<AppModel>> loader) {
+        dataList.clear();
+        adapter.notifyDataSetChanged();
+    }
+
+    boolean              needLog;
+    ScriptExec.LogDialog event;
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onEventMainThread(ScriptExec.LogDialog event) {
+        this.event = event;
+        needLog = true;
+    }
+
+    public void showLogDialog(ScriptExec.LogDialog event) {
+        AlertDialog alertDialog = new AlertDialog.Builder(this, R.style.MyDialog)
+                .setTitle(R.string.last_log)
+                .setMessage(com.quseit.qpyengine.R.string.open_log)
+                .setNegativeButton(R.string.no, ((dialog, which) -> dialog.dismiss()))
+                .setPositiveButton(R.string.ok, (dialog, which) -> {
+
+                    Utils.checkRunTimeLog(this, event.title, event.path);
+
+                    dialog.dismiss();
+                })
+                .create();
+        alertDialog.show();
+    }
+
+    @Override
+    public void finish() {
+        super.finish();
+        overridePendingTransition(0, R.anim.fade_out);
+    }
+}
\ No newline at end of file
diff --git a/qpython/src/main/java/org/qpython/qpy/main/activity/CodeDetailActivity.java b/qpython/src/main/java/org/qpython/qpy/main/activity/CodeDetailActivity.java
new file mode 100644
index 00000000..c8ff7ba6
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/activity/CodeDetailActivity.java
@@ -0,0 +1,132 @@
+package org.qpython.qpy.main.activity;
+
+import android.app.Fragment;
+import android.app.FragmentTransaction;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.LinearLayoutManager;
+import android.view.View;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.codeshare.pojo.Gist;
+import org.qpython.qpy.databinding.ActivityCodeDetailBinding;
+import org.qpython.qpy.main.adapter.CodeCommentAdapter;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.widget.CodeSendComment;
+import org.qpython.qpy.texteditor.EditorActivity;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class CodeDetailActivity extends AppCompatActivity implements DialogInterface.OnDismissListener {
+    private static final String GIST_ID      = "gist_id";
+    private static final String IS_PROJ      = "is_proj";
+    private static final int    SCROOL_RANGE = 30;
+    private ActivityCodeDetailBinding binding;
+    private List<Gist.CommentBean>    comments;
+    private CodeCommentAdapter        adapter;
+    private CodeSendComment           sendDialog;
+    private String                    gistId;
+    private boolean                   isProj;
+
+    public static void start(Context context, String gistId, boolean isProj) {
+        Intent starter = new Intent(context, CodeDetailActivity.class);
+        starter.putExtra(GIST_ID, gistId);
+        starter.putExtra(IS_PROJ, isProj);
+        context.startActivity(starter);
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        gistId = getIntent().getStringExtra(GIST_ID);
+        isProj = getIntent().getBooleanExtra(IS_PROJ, false);
+        initView();
+        initData();
+        initListener();
+    }
+
+    private void initView() {
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_code_detail);
+        setSupportActionBar(binding.lt.toolbar);
+        setTitle(R.string.community);
+        binding.lt.toolbar.setNavigationIcon(R.drawable.ic_back);
+        binding.lt.toolbar.setNavigationOnClickListener(v -> finish());
+        if (App.getUser() == null) {
+            return;
+        }
+        sendDialog = CodeSendComment.newInstance(gistId, isProj);
+        sendDialog.setCallback(comment -> {
+            if (binding.emptyHint.getVisibility() == View.VISIBLE) {
+                binding.emptyHint.setVisibility(View.GONE);
+                comments = new ArrayList<>();
+                adapter = new CodeCommentAdapter(comments);
+                adapter.setItemClickListener((to, reComment) -> sendDialog.setReply(to, reComment));
+                binding.recyclerView.setLayoutManager(new LinearLayoutManager(CodeDetailActivity.this));
+                binding.recyclerView.setAdapter(adapter);
+            }
+            comments.add(0, comment);
+            adapter.notifyItemInserted(0);
+            binding.commentCount.setText(Integer.parseInt(binding.commentCount.getText().toString()) + 1 + "");
+        });
+        FragmentTransaction ft = getFragmentManager().beginTransaction();
+        Fragment prev = getFragmentManager().findFragmentByTag("dialog");
+        if (prev != null) {
+            ft.remove(prev);
+        }
+        ft.addToBackStack(null);
+        sendDialog.setCancelable(false);
+        sendDialog.show(ft, "dialog");
+    }
+
+    private void initData() {
+//        ShareCodeUtil.getInstance().getGistDetail(gist_id, isProj, gist -> {
+//            binding.name.setText(gist.getAuthor());
+//            binding.title.setText(gist.getTitle());
+//            binding.description.setText(gist.getDescribe());
+//            binding.bookmarkCount.setText(gist.getBookmarkerCount());
+//            binding.commentCount.setText(gist.getCommentCount());
+//            binding.code.setText(gist.getLastCommitCode());
+//            ImageDownLoader.setImageFromUrl(CodeDetailActivity.this, binding.avatar, gist.getAvatar());
+//
+//            if (gist.getFrom_content() != null) {
+//                comments = new ArrayList<>();
+//                comments.addAll(gist.getFrom_content());
+//                adapter = new CodeCommentAdapter(comments);
+//                adapter.setItemClickListener((to, reComment) -> sendDialog.setReply(to, reComment));
+//                binding.recyclerView.setLayoutManager(new LinearLayoutManager(CodeDetailActivity.this));
+//                binding.recyclerView.setAdapter(adapter);
+//                binding.recyclerView.setNestedScrollingEnabled(false);
+//            } else {
+//                binding.emptyHint.setVisibility(View.VISIBLE);
+//            }
+//        });
+    }
+
+    private void initListener() {
+        binding.btnCopy.setOnClickListener(v -> EditorActivity.start(this, binding.code.getText().toString()));
+        binding.bookmarkCount.setOnClickListener(v -> {
+            v.setSelected(!v.isSelected());
+//            if (v.isSelected()) {
+//                ShareCodeUtil.getInstance().bookmark(gist_id);
+//                binding.bookmarkCount.setText(Integer.parseInt(binding.bookmarkCount.getText().toString()) + 1 + "");
+//                binding.bookmarkCount.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_com_liked, 0, 0, 0);
+//            } else {
+//                ShareCodeUtil.getInstance().cancelBookmark(gist_id);
+//                binding.bookmarkCount.setText(Integer.parseInt(binding.bookmarkCount.getText().toString()) - 1 + "");
+//                binding.bookmarkCount.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_com_like, 0, 0, 0);
+//            }
+        });
+    }
+
+    @Override
+    public void onDismiss(DialogInterface dialog) {
+        finish();
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/activity/CodeShareActivity.java b/qpython/src/main/java/org/qpython/qpy/main/activity/CodeShareActivity.java
new file mode 100644
index 00000000..1a75bffb
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/activity/CodeShareActivity.java
@@ -0,0 +1,88 @@
+package org.qpython.qpy.main.activity;
+
+import android.animation.ArgbEvaluator;
+import android.content.Context;
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.view.ViewPager;
+import android.support.v7.app.AppCompatActivity;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ActivityCodeShareBinding;
+import org.qpython.qpy.main.adapter.ViewPagerAdapter;
+import org.qpython.qpy.main.fragment.CodeFragment;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class CodeShareActivity extends AppCompatActivity {
+    ActivityCodeShareBinding binding;
+    ArgbEvaluator evaluator = new ArgbEvaluator();
+
+    public static void start(Context context) {
+        Intent starter = new Intent(context, CodeShareActivity.class);
+        context.startActivity(starter);
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_code_share);
+        initView();
+        initFragment();
+    }
+
+    private void initView() {
+        setSupportActionBar(binding.lt.toolbar);
+        binding.lt.toolbar.setNavigationIcon(R.drawable.ic_back);
+        binding.lt.toolbar.setNavigationOnClickListener(v -> finish());
+        setTitle(R.string.community);
+    }
+
+    private void initFragment() {
+        binding.btnProject.setOnClickListener(v -> binding.viewPager.setCurrentItem(0));
+        binding.btnScript.setOnClickListener(v -> binding.viewPager.setCurrentItem(1));
+
+        List<CodeFragment> fragments = new ArrayList<>();
+        fragments.add(CodeFragment.newInstance(CodeFragment.PROGRAM));
+        fragments.add(CodeFragment.newInstance(CodeFragment.SCRIPT));
+        binding.viewPager.setAdapter(new ViewPagerAdapter<>(getSupportFragmentManager(), fragments));
+        binding.viewPager.addOnPageChangeListener(new ViewPager.SimpleOnPageChangeListener() {
+            @Override
+            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+                super.onPageScrolled(position, positionOffset, positionOffsetPixels);
+                int showColor = (int) evaluator.evaluate(positionOffset, 0XFF4A4A4A, 0XFF4BAC07);
+                int dismissColor = (int) evaluator.evaluate(positionOffset, 0XFF4BAC07, 0XFF4A4A4A);
+                int textShowColor = (int) evaluator.evaluate(positionOffset, 0XFFFFFFFF, 0XFF4BAC07);
+                int textDismissColor = (int) evaluator.evaluate(positionOffset, 0XFF4BAC07, 0XFFFFFFFF);
+                if (position == 0) {
+                    binding.btnProject.setTextColor(textDismissColor);
+                    binding.btnScript.setTextColor(textShowColor);
+                    binding.lineOne.setBackgroundColor(dismissColor);
+                    binding.lineTwo.setBackgroundColor(showColor);
+                } else {
+                    binding.btnProject.setTextColor(textShowColor);
+                    binding.btnScript.setTextColor(textDismissColor);
+                    binding.lineOne.setBackgroundColor(showColor);
+                    binding.lineTwo.setBackgroundColor(dismissColor);
+                }
+            }
+
+            @Override
+            public void onPageSelected(int position) {
+                switch (position) {
+                    case 0:
+                        binding.btnProject.setSelected(true);
+                        binding.btnScript.setSelected(false);
+                        break;
+                    case 1:
+                        binding.btnProject.setSelected(false);
+                        binding.btnScript.setSelected(true);
+                        break;
+                }
+            }
+        });
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/activity/CourseActivity.java b/qpython/src/main/java/org/qpython/qpy/main/activity/CourseActivity.java
new file mode 100644
index 00000000..3a8ff90d
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/activity/CourseActivity.java
@@ -0,0 +1,213 @@
+package org.qpython.qpy.main.activity;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.design.widget.TabLayout;
+import android.support.v4.app.Fragment;
+import android.support.v4.widget.NestedScrollView;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+
+import com.quseit.util.ACache;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ActivityCourseBinding;
+import org.qpython.qpy.main.adapter.ViewPagerAdapter;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.fragment.CourseFragment;
+import org.qpython.qpy.main.fragment.MyCourseFragment;
+import org.qpython.qpy.main.server.CacheKey;
+import org.qpython.qpy.main.server.MySubscriber;
+import org.qpython.qpy.main.server.model.CourseAdModel;
+import org.qpython.qpy.main.server.model.CourseModel;
+import org.qpython.qsl4a.qsl4a.LogUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import rx.Observable;
+import rx.Subscriber;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+/**
+ * Course
+ * Created by Hmei on 2017-06-28.
+ */
+
+public class CourseActivity extends AppCompatActivity {
+    private ActivityCourseBinding binding;
+    private CourseFragment        recommend, latest;
+    private MyCourseFragment my;
+    private String TAG = "CourseActivity";
+
+    private int scrollHeight;// 记录滚动超出多少后显示顶部的Tab
+    private List<CourseModel> recommendList = new ArrayList<>(), latestList = new ArrayList<>();
+
+    public static void start(Context context) {
+        Intent starter = new Intent(context, CourseActivity.class);
+        context.startActivity(starter);
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_course);
+        binding.topTabs.root.setVisibility(View.GONE);
+        setSupportActionBar(binding.lt.toolbar);
+        binding.lt.toolbar.setNavigationIcon(R.drawable.ic_back);
+        binding.lt.toolbar.setNavigationOnClickListener(v -> finish());
+
+        setTitle(getString(R.string.course));
+        initTab(binding.tabs.root);
+        initTab(binding.topTabs.root);
+        initFragment();
+        initListener();
+        initData();
+        initAD();
+    }
+
+    @Override
+    protected void onDestroy() {
+        LogUtil.d("onDestroy");
+        binding.adSlide.stop();
+        super.onDestroy();
+        //binding.adSlide;
+    }
+
+    private void initTab(TabLayout tabLayout) {
+        tabLayout.addTab(tabLayout.newTab().setText(R.string.newest_course));
+        tabLayout.addTab(tabLayout.newTab().setText(R.string.featured));
+        tabLayout.addTab(tabLayout.newTab().setText(R.string.my));
+        tabLayout.setTabTextColors(getResources().getColor(R.color.white), getResources().getColor(R.color.colorAccent));
+        tabLayout.setSelectedTabIndicatorColor(getResources().getColor(R.color.colorAccent));
+
+        binding.vp.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(tabLayout));
+        tabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
+            @Override
+            public void onTabSelected(TabLayout.Tab tab) {
+                binding.vp.setCurrentItem(tab.getPosition());
+            }
+
+            @Override
+            public void onTabUnselected(TabLayout.Tab tab) {
+            }
+
+            @Override
+            public void onTabReselected(TabLayout.Tab tab) {
+            }
+        });
+    }
+
+    private void initFragment() {
+        recommend = new CourseFragment();
+        recommend.setTypeVisible(true);
+        latest = new CourseFragment();
+        latest.setTypeVisible(false);
+        my = new MyCourseFragment();
+
+        List<Fragment> fragments = new ArrayList<>();
+        fragments.add(latest);
+        fragments.add(recommend);
+        fragments.add(my);
+
+        ViewPagerAdapter adapter = new ViewPagerAdapter<>(getSupportFragmentManager(), fragments);
+        binding.vp.setAdapter(adapter);
+        binding.vp.setOffscreenPageLimit(3);
+    }
+
+    private void initListener() {
+
+        binding.root.getViewTreeObserver().addOnGlobalLayoutListener(() -> scrollHeight =
+                binding.adSlide.getHeight());
+
+        binding.scroll.setOnScrollChangeListener((NestedScrollView.OnScrollChangeListener) (v, scrollX, scrollY, oldScrollX, oldScrollY) -> {
+            if (scrollY > scrollHeight) {
+                binding.topTabs.root.setVisibility(View.VISIBLE);
+            } else {
+                binding.topTabs.root.setVisibility(View.GONE);
+            }
+        });
+    }
+
+    private void initData() {
+        App.getService().getCourse()
+                .subscribeOn(Schedulers.io())
+                .flatMap(Observable::from)
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new MySubscriber<CourseModel>() {
+                    @Override
+                    public void onNext(CourseModel o) {
+                        switch (o.getCat()) {
+                            case "new":
+                                latestList.add(o);
+                                break;
+                            case "featured":
+                                recommendList.add(o);
+                                break;
+                        }
+                    }
+
+                    @Override
+                    public void onCompleted() {
+                        ACache.get(CourseActivity.this).put(CacheKey.COURSE_RECOMMEND, App.getGson().toJson(recommendList), ACache.TIME_HOUR);
+                        ACache.get(CourseActivity.this).put(CacheKey.COURSE_LATEST, App.getGson().toJson(latestList), ACache.TIME_HOUR);
+                        binding.progressBar.setVisibility(View.GONE);
+                        recommend.setDataList(recommendList);
+                        latest.setDataList(latestList);
+                    }
+
+                    @Override
+                    public void onError(Throwable e) {
+                        binding.progressBar.setVisibility(View.GONE);
+                        recommend.setDataList(recommendList);
+                        latest.setDataList(latestList);
+                    }
+                });
+    }
+
+    private void initAD() {
+        List<String> url = new ArrayList<>(), imageUrl = new ArrayList<>(), title = new ArrayList<>();
+        App.getService().getCourseAd()
+                .subscribeOn(Schedulers.io())
+                .flatMap(courseAdModel -> Observable.from(courseAdModel.getQpy().getExt_ad().getFeatured()))
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Subscriber<CourseAdModel.QpyBean.ExtAdBean.FeaturedBean>() {
+                    @Override
+                    public void onCompleted() {
+                        binding.adSlide.setImagesFromUrl(imageUrl);
+                        binding.adSlide.setOnUrlBackCall(i -> QWebViewActivity.start(CourseActivity.this, getString(R.string.qpy_featured), url.get(i)));
+                    }
+
+                    @Override
+                    public void onError(Throwable e) {
+                        binding.adSlide.setVisibility(View.GONE);
+                    }
+
+                    @Override
+                    public void onNext(CourseAdModel.QpyBean.ExtAdBean.FeaturedBean featuredBean) {
+                        title.add(featuredBean.getAd_link());
+                        imageUrl.add(featuredBean.getAd_img());
+                        url.add(featuredBean.getAd_link());
+                    }
+                });
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        switch (requestCode) {
+            case MyCourseFragment.REQUEST_CODE:
+                if (resultCode == Activity.RESULT_OK) my.getDataList();
+                break;
+        }
+    }
+
+    public void switchToFeature() {
+        binding.tabs.root.getTabAt(1).select();
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/activity/CourseIndexActivity.java b/qpython/src/main/java/org/qpython/qpy/main/activity/CourseIndexActivity.java
new file mode 100644
index 00000000..e4f6425c
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/activity/CourseIndexActivity.java
@@ -0,0 +1,78 @@
+package org.qpython.qpy.main.activity;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.annotation.RequiresApi;
+import android.support.v4.app.ActivityOptionsCompat;
+import android.support.v4.util.Pair;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+
+import com.quseit.util.ImageDownLoader;
+
+import org.qpython.qpy.BR;
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ActivityCourseIndexBinding;
+import org.qpython.qpy.main.server.model.CourseModel;
+
+import java.util.List;
+
+
+public class CourseIndexActivity extends AppCompatActivity {
+    private static final String COURSE = "COURSE";
+
+    @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN)
+    public static void start(Activity context, Pair<View, String>[] pairs, CourseModel courseModel) {
+        Intent starter = new Intent(context, CourseIndexActivity.class);
+        starter.putExtra(COURSE, courseModel);
+        ActivityOptionsCompat options = ActivityOptionsCompat.
+                makeSceneTransitionAnimation(context, pairs);
+        context.startActivity(starter, options.toBundle());
+    }
+
+    public static void start(Context context, CourseModel courseModel) {
+        Intent starter = new Intent(context, CourseIndexActivity.class);
+        starter.putExtra(COURSE, courseModel);
+        context.startActivity(starter);
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        ActivityCourseIndexBinding binding = DataBindingUtil.setContentView(this, R.layout.activity_course_index);
+        CourseModel course = (CourseModel) getIntent().getSerializableExtra(COURSE);
+        binding.setCourse(course);
+        binding.item.free.setVisibility(View.GONE);
+
+        setSupportActionBar(binding.tl.toolbar);
+        setTitle(course.getTitle());
+        binding.tl.toolbar.setNavigationIcon(R.drawable.ic_back);
+        binding.tl.toolbar.setNavigationOnClickListener(v -> {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                finishAfterTransition();
+            } else {
+                finish();
+            }
+        });
+
+        binding.item.tvLevel.setText(getString(R.string.level, course.getLevel() + ""));
+        binding.item.tvView.setText(String.valueOf(course.getDownloads()));
+        binding.item.tvTitle.setText(course.getTitle());
+        binding.item.tvDate.setText(course.getRdate());
+        ImageDownLoader.setImageFromUrl(this, binding.item.ivTheme, course.getLogo());
+
+        ArrayAdapter<CourseModel.CoursesBean> adapter = new ArrayAdapter<>(this, R.layout.item_course_index, course.getCourses());
+        binding.rvIndex.setAdapter(adapter);
+        binding.rvIndex.setOnItemClickListener((parent, view, position, id) ->
+                QWebViewActivity.start(this, course.getCourses().get(position).getTitle(), course.getCourses().get(position).getLink()));
+
+        //binding.item.ivTheme.setOnClickListener(v -> QWebViewActivity.start(this, course.getTitle(), course.getLink()));
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/activity/CourseIndexFundingActivity.java b/qpython/src/main/java/org/qpython/qpy/main/activity/CourseIndexFundingActivity.java
new file mode 100644
index 00000000..6d1b4b6e
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/activity/CourseIndexFundingActivity.java
@@ -0,0 +1,266 @@
+package org.qpython.qpy.main.activity;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.annotation.RequiresApi;
+import android.support.v4.app.ActivityOptionsCompat;
+import android.support.v4.util.Pair;
+import android.support.v7.app.AppCompatActivity;
+import android.text.TextUtils;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.ArrayAdapter;
+
+import com.quseit.util.ImageDownLoader;
+import com.quseit.util.VeDate;
+import com.quseit.util.NAction;
+
+import org.greenrobot.eventbus.EventBus;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ActivityCourseCrowdfundingBinding;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.server.MySubscriber;
+import org.qpython.qpy.main.server.model.CourseModel;
+import org.qpython.qpy.main.server.model.PayStatusModel;
+import org.qpython.qpy.main.widget.scheduleview.DotObj;
+import org.qpython.qpy.utils.UpdateHelper;
+
+import java.util.Map;
+
+
+public class CourseIndexFundingActivity extends AppCompatActivity {
+    private static final int SUPPORT_LOGIN_REQUEST_CODE = 2053;
+    private static final int COURSE_LOGIN_REQUEST_CODE  = 2030;
+
+    private static final String START_TO_LEARN_TYPE = "course_free";
+    private static final String COMMENT_HTML        = "http://edu.qpython.org/comments/%s.html?from=app";
+    private static final String STATUS              = "status";
+    private static final String COURSE              = "COURSE";
+
+    private ActivityCourseCrowdfundingBinding binding;
+
+    private CourseModel course;
+
+    @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN)
+    public static void start(Activity context, Pair<View, String>[] pairs, CourseModel courseModel, int status) {
+        Intent starter = new Intent(context, CourseIndexFundingActivity.class);
+        starter.putExtra(COURSE, courseModel);
+        starter.putExtra(STATUS, status);
+        ActivityOptionsCompat options = ActivityOptionsCompat.
+                makeSceneTransitionAnimation(context, pairs);
+        context.startActivity(starter, options.toBundle());
+    }
+
+    public static void start(Context context, CourseModel courseModel, int status) {
+        Intent starter = new Intent(context, CourseIndexFundingActivity.class);
+        starter.putExtra(COURSE, courseModel);
+        starter.putExtra(STATUS, status);
+        context.startActivity(starter);
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_course_crowdfunding);
+        course = (CourseModel) getIntent().getSerializableExtra(COURSE);
+        binding.setCourse(course);
+        initToolbar();
+        initViewContent();
+        initListener();
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.comment_menu, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.menu_comment:
+                startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(String.format(COMMENT_HTML, course.getSmodule()))));
+                break;
+        }
+        return true;
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+    }
+
+    private void initToolbar() {
+        setSupportActionBar(binding.tl.toolbar);
+        setTitle(course.getTitle());
+        binding.tl.toolbar.setNavigationIcon(R.drawable.ic_back);
+        binding.tl.toolbar.setNavigationOnClickListener(v -> {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                finishAfterTransition();
+            } else {
+                finish();
+            }
+        });
+    }
+
+    private void initViewContent() {
+        binding.tvLevel.setText(getString(R.string.level, course.getLevel() + ""));
+        binding.supportBtn.setText(binding.schedule.getVisibility() == View.VISIBLE ? R.string.support : R.string.buy_course);
+        ImageDownLoader.setImageFromUrl(this, binding.authorAvatar, course.getAuth_avatar());
+        ImageDownLoader.setImageFromUrl(this, binding.ivTheme, course.getLogo());
+
+        ArrayAdapter<CourseModel.CoursesBean> adapter = new ArrayAdapter<>(this, R.layout.item_course_funding_index, course.getCourses());
+        binding.rvIndex.setAdapter(adapter);
+
+        if (getIntent().getIntExtra(STATUS, 0) == 0 || getIntent().getIntExtra(STATUS, 0) == 4) {
+            //[0,不进行众筹/1,初级课程众筹/2, 中级课程众筹/3,高级课程众筹/4, 众筹完毕]
+            binding.schedule.setVisibility(View.GONE);
+            binding.explanation.setVisibility(View.GONE);
+            binding.more.setVisibility(View.GONE);
+            binding.supportBtn.setVisibility(View.GONE);
+
+            binding.thumbBtn.setVisibility(View.VISIBLE);
+            binding.supportPercent.setText(R.string.support_explanation);
+            binding.rvIndex.setOnItemClickListener((parent, view, position, id) ->
+                    QWebViewActivity.start(this, course.getCourses().get(position).getTitle(), course.getCourses().get(position).getLink()));
+        } else {
+            binding.thumbBtn.setVisibility(View.GONE);
+            binding.schedule.setDotObj(DotObj.getDefaultList(this));
+            binding.schedule.setPercent(course.getFunding_process());
+
+            String[] fundingPrice = getResources().getStringArray(R.array.funding_price);
+            binding.moreText.setText(getString(R.string.explanation_more, fundingPrice[0],
+                    fundingPrice[1],
+                    fundingPrice[2],
+                    fundingPrice[3]));
+            initSupportCount();
+        }
+    }
+
+    private void initSupportCount() {
+        App.getService().getArticleSupportNum(course.getSmodule(), new MySubscriber<Object>() {
+            @Override
+            public void onNext(Object o) {
+                String num = ((Double) ((Map) o).get("number")).intValue() + "";
+                if (TextUtils.isEmpty(num)) {
+                    binding.supportPercent.setVisibility(View.GONE);
+                } else {
+                    binding.supportPercent.setVisibility(View.VISIBLE);
+                    binding.supportPercent.setText(getString(R.string.support_count, num));
+                }
+            }
+        });
+    }
+
+    View.OnClickListener recordNIndex = (v -> {
+        if (App.getUser() != null) {
+            uploadMyCourse();
+            QWebViewActivity.start(this, course.getTitle(), course.getLink());
+        } else {
+            startActivityForResult(new Intent(this, SignInActivity.class), COURSE_LOGIN_REQUEST_CODE);
+        }
+    });
+
+    View.OnClickListener backThisProjectUnlogin = (v -> {
+
+        startActivityForResult(new Intent(this, SignInActivity.class), SUPPORT_LOGIN_REQUEST_CODE);
+    });
+
+    private void initListener() {
+        binding.more.setOnClickListener(v -> {
+            binding.explanationMore.toggle();
+            binding.more.setText(binding.explanationMore.isExpanded() ? R.string.more : R.string.hide);
+        });
+
+        //binding.ivTheme.setOnClickListener(v -> QWebViewActivity.start(this, course.getTitle(), course.getLink()));
+
+        binding.supportBtn.setOnClickListener(v -> {
+            if (App.getUser() != null) {
+                FundingPurchaseActivity.startSupport(this, course.getSmodule(), course.getFunding_process());
+            } else {
+                startActivityForResult(new Intent(this, SignInActivity.class), SUPPORT_LOGIN_REQUEST_CODE);
+            }
+        });
+
+        binding.thumbBtn.setOnClickListener(v -> PurchaseActivity.start(this, course.getSmodule()));
+
+        switch (getIntent().getIntExtra(STATUS, 0)) {
+            //[0,不进行众筹/1,初级课程众筹/2, 中级课程众筹/3,高级课程众筹/4, 众筹完毕]
+            case 0:
+                binding.btnStartLearn.setOnClickListener(recordNIndex);
+                break;
+            case 1:
+            case 2:
+            case 3:
+            case 4:
+                checkIsPayed();
+                break;
+        }
+    }
+
+    private void checkIsPayed() {
+        if (App.getUser() != null) {
+            App.getService().getPayStatus(App.getUser().getEmail(), course.getSmodule(), new
+                    MySubscriber<PayStatusModel>() {
+                        @Override
+                        public void onNext(PayStatusModel o) {
+                            if (o.getPayed() > 0) {
+                                binding.btnStartLearn.setText(R.string.start_learn);
+                                binding.btnStartLearn.setOnClickListener(recordNIndex);
+                            } else {
+                                binding.btnStartLearn.setText(R.string.back_course);
+                                binding.btnStartLearn.setOnClickListener(v -> FundingPurchaseActivity
+                                        .startSupport(CourseIndexFundingActivity.this, course
+                                                .getSmodule(), course
+                                                .getFunding_process()));
+                            }
+                        }
+                    });
+        } else {
+            binding.btnStartLearn.setText(R.string.back_course);
+            binding.btnStartLearn.setOnClickListener(backThisProjectUnlogin);
+
+
+            //startActivityForResult(new Intent(this, SignInActivity.class), SUPPORT_LOGIN_REQUEST_CODE);
+        }
+    }
+
+    private void uploadMyCourse() {
+        JSONObject jsonObject = new JSONObject();
+        try {
+            jsonObject.put("type", START_TO_LEARN_TYPE);
+            jsonObject.put("time", VeDate.getStringDateHourAsInt());
+            jsonObject.put("crowdfunding", 0);//0 非众筹/ 1: 0-100 /2: 100-500/3 500-2000
+            jsonObject.put("articleId", course.getSmodule());
+            jsonObject.put("account", App.getUser().getEmail());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        UpdateHelper.submitIAPLog(CourseIndexFundingActivity.this, NAction.getUserNoId(this),
+                App.getGson().toJson(jsonObject));
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        switch (requestCode) {
+            case SUPPORT_LOGIN_REQUEST_CODE:
+                if (resultCode == Activity.RESULT_OK) {
+                    FundingPurchaseActivity.startSupport(this, course.getSmodule(), course.getFunding_process());
+                }
+                break;
+            case COURSE_LOGIN_REQUEST_CODE:
+                // do nothing
+                break;
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/activity/FTPActivity.java b/qpython/src/main/java/org/qpython/qpy/main/activity/FTPActivity.java
new file mode 100644
index 00000000..d08f9d26
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/activity/FTPActivity.java
@@ -0,0 +1,31 @@
+package org.qpython.qpy.main.activity;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.database.DatabaseUtils;
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ActivityFtpBinding;
+
+/**
+ * FTP service setting page
+ * Created by Hmei on 2017-05-27.
+ */
+
+public class FTPActivity extends Activity {
+    ActivityFtpBinding binding;
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_ftp);
+    }
+
+    public static void start(Context context) {
+        Intent starter = new Intent(context, FTPActivity.class);
+        context.startActivity(starter);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/activity/GistActivity.java b/qpython/src/main/java/org/qpython/qpy/main/activity/GistActivity.java
new file mode 100644
index 00000000..0ad836c8
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/activity/GistActivity.java
@@ -0,0 +1,234 @@
+package org.qpython.qpy.main.activity;
+
+import android.content.Context;
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.design.widget.TabLayout;
+import android.support.v4.app.Fragment;
+import android.support.v4.widget.NestedScrollView;
+import android.text.TextUtils;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.Toast;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ActivityCommunityBinding;
+import org.qpython.qpy.main.adapter.ViewPagerAdapter;
+import org.qpython.qpy.main.fragment.GistFragment;
+import org.qpython.qpy.main.server.gist.TokenManager;
+import org.qpython.qpy.main.server.gist.indexScreen.GistHomeControler;
+import org.qpython.qpy.main.server.gist.indexScreen.GistHomeView;
+import org.qpython.qpy.main.server.gist.response.GistBean;
+import org.qpython.qpy.main.server.model.CourseAdModel.QpyBean.ExtAdBean.FeaturedBean;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * 文 件 名: GistActivity
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2017/12/25 15:41
+ * 邮   箱: qq798435167@gmail.com
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class GistActivity extends BaseActivity implements GistHomeView {
+
+    private ActivityCommunityBinding binding;
+    private List<FeaturedBean>       mADBeans;
+    private GistHomeControler        mGistHomeControler;
+    private GistFragment             latestFragment, featureFragment;
+    private int scrollHeight;// 记录滚动超出多少后显示顶部的Tab
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_community);
+        mGistHomeControler = new GistHomeControler(this);
+        initToolbar(getString(R.string.gist));
+        initTab(binding.tabs.root);
+        initTab(binding.topTabs.root);
+        initFragment();
+        initListener();
+        getData();
+        getAD();
+    }
+
+    @Override
+    protected void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+
+    }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+    }
+
+    private void loadMore() {
+        mGistHomeControler.loadMore();
+    }
+
+    private void initToolbar(String title) {
+        setSupportActionBar(binding.lt.toolbar);
+        binding.lt.toolbar.setNavigationIcon(R.drawable.ic_back);
+        binding.lt.toolbar.setNavigationOnClickListener(v -> finish());
+        setTitle(title);
+    }
+
+    private void initTab(TabLayout tabLayout) {
+        tabLayout.addTab(tabLayout.newTab().setText(R.string.newest_course));
+        tabLayout.addTab(tabLayout.newTab().setText(R.string.featured));
+        tabLayout.setTabTextColors(getResources().getColor(R.color.white), getResources().getColor(R.color.colorAccent));
+        tabLayout.setSelectedTabIndicatorColor(getResources().getColor(R.color.colorAccent));
+
+        binding.vp.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(tabLayout));
+        tabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
+            @Override
+            public void onTabSelected(TabLayout.Tab tab) {
+                binding.vp.setCurrentItem(tab.getPosition());
+            }
+
+            @Override
+            public void onTabUnselected(TabLayout.Tab tab) {
+            }
+
+            @Override
+            public void onTabReselected(TabLayout.Tab tab) {
+            }
+        });
+    }
+
+    private void initFragment() {
+        List<Fragment> fragments = new ArrayList<>();
+        latestFragment = new GistFragment();
+        featureFragment = new GistFragment();
+        fragments.add(latestFragment);
+        fragments.add(featureFragment);
+
+        ViewPagerAdapter adapter = new ViewPagerAdapter<>(getSupportFragmentManager(), fragments);
+        binding.vp.setAdapter(adapter);
+        binding.vp.setOffscreenPageLimit(2);
+    }
+
+    private void initListener() {
+        binding.adSlide.setOnUrlBackCall(i -> {
+            FeaturedBean bean = mADBeans.get(i);
+            QWebViewActivity.start(this, bean.getAd_man(), bean.getAd_link());
+        });
+        binding.getRoot().getViewTreeObserver().addOnGlobalLayoutListener(() -> scrollHeight = binding
+                .adSlide.getHeight());
+
+        binding.scroll.setOnScrollChangeListener((NestedScrollView.OnScrollChangeListener) (v, scrollX, scrollY, oldScrollX, oldScrollY) -> {
+            if (scrollY > scrollHeight) {
+                binding.topTabs.root.setVisibility(View.VISIBLE);
+            } else {
+                binding.topTabs.root.setVisibility(View.GONE);
+            }
+        });
+    }
+
+    public static void startCommunity(Context context) {
+        Intent intent = new Intent(context, GistActivity.class);
+        context.startActivity(intent);
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        if (!TextUtils.isEmpty(TokenManager.getToken())) {
+            getMenuInflater().inflate(R.menu.community_menu, menu);
+        }
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == R.id.news_edit) {
+            MyGistActivity.startMyShare(this);
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    public void getData() {
+        mGistHomeControler.refresh();
+    }
+
+    public void getAD() {
+        mGistHomeControler.getAD();
+    }
+
+    @Override
+    public void showError(String msg) {
+    }
+
+    @Override
+    public void hideError() {
+    }
+
+    @Override
+    public void setAD(List<FeaturedBean> list) {
+        mADBeans = list;
+        List<String> urls = new ArrayList<>();
+        for (FeaturedBean featuredBean : list) {
+            urls.add(featuredBean.getAd_img());
+        }
+        binding.adSlide.setImagesFromUrl(urls);
+    }
+
+    @Override
+    public void hideAd() {
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+    }
+
+    @Override
+    public void showLoading() {
+    }
+
+    @Override
+    public void hideLoading() {
+        binding.progressBar.setVisibility(View.GONE);
+    }
+
+    @Override
+    public void showToast(String msg) {
+        Toast.makeText(this, msg, Toast.LENGTH_SHORT).show();
+    }
+
+    @Override
+    public void setData(List<GistBean> list) {
+        ArrayList<GistBean> latest = new ArrayList<>(), feature = new ArrayList<>();
+        for (GistBean gistBean : list) {
+            if (gistBean.isFeature()) {
+                feature.add(gistBean);
+            } else {
+                latest.add(gistBean);
+            }
+        }
+        latestFragment.setDataList(latest);
+        featureFragment.setDataList(feature);
+    }
+
+    @Override
+    public void loadMoreGist(List<GistBean> list) {
+//        mCommunityAdapter.loadMore(list);
+    }
+
+    @Override
+    public void favorite(boolean is) {
+
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/activity/GistDetailActivity.java b/qpython/src/main/java/org/qpython/qpy/main/activity/GistDetailActivity.java
new file mode 100644
index 00000000..01651226
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/activity/GistDetailActivity.java
@@ -0,0 +1,343 @@
+package org.qpython.qpy.main.activity;
+
+import android.content.Context;
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.Toast;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ActivityNewsDetailBinding;
+import org.qpython.qpy.main.adapter.NewsDetailAdapter;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.listener.LoadmoreListener;
+import org.qpython.qpy.main.server.gist.GistEvent;
+import org.qpython.qpy.main.server.gist.detailScreen.DetailControler;
+import org.qpython.qpy.main.server.gist.detailScreen.DetailView;
+import org.qpython.qpy.main.server.gist.response.CommentBean;
+import org.qpython.qpy.main.server.gist.response.GistBean;
+import org.qpython.qpy.main.widget.CodeReviewDialog;
+import org.qpython.qpy.main.widget.ShareDialog;
+import org.qpython.qpy.texteditor.EditorActivity;
+import org.qpython.qpy.utils.OpenWebUtil;
+
+import java.util.List;
+
+import static org.qpython.qpy.main.server.gist.GistEvent.ADD_COMMENT;
+import static org.qpython.qpy.main.server.gist.GistEvent.CODE_REVIEW_EVENT;
+import static org.qpython.qpy.main.server.gist.GistEvent.COMMENT_EVENT;
+import static org.qpython.qpy.main.server.gist.GistEvent.DIVIDER;
+import static org.qpython.qpy.main.server.gist.GistEvent.FAVORITE_REQUEST;
+import static org.qpython.qpy.main.server.gist.GistEvent.FORK;
+import static org.qpython.qpy.main.server.gist.GistEvent.REPLY_EVENT;
+import static org.qpython.qpy.main.server.gist.GistEvent.RUN_NOTEBOOK;
+import static org.qpython.qpy.main.server.gist.GistEvent.RUN_SCRIPT;
+
+
+/**
+ * 文 件 名: GistDetailActivity
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2017/12/26 10:12
+ * 邮   箱: qq798435167@gmail.com
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class GistDetailActivity extends BaseActivity implements DetailView {
+
+    private static final String GIST_ID = "gist_id";
+    //    public static final  String IS_EDITABLE = "is_editable";
+    private String                    id;
+    private String                    gistUserName;
+    private ActivityNewsDetailBinding mBinding;
+    private NewsDetailAdapter         mNewsDetailAdapter;
+    private ShareDialog               mShareDialog;
+
+    private CodeReviewDialog mCodeReviewDialog;
+
+    //    public static final String UPDATE_SHARE = "UPDATE_SHARE";
+    private DetailControler mDetailControler;
+    private String          toId;// reply comment
+    private String          commentUserName;//reply user name
+
+    public static void startNewsDetail(Context context, String id/*, boolean isEditable*/) {
+        Intent intent = new Intent(context, GistDetailActivity.class);
+        intent.putExtra(GIST_ID, id);
+//        intent.putExtra(IS_EDITABLE, isEditable);
+        context.startActivity(intent);
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mBinding = DataBindingUtil.setContentView(this, R.layout.activity_news_detail);
+        initToolbar();
+        initView();
+        EventBus.getDefault().register(this);
+        mDetailControler = new DetailControler(this);
+        id = getIntent().getStringExtra(GIST_ID);
+        refresh(id);
+    }
+
+    private void initView() {
+        mNewsDetailAdapter = new NewsDetailAdapter(this);
+
+        mBinding.newsRv.setLayoutManager(new LinearLayoutManager(this));
+        mBinding.newsRv.setAdapter(mNewsDetailAdapter);
+
+        mCodeReviewDialog = new CodeReviewDialog(this);
+        mShareDialog = new ShareDialog(this);
+
+        initListener();
+    }
+
+    private void initListener() {
+        mBinding.newsRv.addOnItemTouchListener(new RecyclerView.OnItemTouchListener() {
+            @Override
+            public boolean onInterceptTouchEvent(RecyclerView rv, MotionEvent e) {
+                if (e.getAction() == MotionEvent.ACTION_DOWN) {
+                    mBinding.commentLayout.setVisibility(View.GONE);
+                    showSoftInput(false);
+                }
+                return false;
+            }
+
+            @Override
+            public void onTouchEvent(RecyclerView rv, MotionEvent e) {
+
+            }
+
+            @Override
+            public void onRequestDisallowInterceptTouchEvent(boolean disallowIntercept) {
+
+            }
+        });
+        mBinding.newsRv.addOnScrollListener(new LoadmoreListener() {
+            @Override
+            public void OnLoadmore() {
+                loadMore();
+            }
+        });
+        mBinding.refreshLayou.setOnRefreshListener(this::refresh);
+        mBinding.sendTv.setOnClickListener(v -> {
+            sendComment(mBinding.commentEdit.getText().toString());
+            showSoftInput(false);
+            mBinding.commentLayout.setVisibility(View.GONE);
+            mBinding.commentEdit.setText("");
+            toId = null;
+        });
+
+        mShareDialog.setOnClickListener(index -> {
+            switch (index) {
+                case ShareDialog.FACEBOOK: {
+                    OpenWebUtil.open(this, "https://www.facebook.com/qpython/");
+                    break;
+                }
+                case ShareDialog.TWITTER: {
+                    OpenWebUtil.open(this, "https://twitter.com/qpython");
+                    break;
+                }
+                case ShareDialog.COPY_LINK: {
+                    OpenWebUtil.open(this, "http://gist.qpy.io/share/"+getIntent().getStringExtra(GIST_ID));
+                    break;
+                }
+            }
+        });
+
+    }
+
+    private void refresh() {
+        mDetailControler.getDetail(id);
+    }
+
+    private void loadMore() {
+        mDetailControler.loadMoreComment(id);
+    }
+
+    private void initToolbar() {
+        setSupportActionBar(mBinding.lt.toolbar);
+        mBinding.lt.toolbar.setNavigationIcon(R.drawable.ic_back);
+        mBinding.lt.toolbar.setNavigationOnClickListener(v -> finish());
+//        setTitle(title);
+    }
+
+    @Subscribe
+    public void onEvent(GistEvent event) {
+        switch (event.name) {
+            case FORK:
+                ifLogin(this::fork);
+                break;
+            case COMMENT_EVENT: {
+                ifLogin(() -> {
+                    mBinding.commentLayout.setVisibility(View.VISIBLE);
+                    mBinding.commentEdit.requestFocus();
+                    showSoftInput(true);
+                });
+                break;
+            }
+
+            case FAVORITE_REQUEST: {
+                ifLogin(() -> mDetailControler.favoriteGist(id));
+                break;
+            }
+
+            case RUN_SCRIPT: {
+                String[] titleCode = event.content.split(DIVIDER);
+                EditorActivity.start(this, titleCode[1], titleCode[0]);
+                break;
+            }
+
+            case RUN_NOTEBOOK: {
+                // TODO: 2018/3/12 打开notebook
+                break;
+            }
+
+            case CODE_REVIEW_EVENT: {
+                mCodeReviewDialog.show();
+                break;
+            }
+
+            case REPLY_EVENT: {
+                ifLogin(() -> {
+                    toId = event.content.split(",")[0];
+                    commentUserName = event.content.split(",")[1];
+                    mBinding.commentLayout.setVisibility(View.VISIBLE);
+                    mBinding.commentEdit.requestFocus();
+                    showSoftInput(true);
+                });
+                break;
+            }
+
+        }
+
+    }
+
+    /**
+     * 发送评论
+     */
+    private void sendComment(String s) {
+        if (s.isEmpty()) {
+            Toast.makeText(this, R.string.empty_hint, Toast.LENGTH_SHORT).show();
+            return;
+        }
+        mDetailControler.comment(id, s, toId);
+    }
+
+    private void showSoftInput(boolean show) {
+        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+        if (show) {
+            if (commentUserName != null) {
+                mBinding.commentEdit.setHint(getString(R.string.reply_to, commentUserName));
+            }
+            imm.showSoftInput(mBinding.commentEdit, 0);
+        } else {
+            commentUserName = null;
+            toId = null;
+            mBinding.commentEdit.setHint("");
+            imm.hideSoftInputFromWindow(mBinding.commentEdit.getWindowToken(), 0);
+        }
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.news_menu, menu);
+
+//        if (!getIntent().getBooleanExtra(IS_EDITABLE, false)) {
+        MenuItem item = menu.findItem(R.id.news_edit);
+        if (App.getUser() != null && App.getUser().getUserName().equals(gistUserName)) {
+            item.setVisible(true);
+        } else {
+            item.setVisible(false);
+        }
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.news_share:
+                mShareDialog.show();
+                mBinding.commentLayout.setVisibility(View.GONE);
+                break;
+            case R.id.news_edit:
+                mNewsDetailAdapter.startEdit();
+                break;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        EventBus.getDefault().unregister(this);
+        mDetailControler.onDestroy();
+    }
+
+    @Override
+    public void showLoading() {
+        mBinding.progressBar.setVisibility(View.VISIBLE);
+    }
+
+    @Override
+    public void hideLoading() {
+        mBinding.progressBar.setVisibility(View.GONE);
+        mBinding.refreshLayou.setRefreshing(false);
+    }
+
+    @Override
+    public void showToast(String msg) {
+        Toast.makeText(this, msg, Toast.LENGTH_SHORT).show();
+    }
+
+    @Override
+    public void setData(GistBean gistBean) {
+        setTitle(gistBean.getTitle());
+        mNewsDetailAdapter.setData(gistBean);
+        mCodeReviewDialog.setContent(gistBean.getSource());
+        gistUserName = gistBean.getUser().getUserName();
+        invalidateOptionsMenu();
+    }
+
+    @Override
+    public void loadMoreComments(List<CommentBean> list) {
+        mNewsDetailAdapter.loadMoreComment(list);
+    }
+
+    @Override
+    public void favorite(boolean is) {
+        mNewsDetailAdapter.favorite(is);
+    }
+
+    @Override
+    public void addComment(CommentBean comment) {
+        mNewsDetailAdapter.addComment(comment);
+        EventBus.getDefault().post(new GistEvent(ADD_COMMENT, id));
+    }
+
+    @Override
+    public void fork() {
+        mDetailControler.forkGist(id);
+    }
+
+    @Override
+    public void forkSuccess() {
+        MyGistActivity.startMyShare(this);
+//        Toast.makeText(this, R.string.fork_suc, Toast.LENGTH_SHORT).show();
+    }
+
+    @Override
+    public void refresh(String id) {
+        this.id = id;
+        refresh();
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/activity/GistEditActivity.java b/qpython/src/main/java/org/qpython/qpy/main/activity/GistEditActivity.java
new file mode 100644
index 00000000..15c2937f
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/activity/GistEditActivity.java
@@ -0,0 +1,267 @@
+package org.qpython.qpy.main.activity;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+import android.text.Editable;
+import android.text.SpannableString;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.view.View;
+import android.widget.Toast;
+
+import org.greenrobot.eventbus.EventBus;
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ActivityAddGistBinding;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.User;
+import org.qpython.qpy.main.server.gist.GistEvent;
+import org.qpython.qpy.main.server.gist.createScreen.CreateGistControler;
+import org.qpython.qpy.main.server.gist.createScreen.CreateGistView;
+import org.qpython.qpy.texteditor.common.TextFileUtils;
+import org.qpython.qpy.utils.CodePattern;
+import org.qpython.qpy.utils.SolfKeybroadUtil;
+
+import java.io.File;
+
+import rx.Observable;
+import rx.Observer;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+public class GistEditActivity extends AppCompatActivity implements TextWatcher, CreateGistView {
+
+    public static final String GIST_ID = "gist_id";
+    public static final String TITLE   = "filename";
+    public static final String DESC    = "desc";
+    public static final String CODE    = "code";
+
+    public static final String TYPE   = "type";
+    public static final String UPDATE = "update";
+    public static final String NEW    = "new";
+
+    private static final int    DESCRIPTION_TEXT_MAX_LENGTH = 140;
+    private static final String PATH                        = "path";
+    private ActivityAddGistBinding binding;
+    private String                 path;
+
+    private CreateGistControler mCreateGistControler;
+    private String              type;
+    private String              filename;
+
+    public static void start(Context context, String path) {
+        Intent starter = new Intent(context, GistEditActivity.class);
+        starter.putExtra(PATH, path);
+        starter.putExtra(TYPE, NEW);
+        context.startActivity(starter);
+    }
+
+    public static void start(Context context, String gistId, String title, String desc, SpannableString
+            code) {
+        Intent starter = new Intent(context, GistEditActivity.class);
+        starter.putExtra(GIST_ID, gistId);
+        starter.putExtra(TITLE, title);
+        starter.putExtra(DESC, desc);
+        starter.putExtra(CODE, code.toString());
+        starter.putExtra(TYPE, UPDATE);
+
+        context.startActivity(starter);
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_add_gist);
+        type = getIntent().getStringExtra(TYPE);
+        path = getIntent().getStringExtra(PATH);
+        filename = getIntent().getStringExtra(TITLE);
+        if (TextUtils.isEmpty(filename)) {
+            filename = new File(path).getName();
+        }
+
+        initView();
+        initListener();
+        mCreateGistControler = new CreateGistControler(this);
+    }
+
+    private void initView() {
+        setSupportActionBar(binding.toolbar);
+        setTitle(filename);
+        binding.toolbar.setNavigationIcon(R.drawable.ic_back);
+        binding.toolbar.setNavigationOnClickListener(v -> finish());
+
+        //加载代码数据
+        switch (type) {
+            case NEW:
+                loadCode();
+                break;
+            case UPDATE:
+                String desc = getIntent().getStringExtra(DESC);
+                String code = getIntent().getStringExtra(CODE);
+                binding.description.setText(desc);
+                binding.codeContentTv.setVisibility(View.VISIBLE);
+                binding.codeContentTv.setText(CodePattern.formatPyCode(code));
+                break;
+        }
+    }
+
+    /**
+     * 通过文件路径获取到文件内容
+     */
+    private void loadCode() {
+//        binding.filename.setText(new File(path).getName());
+        binding.progressBar.setVisibility(View.VISIBLE);
+        Observable
+                .create((Observable.OnSubscribe<String>) subscriber -> {
+                    File file = new File(path);
+                    String content = TextFileUtils.readTextFile(file);
+                    if (content == null) {
+                        subscriber.onError(new Throwable("no data"));
+                    }
+                    subscriber.onNext(content);
+                    subscriber.onCompleted();
+                })
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .doOnTerminate(() -> binding.progressBar.setVisibility(View.GONE))
+                .subscribe(new Observer<String>() {
+                    @Override
+                    public void onCompleted() {
+
+                    }
+
+                    @Override
+                    public void onError(Throwable e) {
+
+                    }
+
+                    @Override
+                    public void onNext(String s) {
+                        binding.codeContentTv.setVisibility(View.VISIBLE);
+                        binding.codeContentTv.setText(s);
+//                        mCodeReviewDialog.setContent(s);
+                    }
+                });
+    }
+
+    private void initListener() {
+        binding.description.addTextChangedListener(this);
+//        binding.filename.addTextChangedListener(this);
+        binding.sendBtn.setOnClickListener(v -> {
+            shareCode();
+            SolfKeybroadUtil.showSolfInput(binding.sendBtn, false);
+        });
+
+    }
+
+    @Override
+    public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+    }
+
+    @Override
+    public void onTextChanged(CharSequence s, int start, int before, int count) {
+
+    }
+
+    @SuppressLint("SetTextI18n")
+    @Override
+    public void afterTextChanged(Editable s) {
+        int length = binding.description.length();
+        binding.textCount.setText(DESCRIPTION_TEXT_MAX_LENGTH - length + "");
+        if (length > DESCRIPTION_TEXT_MAX_LENGTH) {
+            binding.textCount.setTextColor(getResources().getColor(R.color.error));
+            binding.description.setError(getString(R.string.too_long_hint));
+        } else {
+            binding.textCount.setTextColor(getResources().getColor(R.color.text_gray));
+            binding.description.setError(null);
+        }
+        if (binding.description.length() > 0
+                && binding.description.length() < 140) {
+            binding.sendBtn.setClickable(true);
+            binding.sendBtn.setTextColor(getResources().getColor(R.color.colorAccent));
+        } else {
+            binding.sendBtn.setClickable(false);
+            binding.sendBtn.setTextColor(getResources().getColor(R.color.text_gray));
+        }
+    }
+
+    /**
+     * 发布代码分享
+     */
+    private void shareCode() {
+        if (loginCheck()) {
+            String content = binding.codeContentTv.getText().toString();
+            String summary = binding.description.getText().toString();
+            boolean isSahre = binding.gistShare.isChecked();
+            if (checkData(filename, summary)) {
+                switch (type) {
+                    case NEW:
+                        mCreateGistControler.createGist(
+                                filename,
+                                summary,
+                                content,
+                                path.contains(".ipynb") ? "notebook" : "script",
+                                isSahre);
+                        break;
+                    case UPDATE:
+                        mCreateGistControler.updateGist(
+                                getIntent().getStringExtra(GIST_ID),
+                                filename,
+                                summary,
+                                content);
+                        break;
+                }
+            }
+        }
+    }
+
+    private boolean checkData(String title, String summary) {
+        if (TextUtils.isEmpty(title)) {
+            showToast("filename must be not empty!");
+            return false;
+        }
+        if (TextUtils.isEmpty(summary)) {
+            showToast("summary must be not empty!");
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public void showLoading() {
+        binding.progressBar.setVisibility(View.VISIBLE);
+    }
+
+    @Override
+    public void hideLoading() {
+        binding.progressBar.setVisibility(View.GONE);
+    }
+
+    @Override
+    public void showToast(String msg) {
+        Toast.makeText(this, msg, Toast.LENGTH_SHORT).show();
+    }
+
+    @Override
+    public void onSuccess(String id) {
+        EventBus.getDefault().post(new GistEvent(GistEvent.UPDATE_GIST_SUC));
+        //MyGistActivity.startMyShare(this);
+        //GistActivity.startCommunity(this);
+        finish();
+    }
+
+    private boolean loginCheck() {
+        User user = App.getUser();
+        if (user == null) {
+            showToast(getString(R.string.login_first));
+            return false;
+        } else {
+            return true;
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/activity/HomeMainActivity.java b/qpython/src/main/java/org/qpython/qpy/main/activity/HomeMainActivity.java
new file mode 100644
index 00000000..c058e0cd
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/activity/HomeMainActivity.java
@@ -0,0 +1,473 @@
+package org.qpython.qpy.main.activity;
+
+import android.Manifest;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
+import android.content.res.Resources;
+import android.databinding.DataBindingUtil;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Environment;
+import android.preference.PreferenceManager;
+import android.support.v4.app.ActivityCompat;
+import android.support.v7.app.AlertDialog;
+import android.text.Html;
+import android.util.Log;
+import android.view.View;
+import android.widget.Toast;
+
+import com.quseit.util.NAction;
+import com.quseit.util.Utils;
+
+import org.greenrobot.eventbus.Subscribe;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.qpython.qpy.R;
+import org.qpython.qpy.console.TermActivity;
+import org.qpython.qpy.databinding.ActivityMainBinding;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.CONF;
+import org.qpython.qpy.main.server.MySubscriber;
+import org.qpython.qpy.main.server.model.CourseAdModel;
+import org.qpython.qpy.main.utils.Bus;
+import org.qpython.qpy.texteditor.EditorActivity;
+import org.qpython.qpy.texteditor.TedLocalActivity;
+import org.qpython.qpy.utils.UpdateHelper;
+import org.qpython.qpysdk.QPyConstants;
+import org.qpython.qpysdk.QPySDK;
+import org.qpython.qpysdk.utils.FileHelper;
+import org.qpython.qsl4a.QPyScriptService;
+
+import java.io.File;
+import java.io.InputStream;
+
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+import static org.qpython.qpysdk.QPyConstants.PYTHON_2;
+
+public class HomeMainActivity extends BaseActivity {
+    private static final String URL_COMMUNITY = "https://www.qpython.org/community.html";
+    private static final String URL_COURSE    = "https://edu.qpython.org/?from=qpy2";
+    private static final String USER_NAME     = "username";
+    private static final String TAG = "HomeMainActivity";
+
+    private static final int LOGIN_REQUEST_CODE = 136;
+
+    private ActivityMainBinding binding;
+
+    public static void start(Context context) {
+        Intent starter = new Intent(context, HomeMainActivity.class);
+        context.startActivity(starter);
+    }
+
+    public static void start(Context context, String userName) {
+        Intent starter = new Intent(context, HomeMainActivity.class);
+        starter.putExtra(USER_NAME, userName);
+        context.startActivity(starter);
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_main);
+        //App.setActivity(this);
+        startMain();
+        handlePython3(getIntent());
+        handleNotification(savedInstanceState);
+    }
+
+    private void initIcon() {
+        switch (NAction.getQPyInterpreter(this)) {
+            case "3.x":
+                binding.icon.setImageResource(R.drawable.img_home_logo_3);
+                break;
+            case "2.x":
+                binding.icon.setImageResource(R.drawable.img_home_logo);
+                break;
+        }
+    }
+
+    private void initUser() {
+        if (App.getUser() == null) {
+            binding.login.setVisibility(View.GONE);
+        } else {
+            binding.login.setText(Html.fromHtml(getString(R.string.welcome_s, App.getUser().getNick())));
+        }
+    }
+
+    private void startMain() {
+        initListener();
+        startPyService();
+        Bus.getDefault().register(this);
+        init();
+        if (ActivityCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) {
+            UpdateHelper.checkConfUpdate(this, QPyConstants.BASE_PATH);
+        }
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        initUser();
+        initIcon();
+        handleNotification();
+    }
+
+    @Override
+    protected void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        handlePython3(intent);
+    }
+
+    private void initListener() {
+        binding.ivScan.setOnClickListener(v -> Bus.getDefault().post(new StartQrCodeActivityEvent()));
+        binding.login.setOnClickListener(v -> {
+            if (App.getUser() == null) {
+                sendEvent(getString(R.string.event_login));
+                startActivityForResult(new Intent(this, SignInActivity.class), LOGIN_REQUEST_CODE);
+            } else {
+                sendEvent(getString(R.string.event_me));
+                UserActivity.start(this);
+            }
+        });
+
+        binding.llTerminal.setOnClickListener(v -> {
+            TermActivity.startActivity(HomeMainActivity.this);
+            sendEvent(getString(R.string.event_term));
+        });
+
+        binding.llTerminal.setOnLongClickListener(v -> {
+            CharSequence[] chars = new CharSequence[]{ this.getString(R.string.python_interpreter), this.getString(R.string.action_notebook), this.getString(R.string.shell_terminal)};
+            new AlertDialog.Builder(this, R.style.MyDialog)
+                    .setTitle(R.string.choose_action)
+                    .setItems(chars, (dialog, which) -> {
+                        switch (which) {
+                            case 0: // Create Shortcut
+                                TermActivity.startActivity(HomeMainActivity.this);
+                                break;
+                            case 1:
+                                NotebookActivity.start(HomeMainActivity.this, null, false);
+                                break;
+                            case 2:
+                                TermActivity.startShell(HomeMainActivity.this);
+                                break;
+                        }
+                    }).setNegativeButton(getString(R.string.close), new DialogInterface.OnClickListener() {
+
+                @Override
+                public void onClick(DialogInterface dialogInterface, int i) {
+                    dialogInterface.dismiss();
+                }
+            })
+                    .show();
+
+            return true;
+        });
+        binding.llEditor.setOnClickListener(v -> {
+            EditorActivity.start(this);
+            sendEvent(getString(R.string.event_editor));
+        });
+        binding.llLibrary.setOnClickListener(v -> {
+            LibActivity.start(this);
+            sendEvent(getString(R.string.event_qpypi));
+        });
+//        binding.llCommunity.setOnClickListener(v -> {
+//            startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(URL_COMMUNITY)));
+//            sendEvent(getString(R.string.event_commu));
+//        });
+//        binding.llGist.setOnClickListener(view -> GistActivity.startCommunity(HomeMainActivity.this)
+//        );
+        binding.llSetting.setOnClickListener(v -> {
+            SettingActivity.startActivity(this);
+            sendEvent(getString(R.string.event_setting));
+        });
+        binding.llFile.setOnClickListener(v -> {
+            TedLocalActivity.start(this, TedLocalActivity.REQUEST_HOME_PAGE);
+            sendEvent(getString(R.string.event_file));
+        });
+        binding.llQpyApp.setOnClickListener(v -> {
+                AppListActivity.start(this, AppListActivity.TYPE_SCRIPT);
+            overridePendingTransition(R.anim.fade_in, R.anim.fade_out);
+            sendEvent(getString(R.string.event_top));
+        });
+
+        binding.llCourse.setOnClickListener(v -> {
+            CourseActivity.start(HomeMainActivity.this);
+            sendEvent(getString(R.string.event_course));
+        });
+/*        binding.llCourse.setOnClickListener(v ->
+                QWebViewActivity.start(HomeMainActivity.this, getString(R.string.course), URL_COURSE));
+
+        initCourseListener();*/
+    }
+
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        Bus.getDefault().unregister(this);
+    }
+
+    private void handlePython3(Intent intent) {
+        String action = intent.getAction();
+        if (action != null && action.equals(getString(R.string.action_from_python_three))
+                && NAction.getQPyInterpreter(this).equals(PYTHON_2)) {
+            new AlertDialog.Builder(this)
+                    .setTitle(R.string.py2_now)
+                    .setMessage(R.string.switch_py3_hint)
+                    .setNegativeButton(R.string.no, (dialog, which) -> dialog.dismiss())
+                    .setPositiveButton(R.string.goto_setting, (dialog, which) -> SettingActivity.startActivity(this))
+                    .create()
+                    .show();
+        }
+    }
+
+    private void handleNotification(Bundle bundle) {
+        if (bundle == null) return;
+        if (!bundle.getBoolean("force") && !PreferenceManager.getDefaultSharedPreferences(this).getBoolean(getString(R.string.key_hide_push), true)) {
+            return;
+        }
+        String type = bundle.getString("type", "");
+        if (!type.equals("")) {
+            String link = bundle.getString("link", "");
+            String title = bundle.getString("title", "");
+
+            switch (type) {
+                case "in":
+                    QWebViewActivity.start(this, title, link);
+                    break;
+                case "ext":
+                    Intent starter = new Intent(Intent.ACTION_VIEW, Uri.parse(link));
+                    startActivity(starter);
+                    break;
+            }
+        }
+    }
+
+    private void handleNotification() {
+        if (!PreferenceManager.getDefaultSharedPreferences(this).getBoolean(getString(R.string.key_hide_push), true)) {
+            return;
+        }
+        SharedPreferences sharedPreferences = getSharedPreferences(CONF.NOTIFICATION_SP_NAME, MODE_PRIVATE);
+        try {
+            String notifString = sharedPreferences.getString(CONF.NOTIFICATION_SP_OBJ, "");
+            if ("".equals(notifString)) {
+                return;
+            }
+            JSONObject extra = new JSONObject(notifString);
+            String type = extra.getString("type");
+            String link = extra.getString("link");
+            String title = extra.getString("title");
+            switch (type) {
+                case "in":
+                    QWebViewActivity.start(this, title, link);
+                    break;
+                case "ext":
+                    Intent starter = new Intent(Intent.ACTION_VIEW, Uri.parse(link));
+                    startActivity(starter);
+                    break;
+            }
+            sharedPreferences.edit().clear().apply();
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+    }
+
+//    private void initCourseListener() {
+//        App.getService().getCourseAd().subscribeOn(Schedulers.io())
+//                .observeOn(AndroidSchedulers.mainThread())
+//                .subscribe(new MySubscriber<CourseAdModel>() {
+//                    @Override
+//                    public void onNext(CourseAdModel o) {
+//                        super.onNext(o);
+//                        if ("0".equals(o.getQpy().getCourse_open())) {
+//                            // open web
+//                            binding.llCourse.setOnClickListener(v ->
+//                                    QWebViewActivity.start(HomeMainActivity.this, getString(R.string.course), URL_COURSE));
+//                        } else {
+//                            // open with native
+//                            binding.llCourse.setOnClickListener(v -> {
+//                                CourseActivity.start(HomeMainActivity.this);
+//                                sendEvent(getString(R.string.event_course));
+//                            });
+//                        }
+//                    }
+//
+//                    @Override
+//                    public void onError(Throwable e) {
+//                        binding.llCourse.setOnClickListener(v ->
+//                                QWebViewActivity.start(HomeMainActivity.this, getString(R.string.course), URL_COURSE));
+//                    }
+//                });
+//    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+    }
+
+    private void startPyService() {
+        Log.d(TAG, "startPyService");
+        Intent intent = new Intent(this, QPyScriptService.class);
+        startService(intent);
+    }
+
+    private void openQpySDK() {
+        Log.d("HomeMainActivity", "openQpySDK");
+        String[] permssions = {Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE};
+        checkPermissionDo(permssions, new BaseActivity.PermissionAction() {
+            @Override
+            public void onGrant() {
+                //这里只执行一次做为初始化
+
+                if (!NAction.isQPyInterpreterSet(HomeMainActivity.this)) {
+                    new AlertDialog.Builder(HomeMainActivity.this, R.style.MyDialog)
+                            .setTitle(R.string.notice)
+                            .setMessage(R.string.py2_or_3)
+                            .setPositiveButton(R.string.use_py3, (dialog1, which) -> initQpySDK3())
+                            .setNegativeButton(R.string.use_py2, (dialog1, which) -> initQpySDK())
+                            .create()
+                            .show();
+                }
+            }
+
+            @Override
+            public void onDeny() {
+                Toast.makeText(HomeMainActivity.this,  getString(R.string.grant_storage_hint), Toast.LENGTH_SHORT).show();
+            }
+        });
+    }
+
+    /**
+     * 在工作线程中作初始化
+     */
+    private void initQpySDK3() {
+        Log.d(TAG, "initQpySDK3");
+        NAction.setQPyInterpreter(HomeMainActivity.this, "3.x");
+        initQPy(true);
+        initIcon();
+    }
+    private void initQpySDK() {
+        Log.d(TAG, "initQpySDK");
+        initQPy(false);
+        NAction.setQPyInterpreter(HomeMainActivity.this, "2.x");
+        initIcon();
+    }
+
+    private void initQPy(boolean py3) {
+        new Thread(() -> {
+            QPySDK qpysdk = new QPySDK(HomeMainActivity.this, HomeMainActivity.this);
+            //这里会在切换qpy3的时候再次释放相关资源
+            qpysdk.extractRes(py3?"private31":"private1", HomeMainActivity.this.getFilesDir());
+            qpysdk.extractRes(py3?"private32":"private2", HomeMainActivity.this.getFilesDir());
+            qpysdk.extractRes(py3?"private33":"private3", HomeMainActivity.this.getFilesDir());
+            if (py3) {
+                qpysdk.extractRes("notebook3", HomeMainActivity.this.getFilesDir());
+            }
+            File externalStorage = new File(Environment.getExternalStorageDirectory(), "qpython");
+            FileHelper.createDirIfNExists(externalStorage + "/cache");
+            FileHelper.createDirIfNExists(externalStorage + "/log");
+            FileHelper.createDirIfNExists(externalStorage + "/notebooks");
+
+            qpysdk.extractRes(py3?"public3":"public", new File(externalStorage + "/lib"));
+
+            qpysdk.extractRes("ipynb", new File(externalStorage + "/notebooks"));
+
+            extractRes();
+        }).start();
+    }
+
+
+    /**
+     * 初始化内置python项目
+     */
+    public void extractRes() {
+        File externalStorage = new File(QPyConstants.ABSOLUTE_PATH);
+        if (checkExpired("public", new File(externalStorage + "/lib").getAbsolutePath(), "programs"+NAction.getPyVer(this))) {
+            String name, sFileName;
+            InputStream content;
+
+            R.raw a = new R.raw();
+            java.lang.reflect.Field[] t = R.raw.class.getFields();
+            Resources resources = getResources();
+
+            for (int i = 0; i < t.length; i++) {
+                try {
+                    name = resources.getText(t[i].getInt(a)).toString();
+                    sFileName = name.substring(name.lastIndexOf('/') + 1, name.length());
+                    content = getResources().openRawResource(t[i].getInt(a));
+                    content.reset();
+
+                    if (sFileName.equals("projects2.zip")) {
+                        Utils.createDirectoryOnExternalStorage("qpython/projects/");
+                        Utils.unzip(content, Environment.getExternalStorageDirectory().getAbsolutePath() + "/qpython/projects/", false);
+
+                    } else if (sFileName.equals("scripts2.zip")) {
+                        Utils.unzip(content, Environment.getExternalStorageDirectory().getAbsolutePath() + "/qpython/scripts/", false);
+
+                    } else if (sFileName.equals("projects3.zip")) {
+                        Utils.createDirectoryOnExternalStorage("qpython/projects3/");
+                        Utils.unzip(content, Environment.getExternalStorageDirectory().getAbsolutePath() + "/qpython/projects3/", false);
+
+                    } else if (sFileName.equals("scripts3.zip")) {
+                        Utils.createDirectoryOnExternalStorage("qpython/scripts3/");
+                        Utils.unzip(content, Environment.getExternalStorageDirectory().getAbsolutePath() + "/qpython/scripts3/", false);
+
+                    } if (sFileName.equals("ipynb.zip")) {
+                        Utils.createDirectoryOnExternalStorage("qpython/notebooks/");
+                        Utils.unzip(content, Environment.getExternalStorageDirectory().getAbsolutePath() + "/qpython/notebooks/", false);
+                    }
+
+                } catch (Exception e) {
+                    Log.e("HomeMainActivity", "Failed to copyResourcesToLocal", e);
+
+                }
+            }
+        }
+    }
+
+    private void init() {
+        openQpySDK();
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (resultCode == RESULT_OK) {
+            switch (requestCode) {
+                case LOGIN_REQUEST_CODE:
+                    binding.login.setText(Html.fromHtml(getString(R.string.welcome_s, App.getUser().getNick())));
+                    break;
+            }
+        }
+    }
+
+    @Subscribe
+    public void startQrCodeActivity(StartQrCodeActivityEvent event) {
+        String[] permissions = {Manifest.permission.CAMERA};
+
+        checkPermissionDo(permissions, new BaseActivity.PermissionAction() {
+            @Override
+            public void onGrant() {
+                QrCodeActivity.start(HomeMainActivity.this);
+            }
+
+            @Override
+            public void onDeny() {
+                Toast.makeText(HomeMainActivity.this, getString(R.string.no_camera), Toast.LENGTH_SHORT).show();
+            }
+        });
+    }
+
+    public static class StartQrCodeActivityEvent {
+
+    }
+
+    private void sendEvent(String evenName) {
+
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/activity/LibActivity.java b/qpython/src/main/java/org/qpython/qpy/main/activity/LibActivity.java
new file mode 100644
index 00000000..f9b9315a
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/activity/LibActivity.java
@@ -0,0 +1,153 @@
+package org.qpython.qpy.main.activity;
+
+import android.app.DownloadManager;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.databinding.DataBindingUtil;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.design.widget.TabLayout;
+import android.support.v4.app.Fragment;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.view.Menu;
+import android.view.MenuItem;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ActivityLibBinding;
+import org.qpython.qpy.main.adapter.LibPagerAdapter;
+import org.qpython.qpy.main.fragment.RefreshFragment;
+import org.qpython.qpy.main.receiver.DownloadReceiver;
+
+/**
+ * Manager Lib
+ * Created by Hmei on 2017-05-27.
+ */
+
+public class LibActivity extends AppCompatActivity {
+    private static final String OPEN_AIPY_ACTION = "org.qpython.qpy.OPEN_AIPY_FRAGMENT";
+    private ActivityLibBinding binding;
+    private DownloadReceiver   receiver;
+    private int                position;
+    private LibPagerAdapter    adapter;
+
+    public static void start(Context context) {
+        Intent starter = new Intent(context, LibActivity.class);
+        context.startActivity(starter);
+    }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+        EventBus.getDefault().register(this);
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        registerReceiver(receiver, new IntentFilter(
+                DownloadManager.ACTION_DOWNLOAD_COMPLETE));
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_lib);
+        receiver = new DownloadReceiver();
+
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        toolbar.setTitleTextColor(Color.WHITE);
+        setSupportActionBar(toolbar);
+        setTitle(R.string.lib_manager);
+        toolbar.setNavigationIcon(R.drawable.ic_back);
+        toolbar.setNavigationOnClickListener(v -> finish());
+
+        initTabs();
+        handleIntent();
+    }
+
+    private void handleIntent() {
+        Intent intent = getIntent();
+        String action = intent.getAction() == null ? "" : intent.getAction();
+        switch (action) {
+            case OPEN_AIPY_ACTION:
+                binding.vp.setCurrentItem(2);
+                break;
+        }
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        EventBus.getDefault().unregister(this);
+        try {
+            if (receiver != null) {
+                unregisterReceiver(receiver);
+            }
+        } catch (IllegalArgumentException ignore) {
+            // TODO: 2017-06-21 reopen this activity may cause crash, have not find the reason yet
+        }
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.refresh_menu, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == R.id.refresh_menu) {
+            Fragment currentFragment = adapter.getItem(position);
+            if (currentFragment instanceof RefreshFragment) {
+                ((RefreshFragment) currentFragment).refresh(true);
+            }
+        }
+        return true;
+    }
+
+    private void initTabs() {
+        binding.tabs.addTab(binding.tabs.newTab().setText(R.string.tools));
+        binding.tabs.addTab(binding.tabs.newTab().setText(R.string.qpypi));
+        binding.tabs.addTab(binding.tabs.newTab().setText(R.string.aipy));
+        binding.tabs.setTabGravity(TabLayout.GRAVITY_FILL);
+        binding.tabs.setTabTextColors(getResources().getColor(R.color.white), getResources().getColor(R.color.colorAccent));
+        binding.tabs.setSelectedTabIndicatorColor(getResources().getColor(R.color.colorAccent));
+        adapter = new LibPagerAdapter(getSupportFragmentManager());
+        binding.vp.setAdapter(adapter);
+
+        binding.vp.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(binding.tabs));
+        binding.tabs.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
+            @Override
+            public void onTabSelected(TabLayout.Tab tab) {
+                binding.vp.setCurrentItem(tab.getPosition());
+                position = tab.getPosition();
+            }
+
+            @Override
+            public void onTabUnselected(TabLayout.Tab tab) {
+            }
+
+            @Override
+            public void onTabReselected(TabLayout.Tab tab) {
+            }
+        });
+    }
+
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onMessageEvent(DownloadFinishedEvent event) {
+        if (receiver != null) {
+            receiver.setEnqueue(event.queueId);
+        }
+    }
+
+    public static class DownloadFinishedEvent {
+        public long queueId;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/activity/LogActivity.java b/qpython/src/main/java/org/qpython/qpy/main/activity/LogActivity.java
new file mode 100644
index 00000000..b2a67421
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/activity/LogActivity.java
@@ -0,0 +1,80 @@
+package org.qpython.qpy.main.activity;
+
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.view.Menu;
+import android.view.MenuItem;
+
+import com.quseit.util.FileHelper;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.AboutBinding;
+import org.qpython.qpysdk.utils.DateTimeHelper;
+
+/**
+ * LogUtil Activity
+ * Created by Hmei on 2017-06-22.
+ */
+
+public class LogActivity extends BaseActivity {
+
+    public static final String LOG_TITLE = "title";
+    public static final String LOG_PATH = "path";
+
+    AboutBinding binding;
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.about);
+        setSupportActionBar(binding.lt.toolbar);
+        setTitle(R.string.log_title);
+        binding.lt.toolbar.setNavigationIcon(R.drawable.ic_back);
+        binding.lt.toolbar.setNavigationOnClickListener(view -> finish());
+
+        binding.title.setText(getIntent().getStringExtra(LOG_TITLE));
+        binding.path.setText(getIntent().getStringExtra(LOG_PATH));
+        //binding.time.setText(getString(R.string.date_format, DateTimeHelper.getDate()));
+        String content = FileHelper.getFileContents(getIntent().getStringExtra(LOG_PATH));
+        binding.content.setText(content);
+
+//        binding.ibMail.setOnClickListener(v -> {
+//
+//        });
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.log_menu, menu);
+
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.menu_more:
+                binding.path.setText(getIntent().getStringExtra(LOG_PATH));
+                String content = FileHelper.getFileContents(getIntent().getStringExtra(LOG_PATH));
+                onFeedback(content);
+//                Intent intent = new Intent(Intent.ACTION_SENDTO, Uri.parse("mailto:" + getString(R.string.ui_feedback_mail)));
+//                String body = MessageFormat.format(getString(com.quseit.android.R.string.feedback_email_body), Build.PRODUCT,
+//                        Build.VERSION.RELEASE, Build.VERSION.SDK_INT, binding.content.getContext());
+//                String subject = getString(R.string.feedback_email_subject);
+//                intent.putExtra(Intent.EXTRA_SUBJECT, subject);
+//                intent.putExtra(Intent.EXTRA_TEXT, body);
+//                try {
+//                    startActivity(Intent.createChooser(intent,
+//                            getString(R.string.email_transcript_chooser_title)));
+//                } catch (ActivityNotFoundException e) {
+//                    Toast.makeText(this,
+//                            R.string.email_transcript_no_email_activity_found,
+//                            Toast.LENGTH_LONG)
+//                            .show();
+//                }
+
+        }
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/qpython/src/main/java/org/qpython/qpy/main/activity/MyGistActivity.java b/qpython/src/main/java/org/qpython/qpy/main/activity/MyGistActivity.java
new file mode 100644
index 00000000..35ac71a2
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/activity/MyGistActivity.java
@@ -0,0 +1,65 @@
+package org.qpython.qpy.main.activity;
+
+import android.content.Context;
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.view.View;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ActivityMyShareBinding;
+import org.qpython.qpy.main.adapter.MyShareFragmentAdapter;
+
+/**
+ * 文 件 名: MyGistActivity
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2017/12/26 14:32
+ * 邮   箱: qq798435167@gmail.com
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class MyGistActivity extends BaseActivity {
+    private ActivityMyShareBinding binding;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_my_share);
+        initToolbar();
+        initView();
+    }
+
+    private void initToolbar() {
+        setSupportActionBar(binding.lt.toolbar);
+        setTitle(R.string.my_share);
+        binding.lt.toolbar.setNavigationIcon(R.drawable.ic_back);
+        binding.lt.toolbar.setNavigationOnClickListener(v -> finish());
+    }
+
+    private void initView() {
+        MyShareFragmentAdapter mMyShareFragmentAdapter = new MyShareFragmentAdapter(getSupportFragmentManager());
+        binding.vp.setAdapter(mMyShareFragmentAdapter);
+        binding.tabs.setupWithViewPager(binding.vp);
+    }
+
+    public static void startMyShare(Context context) {
+        Intent intent = new Intent(context, MyGistActivity.class);
+        context.startActivity(intent);
+    }
+
+
+    public void showProgress(boolean show) {
+        if (show) {
+            binding.progressBar.setVisibility(View.VISIBLE);
+        } else {
+            binding.progressBar.setVisibility(View.GONE);
+        }
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/activity/NotebookActivity.java b/qpython/src/main/java/org/qpython/qpy/main/activity/NotebookActivity.java
new file mode 100644
index 00000000..38dbfe29
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/activity/NotebookActivity.java
@@ -0,0 +1,540 @@
+package org.qpython.qpy.main.activity;
+
+import android.annotation.SuppressLint;
+import android.app.AlertDialog;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
+import android.content.res.Configuration;
+import android.databinding.DataBindingUtil;
+import android.graphics.Bitmap;
+import android.net.Uri;
+import android.os.AsyncTask;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.annotation.RequiresApi;
+import android.text.Html;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.webkit.WebChromeClient;
+import android.webkit.WebResourceError;
+import android.webkit.WebResourceRequest;
+import android.webkit.WebSettings;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+import android.widget.Toast;
+
+import com.quseit.util.Log;
+import com.quseit.util.NAction;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ActivityNotebookBinding;
+import org.qpython.qpy.main.event.Bean;
+import org.qpython.qpy.main.widget.LoadingDialog;
+import org.qpython.qpy.texteditor.ui.view.EnterDialog;
+import org.qpython.qpy.utils.NoteBookAction;
+import org.qpython.qpy.utils.NotebookUtil;
+import org.qpython.qpy.main.utils.Utils;
+
+import java.io.File;
+
+/**
+ * 文 件 名: NotebookActivity
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/2/5 11:12
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class NotebookActivity extends BaseActivity implements View.OnClickListener {
+
+    private ActivityNotebookBinding mBinding;
+    private String lastNotebook;
+    private static final String TOKEN = "?token=qpythonotebook";
+    private SharedPreferences mSharedPreferences;
+    private static final String FILE_PATH = "FILEPATH";
+    public static final int REQUEST_SETTTING_CODE = 0X998;
+
+    private Bean mBean;
+    //关闭页面标识
+    private boolean needClose = true;
+
+    public static void start(Context context, String filePath, final boolean isNew) {
+        Log.d("NotebookActivity", "start:"+filePath);
+        Intent intent = new Intent(context, NotebookActivity.class);
+        if (isNew) {
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        }
+        intent.putExtra(FILE_PATH, filePath);
+        context.startActivity(intent);
+    }
+
+    public static void startFromUrl(Context context, String url, final boolean isNew) {
+        Log.d("NotebookActivity", "startFromUrl:"+url);
+        LoadingDialog loadingDialog = new LoadingDialog(context);
+        loadingDialog.show();
+        NotebookUtil.downloadFile(url, new NotebookUtil.DownloadCallback() {
+            @Override
+            public void onSuccess(String filePath) {
+                start(context, filePath, isNew);
+                loadingDialog.dismiss();
+            }
+
+            @Override
+            public void onFail(String msg) {
+                Toast.makeText(context, msg, Toast.LENGTH_SHORT).show();
+                loadingDialog.dismiss();
+            }
+        });
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR1)
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mBinding = DataBindingUtil.setContentView(this, R.layout.activity_notebook);
+        mSharedPreferences = getSharedPreferences("data", MODE_PRIVATE);
+
+        initToolbar();
+        if (NotebookUtil.isNotebookLibInstall(this)) {
+            initNotebookRes();
+            initWebView();
+            initListener();
+        } else {
+            enableNotebookFromSetting();
+        }
+
+        IntentFilter filter = new IntentFilter(".QWebViewActivity");
+        registerReceiver(webviewActivityReceiver, filter);
+
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR1)
+    public void enableNotebookFromSetting() {
+        new AlertDialog.Builder(this)
+                .setTitle(R.string.dialog_alert)
+                .setMessage(R.string.ennable_notebook_first)
+                .setPositiveButton(R.string.ok, (dialog, which) -> {
+                    dialog.dismiss();
+                    startActivityForResult(new Intent(this,SettingActivity.class),REQUEST_SETTTING_CODE);
+                    needClose = false;
+                })
+                .setNegativeButton(R.string.cancel, (dialog, which) -> {
+                    dialog.dismiss();
+                    needClose = true;
+                })
+                .setOnDismissListener(dialog -> {
+                    if (needClose){
+                        finish();
+                    }
+                })
+                .show();
+    }
+    /**
+     * enable notebook 后加载资源
+     * */
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == REQUEST_SETTTING_CODE && resultCode == RESULT_OK){
+            initNotebookRes();
+            NotebookUtil.startNotebookService2(this);
+            initWebView();
+            initListener();
+        }else {
+            finish();
+        }
+    }
+
+    /**
+     * 在该页面内的notebook文件选择
+     * */
+    @Override
+    protected void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        String filePath = intent.getStringExtra(FILE_PATH);
+        Log.d("NotebookActivity", "filePath:"+filePath);
+        if (filePath != null) {
+            lastNotebook = filePath;
+            loadNotebook("");
+        }
+    }
+
+    private String getFileName(String filePath) {
+        if (!filePath.contains("/")) {
+            return "";
+        }
+        String name = filePath.substring(filePath.lastIndexOf("/") + 1);
+
+        return name;
+    }
+
+    private String getRequestPath(String filePath) {
+        if (filePath==null || !filePath.contains(NotebookUtil.NOTEBOOK_DIR)) {
+            return "";
+        }
+        String path = filePath.substring(NotebookUtil.NOTEBOOK_DIR.length())+"";
+        return path;
+    }
+
+    private void initListener() {
+
+        mBinding.switchTerminalImg.setOnClickListener(this);
+        mBinding.stepinImg.setOnClickListener(this);
+        mBinding.saveImg.setOnClickListener(this);
+        mBinding.markdownAddImg.setOnClickListener(this);
+        mBinding.codeAddImg.setOnClickListener(this);
+        mBinding.playallImg.setOnClickListener(this);
+        mBinding.undoImg.setOnClickListener(this);
+        mBinding.refreshImg.setOnClickListener(this);
+        mBinding.deleteCellImg.setOnClickListener(this);
+        mBinding.cellUpImg.setOnClickListener(this);
+        mBinding.cellDownImg.setOnClickListener(this);
+        mBinding.switchCodeImg.setOnClickListener(this);
+        mBinding.switchMarkdownImg.setOnClickListener(this);
+
+    }
+
+    private void initNotebookRes() {
+        String filePath = getIntent().getStringExtra(FILE_PATH);
+        Log.d("NotebookActivity", "initNotebookRes:"+filePath);
+        //判断是否从文件列表打开
+        if (filePath == null) {
+            //打开最近一次编辑保存的文件
+            lastNotebook = mSharedPreferences.getString("last_notebook", null);
+            if (lastNotebook == null) {
+                String fileName = "Welcome.ipynb";
+                File file = new File(NotebookUtil.NOTEBOOK_DIR + "notebooks", fileName);
+                if (file.exists()) {
+                    lastNotebook = file.getAbsolutePath();
+                } else {
+                    lastNotebook = NotebookUtil.createNotebook(this, NotebookUtil.Untitled);
+                }
+            } else  {
+                Log.d(TAG, "lastNotebook:"+lastNotebook);
+            }
+        } else {
+            if (filePath.contains(NotebookUtil.NOTEBOOK_DIR)) {
+                lastNotebook = filePath;
+            } else {
+
+                Toast.makeText(this, "inalid file", Toast.LENGTH_SHORT).show();
+                return;
+            }
+        }
+        if (lastNotebook!=null) {
+            mBinding.toolbar.setTitle(getFileName(lastNotebook));
+        }
+//        if (checkNotebook()) {
+//            createServer();
+//        }
+    }
+
+    /**
+     * 开启notebook服务
+     */
+    private void createServer() {
+        //如果服务未开启则开启服务
+        AsyncTask.execute(() -> {
+            if (!Utils.httpPing(NotebookUtil.NB_SERVER, 3000)) {
+                runOnUiThread(() -> NotebookUtil.startNotebookService(getApplication()));
+            }
+        });
+
+    }
+
+    public static final  String URL          = "url";
+    public static final  String ACT          = "act";
+    protected static final String TAG        = "NotebookActivity";
+
+    protected final BroadcastReceiver webviewActivityReceiver = new BroadcastReceiver() {
+        @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR1)
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String act = intent.getExtras().getString(ACT);
+            String url = intent.getExtras().getString(URL);
+            android.util.Log.d(TAG, "BroadcastReceiver:" + act);
+            switch (act != null ? act : "") {
+                case "onnext": {
+                    enableNotebookFromSetting();
+
+                }
+            }
+        }
+    };
+
+    @SuppressLint("ClickableViewAccessibility")
+    private void initWebView() {
+        mBinding.WebViewProgress.setMax(100);
+        //设置js调用的javabean
+        mBean = new Bean(this, mBinding.webView);
+        mBean.setSrv(NotebookUtil.NOTEBOOK_SERVER + getRequestPath(lastNotebook) + TOKEN);
+        mBinding.webView.addJavascriptInterface(mBean, "milib");
+
+        mBinding.webView.getSettings().setSupportMultipleWindows(false);
+        mBinding.webView.getSettings().setCacheMode(WebSettings.LOAD_CACHE_ELSE_NETWORK);
+        //设置WebView属性，能够执行Javascript脚本
+        mBinding.webView.getSettings().setJavaScriptEnabled(true);
+        //设置可以访问文件
+        mBinding.webView.getSettings().setAllowFileAccess(true);
+        mBinding.webView.setWebViewClient(new WebViewClient() {
+
+            @SuppressWarnings("deprecation")
+            @Override
+            public boolean shouldOverrideUrlLoading(WebView view, String request) {
+                Log.d("WEBVIEW", "url:" + request);
+                view.loadUrl(request);
+//                if (request.endsWith(NotebookUtil.ext)) {
+//                    view.clearHistory();
+//                }
+                return true;
+            }
+
+            @Override
+            public void onPageStarted(WebView view, String url, Bitmap favicon) {
+                super.onPageStarted(view, url, favicon);
+            }
+
+            @Override
+            public void onPageFinished(WebView view, String url) {
+                super.onPageFinished(view, url);
+            }
+
+            @Override
+            public void onReceivedError(WebView view, WebResourceRequest request, WebResourceError error) {
+                super.onReceivedError(view, request, error);
+                Log.d("webview", error.toString());
+            }
+        });
+
+        mBinding.webView.setWebChromeClient(new WebChromeClient() {
+            @Override
+            public void onProgressChanged(WebView view, int newProgress) {
+                super.onProgressChanged(view, newProgress);
+                mBinding.WebViewProgress.setProgress(mBinding.webView.getProgress());
+            }
+        });
+
+        //设置默认的加载页面来处理url跳转
+        mBinding.webView.loadUrl("file:///android_asset/html/index.html");
+    }
+
+    private void initToolbar() {
+        setSupportActionBar(mBinding.toolbar);
+        getSupportActionBar().setDisplayShowTitleEnabled(false);
+        mBinding.toolbar.setNavigationIcon(R.drawable.ic_back);
+        mBinding.toolbar.setNavigationOnClickListener(v -> closeActivity());
+    }
+
+    private void closeActivity() {
+        doAction(NoteBookAction.SAVE_NOTEBOOK);
+        finish();
+    }
+
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.switch_terminal_img:
+                NotebookListActivity.start(NotebookActivity.this);
+                break;
+            case R.id.stepin_img:
+                //运行并选择下一个cell
+                doAction(NoteBookAction.PLAY_CURRENT_CELL);
+                break;
+            case R.id.markdown_add_img:
+                //添加一个markdown
+                doAction(NoteBookAction.ADD_CELL_BELOW, NoteBookAction.SWITCH_MARKDOWN_TYPE);
+                break;
+            case R.id.code_add_img:
+                //添加一个code
+                doAction(NoteBookAction.ADD_CELL_BELOW);
+                break;
+            case R.id.playall_img:
+                //运行全部
+                doAction(NoteBookAction.PLAY_ALL_CELL);
+                break;
+            case R.id.undo_img:
+                //撤销修改
+                doAction(NoteBookAction.CELL_UNDO);
+                break;
+            case R.id.save_img:
+                //保存
+                saveFile();
+                break;
+            case R.id.delete_cell_img:
+                //删除cell
+                doAction(NoteBookAction.DELETE_CELL);
+                break;
+            case R.id.refresh_img:
+                //清空输出，重新加载
+                doAction(NoteBookAction.CLEAR_ALL_OUTPUT);
+                break;
+            case R.id.cell_down_img:
+                //移动到下一个cell
+                doAction(NoteBookAction.MOVE_CELL_DOWN);
+                break;
+            case R.id.cell_up_img:
+                //移动到上一个cell
+                doAction(NoteBookAction.MOVE_CELL_UP);
+                break;
+            case R.id.switch_code_img:
+                //移动到上一个cell
+                doAction(NoteBookAction.SWITCH_CODE_TYPE);
+                break;
+            case R.id.switch_markdown_img:
+                //移动到上一个cell
+                doAction(NoteBookAction.SWITCH_MARKDOWN_TYPE);
+                break;
+        }
+    }
+
+    private void srvManange() {
+        new AlertDialog.Builder(this, R.style.MyDialog)
+            .setTitle(R.string.notebook_service)
+            .setMessage(R.string.notebook_service_restart)
+
+            .setNegativeButton(R.string.notebook_restart, (dialog1, which) -> {
+                dialog1.dismiss();
+                NotebookUtil.killNBSrv(this);
+                NotebookUtil.startNotebookService2(this);
+                initWebView();
+            })
+            .setPositiveButton(R.string.notebook_reload, (dialog1, which) -> {
+                mBinding.webView.reload();
+
+            })
+            .create()
+            .show();
+    }
+
+    private void saveFile() {
+        if (lastNotebook.endsWith(NotebookUtil.Untitled + NotebookUtil.ext)) {
+            new EnterDialog(this)
+                .setTitle(getString(R.string.save))
+                .setHint(getString(R.string.file_name))
+                .setConfirmListener(new EnterDialog.ClickListener() {
+                    @Override
+                    public boolean OnClickListener(String name) {
+                        doAction(NoteBookAction.SAVE_NOTEBOOK);
+                        File file = new File(lastNotebook);
+                        File newFile = new File(NotebookUtil.NOTEBOOK_DIR + "notebooks/", name + NotebookUtil.ext);
+                        file.renameTo(newFile);
+                        lastNotebook = newFile.getAbsolutePath();
+                        mBinding.toolbar.setTitle(getFileName(lastNotebook));
+                        //toast("save file successful!");
+                        return true;
+                    }
+                }).show();
+        } else {
+            doAction(NoteBookAction.SAVE_NOTEBOOK);
+        }
+    }
+
+    public void toast(String msg) {
+        Toast.makeText(this, msg, Toast.LENGTH_SHORT).show();
+    }
+
+    public static final String JS_SUFFIX = "javascript:";
+
+    private void doAction(String... actions) {
+        for (String action : actions) {
+            mBinding.webView.loadUrl(JS_SUFFIX + action);
+        }
+    }
+
+    /**
+     * jupyter未安装则跳转应用市场安装
+     */
+    private void linkToStore() {
+        Intent intent = new Intent(Intent.ACTION_VIEW);
+        intent.setData(Uri.parse("http://nb.qpython.org/install.html"));
+        startActivity(intent);
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.notebook_menu, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.menu_open:
+                //打开文件
+                NotebookListActivity.start(NotebookActivity.this);
+                break;
+
+            case R.id.menu_add:
+                //新增一个文件
+                createNewFile();
+                break;
+            case R.id.menu_new_more:
+                srvManange();
+                break;
+        }
+        return true;
+    }
+
+    /**
+     * 创建一个新的notebook文件
+     */
+    private void createNewFile() {
+        new EnterDialog(this)
+            .setTitle(getString(R.string.new_file))
+            .setHint(getString(R.string.file_name))
+            .setConfirmListener(name -> {
+                lastNotebook = NotebookUtil.createNotebook(NotebookActivity.this, name);
+                loadNotebook("?kernel_name=python"+ NAction.getPyVer(this));
+                return true;
+            }).show();
+    }
+
+    /**
+     * 加载文档
+     */
+    private void loadNotebook(String kernel) {
+        mBinding.toolbar.setTitle(getFileName(lastNotebook));
+        String url = NotebookUtil.NOTEBOOK_SERVER + getRequestPath(lastNotebook)+kernel;
+        Log.d("NotebookActivity", "loadNotebook:"+url);
+        mBinding.webView.loadUrl(url);
+    }
+
+    /**
+     * 退出时清除webview相关资源
+     */
+    @Override
+    protected void onDestroy() {
+        if (mBinding.webView != null) {
+            doAction(NoteBookAction.SHUTDOWN_KERNEL);
+            mBinding.webView.clearHistory();
+            //移除webview并注销
+            ((ViewGroup) mBinding.webView.getParent()).removeView(mBinding.webView);
+            mBinding.webView.destroy();
+        }
+        mSharedPreferences.edit().putString("last_notebook", lastNotebook).apply();
+        unregisterReceiver(webviewActivityReceiver);
+
+        super.onDestroy();
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+    }
+
+    /**
+     * 返回键控制webview回退
+     * 注：由于只会有一个编辑页，所以并不需要回退
+     */
+    @Override
+    public void onBackPressed() {
+        closeActivity();
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/activity/NotebookListActivity.java b/qpython/src/main/java/org/qpython/qpy/main/activity/NotebookListActivity.java
new file mode 100644
index 00000000..7e7bb75f
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/activity/NotebookListActivity.java
@@ -0,0 +1,98 @@
+package org.qpython.qpy.main.activity;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Configuration;
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.os.Environment;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.LinearLayoutManager;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ActivityNotebooklistBinding;
+import org.qpython.qpy.main.adapter.NotebookAdapter;
+import org.qpython.qpysdk.QPyConstants;
+
+import java.io.File;
+
+/**
+ * 文 件 名: NotebookListActivity
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/2/8 15:38
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class NotebookListActivity extends BaseActivity {
+
+    private ActivityNotebooklistBinding mBinding;
+    private NotebookAdapter mNotebookAdapter;
+    private File mRootFile;
+    private static final String sdcard = Environment.getExternalStorageDirectory().getAbsolutePath();
+
+    public static void start(Context context){
+        Intent intent = new Intent(context,NotebookListActivity.class);
+        context.startActivity(intent);
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mBinding = DataBindingUtil.setContentView(this, R.layout.activity_notebooklist);
+        initRootDir();
+        initToolbar();
+        initRV();
+        setParentPath(mRootFile.getAbsolutePath());
+    }
+
+    private void initRootDir() {
+        mRootFile = new File(QPyConstants.ABSOLUTE_PATH+"/notebooks");
+        if (!mRootFile.exists()) {
+            mRootFile.mkdirs();
+        }
+    }
+
+    private void initRV() {
+        mBinding.rvFiles.setLayoutManager(new LinearLayoutManager(this));
+        mNotebookAdapter = new NotebookAdapter(this, mRootFile);
+        mNotebookAdapter.setOnItemClickCallback((filePath,isDir) -> {
+            if (isDir){
+                setParentPath(filePath);
+            }else {
+                NotebookActivity.start(this, filePath, false);
+                finish();
+            }
+        });
+        mBinding.rvFiles.setAdapter(mNotebookAdapter);
+    }
+
+    private void initToolbar() {
+        setSupportActionBar(mBinding.toolbar);
+        getSupportActionBar().setDisplayShowTitleEnabled(false);
+        mBinding.toolbar.setNavigationIcon(R.drawable.ic_back);
+        mBinding.toolbar.setNavigationOnClickListener(v -> finish());
+        mBinding.toolbar.setTitle("Notebooks");
+    }
+
+    private void setParentPath(String path){
+        if (path.contains(sdcard)){
+            String p = path.substring(sdcard.length());
+            mBinding.tvPath.setText(p);
+        }
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+    }
+
+    @Override
+    public void onBackPressed() {
+        if (mNotebookAdapter.getFile().getAbsoluteFile().equals(mRootFile.getAbsoluteFile())) {
+            finish();
+        } else {
+            mNotebookAdapter.setFile(mNotebookAdapter.getFile().getParentFile());
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/activity/QWebViewActivity.java b/qpython/src/main/java/org/qpython/qpy/main/activity/QWebViewActivity.java
new file mode 100644
index 00000000..e901c85f
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/activity/QWebViewActivity.java
@@ -0,0 +1,506 @@
+package org.qpython.qpy.main.activity;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.DownloadManager;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.databinding.DataBindingUtil;
+import android.graphics.Bitmap;
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.webkit.JavascriptInterface;
+import android.webkit.ValueCallback;
+import android.webkit.WebBackForwardList;
+import android.webkit.WebChromeClient;
+import android.webkit.WebSettings;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+import android.widget.Toast;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+
+import com.loopj.android.http.AsyncHttpResponseHandler;
+import com.quseit.base.QBaseApp;
+import com.quseit.util.NAction;
+import com.quseit.util.NUtil;
+
+import org.apache.http.Header;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+import org.qpython.qpy.R;
+import org.qpython.qpy.console.ScriptExec;
+import org.qpython.qpy.databinding.ActivityQwebviewBinding;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.event.Bean;
+import org.qpython.qpy.main.receiver.DownloadNotebookReceiver;
+import org.qpython.qpy.main.utils.Utils;
+import org.qpython.qpy.utils.NotebookUtil;
+import org.qpython.qpysdk.QPyConstants;
+import org.qpython.qpysdk.utils.FileHelper;
+
+import java.io.File;
+
+
+/**
+ * inner web view
+ * Created by yhc on 16/9/30.
+ */
+
+public class QWebViewActivity extends BaseActivity {
+    protected static final String TAG                    = "QWebViewActivity";
+    protected final static int    FILECHOOSER_RESULTCODE = 1;
+    private static final   int    PURCHASE_REQUEST_CODE  = 233;
+
+    public static final String IS_NO_HEADER = "is_no_header";
+    public static final String IS_DRAWER    = "is_drawer";
+
+    private static final String TYPE         = "type";
+    public static final  String HTML         = "html";
+    public static final  String TITLE        = "title";
+    public static final  String URL          = "url";
+    public static final  String SRC          = "src";
+    public static final  String ACT          = "act";
+    public static final  String LOG_PATH     = "LOG_PATH";
+    protected            String wvCookie     = "";
+    protected            String wvDocument   = "";
+    private              String launchScript = "";
+    private DownloadNotebookReceiver receiver;
+
+    protected ValueCallback<Uri> mUploadMessage;
+
+    protected final BroadcastReceiver webviewActivityReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String act = intent.getExtras().getString(ACT);
+            String url = intent.getExtras().getString(URL);
+            Log.d(TAG, "BroadcastReceiver:"+act);
+
+            switch (act != null ? act : "") {
+                case "pipconsole": {
+                    String[] args = {getApplicationContext().getFilesDir() + "/bin/pip_console.py", getApplicationContext().getFilesDir().toString()};
+                    ScriptExec.getInstance().execPyInConsole((Activity) context, args);
+
+                    break;
+                }
+                case "pipinstall": {
+                    String src = intent.getExtras().getString(QWebViewActivity.SRC);
+                    String[] args = {getApplicationContext().getFilesDir() + "/bin/pip"+ (NAction.isQPy3(getApplicationContext())?"3":""), "install", url, "-i", src, getApplicationContext().getFilesDir().toString()};
+                    ScriptExec.getInstance().execPyInConsole((Activity) context, args);
+                    break;
+                }
+                case "close":
+                    finish();
+                    break;
+                case "launchsrv":
+                    String script = getIntent().getStringExtra(LOG_PATH);
+                    if (script != null && !script.equals("")) {
+                        launchScript = script;
+                    }
+                    break;
+                case "opennotebook":
+                    String notebookurl = getIntent().getStringExtra(URL);
+                    String downloadDir = "qpython/notebooks";
+                    Log.d(TAG, "opennotebook:"+notebookurl);
+
+                    App.getService().downloadFile(getApplicationContext(), notebookurl, NUtil.getFileFromUrl(notebookurl), "", downloadDir);
+                    break;
+                case "onnext":
+                    break;
+                case "loadhtml":
+                    String data = getIntent().getStringExtra(HTML);
+                    binding.wv.loadDataWithBaseURL("file:///android_asset/", data, "text/html", "UTF-8", null);
+                    break;
+
+            }
+        }
+    };
+    private ActivityQwebviewBinding binding;
+
+    public static void start(Context context, String title, String url) {
+        Intent starter = new Intent(context, QWebViewActivity.class);
+        if (context == App.getContext()) {
+            starter.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        }
+        starter.putExtra(QWebViewActivity.TITLE, title);
+        starter.putExtra(QWebViewActivity.URL, url);
+        context.startActivity(starter);
+    }
+
+    public static void start(Context context, String act, String title, String url, String logPath) {
+        Intent starter = new Intent(context, QWebViewActivity.class);
+        if (context == App.getContext()) {
+            starter.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        }
+        starter.putExtra(QWebViewActivity.ACT, act);
+        starter.putExtra(QWebViewActivity.TITLE, title);
+        starter.putExtra(QWebViewActivity.SRC, url);
+        starter.putExtra(QWebViewActivity.LOG_PATH, logPath);
+        context.startActivity(starter);
+    }
+
+    public static void loadHtml(Context context, String html, String title) {
+        Intent starter = new Intent(context, QWebViewActivity.class);
+        starter.putExtra(TYPE, HTML);
+        starter.putExtra(HTML, html);
+        starter.putExtra(TITLE, title);
+        context.startActivity(starter);
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_qwebview);
+        receiver = new DownloadNotebookReceiver();
+
+        Intent i = getIntent();
+        String title = i.getStringExtra(TITLE);
+        String type = i.getStringExtra(TYPE);
+        if (launchScript == null || launchScript.isEmpty())
+            launchScript = i.getStringExtra(LOG_PATH);
+
+        setSupportActionBar(binding.lt.toolbar);
+        binding.lt.toolbar.setNavigationIcon(R.drawable.ic_back);
+        binding.lt.toolbar.setNavigationOnClickListener(view -> QWebViewActivity.this.finish());
+
+        if (title != null) {
+            setTitle(title);
+        } else {
+            setTitle(R.string.app_name);
+        }
+
+        switch (type == null ? "" : type) {
+            case HTML:
+                binding.wv.loadData(i.getStringExtra(HTML), "text/html", null);
+                break;
+            default:
+                initWebView();
+                accessUrl();
+                break;
+        }
+
+        IntentFilter filter = new IntentFilter();
+        registerReceiver(webviewActivityReceiver, filter);
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+//        registerReceiver(receiver, new IntentFilter(
+//                DownloadManager.ACTION_DOWNLOAD_COMPLETE));
+    }
+
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.refresh_menu, menu);
+        if (launchScript != null && !launchScript.isEmpty()) {
+            MenuItem logItem = menu.findItem(R.id.log_menu);
+            logItem.setVisible(true);
+        }
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.refresh_menu:
+                binding.WebViewProgress.setVisibility(View.VISIBLE);
+                binding.wv.loadUrl("javascript:window.location.reload( true )");
+                break;
+            case R.id.log_menu:
+                String title = FileHelper.getFileName(launchScript);
+                Intent resultIntent = new Intent(this, LogActivity.class);
+                if (launchScript.contains("/scripts")) {
+                    String proj = new File(launchScript).getName();
+
+                    resultIntent.putExtra(LogActivity.LOG_PATH, QPyConstants.ABSOLUTE_LOG);
+                    resultIntent.putExtra(LogActivity.LOG_TITLE, proj);
+                } else {
+                    String proj = new File(launchScript).getParentFile().getName();
+                    resultIntent.putExtra(LogActivity.LOG_PATH, QPyConstants.ABSOLUTE_LOG);
+                    resultIntent.putExtra(LogActivity.LOG_TITLE, proj);
+                }
+
+                startActivity(resultIntent);
+                break;
+        }
+        return true;
+    }
+
+    public void onDestroy() {
+        super.onDestroy();
+        unregisterReceiver(webviewActivityReceiver);
+        if (launchScript != null && !launchScript.equals("")) {
+            endWebSrv(launchScript);
+        }
+    }
+
+    protected void endWebSrv(String script) {
+        QBaseApp.getInstance().getAsyncHttpClient().get(Utils.getSrv(script) + "/__exit", new AsyncHttpResponseHandler() {
+
+            @Override
+            public void onSuccess(int i, Header[] headers, byte[] bytes) {
+
+            }
+
+            @Override
+            public void onFailure(int i, Header[] headers, byte[] bytes, Throwable throwable) {
+
+            }
+
+        });
+    }
+
+    public void accessUrl() {
+        if (Utils.netOk(getApplicationContext())) {
+            String url;
+            Intent i = getIntent();
+            if (i.getData() != null) {
+                url = i.getDataString();
+                Log.d(TAG, "accessUrl:"+url);
+
+            } else {
+                url = i.getStringExtra(URL) == null ?
+                        i.getStringExtra(Intent.EXTRA_TEXT) == null ?
+                                "file:///android_asset/html/index.html"
+                                : i.getStringExtra(Intent.EXTRA_TEXT)
+                        : i.getStringExtra(URL);
+            }
+
+            loadurl(binding.wv, url);
+
+        } else {
+            String url = "file:///android_asset/html/index.html";
+
+            Intent i = getIntent();
+            if (i.getData() != null) {
+                url = i.getDataString();
+                Log.d(TAG, "accessUrl:"+url);
+
+            }
+
+            loadurl(binding.wv, url);
+        }
+    }
+
+    private void writeWebLog(String data) {
+        FileHelper.writeToFile(QPyConstants.ABSOLUTE_LOG,data+"\n", true);
+    }
+
+    //
+    public void initWebView() {// 初始化
+        binding.WebViewProgress.setMax(100);
+
+        Bean bean = new Bean(this, binding.wv);
+        String act = getIntent().getStringExtra(ACT);
+
+        if (act != null && act.equals("main")) {
+            String url = getIntent().getStringExtra(QWebViewActivity.SRC);
+            bean.setSrv(url);
+
+            launchScript = getIntent().getStringExtra(LOG_PATH);
+//            String title = getIntent().getStringExtra(TITLE);
+//            String isNoHead = getIntent().getStringExtra(IS_NO_HEADER);
+//            String isDrawer = getIntent().getStringExtra(IS_DRAWER);
+        }
+
+        binding.wv.setInitialScale(1);
+        binding.wv.getSettings().setAllowFileAccess(true);
+        binding.wv.getSettings().setPluginState(WebSettings.PluginState.ON);
+        binding.wv.getSettings().setPluginState(WebSettings.PluginState.ON_DEMAND);
+        binding.wv.getSettings().setLoadWithOverviewMode(true);
+        binding.wv.getSettings().setUseWideViewPort(true);
+
+        binding.wv.getSettings().setJavaScriptEnabled(true);// 可用JS
+        binding.wv.addJavascriptInterface(bean, "milib");
+        binding.wv.setScrollBarStyle(View.SCROLLBARS_INSIDE_OVERLAY);// 滚动条风格，为0就是不给滚动条留空间，滚动条覆盖在网页上
+        binding.wv.getSettings().setRenderPriority(WebSettings.RenderPriority.HIGH);
+        binding.wv.getSettings().setBlockNetworkImage(false);
+        binding.wv.getSettings().setAllowFileAccess(true);
+        binding.wv.setWebViewClient(new WebViewClient() {
+            public boolean shouldOverrideUrlLoading(final WebView view, final String url) {
+                writeWebLog("[Console] Loading URL:" + url);
+                loadurl(view, url);// 载入网页
+                return true;
+            }
+
+            @Override
+            public void onReceivedError(WebView view, int errorCode, String description, String failingUrl) {
+                writeWebLog("[Console] Errorcode " + errorCode + " ("+failingUrl+")\n  Description:" + description);
+            }
+
+            @Override
+            public void onPageFinished(WebView view, String url) {
+                writeWebLog("[Console] Load PageFinished URL:" + url);
+
+                super.onPageFinished(view, url);
+            }
+
+            @Override
+            public void onPageStarted(WebView view, String url, Bitmap favicon) {
+                writeWebLog("[Console] Load PageFinished start:" + url);
+
+                binding.wv.requestFocus();
+            }
+        });
+
+        binding.wv.setWebChromeClient(new WebChromeClient() {
+
+            @Override
+            public void onProgressChanged(WebView view, int progress) {// 载入进度改变而触发
+                if (binding.WebViewProgress != null)
+                    binding.WebViewProgress.setProgress(binding.wv.getProgress());
+                super.onProgressChanged(view, progress);
+            }
+
+            @Override
+            public void onConsoleMessage(String message, int lineNumber, String sourceID) {
+                writeWebLog("[Console] Line "+lineNumber+ " ("+sourceID+")\n  Message:"+ message);
+            }
+
+            public void openFileChooser(ValueCallback<Uri> uploadMsg) {
+
+                mUploadMessage = uploadMsg;
+                Intent i = new Intent(Intent.ACTION_GET_CONTENT);
+                i.addCategory(Intent.CATEGORY_OPENABLE);
+                i.setType("*/*");
+                startActivityForResult(Intent.createChooser(i, "File Chooser"), FILECHOOSER_RESULTCODE);
+            }
+
+            // For Android 3.0+
+            public void openFileChooser(ValueCallback uploadMsg, String acceptType) {
+                mUploadMessage = uploadMsg;
+                Intent i = new Intent(Intent.ACTION_GET_CONTENT);
+                i.addCategory(Intent.CATEGORY_OPENABLE);
+                i.setType("*/*");
+                startActivityForResult(Intent.createChooser(i, "File Browser"), FILECHOOSER_RESULTCODE);
+            }
+
+            // For Android 4.1
+            public void openFileChooser(ValueCallback<Uri> uploadMsg, String acceptType, String capture) {
+                mUploadMessage = uploadMsg;
+                Intent i = new Intent(Intent.ACTION_GET_CONTENT);
+                i.addCategory(Intent.CATEGORY_OPENABLE);
+                i.setType("*/*");
+                startActivityForResult(Intent.createChooser(i, "File Chooser"), FILECHOOSER_RESULTCODE);
+            }
+        });
+
+        binding.wv.getSettings().setLoadWithOverviewMode(true);
+    }
+
+    @Override
+    public boolean onKeyDown(int keycode, KeyEvent event) {
+        if (keycode == KeyEvent.KEYCODE_BACK) {
+            if (binding.wv.canGoBack()) {
+                WebBackForwardList mWebBackForwardList = binding.wv.copyBackForwardList();
+                String historyUrl = mWebBackForwardList.getItemAtIndex(mWebBackForwardList.getCurrentIndex() - 1).getUrl();
+                if (historyUrl.startsWith("file:///android_asset/")) {
+                    finish();
+                    return true;
+                } else {
+                    binding.wv.goBack();
+                    return false;
+                }
+            } else {
+                finish();
+                return true;
+            }
+        } else {
+            return super.onKeyDown(keycode, event);
+        }
+    }
+
+    // if ext endswith .ipynb, you have option to open it with NotebookActivity
+    public void loadurl(final WebView view, final String url) {
+        URL u = null;
+        try {
+            u = new URL(url);
+            String path = u.getPath();
+            if (path!=null
+                    && NotebookUtil.isNotebookLibInstall(this)
+                    && path.endsWith((NotebookUtil.ext))) {
+
+
+                new AlertDialog.Builder(this, R.style.MyDialog)
+                        .setTitle(R.string.confirm)
+                        .setMessage(R.string.notebook_open)
+                        .setPositiveButton(R.string.ok, (dialog1, which) -> {
+                            dialog1.dismiss();
+
+                            this.finish();
+
+                            NotebookUtil.killNBSrv(this);
+                            NotebookUtil.startNotebookService2(this);
+                            NotebookActivity.startFromUrl(this, url, true);
+                        })
+                        .setNegativeButton(R.string.no, (dialog1,which)-> {
+                            dialog1.dismiss();
+                            view.loadUrl(url);// 载入网页
+
+                        })
+                        .create()
+                        .show();
+            } else {
+                view.loadUrl(url);// 载入网页
+
+            }
+        } catch (MalformedURLException e) {
+            e.printStackTrace();
+            view.loadUrl(url);// 载入网页
+
+        }
+
+    }
+
+    public void loadContent(final WebView view, final String content, final String historyUrl) {
+        new Thread() {
+            public void run() {
+                view.loadDataWithBaseURL("file:///android_asset/", content, "text/html", "UTF-8", historyUrl);
+            }
+        }.start();
+    }
+
+    public void onRefresh(View v) {
+        if (binding.wv != null) {
+            // openWaitWindow();
+            binding.wv.reload();
+        }
+    }
+
+    class QPyLib {
+        public QPyLib(Context context) {
+        }
+
+        @JavascriptInterface
+        public void processHTML(String cookie, String data) {
+            // LogUtil.d(TAG, "processHTML called(cookie):"+cookie);
+            // LogUtil.d(TAG, "processHTML called(data):"+data);
+            wvCookie = cookie;
+            wvDocument = data;
+
+        }
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onMessageEvent(CreateNotebookDownloadFinishEvent event) {
+        String notebook = event.fileName;
+        Toast.makeText(this, notebook+" is downloaded", Toast.LENGTH_SHORT).show();
+
+    }
+    public static class CreateNotebookDownloadFinishEvent {
+        public String fileName;
+    }
+
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/activity/QrCodeActivity.java b/qpython/src/main/java/org/qpython/qpy/main/activity/QrCodeActivity.java
new file mode 100644
index 00000000..7a3760f0
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/activity/QrCodeActivity.java
@@ -0,0 +1,120 @@
+package org.qpython.qpy.main.activity;
+
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.app.AppCompatActivity;
+import android.widget.Toast;
+import android.support.v7.widget.Toolbar;
+
+import com.google.zxing.Result;
+import com.loopj.android.http.AsyncHttpResponseHandler;
+import com.quseit.base.QBaseApp;
+import com.quseit.util.NUtil;
+
+import org.apache.http.Header;
+import org.qpython.qpy.R;
+import org.qpython.qpy.console.ScriptExec;
+import org.qpython.qpy.texteditor.EditorActivity;
+
+import java.util.List;
+import java.util.Map;
+
+import me.dm7.barcodescanner.zxing.ZXingScannerView;
+
+public class QrCodeActivity extends AppCompatActivity implements ZXingScannerView.ResultHandler {
+    private ZXingScannerView mScannerView;
+
+    public static void start(Context context) {
+        Intent starter = new Intent(context, QrCodeActivity.class);
+        context.startActivity(starter);
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_qrcode);
+        setTitle(R.string.read_script_from_qrcode);
+        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+        toolbar.setNavigationIcon(R.drawable.ic_back);
+        toolbar.setNavigationOnClickListener(v -> finish());
+        mScannerView = (ZXingScannerView) findViewById(R.id.scanner);
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        mScannerView.setResultHandler(this);
+        mScannerView.startCamera();
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        mScannerView.stopCamera();
+    }
+
+    private void close() {
+        this.finish();
+    }
+    private void linkToScanURL(String scanResult) {
+        QrCodeActivity.this.close();
+
+        QWebViewActivity.start(this, "QWebView", scanResult);
+
+    }
+    @Override
+    public void handleResult(Result result) {
+        String scanResult = result.getText();
+        if (scanResult.startsWith("http://") || scanResult.startsWith("https://")) {
+            // Handle url
+            new AlertDialog.Builder(this)
+                    .setTitle(R.string.qr_info)
+                    .setMessage(getString(R.string.qr_goto)+"\n\n"+scanResult)
+                    .setNegativeButton(R.string.cancel, (dialog1, which) -> dialog1.dismiss())
+                    .setPositiveButton(R.string.ok, (dialog1, which) -> linkToScanURL(scanResult))
+                    .create()
+                    .show();
+
+        } else if (scanResult.startsWith("qwe://")) {
+            // start the qpy.io editor
+            if (scanResult.contains("token=")) {
+                String qweLink = scanResult.replace("qwe://", "http://") + "&ip=" + NUtil.getIPAddress(true) + ":10000";
+                Map<String, List<String>> ps = NUtil.getQueryParams(qweLink);
+                String token = "";
+                if (ps.get("token") != null) {
+                    token = ps.get("token").get(0);
+                }
+                ScriptExec.getInstance().playScript(this,getApplicationContext().getFilesDir() + "/bin/qedit4web.py", token, false);
+                QBaseApp.getInstance().getAsyncHttpClient().get(this, qweLink, null, new AsyncHttpResponseHandler() {
+
+                    @Override
+                    public void onSuccess(int i, Header[] headers, byte[] bytes) {
+                        Toast.makeText(getApplicationContext(), "QWE Service started", Toast.LENGTH_SHORT).show();
+
+                    }
+
+                    @Override
+                    public void onFailure(int i, Header[] headers, byte[] bytes, Throwable throwable) {
+                        Toast.makeText(getApplicationContext(), "QWE Service failed to start", Toast.LENGTH_SHORT).show();
+
+                    }
+
+                });
+            } else {
+                Toast.makeText(getApplicationContext(), "Failed to parse token", Toast.LENGTH_SHORT).show();
+            }
+            finish();
+
+        } else {
+            EditorActivity.start(this, result.getText(), "FromQRCode");
+
+            finish();
+
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/activity/SettingActivity.java b/qpython/src/main/java/org/qpython/qpy/main/activity/SettingActivity.java
new file mode 100644
index 00000000..62a109cc
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/activity/SettingActivity.java
@@ -0,0 +1,86 @@
+package org.qpython.qpy.main.activity;
+
+import android.app.AlarmManager;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.main.fragment.SettingFragment;
+import org.qpython.qpy.main.service.FTPServerService;
+import org.qpython.qpy.utils.NotebookUtil;
+import org.swiftp.Globals;
+
+
+public class SettingActivity extends AppCompatActivity {
+    SettingFragment fragment;
+
+    public static void startActivity(Context context) {
+        Intent intent = new Intent(context, SettingActivity.class);
+        context.startActivity(intent);
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_setting);
+        fragment = new SettingFragment();
+        getFragmentManager().beginTransaction()
+                .replace(R.id.setting_fragment, fragment)
+                .commit();
+        Globals.setContext(getApplicationContext());
+        init();
+        //Thread.setDefaultUncaughtExceptionHandler((t, e) -> SettingActivity.restartApp(SettingActivity.this));
+    }
+
+    public static void restartApp(Context context) {
+        Intent mStartActivity = new Intent(context, HomeMainActivity.class); //Replace StartActivity with the name of the first activity in your app
+        int mPendingIntentId = 123456;
+        PendingIntent mPendingIntent = PendingIntent.getActivity(context, mPendingIntentId, mStartActivity, PendingIntent.FLAG_CANCEL_CURRENT);
+        AlarmManager mgr = (AlarmManager)context.getSystemService(Context.ALARM_SERVICE);
+        mgr.set(AlarmManager.RTC, System.currentTimeMillis() + 100, mPendingIntent);
+        System.exit(0);
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(FTPServerService.ACTION_STARTED);
+        filter.addAction(FTPServerService.ACTION_STOPPED);
+        filter.addAction(FTPServerService.ACTION_FAILEDTOSTART);
+        registerReceiver(fragment.getFtpServerReceiver(), filter);
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        unregisterReceiver(fragment.getFtpServerReceiver());
+    }
+
+    @Override
+    public void onBackPressed() {
+        if (NotebookUtil.isNotebookEnable(this)){
+            setResult(RESULT_OK);
+        }
+        super.onBackPressed();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+    }
+
+    private void init() {
+        Toolbar mToolbar = (Toolbar) findViewById(R.id.toolbar);
+        setSupportActionBar(mToolbar);
+        mToolbar.setTitle(getString(R.string.more));
+        mToolbar.setNavigationIcon(R.drawable.ic_back);
+        mToolbar.setNavigationOnClickListener(view -> SettingActivity.this.finish());
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/activity/SplashActivity.java b/qpython/src/main/java/org/qpython/qpy/main/activity/SplashActivity.java
new file mode 100644
index 00000000..4d9fdfd6
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/activity/SplashActivity.java
@@ -0,0 +1,30 @@
+package org.qpython.qpy.main.activity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+
+import org.qpython.qpy.R;
+
+import java.util.Timer;
+import java.util.TimerTask;
+
+public class SplashActivity extends AppCompatActivity {
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_splash);
+        new Timer().schedule(new TimerTask() {
+            @Override
+            public void run() {
+                Intent intent = new Intent(SplashActivity.this,HomeMainActivity.class);
+                intent.setAction(getIntent().getAction());
+                startActivity(intent);
+                finish();
+            }
+        },1000);
+    }
+
+}
\ No newline at end of file
diff --git a/qpython/src/main/java/org/qpython/qpy/main/adapter/AppListAdapter.java b/qpython/src/main/java/org/qpython/qpy/main/adapter/AppListAdapter.java
new file mode 100644
index 00000000..920a5d19
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/adapter/AppListAdapter.java
@@ -0,0 +1,232 @@
+package org.qpython.qpy.main.adapter;
+
+import android.app.Activity;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.pm.ShortcutInfo;
+import android.content.pm.ShortcutManager;
+import android.databinding.DataBindingUtil;
+import android.graphics.drawable.Icon;
+import android.net.Uri;
+import android.os.Build;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.console.ScriptExec;
+import org.qpython.qpy.databinding.ItemAppListBinding;
+import org.qpython.qpy.main.activity.AppListActivity;
+import org.qpython.qpy.main.model.AppModel;
+import org.qpython.qpy.main.model.LocalAppModel;
+import org.qpython.qpy.main.model.QPyScriptModel;
+import org.qpython.qpy.texteditor.EditorActivity;
+import org.qpython.qpy.texteditor.ui.view.EnterDialog;
+import android.support.v7.app.AlertDialog;
+
+
+import java.util.List;
+
+/**
+ * App list adapter
+ * Created by Hmei on 2017-05-25.
+ */
+
+public class AppListAdapter extends RecyclerView.Adapter<MyViewHolder<ItemAppListBinding>> {
+    private static final String TYPE_SCRIPT = "script";
+    private static final String TAG = "AppListAdapter";
+
+    private List<AppModel> dataList;
+    private String         type;
+    private Context        context;
+    private Callback       callback;
+
+    public AppListAdapter(List<AppModel> dataList, String type, Context context) {
+        this.dataList = dataList;
+        this.type = type;
+        this.context = context;
+    }
+
+    @Override
+    public MyViewHolder<ItemAppListBinding> onCreateViewHolder(ViewGroup parent, int viewType) {
+        ItemAppListBinding binding = DataBindingUtil.inflate(LayoutInflater.from(context), R.layout.item_app_list, parent, false);
+        MyViewHolder<ItemAppListBinding> holder = new MyViewHolder<>(binding.getRoot());
+        holder.setBinding(binding);
+        return holder;
+    }
+
+    @Override
+    public void onBindViewHolder(MyViewHolder<ItemAppListBinding> holder, int position) {
+        ItemAppListBinding binding = holder.getBinding();
+        if (type.equals(TYPE_SCRIPT) & position == dataList.size()) {
+            binding.ciAppIcon.setImageResource(R.drawable.ic_home_qpy_add);
+            binding.tvAppName.setText(R.string.add);
+        } else {
+            binding.ciAppIcon.setImageDrawable(dataList.get(position).getIcon());
+            binding.tvAppName.setText(dataList.get(position).getLabel());
+        }
+        binding.getRoot().setOnClickListener(v -> {
+            if (position == dataList.size()) {
+                EditorActivity.start(context, "");
+            } else if (dataList.get(position) instanceof QPyScriptModel) {
+                QPyScriptModel qPyScriptItem = (QPyScriptModel) dataList.get(position);
+                if (qPyScriptItem.isProj()) {
+                    callback.runProject(qPyScriptItem);
+                } else {
+                    callback.runScript(qPyScriptItem);
+                }
+            } else if (dataList.get(position) instanceof LocalAppModel) {
+                LocalAppModel localAppItem = (LocalAppModel) dataList.get(position);
+                Intent intent = context.getPackageManager().getLaunchIntentForPackage(localAppItem.getApplicationPackageName());
+                if (intent != null) {
+                    context.startActivity(intent);
+                }
+            } else {
+
+                Log.d(TAG, "ONCLICK");
+                callback.exit();
+            }
+        });
+
+        binding.getRoot().setOnLongClickListener(v -> {
+            if (position != dataList.size()) {
+                CharSequence[] chars = new CharSequence[]{context.getString(R.string.create_shortcut), context.getString(R.string.run_with_params), context.getString(R.string.open_with_editor)};
+
+                final boolean[] isConsumed = new boolean[]{true};
+                new AlertDialog.Builder(context, R.style.MyDialog)
+                        .setTitle(R.string.choose_action)
+                        .setItems(chars, (dialog, which) -> {
+                            switch (which) {
+                                case 0: // Create Shortcut
+                                    isConsumed[0] = createShortCut(position);
+                                    dialog.dismiss();
+                                    break;
+                                case 1: // Run with params
+                                    runWithParams(position);
+                                    dialog.dismiss();
+                                    break;
+                                case 2:
+                                    openToEdit(position);
+                                    dialog.dismiss();
+
+                            }
+                        }).setNegativeButton("CLOSE", new DialogInterface.OnClickListener() {
+
+                    @Override
+                    public void onClick(DialogInterface dialogInterface, int i) {
+                        dialogInterface.dismiss();
+                    }
+                })
+                        .show();
+                return isConsumed[0];
+            } else {
+                return true;
+            }
+        });
+
+    }
+
+    @Override
+    public int getItemCount() {
+        return dataList == null ? 0 : type.equals(TYPE_SCRIPT) ? dataList.size() + 1 : dataList.size();
+    }
+
+    public void setCallback(Callback callback) {
+        this.callback = callback;
+    }
+
+    public interface Callback {
+        void runScript(QPyScriptModel item);
+
+        void runProject(QPyScriptModel item);
+
+        void exit();
+    }
+
+    private boolean createShortCut(int position) {
+        //最后一个为添加script，不用创建快键图标
+        if (position == dataList.size()) {
+            return false;
+        }
+        // Create shortcut
+        QPyScriptModel qPyScriptModel = (QPyScriptModel) dataList.get(position);
+        Intent intent = new Intent();
+        intent.setClass(context, AppListActivity.class);
+        intent.setAction(Intent.ACTION_VIEW);
+        intent.putExtra("type", "script");
+        intent.putExtra("path", qPyScriptModel.getPath());
+        intent.putExtra("isProj", qPyScriptModel.isProj());
+
+        if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            ShortcutManager mShortcutManager = context.getSystemService(ShortcutManager.class);
+            if (mShortcutManager.isRequestPinShortcutSupported()) {
+                ShortcutInfo pinShortcutInfo =
+                        new ShortcutInfo.Builder(context, dataList.get(position).getLabel())
+                                .setShortLabel(dataList.get(position).getLabel())
+                                .setLongLabel(dataList.get(position).getLabel())
+                                .setIcon(Icon.createWithResource(context, dataList.get(position).getIconRes()))
+                                .setIntent(intent)
+                                .build();
+                Intent pinnedShortcutCallbackIntent =
+                        mShortcutManager.createShortcutResultIntent(pinShortcutInfo);
+                PendingIntent successCallback = PendingIntent.getBroadcast(context, 0,
+                        pinnedShortcutCallbackIntent, 0);
+                mShortcutManager.requestPinShortcut(pinShortcutInfo,
+                        successCallback.getIntentSender());
+            }
+        } else {
+            //Adding shortcut for MainActivity
+            //on Home screen
+            Intent addIntent = new Intent();
+            addIntent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, intent);
+            addIntent.putExtra(Intent.EXTRA_SHORTCUT_NAME, dataList.get(position).getLabel());
+            addIntent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE,
+                    Intent.ShortcutIconResource.fromContext(context.getApplicationContext(),
+                            dataList.get(position).getIconRes()));
+            addIntent.setAction("com.android.launcher.action.INSTALL_SHORTCUT");
+            context.getApplicationContext().sendBroadcast(addIntent);
+            Toast.makeText(context, context.getString(R.string.shortcut_create_suc, dataList.get(position).getLabel()), Toast.LENGTH_SHORT).show();
+        }
+        return true;
+    }
+
+    private void openToEdit(int position) {
+        QPyScriptModel model = (QPyScriptModel) dataList.get(position);
+        if (model.isProj()) {
+
+            EditorActivity.start(model.getPath(), context);
+
+        } else {
+            //Intent intent = new Intent();
+            //model.getPath()
+            EditorActivity.start(context, Uri.parse("file://"+model.getPath()));
+        }
+    }
+
+    private void runWithParams(int position) {
+        new EnterDialog(context)
+                .setTitle(context.getString(R.string.enter_u_params))
+                .setHint(context.getString(R.string.params))
+                .setConfirmListener(args -> {
+                    if (TextUtils.isEmpty(args)) {
+                        Toast.makeText(context, R.string.params_emp, Toast.LENGTH_SHORT).show();
+                        return false;
+                    }
+                    QPyScriptModel model = (QPyScriptModel) dataList.get(position);
+                    if (model.isProj()) {
+                        ScriptExec.getInstance().playProject(context, model.getPath(), args, false);
+                    } else {
+                        ScriptExec.getInstance().playScript(context, model.getPath(),
+                                args, false);
+                    }
+                    return true;
+                })
+                .show();
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/adapter/CloudScriptAdapter.java b/qpython/src/main/java/org/qpython/qpy/main/adapter/CloudScriptAdapter.java
new file mode 100644
index 00000000..7df33aca
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/adapter/CloudScriptAdapter.java
@@ -0,0 +1,69 @@
+package org.qpython.qpy.main.adapter;
+
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.codeshare.pojo.CloudFile;
+import org.qpython.qpy.databinding.ItemFolderBinding;
+import org.qpython.qpy.texteditor.ui.adapter.MyViewHolder;
+import org.qpython.qpysdk.QPyConstants;
+
+import java.io.File;
+import java.util.List;
+
+
+public class CloudScriptAdapter extends RecyclerView.Adapter<MyViewHolder<ItemFolderBinding>> {
+    private List<CloudFile> dataList;
+    private Callback        callback;
+
+    public CloudScriptAdapter(List<CloudFile> dataList) {
+        this.dataList = dataList;
+    }
+
+    public void setCallback(Callback callback) {
+        this.callback = callback;
+    }
+
+    @Override
+    public MyViewHolder<ItemFolderBinding> onCreateViewHolder(ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_folder, null);
+        return new MyViewHolder<>(view);
+    }
+
+    @Override
+    public void onBindViewHolder(MyViewHolder<ItemFolderBinding> holder, int position) {
+        ItemFolderBinding binding = holder.getBinding();
+        CloudFile cloudFile = dataList.get(position);
+        binding.tvPath.setText(cloudFile.getUploadTime());
+        binding.tvFileName.setText(cloudFile.getName());
+        binding.ivFileIcon.setImageResource(R.drawable.ic_editor_file);
+        binding.tvPath.setText(cloudFile.getPath());
+        binding.tvPath.setVisibility(View.VISIBLE);
+        binding.getRoot().setOnClickListener(v -> callback.onClick(position));
+
+        if (cloudFile.isUploading()) {
+            binding.uploading.setVisibility(View.VISIBLE);
+        } else {
+            binding.uploading.setVisibility(View.GONE);
+        }
+        if (new File(QPyConstants.ABSOLUTE_PATH + cloudFile.getPath()).exists()) {
+            binding.uploaded.setImageResource(R.drawable.ic_check_circle);
+            binding.uploaded.setVisibility(View.VISIBLE);
+        } else {
+            binding.uploaded.setVisibility(View.GONE);
+        }
+    }
+
+    @Override
+    public int getItemCount() {
+        return dataList == null ? 0 : dataList.size();
+    }
+
+    public interface Callback {
+        void onClick(int position);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/adapter/CodeCommentAdapter.java b/qpython/src/main/java/org/qpython/qpy/main/adapter/CodeCommentAdapter.java
new file mode 100644
index 00000000..233b1aa0
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/adapter/CodeCommentAdapter.java
@@ -0,0 +1,78 @@
+package org.qpython.qpy.main.adapter;
+
+import android.content.Context;
+import android.databinding.DataBindingUtil;
+import android.support.v7.widget.RecyclerView;
+import android.text.Html;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.quseit.util.ImageDownLoader;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.codeshare.pojo.Gist;
+import org.qpython.qpy.databinding.ItemCommentBinding;
+
+import java.util.List;
+
+
+public class CodeCommentAdapter extends RecyclerView.Adapter<MyViewHolder<ItemCommentBinding>> {
+    private List<Gist.CommentBean> dataList;
+    private Reply                  callback;
+    private Context                context;
+
+    public CodeCommentAdapter(List<Gist.CommentBean> dataList) {
+        this.dataList = dataList;
+    }
+
+    public void setItemClickListener(Reply callback) {
+        this.callback = callback;
+    }
+
+    @Override
+    public MyViewHolder<ItemCommentBinding> onCreateViewHolder(ViewGroup parent, int viewType) {
+        context = parent.getContext();
+        ItemCommentBinding binding = DataBindingUtil.inflate(LayoutInflater.from(parent.getContext()), R.layout.item_comment, parent, false);
+        MyViewHolder<ItemCommentBinding> holder = new MyViewHolder<>(binding.getRoot());
+        holder.setBinding(binding);
+        return holder;
+    }
+
+    @Override
+    public void onBindViewHolder(MyViewHolder<ItemCommentBinding> holder, int position) {
+        ItemCommentBinding binding = holder.getBinding();
+        if (position == dataList.size()) {
+            binding.avatar.setImageResource(0);
+            binding.reComment.setVisibility(View.GONE);
+            binding.line.setVisibility(View.GONE);
+            return;
+        }
+        Gist.CommentBean item = dataList.get(position);
+        binding.date.setText(item.getData());
+        binding.name.setText(item.getFrom());
+        if (item.getAvatar() != null) {
+            ImageDownLoader.setImageFromUrl(context, binding.avatar, item.getAvatar());
+        }
+        if (TextUtils.isEmpty(item.getRe())) {
+            binding.fromContent.setText(item.getFrom_content());
+            binding.reComment.setVisibility(View.GONE);
+        } else {
+            binding.reComment.setVisibility(View.VISIBLE);
+            binding.fromContent.setText(Html.fromHtml(context.getString(R.string.re_format, item.getFrom(), item.getFrom_content())));
+            binding.reComment.setText(Html.fromHtml(context.getString(R.string.replied_format, item.getRe(), item.getRe_content())));
+        }
+
+        binding.getRoot().setOnClickListener(v -> callback.reply(item.getFrom(), item.getFrom_content()));
+    }
+
+    @Override
+    public int getItemCount() {
+        return dataList == null ? 0 : dataList.size() + 1;
+    }
+
+    public interface Reply {
+        void reply(String to, String reComment);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/adapter/CodeShareAdapter.java b/qpython/src/main/java/org/qpython/qpy/main/adapter/CodeShareAdapter.java
new file mode 100644
index 00000000..a052f902
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/adapter/CodeShareAdapter.java
@@ -0,0 +1,58 @@
+package org.qpython.qpy.main.adapter;
+
+import android.content.Context;
+import android.databinding.DataBindingUtil;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+
+import com.quseit.util.ImageDownLoader;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.codeshare.pojo.GistBase;
+import org.qpython.qpy.databinding.ItemShareCodeBinding;
+import org.qpython.qpy.main.activity.CodeDetailActivity;
+import org.qpython.qpy.main.activity.CodeShareActivity;
+
+import java.util.List;
+
+
+public class CodeShareAdapter extends RecyclerView.Adapter<MyViewHolder<ItemShareCodeBinding>> {
+
+    private List<GistBase> dataList;
+    private Context        context;
+    private boolean        isProj;
+
+    public CodeShareAdapter(List<GistBase> dataList, boolean isProj) {
+        this.dataList = dataList;
+        this.isProj = isProj;
+    }
+
+    @Override
+    public MyViewHolder<ItemShareCodeBinding> onCreateViewHolder(ViewGroup parent, int viewType) {
+        context = parent.getContext();
+        ItemShareCodeBinding binding = DataBindingUtil.inflate(LayoutInflater.from(parent.getContext()), R.layout.item_share_code, parent, false);
+        MyViewHolder<ItemShareCodeBinding> holder = new MyViewHolder<>(binding.getRoot());
+        holder.setBinding(binding);
+        return holder;
+    }
+
+    @Override
+    public void onBindViewHolder(MyViewHolder<ItemShareCodeBinding> holder, int position) {
+        ItemShareCodeBinding binding = holder.getBinding();
+        GistBase item = dataList.get(position);
+        ImageDownLoader.setImageFromUrl(context, binding.avatar, item.getAvatar());
+        binding.title.setText(item.getTitle());
+        binding.name.setText(item.getAuthor());
+        binding.date.setText(item.getDate());
+        binding.bookmarkCount.setText(item.getBookmaker_count() + "");
+        binding.commentCount.setText(item.getComment_count() + "");
+
+        binding.getRoot().setOnClickListener(v -> CodeDetailActivity.start(context, item.getId(), isProj));
+    }
+
+    @Override
+    public int getItemCount() {
+        return dataList == null ? 0 : dataList.size();
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/adapter/CourseAdapter.java b/qpython/src/main/java/org/qpython/qpy/main/adapter/CourseAdapter.java
new file mode 100644
index 00000000..1cc8fb63
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/adapter/CourseAdapter.java
@@ -0,0 +1,113 @@
+package org.qpython.qpy.main.adapter;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.net.Uri;
+import android.os.Build;
+import android.support.v4.util.Pair;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.quseit.util.ImageDownLoader;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ItemCourseBinding;
+import org.qpython.qpy.main.activity.CourseIndexFundingActivity;
+import org.qpython.qpy.main.activity.QWebViewActivity;
+import org.qpython.qpy.main.server.model.CourseModel;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * Course adapter
+ * Created by Hmei on 2017-06-29.
+ */
+
+public class CourseAdapter extends RecyclerView.Adapter<MyViewHolder<ItemCourseBinding>> {
+
+    private List<CourseModel> dataList;
+    private Activity          context;
+    private List<View> childViews = new ArrayList<>();
+
+    public CourseAdapter(Activity context, List<CourseModel> dataList) {
+        this.context = context;
+        this.dataList = dataList;
+    }
+
+    @Override
+    public MyViewHolder<ItemCourseBinding> onCreateViewHolder(ViewGroup parent, int viewType) {
+        ItemCourseBinding binding = DataBindingUtil.inflate(LayoutInflater.from(parent.getContext()), R.layout.item_course, parent, false);
+        MyViewHolder<ItemCourseBinding> holder = new MyViewHolder<>(binding.getRoot());
+        holder.setBinding(binding);
+        return holder;
+    }
+
+    @Override
+    public void onBindViewHolder(MyViewHolder<ItemCourseBinding> holder, int position) {
+        CourseModel item = dataList.get(position);
+        ItemCourseBinding binding = holder.getBinding();
+        binding.setCourse(item);
+
+        View.OnClickListener listener = v -> {
+            if (item.getOpen() == 0) {
+                // Open == 0 -> Not release yet
+                QWebViewActivity.start(context, item.getTitle(), item.getLink());
+            } else {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                    initChildViews((ViewGroup) binding.getRoot());
+                    Pair<View, String>[] pairs = new Pair[childViews.size()];
+                    for (int i = 0; i < childViews.size(); i++) {
+                        pairs[i] = new Pair<>(childViews.get(i), childViews.get(i).getTransitionName());
+                    }
+                    CourseIndexFundingActivity.start(context, pairs, item, item.getCrowdfunding());
+                } else {
+                    CourseIndexFundingActivity.start(context, item, item.getCrowdfunding());
+                }
+            }
+        };
+
+        binding.tvLevel.setText(context.getString(R.string.level, item.getLevel() + ""));
+        if (item.getOpen() == 0) {
+            binding.free.setVisibility(View.GONE);
+        } else {
+            binding.free.setVisibility(View.VISIBLE);
+            if (item.getCrowdfunding() == 0) {
+                binding.free.setBackgroundColor(context.getResources().getColor(R.color.theme_green));
+                binding.free.setText(R.string.free);
+            } else {
+                // 众筹中
+                binding.free.setBackgroundColor(context.getResources().getColor(R.color.theme_yellow));
+                binding.free.setText(R.string.funding);
+                binding.free.setOnClickListener(listener);
+            }
+        }
+
+        ImageDownLoader.setImageFromUrl(context, binding.ivTheme, item.getLogo());
+        binding.getRoot().setOnClickListener(listener);
+    }
+
+    private void initChildViews(ViewGroup viewGroup) {
+        int count = viewGroup.getChildCount();
+        for (int i = 0; i < count; i++) {
+            View view = viewGroup.getChildAt(i);
+            if (view instanceof ViewGroup) {
+                initChildViews((ViewGroup) view);
+            } else {
+                childViews.add(view);
+            }
+        }
+    }
+
+    @Override
+    public int getItemCount() {
+        return dataList.size();
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/adapter/CoursePagerAdapter.java b/qpython/src/main/java/org/qpython/qpy/main/adapter/CoursePagerAdapter.java
new file mode 100644
index 00000000..0ea19bad
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/adapter/CoursePagerAdapter.java
@@ -0,0 +1,43 @@
+package org.qpython.qpy.main.adapter;
+
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentStatePagerAdapter;
+
+import org.qpython.qpy.main.fragment.CourseFragment;
+import org.qpython.qpy.main.fragment.LibAIPyFragment;
+import org.qpython.qpy.main.fragment.LibProjectFragment;
+import org.qpython.qpy.main.fragment.LibQPyPiFragment;
+
+
+public class CoursePagerAdapter extends FragmentStatePagerAdapter {
+    private int mNumOfTabs;
+
+    private CourseFragment recommend = new CourseFragment();
+    private CourseFragment latest    = new CourseFragment();
+    private CourseFragment my        = new CourseFragment();
+
+    public CoursePagerAdapter(FragmentManager fm) {
+        super(fm);
+        this.mNumOfTabs = 3;
+    }
+
+    @Override
+    public Fragment getItem(int position) {
+        switch (position) {
+            case 0:
+                return recommend;
+            case 1:
+                return latest;
+            case 2:
+                return my;
+            default:
+                return null;
+        }
+    }
+
+    @Override
+    public int getCount() {
+        return mNumOfTabs;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/adapter/EditorFileTreeAdapter.java b/qpython/src/main/java/org/qpython/qpy/main/adapter/EditorFileTreeAdapter.java
new file mode 100644
index 00000000..1d5c8ba1
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/adapter/EditorFileTreeAdapter.java
@@ -0,0 +1,26 @@
+package org.qpython.qpy.main.adapter;
+
+import org.greenrobot.eventbus.EventBus;
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ItemFolderLittleBinding;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.texteditor.EditorActivity;
+
+public class EditorFileTreeAdapter extends FileTreeAdapter {
+    public EditorFileTreeAdapter(String rootPath) {
+        super(rootPath);
+
+    }
+
+    @Override
+    void itemClick(ItemFolderLittleBinding binding, FileTreeAdapter.FileTreeBean folderBean) {
+        String[] ext = App.getContext().getResources().getStringArray(R.array.text_ext);
+        EditorActivity.OpenFileEvent openFileEvent = new EditorActivity.OpenFileEvent();
+        for (String s : ext) {
+            if (folderBean.name.endsWith(s)) {
+                openFileEvent.filePath = folderBean.path;
+            }
+        }
+        EventBus.getDefault().post(openFileEvent);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/adapter/FileTreeAdapter.java b/qpython/src/main/java/org/qpython/qpy/main/adapter/FileTreeAdapter.java
new file mode 100644
index 00000000..1130204b
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/adapter/FileTreeAdapter.java
@@ -0,0 +1,135 @@
+package org.qpython.qpy.main.adapter;
+
+import android.content.res.Resources;
+import android.databinding.DataBindingUtil;
+import android.support.v7.widget.RecyclerView;
+import android.util.TypedValue;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ItemFolderLittleBinding;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import static com.quseit.util.FolderUtils.sortTypeByName;
+
+
+public abstract class FileTreeAdapter extends RecyclerView.Adapter<MyViewHolder<ItemFolderLittleBinding>> {
+    private   int                offsetX;
+    protected List<FileTreeBean> dataList;
+
+    FileTreeAdapter(String rootPath) {
+        dataList = new ArrayList<>();
+
+        File file = new File(rootPath);
+        dataList.add(new FileTreeBean(file, 0));
+
+        offsetX = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 15, Resources.getSystem().getDisplayMetrics());
+    }
+
+    @Override
+    public MyViewHolder<ItemFolderLittleBinding> onCreateViewHolder(ViewGroup parent, int viewType) {
+        ItemFolderLittleBinding binding = DataBindingUtil.inflate(LayoutInflater.from(parent.getContext()), R.layout.item_folder_little, parent, false);
+        MyViewHolder<ItemFolderLittleBinding> holder = new MyViewHolder<>(binding.getRoot());
+        holder.setBinding(binding);
+        return holder;
+    }
+
+    @Override
+    public void onBindViewHolder(MyViewHolder<ItemFolderLittleBinding> holder, int position) {
+        ItemFolderLittleBinding binding = holder.getBinding();
+        FileTreeBean file = dataList.get(position);
+
+        // initView
+        binding.getRoot().setPadding(offsetX * file.level, 0, 0, 0);
+
+        String fileName = file.name;
+        binding.item.setText(fileName);
+
+        boolean isDir = file.childList.size() != 0;
+        if (!isDir) {
+            binding.arrow.setVisibility(View.INVISIBLE);
+            binding.item.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_editor_file_little, 0, 0, 0);
+        } else {
+            binding.arrow.setImageResource(file.isExpanded ? R.drawable.ic_arrow_drop_down_a : R.drawable.ic_arrow_drop_down_b);
+            binding.arrow.setVisibility(View.VISIBLE);
+            binding.item.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_editor_folder_little, 0, 0, 0);
+        }
+
+        // initListener
+        binding.expandClickZone.setOnClickListener(v -> {
+            if (isDir) {
+                file.isExpanded = !file.isExpanded;
+                notifyItemChanged(position);
+                if (file.isExpanded) {
+                    dataList.addAll(position + 1, file.childList);
+                    notifyItemRangeInserted(position + 1, file.childList.size());
+                } else {
+                    notifyItemRangeRemoved(position + 1, file.childList.size());
+                    dataList.removeAll(file.childList);
+                }
+            } else {
+                itemClick(binding, file);
+            }
+        });
+    }
+
+    public void addNewFile(String path) {
+        File parentFile = new File(path).getParentFile();
+        String parentPath = parentFile.getAbsolutePath();
+        int level;
+        for (int i = 0; i < dataList.size(); i++) {
+            if (dataList.get(i).path.equals(parentPath)) {
+                level = dataList.get(i).level + 1;
+                FileTreeBean fileTreeBean = new FileTreeBean(new File(path), level);
+                dataList.get(i).childList.add(fileTreeBean);
+                if (dataList.get(i).isExpanded) {
+                    dataList.add(i + dataList.get(i).childList.size(), fileTreeBean);
+                    notifyItemInserted(i + dataList.get(i).childList.size());
+                }
+                break;
+            }
+        }
+    }
+
+    @Override
+    public int getItemCount() {
+        return dataList == null ? 0 : dataList.size();
+    }
+
+    abstract void itemClick(ItemFolderLittleBinding binding, FileTreeBean folderBean);
+
+    protected class FileTreeBean {
+        protected int    level;
+        protected String path;
+        protected String name;
+        boolean isExpanded, isCheck;
+        List<FileTreeBean> childList;
+
+        FileTreeBean(File file, int level) {
+            this.level = level;
+            this.path = file.getAbsolutePath();
+            this.name = file.getName();
+            this.childList = new ArrayList<>();
+            if (file.isDirectory()) {
+                File[] files = file.listFiles();
+                Arrays.sort(files, sortTypeByName);
+                for (File child : files) {
+                    if (!child.getName().startsWith(".")) {
+                        childList.add(new FileTreeBean(child, level + 1));
+                    }
+                }
+            }
+        }
+
+        protected boolean isDir() {
+            return childList.size() > 0;
+        }
+    }
+
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/adapter/GistAdapter.java b/qpython/src/main/java/org/qpython/qpy/main/adapter/GistAdapter.java
new file mode 100644
index 00000000..6bd5b80b
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/adapter/GistAdapter.java
@@ -0,0 +1,173 @@
+package org.qpython.qpy.main.adapter;
+
+import android.content.Context;
+import android.databinding.DataBindingUtil;
+import android.os.Build;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.quseit.util.DateTimeHelper;
+import com.quseit.util.ImageDownLoader;
+
+import org.greenrobot.eventbus.EventBus;
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.RvItemNewsBinding;
+import org.qpython.qpy.main.activity.GistDetailActivity;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.fragment.MyGistFragment;
+import org.qpython.qpy.main.server.gist.GistEvent;
+import org.qpython.qpy.main.server.gist.response.GistBean;
+
+import java.util.List;
+import java.util.Objects;
+
+import static org.qpython.qpy.main.server.gist.GistEvent.DELETE;
+
+
+/**
+ * 文 件 名: CommunityAdapter
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2017/12/25 17:21
+ * 邮   箱: qq798435167@gmail.com
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class GistAdapter extends RecyclerView.Adapter<MyViewHolder<RvItemNewsBinding>> {
+
+    private boolean mShowDelete;
+
+    private List<GistBean> mGistBeans;
+    private Context        mContext;
+    private MyGistFragment fragment;
+
+    public GistAdapter(Context context) {
+        mContext = context;
+    }
+
+    public GistAdapter(Context context, MyGistFragment fragment) {
+        mContext = context;
+        this.fragment = fragment;
+    }
+
+    public void setData(List<GistBean> list) {
+        mGistBeans = list;
+        notifyDataSetChanged();
+    }
+
+    public void loadMore(List<GistBean> list) {
+        mGistBeans.addAll(list);
+        notifyDataSetChanged();
+    }
+
+
+    @Override
+    public MyViewHolder<RvItemNewsBinding> onCreateViewHolder(ViewGroup parent, int viewType) {
+        RvItemNewsBinding binding = DataBindingUtil.inflate(LayoutInflater.from(parent.getContext()),
+                R.layout.rv_item_news, parent, false);
+        MyViewHolder<RvItemNewsBinding> holder = new MyViewHolder<>(binding.getRoot());
+        holder.setBinding(binding);
+        return holder;
+    }
+
+
+    @Override
+    public void onBindViewHolder(MyViewHolder<RvItemNewsBinding> holder, int position) {
+        RvItemNewsBinding binding = holder.getBinding();
+        GistBean bean = mGistBeans.get(position);
+        //点击跳转详情
+        binding.rootLayout.setOnClickListener(view -> GistDetailActivity.startNewsDetail(mContext, bean.getId()));
+
+        //名字
+        binding.userNameTv.setText(bean.getUser().getUName());
+        //头像
+        ImageDownLoader.setImageFromUrl(mContext, binding.userAvatarIv, bean.getUser().getAvatar());
+        //时间
+        binding.commitTimeTv.setText(DateTimeHelper.converTime(bean.getCreateAt(), mContext.getResources()
+                .getStringArray(R.array.time_label)));
+        //标题
+        binding.contentTv.setText(bean.getDescription());
+        //收藏数
+        binding.starCountTv.setText(String.valueOf(bean.getStar()));
+        if (App.getFavorites().contains(bean.getId())) {
+            binding.starCountLayout.setSelected(true);
+        } else {
+            binding.starCountLayout.setSelected(false);
+        }
+        //评论数
+        binding.commentCountTv.setText(String.valueOf(bean.getComment()));
+
+        //删除
+        if (mShowDelete) {
+            binding.deleteIv.setVisibility(View.VISIBLE);
+            binding.deleteIv.setOnClickListener(v -> new AlertDialog.Builder(mContext, R.style.MyDialog)
+                    .setTitle(R.string.warning)
+                    .setMessage(R.string.delete_gist_hint)
+                    .setNegativeButton(R.string.no, (dialogInterface, i) -> dialogInterface.dismiss())
+                    .setPositiveButton(R.string.yes, (dialogInterface, i) ->
+                            EventBus.getDefault().post(new GistEvent(DELETE, bean.getId())))
+                    .create().show());
+        } else {
+            binding.deleteIv.setVisibility(View.GONE);
+        }
+    }
+
+    @Override
+    public int getItemCount() {
+        return mGistBeans == null ?
+                0 :
+                mGistBeans.size();
+
+    }
+
+    public void setShowDelete(boolean showDelete) {
+        mShowDelete = showDelete;
+    }
+
+
+    public void addCommentNum(String id) {
+        int position = getPositionById(id);
+        if (position != -1) {
+            mGistBeans.get(position).addCommentNum();
+            notifyItemChanged(position);
+        }
+    }
+
+    public void addFav(String id, boolean isAdd) {
+        int position = getPositionById(id);
+        if (position != -1) {
+            mGistBeans.get(position).changeStar(isAdd);
+            notifyItemChanged(position);
+        }
+    }
+
+    public void delete(String id) {
+        int position = getPositionById(id);
+        if (position != -1) {
+            notifyItemRemoved(position);
+            mGistBeans.remove(position);
+        }
+        if (mGistBeans.size() == 0 && fragment != null) {
+            fragment.showHint(true);
+        }
+    }
+
+    private int getPositionById(String id) {
+        GistBean posBean = null;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            posBean = mGistBeans.stream().filter(bean -> Objects.equals(id, bean.getId()))
+                    .findFirst()
+                    .orElse(null);
+        } else {
+            for (GistBean mGistBean : mGistBeans) {
+                if (id.equals(mGistBean.getId())) {
+                    posBean = mGistBean;
+                }
+            }
+        }
+        return posBean == null ? -1 : mGistBeans.indexOf(posBean);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/adapter/LibListAdapter.java b/qpython/src/main/java/org/qpython/qpy/main/adapter/LibListAdapter.java
new file mode 100644
index 00000000..bc243f30
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/adapter/LibListAdapter.java
@@ -0,0 +1,140 @@
+package org.qpython.qpy.main.adapter;
+
+import android.databinding.DataBindingUtil;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ItemLibListBinding;
+import org.qpython.qpy.main.server.model.BaseLibModel;
+import org.qpython.qpy.main.server.model.LibModel;
+import org.qpython.qpy.texteditor.ui.adapter.MyViewHolder;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * lib list adapter
+ * Created by Hmei on 2017-05-27.
+ */
+
+public class LibListAdapter<T extends BaseLibModel> extends RecyclerView.Adapter<MyViewHolder<ItemLibListBinding>> {
+    private static Map<String, String> nameVer;
+
+    public static final int INSTALLED    = 0;
+    public static final int UN_INSTALLED = 1;
+    public static final int UPGRADE      = 2;
+
+    public static final String TAG = "LibListAdapter";
+
+    private List<T> dataList;
+    private Click   click;
+
+    public LibListAdapter(List<T> dataList) {
+        this.dataList = dataList;
+    }
+
+    @Override
+    public int getItemCount() {
+        return dataList == null ? 0 : dataList.size();
+    }
+
+    @Override
+    public MyViewHolder<ItemLibListBinding> onCreateViewHolder(ViewGroup parent, int viewType) {
+        View realContentView = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_lib_list, parent, false);
+        MyViewHolder<ItemLibListBinding> holder = new MyViewHolder<>(realContentView);
+        holder.setBinding(DataBindingUtil.bind(realContentView));
+        return holder;
+    }
+
+    @Override
+    public void onBindViewHolder(org.qpython.qpy.texteditor.ui.adapter.MyViewHolder<ItemLibListBinding> holder, int position) {
+        ItemLibListBinding binding = holder.getBinding();
+        T item = dataList.get(position);
+        if (!item.isInstalled()) {
+            if (item instanceof LibModel) {
+                binding.ivIcon.setImageResource(R.drawable.ic_program);
+                binding.tvDescription.setText(item.getDescription());
+            } else {
+                binding.ivIcon.setImageResource(R.drawable.ic_library);
+                binding.tvDescription.setText(item.getVer());
+            }
+        } else {
+            if (item instanceof LibModel) {
+                binding.ivIcon.setImageResource(R.drawable.ic_program_install);
+                binding.tvDescription.setText(item.getDescription());
+            } else {
+                binding.ivIcon.setImageResource(R.drawable.ic_library_install);
+                binding.tvDescription.setText(item.getVer());
+            }
+        }
+        if (item.getDownloads().equals("-1")) {
+            binding.tvDownloadCount.setVisibility(View.GONE);
+        } else {
+            binding.tvDownloadCount.setText(String.valueOf(item.getDownloads()));
+        }
+        binding.tvName.setText(item.getTitle());
+        binding.llItem.setOnClickListener(v -> {
+            if (click != null) {
+                click.itemClick(position);
+            }
+        });
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        if (dataList.get(position) instanceof LibModel) {
+            // Project
+            return dataList.get(position).isInstalled() ? INSTALLED : UN_INSTALLED;
+        } else {
+            // QPYPI / AIPY
+            if (!dataList.get(position).isInstalled()) {
+                return UN_INSTALLED;
+            } else {
+//                String[] newVer = dataList.get(position).getVer().split("\\.");
+//                String[] curVer;
+//                String cur = getPackageVersion(dataList.get(position).getSmodule());
+//                if (cur != null) {
+//                    curVer = cur.split("\\.");
+//                } else {
+//                    return UN_INSTALLED;
+//                }
+//                for (int i = 0; i < newVer.length; i++) {
+//                    if (Integer.parseInt(newVer[i]) > Integer.parseInt(curVer[i])) {
+//                        return UPGRADE;
+//                    }
+//                }
+                return INSTALLED;
+            }
+        }
+    }
+
+    public void setClick(Click click) {
+        this.click = click;
+    }
+
+    public interface Click {
+        void itemClick(int position);
+    }
+
+//    private String getPackageVersion(String sModule) {
+//        if (nameVer == null) {
+//            initNameVer();
+//        }
+//        return nameVer.get(sModule);
+//    }
+//
+//    private void initNameVer() {
+//        nameVer = new HashMap<>();
+//        for (File file : new File(org.qpython.qpy.main.app.CONF.qpypiPath()).listFiles()) {
+//            LogUtil.d(TAG, file.getAbsolutePath());
+//            if (file.getName().endsWith("-py"+ CONF.PY_BRANCH+".egg")) {
+//                String name = file.getName();
+//                String[] splited = name.split("-");
+//                if (splited.length > 2) nameVer.put(splited[0].replace("_","-"), splited[1]);
+//            }
+//        }
+//    }
+}
\ No newline at end of file
diff --git a/qpython/src/main/java/org/qpython/qpy/main/adapter/LibPagerAdapter.java b/qpython/src/main/java/org/qpython/qpy/main/adapter/LibPagerAdapter.java
new file mode 100644
index 00000000..988cd282
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/adapter/LibPagerAdapter.java
@@ -0,0 +1,41 @@
+package org.qpython.qpy.main.adapter;
+
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentStatePagerAdapter;
+
+import org.qpython.qpy.main.fragment.LibAIPyFragment;
+import org.qpython.qpy.main.fragment.LibQPyPiFragment;
+import org.qpython.qpy.main.fragment.LibProjectFragment;
+
+
+public class LibPagerAdapter extends FragmentStatePagerAdapter {
+    private int mNumOfTabs;
+    private LibProjectFragment programFragment = new LibProjectFragment();
+    private LibQPyPiFragment   qPyPiFragment   = new LibQPyPiFragment();
+    private LibAIPyFragment    aiPyFragment    = new LibAIPyFragment();
+
+    public LibPagerAdapter(FragmentManager fm) {
+        super(fm);
+        this.mNumOfTabs = 3;
+    }
+
+    @Override
+    public Fragment getItem(int position) {
+        switch (position) {
+            case 0:
+                return programFragment;
+            case 1:
+                return qPyPiFragment;
+            case 2:
+                return aiPyFragment;
+            default:
+                return null;
+        }
+    }
+
+    @Override
+    public int getCount() {
+        return mNumOfTabs;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/adapter/MyCourseAdapter.java b/qpython/src/main/java/org/qpython/qpy/main/adapter/MyCourseAdapter.java
new file mode 100644
index 00000000..8a0b9dac
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/adapter/MyCourseAdapter.java
@@ -0,0 +1,75 @@
+package org.qpython.qpy.main.adapter;
+
+import android.app.Activity;
+import android.databinding.DataBindingUtil;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.quseit.util.ImageDownLoader;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ItemMyCourseBinding;
+import org.qpython.qpy.main.activity.QWebViewActivity;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.server.model.MyCourse;
+
+import java.util.List;
+
+/**
+ * Course adapter
+ * Created by Hmei on 2017-06-29.
+ */
+
+public class MyCourseAdapter extends RecyclerView.Adapter<MyViewHolder<ItemMyCourseBinding>> {
+
+    private List<MyCourse.DataBean> dataList;
+    private Activity                         context;
+
+    public MyCourseAdapter(Activity context, List<MyCourse.DataBean> dataList) {
+        this.context = context;
+        this.dataList = dataList;
+    }
+
+    @Override
+    public MyViewHolder<ItemMyCourseBinding> onCreateViewHolder(ViewGroup parent, int viewType) {
+        ItemMyCourseBinding binding = DataBindingUtil.inflate(LayoutInflater.from(parent.getContext()), R.layout.item_my_course, parent, false);
+        MyViewHolder<ItemMyCourseBinding> holder = new MyViewHolder<>(binding.getRoot());
+        holder.setBinding(binding);
+        return holder;
+    }
+
+    @Override
+    public void onBindViewHolder(MyViewHolder<ItemMyCourseBinding> holder, int position) {
+        ItemMyCourseBinding binding = holder.getBinding();
+        MyCourse.DataBean.InfoBean item = dataList.get(position).getInfo();
+        binding.setCourse(item);
+        binding.tvLevel.setText(context.getString(R.string.level, item.getLevel() + ""));
+        switch (dataList.get(position).getType()) {
+            case "free":
+                ImageDownLoader.setImageFromUrl(context, binding.ivTheme, item.getLogo());
+                binding.status.setVisibility(View.GONE);
+                binding.getRoot().setEnabled(true);
+                break;
+            case "crowdfunding":
+                if (item.getOpen() == 1) {
+                    ImageDownLoader.setImageFromUrl(context, binding.ivTheme, item.getLogo());
+                    binding.status.setVisibility(View.GONE);
+                    binding.getRoot().setEnabled(true);
+                } else {
+                    ImageDownLoader.setBlurImageFromUrl(context, binding.ivTheme, item.getLogo());
+                    binding.ivTheme.setAlpha(0.5f);
+                    binding.status.setVisibility(View.VISIBLE);
+                    binding.getRoot().setEnabled(false);
+                }
+                break;
+        }
+        binding.getRoot().setOnClickListener(v -> QWebViewActivity.start(context, item.getTitle(), item.getLink()));
+    }
+
+    @Override
+    public int getItemCount() {
+        return dataList.size();
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/adapter/MyShareFragmentAdapter.java b/qpython/src/main/java/org/qpython/qpy/main/adapter/MyShareFragmentAdapter.java
new file mode 100644
index 00000000..0f975d9b
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/adapter/MyShareFragmentAdapter.java
@@ -0,0 +1,51 @@
+package org.qpython.qpy.main.adapter;
+
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentPagerAdapter;
+
+import org.qpython.qpy.main.fragment.MyGistFragment;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 文 件 名: MyShareFragmentAdapter
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2017/12/26 14:58
+ * 邮   箱: qq798435167@gmail.com
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class MyShareFragmentAdapter extends FragmentPagerAdapter {
+
+    public static final String[] titles     = new String[]{"My Gists","My Stars"};
+    public List<MyGistFragment>  mFragments = new ArrayList<>();
+
+    public MyShareFragmentAdapter(FragmentManager fm) {
+        super(fm);
+        initFragments();
+    }
+
+    private void initFragments() {
+        for (int i=0;i<titles.length;i++){
+            mFragments.add(MyGistFragment.newInstance(i));
+        }
+    }
+
+    @Override
+    public Fragment getItem(int position) {
+        return mFragments.get(position);
+    }
+
+    @Override
+    public int getCount() {
+        return titles.length;
+    }
+
+    @Override
+    public CharSequence getPageTitle(int position) {
+        return titles[position];
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/adapter/MyViewHolder.java b/qpython/src/main/java/org/qpython/qpy/main/adapter/MyViewHolder.java
new file mode 100644
index 00000000..d5891cce
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/adapter/MyViewHolder.java
@@ -0,0 +1,28 @@
+package org.qpython.qpy.main.adapter;
+
+import android.databinding.DataBindingUtil;
+import android.databinding.ViewDataBinding;
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+
+/**
+ * Custom View Holder for store data binding
+ * Created by Hmei on 2017-05-25.
+ */
+
+public class MyViewHolder<T extends ViewDataBinding> extends RecyclerView.ViewHolder {
+    private T binding;
+
+    public MyViewHolder(View itemView) {
+        super(itemView);
+        binding = DataBindingUtil.bind(itemView);
+    }
+
+    public T getBinding() {
+        return binding;
+    }
+
+    public void setBinding(T binding) {
+        this.binding = binding;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/adapter/NewsDetailAdapter.java b/qpython/src/main/java/org/qpython/qpy/main/adapter/NewsDetailAdapter.java
new file mode 100644
index 00000000..58784e8f
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/adapter/NewsDetailAdapter.java
@@ -0,0 +1,195 @@
+package org.qpython.qpy.main.adapter;
+
+import android.app.Activity;
+import android.content.Context;
+import android.databinding.DataBindingUtil;
+import android.support.v7.widget.RecyclerView;
+import android.text.Html;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.quseit.util.DateTimeHelper;
+import com.quseit.util.ImageDownLoader;
+
+import org.greenrobot.eventbus.EventBus;
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ItemCommentBinding;
+import org.qpython.qpy.databinding.RvItemNewsHeadBinding;
+import org.qpython.qpy.main.activity.GistEditActivity;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.server.gist.GistEvent;
+import org.qpython.qpy.main.server.gist.response.CommentBean;
+import org.qpython.qpy.main.server.gist.response.GistBean;
+
+import java.util.List;
+
+import static org.qpython.qpy.main.server.gist.GistEvent.CODE_REVIEW_EVENT;
+import static org.qpython.qpy.main.server.gist.GistEvent.COMMENT_EVENT;
+import static org.qpython.qpy.main.server.gist.GistEvent.DIVIDER;
+import static org.qpython.qpy.main.server.gist.GistEvent.FAVORITE_REQUEST;
+import static org.qpython.qpy.main.server.gist.GistEvent.FORK;
+import static org.qpython.qpy.main.server.gist.GistEvent.REPLY_EVENT;
+import static org.qpython.qpy.main.server.gist.GistEvent.RUN_NOTEBOOK;
+import static org.qpython.qpy.main.server.gist.GistEvent.RUN_SCRIPT;
+
+/**
+ * 文 件 名: NewsDetailAdapter
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2017/12/26 11:25
+ * 邮   箱: qq798435167@gmail.com
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class NewsDetailAdapter extends RecyclerView.Adapter<MyViewHolder> {
+    private GistBean mGistBean;
+    private Context  mContext;
+
+    public NewsDetailAdapter(Context context) {
+        mContext = context;
+    }
+
+    public void setData(GistBean bean) {
+        mGistBean = bean;
+        notifyDataSetChanged();
+    }
+
+    public void addComment(CommentBean bean) {
+        mGistBean.getComments().add(0, bean);
+        mGistBean.addCommentNum();
+        notifyDataSetChanged();
+    }
+
+    public void loadMoreComment(List<CommentBean> list) {
+        mGistBean.getComments().addAll(list);
+        notifyDataSetChanged();
+    }
+
+    public void favorite(boolean is) {
+        mGistBean.setFavorite(is);
+        mGistBean.changeStar(is);
+        notifyItemChanged(0);
+    }
+
+    public void startEdit() {
+        GistEditActivity.start(mContext, mGistBean.getId(), mGistBean.getTitle(), mGistBean
+                .getDescription(), mGistBean.getSource());
+        ((Activity)mContext).finish();
+    }
+
+    @Override
+    public MyViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        if (viewType == 0) {
+            RvItemNewsHeadBinding binding = DataBindingUtil.inflate(LayoutInflater.from(parent.getContext()), R.layout.rv_item_news_head, parent, false);
+            MyViewHolder<RvItemNewsHeadBinding> holder = new MyViewHolder<>(binding.getRoot());
+            holder.setBinding(binding);
+            return holder;
+        } else {
+            ItemCommentBinding binding = DataBindingUtil.inflate(LayoutInflater.from(parent
+                    .getContext()), R.layout.item_comment, parent, false);
+            MyViewHolder<ItemCommentBinding> holder = new MyViewHolder<>(binding.getRoot());
+            holder.setBinding(binding);
+            return holder;
+        }
+    }
+
+    @Override
+    public void onBindViewHolder(MyViewHolder holder, int position) {
+        if (position == 0) {
+            RvItemNewsHeadBinding binding = (RvItemNewsHeadBinding) holder.getBinding();
+            initHead(binding);
+        } else {
+            ItemCommentBinding binding = (ItemCommentBinding) holder.getBinding();
+            initComments(position - 1, binding);
+        }
+    }
+
+    private void initComments(int position, ItemCommentBinding binding) {
+        CommentBean bean = mGistBean.getComments().get(position);
+//        名字
+        binding.name.setText(bean.getUserName());
+        //头像
+        ImageDownLoader.setImageFromUrl(mContext, binding.avatar, bean.getUserAvatar());
+        //时间
+        binding.date.setText(DateTimeHelper.converTime(bean.getCreateAt(), mContext.getResources()
+                .getStringArray(R.array.time_label)));
+        //评论
+        binding.fromContent.setText(bean.getComment());
+
+        if (bean.getReplies() != null) {
+            String htmlContent = mContext.getString(R.string.replied_format, bean.getReplies
+                    ().getUser_name(), bean.getReplies().getComment_content());
+            binding.reComment.setText(Html.fromHtml(htmlContent));
+            binding.reComment.setVisibility(View.VISIBLE);
+        } else {
+            binding.reComment.setVisibility(View.GONE);
+        }
+        //回复评论
+        binding.getRoot().setOnClickListener(v -> EventBus.getDefault().post(new GistEvent
+                (REPLY_EVENT, bean.getId() + "," + bean.getUserName())));
+    }
+
+    private void initHead(RvItemNewsHeadBinding binding) {
+        //头像
+        ImageDownLoader.setImageFromUrl(mContext, binding.userAvatarIv, mGistBean.getUser().getAvatar());
+        //名字
+        binding.userNameTv.setText(mGistBean.getUser().getUName());
+        //时间
+        binding.commitTimeTv.setText(DateTimeHelper.converTime(mGistBean.getCreateAt(), mContext.getResources()
+                .getStringArray(R.array.time_label)));
+        //收藏数
+        binding.starCountTv.setText(String.valueOf(mGistBean.getStar()));
+        binding.starCountLayout.setSelected(mGistBean.isFavorite());
+        binding.starCountLayout.setOnClickListener(v -> EventBus.getDefault().post(new GistEvent
+                (FAVORITE_REQUEST)));
+        //评论数
+        binding.commentCountTv.setText(String.valueOf(mGistBean.getComment()));
+        binding.commentCountLayout.setOnClickListener(v -> EventBus.getDefault().post(new GistEvent(COMMENT_EVENT)));
+        //空评论
+        binding.emptyTv.setOnClickListener(v -> EventBus.getDefault().post(new GistEvent(COMMENT_EVENT)));
+        if (mGistBean.getComments().size() > 0) binding.emptyTv.setVisibility(View.GONE);
+//        //标题
+//        binding.newsTitleTv.setText(mGistBean.getTitle());
+        //描述
+        binding.newsContentTv.setText(mGistBean.getDescription());
+        //代码
+        binding.codeContentTv.setText(mGistBean.getSource());
+        binding.codeContentTv.setOnClickListener(v -> EventBus.getDefault().post(new GistEvent(CODE_REVIEW_EVENT)));
+        //运行
+        binding.btnRun.setOnClickListener(v -> {
+            if (mGistBean.getSourceType().equals("notebook")) {
+                EventBus.getDefault().post(new GistEvent(RUN_NOTEBOOK, mGistBean.getSource().toString()));
+            } else if (mGistBean.getSourceType().equals("script")) {
+                EventBus.getDefault().post(new GistEvent(RUN_SCRIPT, mGistBean.getTitle() +
+                        DIVIDER + mGistBean.getSource()));
+            }
+        });
+        //fork
+        if (App.getUser() == null || mGistBean.getUser().getUserName().equals(App.getUser()
+                .getUserName())) {
+            binding.btnFork.setVisibility(View.GONE);
+        } else {
+            binding.btnFork.setVisibility(View.VISIBLE);
+            binding.btnFork.setOnClickListener(view -> EventBus.getDefault().post(new GistEvent(FORK)));
+        }
+    }
+
+    @Override
+    public int getItemCount() {
+        return mGistBean == null ?
+                0 :
+                mGistBean.getComments() == null ?
+                        1 :
+                        mGistBean.getComments().size() + 1;
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        if (position == 0) {
+            return 0;
+        } else {
+            return 1;
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/adapter/NotebookAdapter.java b/qpython/src/main/java/org/qpython/qpy/main/adapter/NotebookAdapter.java
new file mode 100644
index 00000000..566f0cae
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/adapter/NotebookAdapter.java
@@ -0,0 +1,92 @@
+package org.qpython.qpy.main.adapter;
+
+import android.content.Context;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import org.qpython.qpy.R;
+
+import java.io.File;
+import java.io.FileFilter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class NotebookAdapter extends RecyclerView.Adapter {
+
+    private Context mContext;
+    private File mFile;
+    private List<File> mFileList;
+    private OnItemClickCallback mOnItemClickCallback;
+
+    public NotebookAdapter(Context context, File file) {
+        mContext = context;
+        getFileList(file);
+    }
+
+    private void getFileList(File file) {
+        mFile = file;
+        File[] files = mFile.listFiles();
+        if (files == null){
+            mFileList = new ArrayList<>();
+        }else {
+            mFileList = Arrays.asList(files);
+        }
+    }
+
+    public void setFile(File file) {
+        getFileList(file);
+        notifyDataSetChanged();
+    }
+
+
+
+    public File getFile() {
+        return mFile;
+    }
+
+    public void setOnItemClickCallback(OnItemClickCallback onItemClickCallback) {
+        mOnItemClickCallback = onItemClickCallback;
+    }
+
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(mContext).inflate(R.layout.item_notebook, parent, false);
+        return new RecyclerView.ViewHolder(view) {
+        };
+    }
+
+    @Override
+    public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
+        File file = mFileList.get(position);
+        TextView tvFileName = holder.itemView.findViewById(R.id.file_name_tv);
+        tvFileName.setText(file.getName());
+        holder.itemView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+                if (mOnItemClickCallback != null) {
+                    if (file.isDirectory()) {
+                        setFile(file);
+                        mOnItemClickCallback.onClick(file.getAbsolutePath(), true);
+                    }else {
+                        mOnItemClickCallback.onClick(file.getAbsolutePath(), false);
+                    }
+                }
+
+            }
+        });
+    }
+
+    @Override
+    public int getItemCount() {
+        return mFileList.size();
+    }
+
+    public interface OnItemClickCallback {
+        void onClick(String filePath, boolean isDir);
+    }
+}
\ No newline at end of file
diff --git a/qpython/src/main/java/org/qpython/qpy/main/adapter/StatePagerAdapter.java b/qpython/src/main/java/org/qpython/qpy/main/adapter/StatePagerAdapter.java
new file mode 100644
index 00000000..b54915d9
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/adapter/StatePagerAdapter.java
@@ -0,0 +1,36 @@
+package org.qpython.qpy.main.adapter;
+
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentStatePagerAdapter;
+
+import org.qpython.qpy.main.fragment.FileFragment;
+
+
+public class StatePagerAdapter extends FragmentStatePagerAdapter {
+    private int mNumOfTabs;
+    private FileFragment projectFiles = FileFragment.newInstance(FileFragment.PROJECT);
+    private FileFragment scriptFiles  = FileFragment.newInstance(FileFragment.SCRIPT);
+
+    public StatePagerAdapter(FragmentManager fm, int NumOfTabs) {
+        super(fm);
+        this.mNumOfTabs = NumOfTabs;
+    }
+
+    @Override
+    public Fragment getItem(int position) {
+        switch (position) {
+            case 0:
+                return projectFiles;
+            case 1:
+                return scriptFiles;
+            default:
+                return null;
+        }
+    }
+
+    @Override
+    public int getCount() {
+        return mNumOfTabs;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/adapter/UploadFileTreeAdapter.java b/qpython/src/main/java/org/qpython/qpy/main/adapter/UploadFileTreeAdapter.java
new file mode 100644
index 00000000..c6e6b058
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/adapter/UploadFileTreeAdapter.java
@@ -0,0 +1,88 @@
+package org.qpython.qpy.main.adapter;
+
+import android.os.Handler;
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+
+import org.qpython.qpy.databinding.ItemFolderLittleBinding;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class UploadFileTreeAdapter extends FileTreeAdapter {
+    private Handler handler = new Handler();
+    private List<String> checkedList;
+    private RecyclerView mRecyclerView;
+
+    public UploadFileTreeAdapter(String rootPath) {
+        super(rootPath);
+        checkedList = new ArrayList<>();
+    }
+
+    @Override
+    public void onAttachedToRecyclerView(RecyclerView recyclerView) {
+        super.onAttachedToRecyclerView(recyclerView);
+        mRecyclerView = recyclerView;
+    }
+
+    @Override
+    public void onBindViewHolder(MyViewHolder<ItemFolderLittleBinding> holder, int position) {
+        super.onBindViewHolder(holder, position);
+        ItemFolderLittleBinding binding = holder.getBinding();
+        FileTreeBean file = dataList.get(position);
+
+        binding.checkbox.setVisibility(View.VISIBLE);
+        binding.checkbox.setOnCheckedChangeListener(null);
+
+        binding.checkbox.setChecked(file.isCheck);
+
+        binding.checkbox.setOnCheckedChangeListener((buttonView, isChecked) -> {
+            if (file.isDir()) {
+                reverseCheck(file, isChecked);
+                return;
+            }
+            if (isChecked) {
+                checkedList.add(file.path);
+            } else {
+                checkedList.remove(file);
+            }
+        });
+    }
+
+    public List<String> getCheckedList() {
+        return checkedList;
+    }
+
+    private void reverseCheck(FileTreeBean file, boolean isChecked) {
+        file.isCheck = isChecked;
+        if (file.isDir()) {
+            for (FileTreeBean fileTreeBean : file.childList) {
+                fileTreeBean.isCheck = isChecked;
+                if (fileTreeBean.isDir()) {
+                    reverseCheck(fileTreeBean, isChecked);
+                }
+                if (isChecked) {
+                    checkedList.add(fileTreeBean.path);
+                } else {
+                    checkedList.remove(fileTreeBean.path);
+                }
+            }
+            postAndNotifyAdapter();
+        }
+    }
+
+    private void postAndNotifyAdapter() {
+        handler.post(() -> {
+            if (!mRecyclerView.isComputingLayout()) {
+                notifyDataSetChanged();
+            } else {
+                postAndNotifyAdapter();
+            }
+        });
+    }
+
+    @Override
+    void itemClick(ItemFolderLittleBinding binding, FileTreeBean folderBean) {
+        binding.checkbox.setChecked(!binding.checkbox.isChecked());
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/adapter/ViewPagerAdapter.java b/qpython/src/main/java/org/qpython/qpy/main/adapter/ViewPagerAdapter.java
new file mode 100644
index 00000000..b3b63d81
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/adapter/ViewPagerAdapter.java
@@ -0,0 +1,60 @@
+package org.qpython.qpy.main.adapter;
+
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentPagerAdapter;
+import android.view.ViewGroup;
+
+import com.google.common.collect.Lists;
+
+import org.qpython.qpy.main.widget.WrapContentHeightViewPager;
+
+import java.util.List;
+import java.util.Locale;
+
+
+public class ViewPagerAdapter<T extends Fragment> extends FragmentPagerAdapter {
+
+    private List<T> fragments;
+    private int mCurrentPosition = -1;
+
+    public ViewPagerAdapter(FragmentManager fm, List<T> fragments) {
+        super(fm);
+//        if (isRTL()) {
+//            this.fragments = Lists.reverse(fragments);
+//            return;
+//        }
+        this.fragments = fragments;
+    }
+
+    @Override
+    public void setPrimaryItem(ViewGroup container, int position, Object object) {
+        super.setPrimaryItem(container, position, object);
+        if (position != mCurrentPosition) {
+            Fragment fragment = (Fragment) object;
+            if (container instanceof WrapContentHeightViewPager) {
+                WrapContentHeightViewPager pager = (WrapContentHeightViewPager) container;
+                if (fragment != null && fragment.getView() != null) {
+                    mCurrentPosition = position;
+                    pager.measureCurrentView(fragment.getView());
+                }
+            }
+        }
+    }
+
+    @Override
+    public int getCount() {
+        return fragments.size();
+    }
+
+    @Override
+    public T getItem(int position) {
+        return fragments.get(position);
+    }
+
+//    private boolean isRTL() {
+//        final int directionality = Character.getDirectionality(Locale.getDefault().getDisplayName().charAt(0));
+//        return directionality == Character.DIRECTIONALITY_RIGHT_TO_LEFT ||
+//                directionality == Character.DIRECTIONALITY_RIGHT_TO_LEFT_ARABIC;
+//    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/app/App.java b/qpython/src/main/java/org/qpython/qpy/main/app/App.java
new file mode 100644
index 00000000..95ea64e2
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/app/App.java
@@ -0,0 +1,228 @@
+package org.qpython.qpy.main.app;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.os.Build;
+import android.support.multidex.MultiDex;
+import android.support.v7.app.AppCompatActivity;
+
+import com.google.gson.Gson;
+import com.quseit.common.CrashHandler;
+import com.quseit.common.updater.downloader.DefaultDownloader;
+import com.squareup.leakcanary.LeakCanary;
+
+import org.qpython.qpy.main.server.Service;
+import org.qpython.qpy.main.server.gist.Api;
+import org.qpython.qpy.main.server.gist.TokenManager;
+import org.qpython.qpy.main.server.gist.response.GistBean;
+import org.qpython.qpy.main.server.http.Retrofitor;
+import org.qpython.qpy.utils.NotebookUtil;
+import org.qpython.qpysdk.QPyConstants;
+import org.qpython.qsl4a.QSL4APP;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+import okhttp3.Cache;
+import okhttp3.OkHttpClient;
+import okhttp3.logging.HttpLoggingInterceptor;
+import retrofit2.Retrofit;
+import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory;
+import retrofit2.converter.gson.GsonConverterFactory;
+
+public class App extends QSL4APP {
+
+    private static Context sContext;
+    private static String  sScriptPath;
+    private static String  sProjectPath;
+    //private static AppCompatActivity sActivity;
+
+    private static OkHttpClient           okHttpClient;
+    private static HttpLoggingInterceptor interceptor;
+    private static Gson                   gson;
+
+    private static DefaultDownloader downloader;
+
+    //保存user信息
+    private static SharedPreferences      mPreferences;
+
+    private static Retrofit.Builder retrofitBuilder;
+
+    private static Service mService;//本地retrofit方法
+
+    public static OkHttpClient getOkHttpClient() {
+        return okHttpClient;
+    }
+
+    public static HttpLoggingInterceptor getInterceptor() {
+        return interceptor;
+    }
+
+    public static Gson getGson() {
+        return gson;
+    }
+
+    public static Retrofit.Builder getRetrofit() {
+        return retrofitBuilder;
+    }
+
+    public static Service getService() {
+        return mService;
+    }
+
+    public static String getScriptPath() {
+        return sScriptPath;
+    }
+
+    public static String getProjectPath() {
+        return sProjectPath;
+    }
+
+    public static Context getContext() {
+        return sContext;
+    }
+
+//    public static AppCompatActivity getActivity() {
+//        return sActivity;
+//    }
+//
+//    public static void setActivity(AppCompatActivity activity) {
+//        sActivity = activity;
+//    }
+    public static User getUser() {
+        if (mPreferences.getString("email", null) == null) {
+            return null;
+        }
+        User user = new User();
+        user.setNick(mPreferences.getString("nick", ""));
+        user.setUserName(mPreferences.getString("name", ""));
+        user.setUserId(mPreferences.getString("id", ""));
+        user.setEmail(mPreferences.getString("email", ""));
+        user.setAvatarUrl(mPreferences.getString("avatar", ""));
+        return user;
+    }
+
+    public static DefaultDownloader getDownloader() {
+        return downloader;
+    }
+
+    public static void setUser(User user) {
+        SharedPreferences.Editor editor = mPreferences.edit();
+        if (user == null) {
+            editor.clear();
+            editor.apply();
+            return;
+        }
+        editor.putString("nick", user.getNick());
+        editor.putString("name", user.getUserName());
+        editor.putString("email", user.getEmail());
+        editor.putString("avatar", user.getAvatarUrl());
+        editor.putString("id", user.getUserId());
+        if (!editor.commit()) {
+            editor.apply();
+        }
+
+    }
+
+    private static List<String> favorites = new ArrayList<>();
+
+    public static List<String> getFavorites() {
+        return favorites;
+    }
+
+    public static void addFavorites(GistBean bean) {
+        favorites.add(bean.getId());
+    }
+
+    public static void setFavorites(List<GistBean> list) {
+        for (GistBean bean : list) {
+            favorites.add(bean.getId());
+        }
+    }
+
+    @Override
+    protected void attachBaseContext(Context base) {
+        super.attachBaseContext(base);
+        MultiDex.install(this);
+    }
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        if (LeakCanary.isInAnalyzerProcess(this)) {
+            // This process is dedicated to LeakCanary for heap analysis.
+            // You should not init your app in this process.
+            return;
+        }
+        LeakCanary.install(this);
+
+        sContext = getApplicationContext();
+        downloader = new DefaultDownloader(sContext);
+        // init retrofit relate
+        gson = new Gson();
+        interceptor = new HttpLoggingInterceptor();
+        interceptor.setLevel(HttpLoggingInterceptor.Level.BASIC);
+
+        int cacheSize = 10 * 1024 * 1024; // 10 MiB
+        Cache cache = new Cache(App.getContext().getCacheDir(), cacheSize);
+
+        okHttpClient = new OkHttpClient.Builder().cache(cache).addInterceptor(interceptor).build();
+        retrofitBuilder = new Retrofit.Builder()
+                .client(okHttpClient)
+                .addConverterFactory(GsonConverterFactory.create())
+                .addCallAdapterFactory(RxJavaCallAdapterFactory.create());
+        mService = new Service();
+
+        String basePath = QPyConstants.ABSOLUTE_PATH;
+        sProjectPath = String.format("%s/%s", basePath, "projects");
+        sScriptPath = String.format("%s/%s", basePath, "scripts");
+
+        initLayoutDir();
+        mPreferences = this.getSharedPreferences("user", 0);
+        CrashHandler.getInstance().init(this);
+        AppInit.init(this);
+
+        Map<String, String> header = new HashMap<>();
+        TokenManager.init(this);
+        header.put("Content-Type", "application/json");
+//        if (!TextUtils.isEmpty(TokenManager.getToken())) {
+//            header.put("HTTP_TOKEN", TokenManager.getToken());
+//        }
+        Retrofitor
+                .getInstance()
+                .setTimeOut(Retrofitor.DEFAULT_TIMEOUT)
+//                .openDebug(BuildConfig.DEBUG)
+  //              .supportSSL(!BuildConfig.DEBUG)
+                .addHeaders(header)
+                .init(Api.BASE_URL);
+
+//        if (NotebookUtil.isNotebookLibInstall(getActivity())) {
+//            if (Utils.httpPing(NotebookUtil.NB_SERVER, 300)) {
+//                NotebookUtil.startNotebookService(getActivity());
+//            }
+//        }
+
+        // restart Notebook
+        if (NotebookUtil.isNBSrvSet(this)) {
+
+            NotebookUtil.killNBSrv(this);
+            NotebookUtil.startNotebookService2(this);
+        }
+    }
+
+
+    private void initLayoutDir() {
+        if (Build.VERSION.SDK_INT >= 17) {
+            Resources resources = getResources();
+            Configuration config = resources.getConfiguration();
+            Locale locale = config.locale;
+            config.setLayoutDirection(locale);
+            resources.updateConfiguration(config, resources.getDisplayMetrics());
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/app/CONF.java b/qpython/src/main/java/org/qpython/qpy/main/app/CONF.java
new file mode 100644
index 00000000..6a37732c
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/app/CONF.java
@@ -0,0 +1,23 @@
+package org.qpython.qpy.main.app;
+
+import com.quseit.util.NAction;
+
+import org.qpython.qpysdk.QPyConstants;
+
+public class CONF implements QPyConstants {
+
+    public static final String LIB_DOWNLOAD_TEMP = QPyConstants.ABSOLUTE_PATH + "/cache";
+        public static final String QPYPI_URL         = "https://pypi.org/simple/";
+
+    public static final String NOTIFICATION_SP_NAME = "NOTIFICATION_EXTRA";
+    public static final String NOTIFICATION_SP_OBJ  = "NOTIFICATION_OBJ";
+
+    public static final String IAP_NUM_REQUEST_URL = "http://apu.quseit.com/conf/iaplognum/org.qpython.qpy/";
+    public static final String GOOGLE_ID_TOKEN     = "955258715976-i6t5usa0tjg8favq17lsfaj885l4lilv.apps.googleusercontent.com";
+
+    public static final String CLOUD_MAP_CACHE_PATH = QPyConstants.ABSOLUTE_PATH + "/lib/.cloud_cache";
+
+    public static String qpypiPath() {
+        return App.getContext().getFilesDir().getAbsolutePath() + "/lib/python"+(NAction.isQPy3(App.getContext())?"3.6":"2.7")+"/site-packages/";
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/app/User.java b/qpython/src/main/java/org/qpython/qpy/main/app/User.java
new file mode 100644
index 00000000..a74ed09b
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/app/User.java
@@ -0,0 +1,51 @@
+package org.qpython.qpy.main.app;
+
+
+public class User {
+    private String userId;
+    private String userName;
+    private String nick;
+
+    private String email;
+    private String avatarUrl;
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getNick() {
+        return nick == null ? "" : nick;
+    }
+
+    public String getUserName() {
+        return userName == null ? "" : userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setNick(String unick) {
+        this.nick = unick;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getAvatarUrl() {
+        return avatarUrl;
+    }
+
+    public void setAvatarUrl(String avatarUrl) {
+        this.avatarUrl = avatarUrl;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/dialog/LogoDialog.java b/qpython/src/main/java/org/qpython/qpy/main/dialog/LogoDialog.java
new file mode 100644
index 00000000..4196ba97
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/dialog/LogoDialog.java
@@ -0,0 +1,36 @@
+package org.qpython.qpy.main.dialog;
+
+import android.support.v4.app.DialogFragment;
+
+//import org.qpython.qpy.databinding.DialogLogoBinding;
+import org.qpython.qpy.main.activity.HomeMainActivity;
+
+public class LogoDialog extends DialogFragment {
+    public static final String TAG = "LogoDialog";
+    //private DialogLogoBinding mBinding;
+
+    public static LogoDialog newInstance() {
+        return new LogoDialog();
+    }
+
+//    @Nullable
+//    @Override
+//    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+//        mBinding = DataBindingUtil.inflate(inflater, R.layout.dialog_logo, container, false);
+//
+//        mBinding.btnQrcode.setOnClickListener(v -> {
+//            Bus.getDefault().post(new HomeMainActivity.StartQrCodeActivityEvent());
+//            dismiss();
+//        });
+//        mBinding.btnScript.setOnClickListener(v -> {
+//            Bus.getDefault().post(new HomeMainActivity.ShowProgramDialogEvent(false));
+//            dismiss();
+//        });
+//        mBinding.btnProject.setOnClickListener(v -> {
+//            Bus.getDefault().post(new HomeMainActivity.ShowProgramDialogEvent(true));
+//            dismiss();
+//        });
+//
+//        return mBinding.getRoot();
+//    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/event/AppsLoader.java b/qpython/src/main/java/org/qpython/qpy/main/event/AppsLoader.java
new file mode 100644
index 00000000..17eed0c7
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/event/AppsLoader.java
@@ -0,0 +1,152 @@
+package org.qpython.qpy.main.event;
+
+import android.content.AsyncTaskLoader;
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+
+import org.qpython.qpy.main.model.AppModel;
+import org.qpython.qpy.main.model.LocalAppModel;
+
+import java.text.Collator;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+/**
+ * Load App list
+ * Created by Hmei on 2017-05-25.
+ */
+
+public class AppsLoader extends AsyncTaskLoader<ArrayList<AppModel>> {
+    ArrayList<AppModel> mInstalledApps;
+
+    final PackageManager mPm;
+
+    public AppsLoader(Context context) {
+        super(context);
+
+        mPm = context.getPackageManager();
+    }
+
+    @Override
+    public ArrayList<AppModel> loadInBackground() {
+        // retrieve the list of installed applications
+        List<ApplicationInfo> apps = mPm.getInstalledApplications(0);
+
+        if (apps == null) {
+            apps = new ArrayList<>();
+        }
+
+        final Context context = getContext();
+
+        // create corresponding apps and load their labels
+        ArrayList<AppModel> items = new ArrayList<>(apps.size());
+        for (int i = 0; i < apps.size(); i++) {
+            String pkg = apps.get(i).packageName;
+
+            // only apps which are launchable
+            if (context.getPackageManager().getLaunchIntentForPackage(pkg) != null) {
+                LocalAppModel app = new LocalAppModel(context, apps.get(i));
+                app.loadLabel(context);
+                items.add(app);
+            }
+        }
+
+        // sort the list
+        Collections.sort(items, ALPHA_COMPARATOR);
+        return items;
+    }
+
+    @Override
+    public void deliverResult(ArrayList<AppModel> apps) {
+        if (isReset()) {
+            // An async query came in while the loader is stopped.  We
+            // don't need the result.
+            if (apps != null) {
+                onReleaseResources(apps);
+            }
+        }
+
+        ArrayList<AppModel> oldApps = apps;
+        mInstalledApps = apps;
+
+        if (isStarted()) {
+            // If the Loader is currently started, we can immediately
+            // deliver its results.
+            super.deliverResult(apps);
+        }
+
+        // At this point we can release the resources associated with
+        // 'oldApps' if needed; now that the new result is delivered we
+        // know that it is no longer in use.
+        if (oldApps != null) {
+            onReleaseResources(oldApps);
+        }
+    }
+
+    @Override
+    protected void onStartLoading() {
+        if (mInstalledApps != null) {
+            // If we currently have a result available, deliver it
+            // immediately.
+            deliverResult(mInstalledApps);
+        }
+
+        if (takeContentChanged() || mInstalledApps == null ) {
+            // If the data has changed since the last time it was loaded
+            // or is not currently available, start a load.
+            forceLoad();
+        }
+    }
+
+    @Override
+    protected void onStopLoading() {
+        // Attempt to cancel the current load task if possible.
+        cancelLoad();
+    }
+
+    @Override
+    public void onCanceled(ArrayList<AppModel> apps) {
+        super.onCanceled(apps);
+
+        // At this point we can release the resources associated with 'apps'
+        // if needed.
+        onReleaseResources(apps);
+    }
+
+    @Override
+    protected void onReset() {
+        // Ensure the loader is stopped
+        onStopLoading();
+
+        // At this point we can release the resources associated with 'apps'
+        // if needed.
+        if (mInstalledApps != null) {
+            onReleaseResources(mInstalledApps);
+            mInstalledApps = null;
+        }
+    }
+
+    /**
+     * Helper method to do the cleanup work if needed, for example if we're
+     * using Cursor, then we should be closing it here
+     *
+     * @param apps
+     */
+    protected void onReleaseResources(ArrayList<AppModel> apps) {
+        // do nothing
+    }
+
+    /**
+     * Perform alphabetical comparison of application entry objects.
+     */
+    public static final Comparator<AppModel> ALPHA_COMPARATOR = new Comparator<AppModel>() {
+        private final Collator sCollator = Collator.getInstance();
+        @Override
+        public int compare(AppModel object1, AppModel object2) {
+            return sCollator.compare(object1.getLabel(), object2.getLabel());
+        }
+    };
+}
\ No newline at end of file
diff --git a/qpython/src/main/java/org/qpython/qpy/main/event/Bean.java b/qpython/src/main/java/org/qpython/qpy/main/event/Bean.java
new file mode 100644
index 00000000..12076c31
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/event/Bean.java
@@ -0,0 +1,387 @@
+package org.qpython.qpy.main.event;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Environment;
+import android.util.Log;
+import android.webkit.JavascriptInterface;
+import android.webkit.WebView;
+import android.widget.Toast;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.qpython.qpy.R;
+import org.qpython.qpy.main.activity.NotebookActivity;
+import org.qpython.qpy.main.activity.PurchaseActivity;
+import org.qpython.qpy.main.activity.QWebViewActivity;
+import org.qpython.qpy.main.activity.SettingActivity;
+import org.qpython.qpy.main.app.CONF;
+import org.qpython.qpy.main.utils.Utils;
+import org.qpython.qpy.texteditor.EditorActivity;
+
+import com.quseit.util.FileHelper;
+
+import org.qpython.qpy.utils.NotebookUtil;
+import org.qpython.qpysdk.QPyConstants;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+public class Bean {
+    private final String TAG = "BEAN";
+    protected String  title;
+    protected Context context;
+    protected WebView webview;
+    protected int     dialogIndex;
+    protected String  srv;
+
+    public Bean(Context context, WebView webview) {
+        this.context = context;
+        this.webview = webview;
+    }
+
+    @JavascriptInterface
+    public String getSrv() {
+        return this.srv;
+    }
+
+    @JavascriptInterface
+    public void setSrv(String srv) {
+        this.srv = srv;
+    }
+
+    @JavascriptInterface
+    public void close() {
+        Intent intent1 = new Intent(".QWebViewActivity");
+        intent1.putExtra(QWebViewActivity.ACT, "close");
+        context.sendBroadcast(intent1);
+    }
+
+    @JavascriptInterface
+    public void alert(String info) {
+        Intent intent1 = new Intent(".QWebViewActivity");
+        intent1.putExtra(QWebViewActivity.ACT, "alert");
+        intent1.putExtra(QWebViewActivity.URL, info);
+
+        context.sendBroadcast(intent1);
+    }
+
+    @JavascriptInterface
+    public void showWait() {
+        Intent intent1 = new Intent(".QWebViewActivity");
+        intent1.putExtra(QWebViewActivity.ACT, "showwait");
+        context.sendBroadcast(intent1);
+    }
+
+    @JavascriptInterface
+    public void closeWait() {
+        Intent intent1 = new Intent(".QWebViewActivity");
+        intent1.putExtra(QWebViewActivity.ACT, "closewait");
+        context.sendBroadcast(intent1);
+    }
+
+    @JavascriptInterface
+    public void pipConsole() {
+        Intent intent1 = new Intent(".QWebViewActivity");
+        intent1.putExtra(QWebViewActivity.ACT, "pipconsole");
+        context.sendBroadcast(intent1);
+    }
+
+    @JavascriptInterface
+    public void pipInstall(String link, String src) {
+        Intent intent1 = new Intent(".QWebViewActivity");
+        intent1.putExtra(QWebViewActivity.ACT, "pipinstall");
+        intent1.putExtra(QWebViewActivity.URL, link);
+        intent1.putExtra(QWebViewActivity.SRC, src);
+        context.sendBroadcast(intent1);
+    }
+
+    @JavascriptInterface
+    public void libMan() {
+        Intent intent1 = new Intent(".QWebViewActivity");
+        intent1.putExtra(QWebViewActivity.ACT, "libman");
+
+        context.sendBroadcast(intent1);
+    }
+
+    @JavascriptInterface
+    public void showDrawerMenu(String menuPythonActivity) {
+        Intent intent1 = new Intent(".QWebViewActivity");
+        intent1.putExtra(QWebViewActivity.ACT, "showdrawermenu");
+        intent1.putExtra(QWebViewActivity.URL, menuPythonActivity);
+        context.sendBroadcast(intent1);
+    }
+
+    @JavascriptInterface
+    public boolean isSrvOk(String srv) {
+        try {
+            URL u = new URL(srv.equals("") ? this.srv : srv);
+            int port = 80;
+            if (u.getPort() != -1) {
+                port = u.getPort();
+            }
+            String url = u.getProtocol() + "://" + u.getHost() + ":" + port + "/";
+            boolean ret = Utils.httpPing(url, 3000);
+            Log.d("Bean", "isSrvOk:"+url+" - "+ret);
+            return ret;
+
+        } catch (MalformedURLException e) {
+            //LogUtil.d("Bean", "MalformedURLException:"+e);
+            return false;
+        }
+    }
+
+    @JavascriptInterface
+    public void openUrl(String url) {
+        Intent intent = Utils.openRemoteLink(context, url);
+        context.startActivity(intent);
+    }
+
+    @JavascriptInterface
+    public void call(String number) {
+        Intent phoneIntent = new Intent(Intent.ACTION_DIAL, Uri.parse("tel:" + number));
+        context.startActivity(phoneIntent);
+    }
+
+    @JavascriptInterface
+    public String isNetworkOk(Context context) {
+        if (Utils.netOk(context)) {
+            return "1";
+        } else {
+            return "0";
+        }
+    }
+
+    @JavascriptInterface
+    public String returnTmpScript(String xcode, String flag, String param) {
+        try {
+            //
+            File root = new File(QPyConstants.ABSOLUTE_PATH + "/cache");
+            if (root != null) {
+                FileHelper.clearDir(root.toString(), 0, false);
+            }
+
+            //String py = FileHelper.getBasePath(QBaseApp.getInstance().getRoot(), PythonActivity.DFROM_QPY)+"/"+PythonActivity.API_SCRIPT;
+            String py;
+            String code;
+            if (flag.equals("qedit")) {
+                if (param != null && !param.equals("")) {
+                    File f = new File(param);
+                    py = new File(f.getParentFile(), ".last_tmp.py").toString();
+                } else {
+                    py = new File(root, ".last_tmp.py").toString();
+                }
+                if (xcode.contains("#{HEADER}")) {
+                    code = xcode.replace("#{HEADER}", "");
+                } else {
+                    code = xcode;
+                }
+
+            } else {
+                py = QPyConstants.ABSOLUTE_PATH + "/cache/main.py";
+                if (xcode.contains("#{HEADER}")) {
+                    code = xcode.replace("#{HEADER}", "PARAM = '" + param + "'");
+
+                } else {
+                    code = "PARAM = '" + param + "'\n" + xcode;
+                }
+            }
+            //LogUtil.d(TAG, "py:"+py);
+            File pyCache = new File(py);
+            if (!pyCache.exists()) {
+                pyCache.createNewFile();
+            }
+            byte[] xcontent = code.getBytes();
+            RandomAccessFile accessFile = new RandomAccessFile(pyCache.getAbsoluteFile(), "rwd");
+            accessFile.setLength(xcontent.length);
+            accessFile.seek(0);
+            accessFile.write(xcontent, 0, xcontent.length);
+            accessFile.close();
+
+            return py;
+        } catch (IOException e) {
+            e.printStackTrace();
+            return "";
+        }
+    }
+
+    @JavascriptInterface
+    public void qeditor(String content) {
+
+        String py = returnTmpScript(content, "qedit", null);
+        Uri uri = Uri.fromFile(new File(py));
+        EditorActivity.start(context, uri);
+    }
+
+    @JavascriptInterface
+    public String qpyChecklibinstall(String cat, String smodule) {
+        final File libFile = getLibFile(smodule, cat);
+
+        if (libFile.exists()) {
+            return "1";
+        } else {
+            return "0";
+        }
+    }
+
+    @JavascriptInterface
+    public File getLibFile(String smodule, String cat) {
+        //String code = NAction.getCode(this);
+        boolean isQpy3 = Utils.isQPy3(context);
+        String base = isQpy3 ? "python3.2/site-packages" : "python2.7/site-packages";
+        String sbase = isQpy3 ? "python3.2" : "python2.7";
+        String ubase = isQpy3 ? "scripts3" : "scripts";
+        String pbase = isQpy3 ? "projects3" : "projects";
+
+        File libFile;
+        if (cat.equals("script")) {
+            libFile = new File(Environment.getExternalStorageDirectory(), "qpython/" + ubase + "/" + smodule);
+
+        } else if (cat.equals("user")) {
+            libFile = new File(Environment.getExternalStorageDirectory(), "qpython/" + pbase + "/" + smodule);
+
+        } else if (cat.equals("component")) {
+            libFile = new File(Environment.getExternalStorageDirectory(), "qpython/lib/" + smodule);
+
+        } else {
+            libFile = new File(context.getFilesDir(), "/lib/" + sbase + "/site-packages/" + smodule);
+
+
+        }
+        return libFile;
+    }
+
+    @JavascriptInterface
+    public void setQBTitle(String title) {
+        Intent intent1 = new Intent(".QWebViewActivity");
+        intent1.putExtra(QWebViewActivity.ACT, "settitle");
+        intent1.putExtra(QWebViewActivity.URL, title);
+        context.sendBroadcast(intent1);
+
+    }
+
+    @JavascriptInterface
+    public void showLog() {
+        Intent intent2 = new Intent(".QWebViewActivity");
+        intent2.putExtra(QWebViewActivity.ACT, "notifylog");
+        intent2.putExtra(QWebViewActivity.URL, "");
+
+        context.sendBroadcast(intent2);
+    }
+
+    @JavascriptInterface
+    public void feedback(String logfile) {
+        Intent intent2 = new Intent(".QWebViewActivity");
+        intent2.putExtra(QWebViewActivity.ACT, "feedback");
+        intent2.putExtra(QWebViewActivity.URL, logfile);
+
+        context.sendBroadcast(intent2);
+    }
+
+    @JavascriptInterface
+    public void loadConsole(String script) {
+        //LogUtil.d(TAG, "loadConsole:"+script);
+        Intent intent1 = new Intent(".QWebViewActivity");
+        intent1.putExtra(QWebViewActivity.ACT, "launchsrv");
+        intent1.putExtra(QWebViewActivity.URL, script);
+        context.sendBroadcast(intent1);
+
+    }
+
+    @JavascriptInterface
+    public void setActivityTitle(String title) {
+    }
+
+    @JavascriptInterface
+    public String getTitle() {
+        return this.title;
+    }
+
+    @JavascriptInterface
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    @JavascriptInterface
+    public void openPurchaseActivity(String articleID) {
+        PurchaseActivity.start(context, articleID);
+    }
+
+    @JavascriptInterface
+    public String getPurchaseNumber(String articleID) {
+        JSONObject ret = FileHelper.getUrlAsJO(CONF.IAP_NUM_REQUEST_URL+articleID);
+        if (ret!=null) {
+            try {
+                int total = ret.getInt("number");
+                if (total>1000) {
+                    return "> 5,000";
+                } else if (total>500) {
+                    return "1000 - 5000";
+                } else if (total>100) {
+                    return "500 - 1000";
+                } else if (total>50) {
+                    return "100 - 500";
+                } else if (total>20) {
+                    return "50 - 100";
+                } else if (total>5) {
+                    return "10 - 50";
+                } else {
+                    return "1 - 10";
+                }
+            } catch (JSONException e) {
+                return "1 - 10";
+            }
+        } else {
+            return "1 - 10";
+        }
+    }
+
+    @JavascriptInterface
+    public void qpynotebook(){
+        boolean notebookenable = NotebookUtil.isNotebookEnable(context);
+        if (notebookenable) {
+            Toast.makeText(context, R.string.ennable_notebook_first, Toast.LENGTH_SHORT).show();
+            return;
+        }
+        NotebookActivity.start(context,null, false);
+    }
+
+    @JavascriptInterface
+    public void onNext(String act) {
+        Log.d(TAG, "onNext");
+        Intent intent1 = new Intent(".QWebViewActivity");
+        intent1.putExtra(QWebViewActivity.ACT, "onnext");
+        intent1.putExtra(QWebViewActivity.URL, act);
+        context.sendBroadcast(intent1);
+    }
+
+    @JavascriptInterface
+    public void openNotebook(String url){
+        Log.d(TAG, "openNotebook:"+url);
+        boolean notebookenable = NotebookUtil.isNotebookEnable(context);
+        if (!notebookenable) {
+            Toast.makeText(context, R.string.ennable_notebook_first, Toast.LENGTH_SHORT).show();
+            SettingActivity.startActivity(context);
+            return;
+        }
+
+        NotebookActivity.startFromUrl(context,url, false);
+    }
+    // for debug
+    @JavascriptInterface
+    public void loadHtml(String data) {
+        Log.d(TAG, "loadHtml");
+        Intent intent1 = new Intent(".QWebViewActivity");
+        intent1.putExtra(QWebViewActivity.ACT, "loadhtml");
+        intent1.putExtra(QWebViewActivity.HTML, data);
+
+        context.sendBroadcast(intent1);
+
+        //this.webview.loadDataWithBaseURL("file:///android_asset/", data, mimeType, encoding, null);
+    }
+
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/event/ShareCodeCallback.java b/qpython/src/main/java/org/qpython/qpy/main/event/ShareCodeCallback.java
new file mode 100644
index 00000000..35fe0d0d
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/event/ShareCodeCallback.java
@@ -0,0 +1,51 @@
+package org.qpython.qpy.main.event;
+
+import org.qpython.qpy.codeshare.pojo.BookmarkerList;
+import org.qpython.qpy.codeshare.pojo.CloudFile;
+import org.qpython.qpy.codeshare.pojo.Gist;
+import org.qpython.qpy.codeshare.pojo.GistBase;
+import org.qpython.qpy.codeshare.pojo.UploadedProject;
+
+import java.util.List;
+
+
+public class ShareCodeCallback {
+    public void getGistBaseList(List<GistBase> gistList) {
+
+    }
+    public void getGistDetail(Gist gistList) {
+    }
+
+    public void getNewestCommit(Gist.HistoryBean gist) {
+    }
+
+    public void getMyGistList(List<GistBase> gistBase) {
+    }
+
+    public  void getMyBookMarkList(List<BookmarkerList> bookmarkerList) {
+    }
+
+    public void getCommentList(List<Gist.CommentBean> commentList) {
+
+    }
+
+    public void getProjectsFileList(List<UploadedProject> projectList) {
+
+    }
+
+    public void getScriptsFileList(List<CloudFile> cloudFiles) {
+
+    }
+
+    public void getUsage(int usage) {
+
+    }
+
+    public void getFileContent(String content) {
+
+    }
+
+    public void getUsageSpace(String usage) {
+
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/fragment/CodeFragment.java b/qpython/src/main/java/org/qpython/qpy/main/fragment/CodeFragment.java
new file mode 100644
index 00000000..de7d2e94
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/fragment/CodeFragment.java
@@ -0,0 +1,93 @@
+package org.qpython.qpy.main.fragment;
+
+
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v7.widget.LinearLayoutManager;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.codeshare.pojo.GistBase;
+import org.qpython.qpy.databinding.FragmentRvBinding;
+import org.qpython.qpy.main.adapter.CodeShareAdapter;
+
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import rx.Observable;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.functions.Action1;
+
+public class CodeFragment extends Fragment {
+    public static final  String PROGRAM    = "program";
+    public static final  String SCRIPT     = "script";
+    public static final  String MY_PROGRAM = "my_program";
+    public static final  String MY_SCRIPT  = "my_script";
+    private static final String TAG        = "TAG";
+    private FragmentRvBinding binding;
+    private String            tag;
+
+    public static CodeFragment newInstance(String tag) {
+        CodeFragment myFragment = new CodeFragment();
+
+        Bundle args = new Bundle();
+        args.putString(TAG, tag);
+        myFragment.setArguments(args);
+
+        return myFragment;
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        binding = DataBindingUtil.inflate(inflater, R.layout.fragment_rv, container, false);
+        return binding.getRoot();
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        tag = getArguments().getString(TAG, "");
+        initData();
+    }
+
+    private void initData() {
+        binding.progressBar.setVisibility(View.VISIBLE);
+        Action1<List<GistBase>> callback = gistList -> {
+            CodeShareAdapter adapter = new CodeShareAdapter(gistList, tag.equals(PROGRAM) || tag.equals(MY_PROGRAM));
+            binding.swipeList.setLayoutManager(new LinearLayoutManager(getActivity()));
+            binding.swipeList.setAdapter(adapter);
+            binding.progressBar.setVisibility(View.GONE);
+            binding.emptyHint.setVisibility(View.GONE);
+        };
+
+        // Dismiss progress bar and show empty msg if no data after 5 seconds
+        Observable.just(null)
+                .delay(5, TimeUnit.SECONDS)
+                .observeOn(AndroidSchedulers.mainThread())
+                .doOnNext(o -> {
+                    if (binding.progressBar.getVisibility() == View.VISIBLE) {
+                        binding.progressBar.setVisibility(View.GONE);
+                        binding.emptyHint.setVisibility(View.VISIBLE);
+                    }
+                })
+                .subscribe();
+
+        switch (tag) {
+            case PROGRAM:
+//                ShareCodeUtil.getInstance().getBaseProjectGistList(callback);
+                break;
+            case SCRIPT:
+//                ShareCodeUtil.getInstance().getBaseScriptGistList(callback);
+                break;
+            case MY_PROGRAM:
+                break;
+            case MY_SCRIPT:
+                break;
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/fragment/CourseFragment.java b/qpython/src/main/java/org/qpython/qpy/main/fragment/CourseFragment.java
new file mode 100644
index 00000000..457292d0
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/fragment/CourseFragment.java
@@ -0,0 +1,156 @@
+package org.qpython.qpy.main.fragment;
+
+
+import android.content.res.Resources;
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v7.widget.LinearLayoutManager;
+import android.util.TypedValue;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.FragmentCourseBinding;
+import org.qpython.qpy.main.adapter.CourseAdapter;
+import org.qpython.qpy.main.server.model.CourseModel;
+import org.qpython.qpy.main.widget.GridSpace;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class CourseFragment extends Fragment {
+
+    private FragmentCourseBinding binding;
+    private CourseAdapter         adapter;
+    private boolean               isTypeVisible;
+    private List<CourseModel> basic = new ArrayList<>(),
+            web                     = new ArrayList<>(),
+            aipy                    = new ArrayList<>(),
+            arvr                    = new ArrayList<>(),
+            other                   = new ArrayList<>(),
+            dataList                = new ArrayList<>();
+
+    public float dp2px(float dp) {
+        Resources r = Resources.getSystem();
+        return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, r.getDisplayMetrics());
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_course, null);
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        binding = DataBindingUtil.bind(view);
+        adapter = new CourseAdapter(getActivity(), dataList);
+        binding.swipeList.setLayoutManager(new LinearLayoutManager(getContext()) {
+            @Override
+            public boolean canScrollVertically() {
+                return false;
+            }
+        });
+        binding.swipeList.addItemDecoration(new GridSpace(1, (int) dp2px(10), false));
+        binding.swipeList.setNestedScrollingEnabled(false);
+        binding.swipeList.setAdapter(adapter);
+        binding.typeLayout.setVisibility(isTypeVisible ? View.VISIBLE : View.GONE);
+        if (isTypeVisible) initTypeLayout();
+    }
+
+    public void setDataList(List<CourseModel> data) {
+        if (data.size() == 0) {
+            binding.emptyHint.setVisibility(View.VISIBLE);
+            return;
+        }
+        for (CourseModel datum : data) {
+            switch (datum.getType()) {
+                case "basic":
+                    basic.add(datum);
+                    break;
+                case "web":
+                    web.add(datum);
+                    break;
+                case "aipy":
+                    aipy.add(datum);
+                    break;
+                case "arvr":
+                    arvr.add(datum);
+                    break;
+                case "other":
+                    other.add(datum);
+                    break;
+                default:
+                    basic.add(datum);
+                    break;
+            }
+        }
+        dataList.addAll(basic);
+        if (adapter != null)
+            adapter.notifyDataSetChanged();
+    }
+
+    private int selectedIndex;
+
+    private void initTypeLayout() {
+        for (int i = 0; i < binding.typeLayout.getChildCount(); i++) {
+            int finalI = i;
+            binding.typeLayout.getChildAt(i).setOnClickListener(v -> {
+                if (finalI != selectedIndex) {
+                    updateSelected(finalI, true);
+                    updateSelected(selectedIndex, false);
+                    selectedIndex = finalI;
+                }
+            });
+        }
+    }
+
+    private void updateSelected(int index, boolean isLight) {
+        int res;
+        List<CourseModel> typeList;
+        switch (index) {
+            case 0:
+                res = isLight ? R.drawable.basics_light : R.drawable.basics;
+                typeList = basic;
+                break;
+            case 1:
+                res = isLight ? R.drawable.database_light : R.drawable.database;
+                typeList = other;
+                break;
+            case 2:
+                res = isLight ? R.drawable.arvr_light : R.drawable.arvr;
+                typeList = arvr;
+                break;
+            case 3:
+                res = isLight ? R.drawable.aipy_light : R.drawable.aipy;
+                typeList = aipy;
+                break;
+            case 4:
+                res = isLight ? R.drawable.web_light : R.drawable.web;
+                typeList = web;
+                break;
+            default:
+                res = 0;
+                typeList = basic;
+                break;
+        }
+        ((TextView) binding.typeLayout.getChildAt(index)).setTextColor(getResources().getColor(isLight ? R.color.theme_green : R.color.white));
+        ((TextView) binding.typeLayout.getChildAt(index)).setCompoundDrawablesWithIntrinsicBounds(0, res, 0, 0);
+
+        if (isLight) {
+            dataList.clear();
+            dataList.addAll(typeList);
+            adapter.notifyDataSetChanged();
+        }
+    }
+
+    public void setTypeVisible(boolean typeVisible) {
+        isTypeVisible = typeVisible;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/fragment/FileFragment.java b/qpython/src/main/java/org/qpython/qpy/main/fragment/FileFragment.java
new file mode 100644
index 00000000..2e14b019
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/fragment/FileFragment.java
@@ -0,0 +1,205 @@
+package org.qpython.qpy.main.fragment;
+
+import android.databinding.DataBindingUtil;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.widget.LinearLayoutManager;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+import com.quseit.util.FileHelper;
+import com.quseit.util.ImageUtil;
+import com.quseit.util.NAction;
+import com.yanzhenjie.recyclerview.swipe.SwipeMenuCreator;
+import com.yanzhenjie.recyclerview.swipe.SwipeMenuItem;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.FragmentRefreshRvBinding;
+import org.qpython.qpy.texteditor.TedLocalActivity;
+import org.qpython.qpy.texteditor.ui.adapter.FolderAdapter;
+import org.qpython.qpy.texteditor.ui.adapter.bean.FolderBean;
+import org.qpython.qpy.texteditor.ui.view.EnterDialog;
+import org.qpython.qpysdk.QPyConstants;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class FileFragment extends Fragment {
+    private int WIDTH = (int) ImageUtil.dp2px(60);
+
+    private FragmentRefreshRvBinding binding;
+
+    private static final String TYPE    = "type";
+    public static final  String PROJECT = "projects";
+    public static final  String SCRIPT  = "scripts";
+
+    public static final  String PROJECT3 = "projects3";
+    public static final  String SCRIPT3  = "scripts3";
+
+    private static final String PROJECT_PATH = QPyConstants.ABSOLUTE_PATH + "/" + PROJECT;
+    private static final String SCRIPT_PATH  = QPyConstants.ABSOLUTE_PATH + "/" + SCRIPT;
+
+    private static final String PROJECT_PATH3 = QPyConstants.ABSOLUTE_PATH + "/" + PROJECT3;
+    private static final String SCRIPT_PATH3  = QPyConstants.ABSOLUTE_PATH + "/" + SCRIPT3;
+
+    private FolderAdapter    adapter;
+    private List<FolderBean> dataList;
+    private String           curPath;
+
+    public static FileFragment newInstance(String type) {
+        FileFragment myFragment = new FileFragment();
+
+        Bundle args = new Bundle();
+        args.putString(TYPE, type);
+        myFragment.setArguments(args);
+
+        return myFragment;
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        dataList = new ArrayList<>();
+        adapter = new FolderAdapter(dataList, false);
+        adapter.setClickListener(new FolderAdapter.Click() {
+            @Override
+            public void onItemClick(int position) {
+                switch (dataList.get(position).getFolder()) {
+                    case PROJECT:
+                        ((TedLocalActivity) getActivity()).finishForOpen(dataList.get(position).getPath(), true);
+                        break;
+                    case SCRIPT:
+                        ((TedLocalActivity) getActivity()).finishForOpen(dataList.get(position).getPath(), false);
+                        break;
+                }
+            }
+
+            @Override
+            public void onLongClick(int position) {
+
+            }
+        });
+        return inflater.inflate(R.layout.fragment_refresh_rv, null);
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        binding = DataBindingUtil.bind(view);
+        boolean isQPy = NAction.isQPy3(getContext());
+        initView();
+        initListener();
+        String type = getArguments().getString(TYPE);
+        switch (type != null ? type : SCRIPT) {
+            case SCRIPT:
+                curPath = isQPy?SCRIPT_PATH3:SCRIPT_PATH;
+                break;
+            case PROJECT:
+                curPath = isQPy?PROJECT_PATH3:PROJECT_PATH;
+                break;
+        }
+
+        File[] files = new File(curPath).listFiles();
+        boolean skip = false;
+        if (files != null){
+            for (File file : files) {
+                skip = true;
+                if (!file.getName().startsWith("."))
+                    if (type == SCRIPT) {
+                        if (file.isFile()) {
+                            skip = false;
+                        }
+                    } else {
+                        if (file.isDirectory()) {
+                            if (new File(file.getAbsoluteFile()+"/main.py").exists()) {
+                                skip = false;
+
+                            }
+                        }
+
+                    }
+                    if (!skip) {
+                        dataList.add(new FolderBean(file));
+                    }
+            }
+        }
+        Collections.sort(dataList, (FolderBean o1, FolderBean o2) -> {
+            String o1Up = o1.getName().toUpperCase();
+            String o2Up = o2.getName().toUpperCase();
+            return o1Up.compareTo(o2Up);
+        });
+        adapter.notifyDataSetChanged();
+    }
+
+    private void initView() {
+        binding.progressBar.setVisibility(View.GONE);
+
+        SwipeMenuCreator swipeMenuCreator = (leftMenu, rightMenu, viewType) -> {
+            SwipeMenuItem renameItem = new SwipeMenuItem(getContext())
+                    .setBackgroundColor(Color.parseColor("#FF4BAC07"))
+                    .setImage(R.drawable.ic_file_rename)
+                    .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+                    .setWidth(WIDTH);
+
+            SwipeMenuItem deleteItem = new SwipeMenuItem(getContext())
+                    .setBackgroundColor(Color.parseColor("#FFD14136"))
+                    .setImage(R.drawable.ic_editor_filetree_close)
+                    .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+                    .setWidth(WIDTH);
+            rightMenu.addMenuItem(renameItem);
+            rightMenu.addMenuItem(deleteItem);
+        };
+
+        binding.swipeList.setLayoutManager(new LinearLayoutManager(getContext()));
+        binding.swipeList.setSwipeMenuCreator(swipeMenuCreator);
+    }
+
+    private void initListener() {
+        binding.swipeList.setSwipeMenuItemClickListener(menuBridge -> {
+            menuBridge.closeMenu();
+            switch (menuBridge.getPosition()) {
+                case 0:
+                    // rename
+                    new EnterDialog(getContext())
+                            .setTitle(getString(R.string.rename))
+                            .setConfirmListener(name -> {
+                                File oldFile = dataList.get(menuBridge.getAdapterPosition()).getFile();
+                                File newFile = new File(oldFile.getParent(), name);
+                                boolean renameSuc = oldFile.renameTo(newFile);
+                                if (renameSuc) {
+                                    dataList.set(menuBridge.getAdapterPosition(), new FolderBean(newFile));
+                                    adapter.notifyItemChanged(menuBridge.getAdapterPosition());
+                                    return true;
+                                } else {
+                                    Toast.makeText(getActivity(), R.string.rename_fail, Toast.LENGTH_SHORT).show();
+                                    return false;
+                                }
+                            })
+                            .setText(dataList.get(menuBridge.getAdapterPosition()).getName())
+                            .show();
+                    break;
+                case 1:
+                    // delete
+                    AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.MyDialog);
+                    builder.setTitle(R.string.warning)
+                            .setMessage(R.string.delete_file_hint)
+                            .setNegativeButton(R.string.no, null)
+                            .setPositiveButton(R.string.yes, (dialog, which) -> {
+                                FileHelper.clearDir(dataList.get(menuBridge.getAdapterPosition()).getFile().getAbsolutePath(), 0, true);
+                                dataList.remove(menuBridge.getAdapterPosition());
+                                adapter.notifyItemRemoved(menuBridge.getAdapterPosition());
+                            })
+                            .show();
+                    break;
+            }
+        });
+        binding.swipeList.setAdapter(adapter);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/fragment/GistFragment.java b/qpython/src/main/java/org/qpython/qpy/main/fragment/GistFragment.java
new file mode 100644
index 00000000..6951bd13
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/fragment/GistFragment.java
@@ -0,0 +1,107 @@
+package org.qpython.qpy.main.fragment;
+
+import android.content.Context;
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v7.widget.LinearLayoutManager;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.FragmentRvBinding;
+import org.qpython.qpy.main.activity.GistActivity;
+import org.qpython.qpy.main.adapter.GistAdapter;
+import org.qpython.qpy.main.server.gist.GistEvent;
+import org.qpython.qpy.main.server.gist.response.GistBean;
+
+import java.util.List;
+
+import static org.qpython.qpy.main.server.gist.GistEvent.ADD_COMMENT;
+import static org.qpython.qpy.main.server.gist.GistEvent.DELETE_SUC;
+import static org.qpython.qpy.main.server.gist.GistEvent.FAVORITE;
+import static org.qpython.qpy.main.server.gist.GistEvent.UNFAVORITE;
+import static org.qpython.qpy.main.server.gist.GistEvent.UPDATE_GIST_SUC;
+
+/**
+ * Created by Hmei
+ * 2018/4/17.
+ */
+
+public class GistFragment extends Fragment {
+    private FragmentRvBinding binding;
+    private GistAdapter       adapter;
+    private GistActivity      activity;
+
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        activity = (GistActivity) context;
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        EventBus.getDefault().register(this);
+        return inflater.inflate(R.layout.fragment_rv, null);
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        binding = DataBindingUtil.bind(view);
+        adapter = new GistAdapter(getContext());
+        binding.swipeList.setLayoutManager(new LinearLayoutManager(getContext()) {
+            @Override
+            public boolean canScrollVertically() {
+                return false;
+            }
+        });
+        binding.swipeList.setNestedScrollingEnabled(false);
+        binding.swipeList.setAdapter(adapter);
+    }
+
+    @Subscribe
+    public void onEvent(GistEvent gistEvent) {
+        String event = gistEvent.name;
+        switch (event) {
+            case DELETE_SUC:
+                adapter.delete(gistEvent.content);
+                break;
+            case UNFAVORITE:
+                adapter.addFav(gistEvent.content, false);
+                break;
+            case FAVORITE:
+                adapter.addFav(gistEvent.content, true);
+                break;
+            case ADD_COMMENT:
+                adapter.addCommentNum(gistEvent.content);
+                break;
+            case UPDATE_GIST_SUC:
+                activity.getData();
+                break;
+        }
+    }
+
+    public void setDataList(List<GistBean> data) {
+        if (data.size() == 0) {
+            binding.emptyHint.setVisibility(View.VISIBLE);
+            return;
+        }
+        if (adapter != null) {
+            adapter.setData(data);
+            adapter.notifyDataSetChanged();
+        }
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        EventBus.getDefault().unregister(this);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/fragment/LibAIPyFragment.java b/qpython/src/main/java/org/qpython/qpy/main/fragment/LibAIPyFragment.java
new file mode 100644
index 00000000..82edef36
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/fragment/LibAIPyFragment.java
@@ -0,0 +1,126 @@
+package org.qpython.qpy.main.fragment;
+
+
+import android.content.pm.PackageManager;
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.LinearLayoutManager;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.quseit.util.ACache;
+import com.quseit.util.NAction;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.FragmentRefreshRvBinding;
+import org.qpython.qpy.main.adapter.LibListAdapter;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.server.CacheKey;
+import org.qpython.qpy.main.server.model.BaseLibModel;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+import rx.Subscriber;
+
+public class LibAIPyFragment extends RefreshFragment {
+
+    private LibListAdapter<BaseLibModel> adapter;
+    private FragmentRefreshRvBinding     binding;
+
+    private List<BaseLibModel> dataList;
+    private boolean            isSaverOn;
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_refresh_rv, null);
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        binding = DataBindingUtil.bind(view);
+        binding.progressBar.setVisibility(View.GONE);
+        dataList = new ArrayList<>();
+        isSaverOn = PreferenceManager.getDefaultSharedPreferences(getContext()).getBoolean(getString(R.string.key_saver), true);
+        binding.netError.setVisibility(View.GONE);
+        adapter = new LibListAdapter<>(dataList);
+        initList();
+        refresh(!isSaverOn);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (adapter == null) {
+            adapter = new LibListAdapter<>(dataList);
+            initList();
+            refresh(!isSaverOn);
+        }
+        //在下载完库之后刷新数据
+        else if (installPosition != -1) {
+            refresh(!isSaverOn);
+            //将其还原防止重复刷新
+            installPosition = -1;
+        }
+    }
+
+
+    private void initList() {
+        binding.swipeList.setLayoutManager(new LinearLayoutManager(getContext()));
+        binding.swipeList.setSwipeMenuCreator(getTypeMenu());
+
+//        if (isAIPyInstall()) {
+//            View description = getActivity().getLayoutInflater().inflate(R.layout.header_lib_description, binding.swipeList, false);
+//            binding.swipeList.addHeaderView(description);
+//        }
+
+        if (adapter != null) {
+            adapter.setClick(position -> binding.swipeList.smoothOpenRightMenu(position));
+            binding.swipeList.setSwipeMenuItemClickListener(getListener(dataList, adapter));
+            binding.swipeList.setAdapter(adapter);
+            adapter.notifyDataSetChanged();
+        }
+    }
+
+
+    @Override
+    public void refresh(boolean forceRefresh) {
+        binding.netError.setVisibility(View.GONE);
+        dataList.clear();
+        adapter.notifyDataSetChanged();
+        binding.progressBar.setVisibility(View.VISIBLE);
+        App.getService().getAIPyList(NAction.isQPy3(getActivity()),forceRefresh, new Subscriber<List<BaseLibModel>>() {
+            @Override
+            public void onCompleted() {
+                binding.swipeList.setVisibility(View.VISIBLE);
+                binding.progressBar.setVisibility(View.GONE);
+            }
+
+            @Override
+            public void onError(Throwable e) {
+                binding.swipeList.setVisibility(View.GONE);
+                binding.progressBar.setVisibility(View.GONE);
+                binding.netError.setVisibility(View.VISIBLE);
+            }
+
+            @Override
+            public void onNext(List<BaseLibModel> o) {
+                for (BaseLibModel lib : o) {
+                    if (new File(getDownloadPath(lib.getTmodule())).exists()) {
+                        lib.setInstalled(true);
+                    }
+                }
+                ACache.get(getContext()).put(CacheKey.AIPY, tostring(o));
+                dataList.addAll(o);
+                adapter.notifyDataSetChanged();
+            }
+        });
+    }
+
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/fragment/LibProjectFragment.java b/qpython/src/main/java/org/qpython/qpy/main/fragment/LibProjectFragment.java
new file mode 100644
index 00000000..d83dc827
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/fragment/LibProjectFragment.java
@@ -0,0 +1,320 @@
+package org.qpython.qpy.main.fragment;
+
+import android.os.Environment;
+import android.preference.PreferenceManager;
+import android.support.v7.app.AlertDialog;
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.LinearLayoutManager;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.quseit.common.updater.downloader.Downloader;
+import com.quseit.util.ACache;
+import com.quseit.util.ImageUtil;
+import com.quseit.util.NAction;
+import com.quseit.util.NetStateUtil;
+import com.yanzhenjie.recyclerview.swipe.SwipeMenuCreator;
+import com.yanzhenjie.recyclerview.swipe.SwipeMenuItem;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+import org.qpython.qpy.R;
+import org.qpython.qpy.console.ScriptExec;
+import org.qpython.qpy.console.TermActivity;
+import org.qpython.qpy.databinding.FragmentRefreshRvBinding;
+import org.qpython.qpy.main.adapter.LibListAdapter;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.CONF;
+import org.qpython.qpy.main.server.CacheKey;
+import org.qpython.qpy.main.server.MySubscriber;
+import org.qpython.qpy.main.server.model.LibModel;
+import org.qpython.qpy.main.utils.Utils;
+import org.qpython.qpysdk.QPyConstants;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Lib/Component list Fragment
+ * Created by Hmei on 2017-05-27.
+ */
+
+public class LibProjectFragment extends RefreshFragment {
+    private static final int    SCRIPT_CONSOLE_CODE = 1237;
+    private static  String SCRIPT_DIR;       //   = QPyConstants.ABSOLUTE_PATH + "/" + QPyConstants.DFROM_QPY2 + "/";
+    private static  String PROJECT_DIR;      //  = QPyConstants.ABSOLUTE_PATH + "/" + QPyConstants.DFROM_PRJ2 + "/";
+
+    private List<LibModel>           dataList;
+    private LibListAdapter<LibModel> adapter;
+    private FragmentRefreshRvBinding binding;
+    private TextView                 header;
+
+    private int WIDTH = (int) ImageUtil.dp2px(60);
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        EventBus.getDefault().register(this);
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_refresh_rv, null);
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        binding = DataBindingUtil.bind(view);
+
+        SCRIPT_DIR = QPyConstants.ABSOLUTE_PATH + "/" + (NAction.isQPy3(getActivity())?QPyConstants.DFROM_QPY3:QPyConstants.DFROM_QPY2) +"/";
+        PROJECT_DIR = QPyConstants.ABSOLUTE_PATH + "/" + (NAction.isQPy3(getActivity())?QPyConstants.DFROM_PRJ3:QPyConstants.DFROM_PRJ2) +"/";
+
+        initDataList();
+        initView();
+        initListener();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        EventBus.getDefault().unregister(this);
+    }
+
+    private void initDataList() {
+        boolean isSaverOn = PreferenceManager.getDefaultSharedPreferences(getContext()).getBoolean(getString(R.string.key_saver), true);
+        dataList = new ArrayList<>();
+        adapter = new LibListAdapter<>(dataList);
+        refresh(!isSaverOn);
+    }
+
+    @Override
+    public void refresh(boolean forceRefresh) {
+        dataList.clear();
+        adapter.notifyDataSetChanged();
+        binding.netError.setVisibility(View.GONE);
+        binding.progressBar.setVisibility(View.VISIBLE);
+        App.getService().getLibs(forceRefresh, new MySubscriber<List<LibModel>>() {
+            @Override
+            public void onCompleted() {
+                binding.progressBar.setVisibility(View.GONE);
+                binding.swipeList.setVisibility(View.VISIBLE);
+                if (header != null) {
+                    header.setText(getString(R.string.last_refresh, ACache.get(getContext()).getAsString(CacheKey.LIB_LAST_REFRESH)));
+                }
+            }
+
+            @Override
+            public void onError(Throwable e) {
+                binding.swipeList.setVisibility(View.GONE);
+                binding.progressBar.setVisibility(View.GONE);
+                binding.netError.setVisibility(View.VISIBLE);
+            }
+
+            @Override
+            public void onNext(List<LibModel> libModels) {
+                for (LibModel lib : libModels) {
+                    if (new File(SCRIPT_DIR + lib.getSmodule()).exists() || new File(PROJECT_DIR + lib.getSmodule()).exists()) {
+                        lib.setInstalled(true);
+                    }
+                }
+                ACache.get(getContext()).put(CacheKey.LIB, tostring(libModels));
+                dataList.addAll(libModels);
+                adapter.notifyDataSetChanged();
+            }
+        });
+    }
+
+    private void initView() {
+        binding.swipeList.setLayoutManager(new LinearLayoutManager(getContext()));
+        binding.swipeList.setSwipeMenuCreator(getMenu());
+
+        View installView = getActivity().getLayoutInflater().inflate(R.layout.header_lib_install, binding.swipeList, false);
+        installView.setOnClickListener(v -> {
+            if (NetStateUtil.isConnected(getContext())) {
+                openPip();
+            } else {
+                Toast.makeText(getContext(), R.string.pip_no_net, Toast.LENGTH_SHORT).show();
+            }
+        });
+        binding.swipeList.addHeaderView(installView);
+
+        binding.progressBar.getIndeterminateDrawable().setColorFilter(0xFF4BAC07, android.graphics.PorterDuff.Mode.MULTIPLY);
+    }
+
+    private void openPip() {
+        File pip = new File(getContext().getApplicationContext().getFilesDir() + "/bin/qpypi.py");
+        if (pip.exists()) {
+            String[] args = {getContext().getApplicationContext().getFilesDir() + "/bin/qpypi.py", getContext().getApplicationContext().getFilesDir().toString()};
+            Intent intent = new Intent(getContext(), TermActivity.class);
+            intent.putExtra(TermActivity.ARGS, args);
+            startActivity(intent);
+        }
+    }
+    private SwipeMenuCreator getMenu() {
+        SwipeMenuItem detail = new SwipeMenuItem(getContext())
+                .setBackgroundColor(Color.parseColor("#FF4A4A4A"))
+                .setImage(R.drawable.ic_library_detail)
+                .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+                .setWidth(WIDTH);
+
+        return (swipeLeftMenu, swipeRightMenu, viewType) -> {
+            switch (viewType) {
+                case LibListAdapter.INSTALLED:
+                    SwipeMenuItem reInstall = new SwipeMenuItem(getContext())
+                            .setBackgroundColor(Color.parseColor("#FF595959"))
+                            .setImage(R.drawable.ic_library_run)
+                            .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+                            .setWidth(WIDTH);
+
+                    SwipeMenuItem delete = new SwipeMenuItem(getContext())
+                            .setBackgroundColor(Color.parseColor("#FFD2483D"))
+                            .setImage(R.drawable.ic_library_delete)
+                            .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+                            .setWidth(WIDTH);
+
+                    swipeRightMenu.addMenuItem(reInstall);
+                    swipeRightMenu.addMenuItem(detail);
+                    swipeRightMenu.addMenuItem(delete);
+                    break;
+                case LibListAdapter.UN_INSTALLED:
+                    SwipeMenuItem download = new SwipeMenuItem(getContext())
+                            .setBackgroundColor(Color.parseColor("#FFECCD00"))
+                            .setImage(R.drawable.ic_library_download)
+                            .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+                            .setWidth(WIDTH);
+                    swipeRightMenu.addMenuItem(detail);
+                    swipeRightMenu.addMenuItem(download);
+                    break;
+            }
+        };
+    }
+
+
+
+    private void installTool(LibModel item) {
+        String downloadDir = null;
+        if (item.getCat().equals("script")) {
+            downloadDir = "qpython/"+(NAction.isQPy3(getActivity())?QPyConstants.DFROM_QPY3:QPyConstants.DFROM_QPY2);
+        } else if (item.getCat().equals("user")) {
+            downloadDir = "qpython/"+(NAction.isQPy3(getActivity())?QPyConstants.DFROM_QPY3:QPyConstants.DFROM_QPY2);
+        }
+
+        // Download
+        App.getDownloader().download(item.getTitle(),  item.getLink(), Environment.getExternalStorageDirectory()+"/"+downloadDir+"/"+item.getSmodule(),
+        new Downloader.Callback() {
+            @Override
+            public void pending(String name) {
+
+            }
+
+            @Override
+            public void complete(String name, File installer) {
+                refresh(true);
+            }
+
+            @Override
+            public void error(String err) {
+
+            }
+        });
+    }
+
+    private void initListener() {
+        adapter.setClick(position -> binding.swipeList.smoothOpenRightMenu(position));
+        binding.swipeList.setSwipeMenuItemClickListener(menuBridge -> {
+            menuBridge.closeMenu();
+            LibModel item = dataList.get(menuBridge.getAdapterPosition());
+            if (!dataList.get(menuBridge.getAdapterPosition()).isInstalled()) {
+                // UN INSTALL
+                switch (menuBridge.getPosition()) {
+                    case 0:
+                        // detail
+                        if (item.getSrc().equals("")) {
+                            AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
+                            AlertDialog alertDialog = builder.setTitle(R.string.location)
+                                    .setMessage(CONF.qpypiPath() + "/" + item.getTitle())
+                                    .setPositiveButton(R.string.confirm, null)
+                                    .create();
+                            alertDialog.show();
+                        } else {
+                            Utils.startWebActivityWithUrl(getActivity(), item.getTitle(), item.getSrc());
+
+                        }
+                        break;
+                    case 1:
+                        // download
+                        installTool(item);
+                        break;
+                }
+            } else {
+                // INSTALLED
+                switch (menuBridge.getPosition()) {
+                    case 0:
+                        // run
+                        String path = "";
+                        if (item.getCat().equals("script")) {
+                            path = SCRIPT_DIR + dataList.get(menuBridge.getAdapterPosition()).getSmodule();
+                        } else if (item.getCat().equals("user")) {
+                            path = PROJECT_DIR + dataList.get(menuBridge.getAdapterPosition()).getSmodule();
+                        }
+                        ScriptExec.getInstance().playScript(getContext(), path, "", true);
+                        break;
+                    case 1:
+                        // detail
+                        if (item.getSrc().equals("")) {
+                            AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
+                            AlertDialog alertDialog = builder.setTitle(R.string.location)
+                                    .setMessage(CONF.qpypiPath() + "/" + item.getTitle())
+                                    .setPositiveButton(R.string.confirm, null)
+                                    .create();
+                            alertDialog.show();
+                        } else {
+                            Utils.startWebActivityWithUrl(getActivity(), item.getTitle(), item.getSrc());
+
+                        }
+                        break;
+                    case 2:
+                        if (new File(SCRIPT_DIR + "/" + item.getSmodule()).delete()) {
+                            dataList.get(menuBridge.getAdapterPosition()).setInstalled(false);
+                            adapter.notifyItemChanged(menuBridge.getAdapterPosition());
+                        } else {
+                            Toast.makeText(getContext(), R.string.delete_fail, Toast.LENGTH_SHORT).show();
+                        }
+                        break;
+                }
+            }
+        });
+        binding.swipeList.setAdapter(adapter);
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onMessageEvent(CreateLibFinishEvent event) {
+        for (LibModel libModel : dataList) {
+            if (libModel.getSmodule().equals(event.fileName)) {
+                libModel.setInstalled(true);
+                adapter.notifyDataSetChanged();
+            }
+        }
+    }
+
+    public void execPyInConsole(String[] args) {
+        Intent intent = new Intent(getContext(), TermActivity.class);
+        intent.putExtra("PYTHONARGS", args);
+        startActivityForResult(intent, SCRIPT_CONSOLE_CODE);
+    }
+
+    public static class CreateLibFinishEvent {
+        public String fileName;
+    }
+}
\ No newline at end of file
diff --git a/qpython/src/main/java/org/qpython/qpy/main/fragment/LibQPyPiFragment.java b/qpython/src/main/java/org/qpython/qpy/main/fragment/LibQPyPiFragment.java
new file mode 100644
index 00000000..c91bd4e1
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/fragment/LibQPyPiFragment.java
@@ -0,0 +1,169 @@
+package org.qpython.qpy.main.fragment;
+
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.LinearLayoutManager;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import com.quseit.util.ACache;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.FragmentQpyPiBinding;
+import org.qpython.qpy.main.adapter.LibListAdapter;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.server.CacheKey;
+import org.qpython.qpy.main.server.MySubscriber;
+import org.qpython.qpy.main.server.model.QpypiModel;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * Nested fragments only available after API 17,
+ * of course it can be work around but .. ha ha
+ * <p>
+ * Created by Hmei on 2017-06-07.
+ */
+
+public class LibQPyPiFragment extends RefreshFragment {
+
+    private List<QpypiModel>     dataList;
+    private LibListAdapter       adapter;
+    private FragmentQpyPiBinding binding;
+    private TextView             header;
+    private boolean              isSaverOn;
+    private final String         TAG = "LibQPyPiFragment";
+
+    @Override
+    public void onResume() {
+        super.onResume();
+//        if (installPosition != -1 && new File(getDownloadPath(
+//                dataList.get(installPosition).getSmodule(),
+//                dataList.get(installPosition).getVer()))
+//                .exists()) {
+//            dataList.get(installPosition).setInstalled(true);
+//            adapter.notifyItemChanged(installPosition);
+//        }
+        //在下载完库之后刷新数据
+        if (installPosition != -1 && adapter!=null){
+            refresh(!isSaverOn);
+            //将其还原防止重复刷新
+            installPosition = -1;
+        }
+        EventBus.getDefault().register(this);
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        binding = DataBindingUtil.inflate(inflater, R.layout.fragment_qpy_pi, container, false);
+        return binding.getRoot();
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        initDataList();
+        initView();
+        initListener();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        EventBus.getDefault().unregister(this);
+    }
+
+    private void initDataList() {
+        Log.d(TAG, "initDataList");
+        isSaverOn = PreferenceManager.getDefaultSharedPreferences(getContext()).getBoolean(getString(R.string.key_saver), true);
+        dataList = new ArrayList<>();
+        adapter = new LibListAdapter<>(dataList);
+        refresh(!isSaverOn);
+    }
+
+    @Override
+    public void refresh(boolean forceRefresh) {
+        Log.d(TAG, "refresh:"+forceRefresh);
+        dataList.clear();
+        binding.progressBar.setVisibility(View.VISIBLE);
+        binding.netError.setVisibility(View.GONE);
+        adapter.notifyDataSetChanged();
+        App.getService().getQPyPi(forceRefresh, new MySubscriber<List<QpypiModel>>() {
+            @Override
+            public void onCompleted() {
+                binding.progressBar.setVisibility(View.GONE);
+                binding.swipeList.setVisibility(View.VISIBLE);
+                if (header != null) {
+                    header.setText(getString(R.string.last_refresh, ACache.get(getContext()).getAsString(CacheKey.QPYPI_LAST_REFRESH)));
+                }
+            }
+
+            @Override
+            public void onError(Throwable e) {
+                binding.progressBar.setVisibility(View.GONE);
+                binding.swipeList.setVisibility(View.GONE);
+                binding.netError.setVisibility(View.VISIBLE);
+            }
+
+            @Override
+            public void onNext(List<QpypiModel> libModels) {
+                String f;
+                for (QpypiModel lib : libModels) {
+                    f = getDownloadPath(lib.getTmodule());
+                    Log.d(TAG, "onNext:"+f);
+
+                    if (new File(f).exists()) {
+                        lib.setInstalled(true);
+                    }
+                }
+                ACache.get(getContext()).put(CacheKey.QPYPI, tostring(libModels));
+                dataList.addAll(libModels);
+                adapter.notifyDataSetChanged();
+            }
+        });
+    }
+
+    private void initView() {
+        binding.swipeList.setLayoutManager(new LinearLayoutManager(getContext()));
+        binding.swipeList.setSwipeMenuCreator(getTypeMenu());
+        binding.swipeList.setFocusable(false);
+
+//        String last_update = ACache.get(getContext()).getAsString(CacheKey.QPYPI_LAST_REFRESH);
+//        if (isSaverOn && last_update != null && !last_update.isEmpty()) {
+//            header = (TextView) getActivity().getLayoutInflater().inflate(R.layout.header_last_refresh_time, binding.swipeList, false);
+//            header.setText(getString(R.string.last_refresh, last_update));
+//            binding.swipeList.addHeaderView(header);
+//        }
+
+    }
+
+    private void initListener() {
+        adapter.setClick(position -> binding.swipeList.smoothOpenRightMenu(position));
+        binding.swipeList.setSwipeMenuItemClickListener(getListener(dataList, adapter));
+        binding.swipeList.setAdapter(adapter);
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onMessageEvent(LibProjectFragment.CreateLibFinishEvent event) {
+        for (QpypiModel libModel : dataList) {
+            if (libModel.getTitle().equals(event.fileName)) {
+                libModel.setInstalled(true);
+                adapter.notifyDataSetChanged();
+            }
+        }
+    }
+
+
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/fragment/LocalFragment.java b/qpython/src/main/java/org/qpython/qpy/main/fragment/LocalFragment.java
new file mode 100644
index 00000000..e017fd57
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/fragment/LocalFragment.java
@@ -0,0 +1,58 @@
+package org.qpython.qpy.main.fragment;
+
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.design.widget.TabLayout;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.FragmentLocalBinding;
+import org.qpython.qpy.main.adapter.StatePagerAdapter;
+
+
+public class LocalFragment extends Fragment {
+    private FragmentLocalBinding binding;
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_local, null);
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        binding = DataBindingUtil.bind(view);
+        binding.tabs.addTab(binding.tabs.newTab().setText(R.string.project));
+        binding.tabs.addTab(binding.tabs.newTab().setText(R.string.script));
+        binding.tabs.setTabGravity(TabLayout.GRAVITY_FILL);
+        binding.tabs.setTabTextColors(getResources().getColor(R.color.white), getResources().getColor(R.color.colorAccent));
+        binding.tabs.setSelectedTabIndicatorColor(getResources().getColor(R.color.colorAccent));
+        StatePagerAdapter adapter = new StatePagerAdapter(getActivity().getSupportFragmentManager(), binding.tabs.getTabCount());
+        binding.vp.setAdapter(adapter);
+        initListener();
+    }
+
+
+    public void initListener() {
+        binding.vp.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(binding.tabs));
+        binding.tabs.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
+            @Override
+            public void onTabSelected(TabLayout.Tab tab) {
+                binding.vp.setCurrentItem(tab.getPosition());
+            }
+
+            @Override
+            public void onTabUnselected(TabLayout.Tab tab) {
+            }
+
+            @Override
+            public void onTabReselected(TabLayout.Tab tab) {
+            }
+        });
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/fragment/MyCourseFragment.java b/qpython/src/main/java/org/qpython/qpy/main/fragment/MyCourseFragment.java
new file mode 100644
index 00000000..2d90b0a0
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/fragment/MyCourseFragment.java
@@ -0,0 +1,191 @@
+package org.qpython.qpy.main.fragment;
+
+
+import android.content.Intent;
+import android.content.res.Resources;
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v7.widget.LinearLayoutManager;
+import android.util.TypedValue;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.FragmentMyCourseBinding;
+import org.qpython.qpy.main.activity.CourseActivity;
+import org.qpython.qpy.main.activity.SignInActivity;
+import org.qpython.qpy.main.adapter.MyCourseAdapter;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.server.MySubscriber;
+import org.qpython.qpy.main.server.model.CourseModel;
+import org.qpython.qpy.main.server.model.MyCourse;
+import org.qpython.qpy.main.widget.GridSpace;
+
+import java.util.ArrayList;
+
+
+public class MyCourseFragment extends Fragment {
+    public static final int REQUEST_CODE = 4803;
+    private FragmentMyCourseBinding binding;
+    private MyCourseAdapter         adapter;
+    private ArrayList<MyCourse.DataBean> dataList = new ArrayList<>();
+    private boolean init;
+
+    public float dp2px(float dp) {
+        Resources r = Resources.getSystem();
+        return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, r.getDisplayMetrics());
+    }
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        EventBus.getDefault().register(this);
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_my_course, null);
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        binding = DataBindingUtil.bind(view);
+        binding.explore.setOnClickListener(v -> ((CourseActivity) getActivity()).switchToFeature());
+        getDataList();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (/*!init && */App.getUser() != null) {
+            getDataList();
+        }
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        EventBus.getDefault().unregister(this);
+    }
+
+    @Subscribe
+    public void needRefresh(boolean needRefresh) {
+        if (needRefresh) {
+            getDataList();
+        }
+    }
+
+    public void getDataList() {
+        if (App.getUser() != null) {
+            init = true;
+            binding.pb.setVisibility(View.VISIBLE);
+            App.getService().getMyCourse(App.getUser().getEmail(), new MySubscriber<MyCourse>() {
+                @Override
+                public void onNext(MyCourse o) {
+                    super.onNext(o);
+                    if (adapter == null) {
+                        adapter = new MyCourseAdapter(getActivity(), dataList);
+                        binding.swipeList.setLayoutManager(new LinearLayoutManager(getContext()) {
+                            @Override
+                            public boolean canScrollVertically() {
+                                return false;
+                            }
+                        });
+                        binding.swipeList.addItemDecoration(new GridSpace(1, (int) dp2px(10), false));
+                        binding.swipeList.setNestedScrollingEnabled(false);
+                        binding.swipeList.setAdapter(adapter);
+                    }
+                    dataList.clear();
+                    binding.pb.setVisibility(View.GONE);
+                    for (MyCourse.DataBean dataBean : o.getData()) {
+                        if (!"notready".equals(dataBean.getType())) {
+                            dataList.add(dataBean);
+                        }
+                    }
+//                    debugAddFakeData();
+                    if (dataList.size() == 0) {
+                        binding.emptyHint.setVisibility(View.VISIBLE);
+                        binding.explore.setVisibility(View.VISIBLE);
+                        binding.explore.setText(R.string.explore_course);
+                        binding.explore.setOnClickListener(v -> ((CourseActivity) getActivity()).switchToFeature());
+                    } else {
+                        binding.emptyHint.setVisibility(View.GONE);
+                        binding.explore.setVisibility(View.GONE);
+                        adapter.notifyDataSetChanged();
+                    }
+                }
+
+                @Override
+                public void onError(Throwable e) {
+                    binding.pb.setVisibility(View.GONE);
+                }
+            });
+        } else {
+            init = false;
+            binding.explore.setText(R.string.login_now);
+            binding.explore.setOnClickListener(v -> getActivity().
+                    startActivityForResult(new Intent(getActivity(), SignInActivity.class), REQUEST_CODE));
+            binding.explore.setVisibility(View.VISIBLE);
+            binding.emptyHint.setVisibility(View.VISIBLE);
+        }
+    }
+
+    private void debugAddFakeData() {
+
+        MyCourse.DataBean unFunding = App.getGson().fromJson("{\n" +
+                "            \"info\": {\n" +
+                "                \"description\": \"How to start QPython\",\n" +
+                "                \"title\": \"QPython Quick Start\",\n" +
+                "                \"open\": 0,\n" +
+                "                \"downloads\": \"10,000+\",\n" +
+                "                \"level\": 1,\n" +
+                "                \"rdate\": \"2017-06-15\",\n" +
+                "                \"link\": \"https://edu.qpython.org/qpython-quick-start/index.html\",\n" +
+                "                \"type\": \"free\",\n" +
+                "                \"logo\": \"https://edu.qpython.org/static/course-qpython-quick-start.png\",\n" +
+                "                \"smodule\": \"qpython-quick-start\"\n" +
+                "            },\n" +
+                "            \"list\": [\n" +
+                "                {\n" +
+                "                    \"gd\": \"course_free\",\n" +
+                "                    \"created\": \"2018021109\"\n" +
+                "                }\n" +
+                "            ],\n" +
+                "            \"type\": \"crowdfunding\",\n" +
+                "            \"course\": \"qpython-quick-start\"\n" +
+                "        }", MyCourse.DataBean.class);
+        MyCourse.DataBean funding = App.getGson().fromJson("{\n" +
+                "            \"info\": {\n" +
+                "                \"description\": \"How to start QPython\",\n" +
+                "                \"title\": \"QPython Quick Start\",\n" +
+                "                \"open\": 1,\n" +
+                "                \"downloads\": \"10,000+\",\n" +
+                "                \"level\": 1,\n" +
+                "                \"rdate\": \"2017-06-15\",\n" +
+                "                \"link\": \"https://edu.qpython.org/qpython-quick-start/index.html\",\n" +
+                "                \"type\": \"free\",\n" +
+                "                \"logo\": \"https://edu.qpython.org/static/course-qpython-quick-start.png\",\n" +
+                "                \"smodule\": \"qpython-quick-start\"\n" +
+                "            },\n" +
+                "            \"list\": [\n" +
+                "                {\n" +
+                "                    \"gd\": \"course_free\",\n" +
+                "                    \"created\": \"2018021109\"\n" +
+                "                }\n" +
+                "            ],\n" +
+                "            \"type\": \"crowdfunding\",\n" +
+                "            \"course\": \"qpython-quick-start\"\n" +
+                "        }", MyCourse.DataBean.class);
+        dataList.add(unFunding);
+        dataList.add(funding);
+    }
+
+
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/fragment/MyGistFragment.java b/qpython/src/main/java/org/qpython/qpy/main/fragment/MyGistFragment.java
new file mode 100644
index 00000000..f6dab74d
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/fragment/MyGistFragment.java
@@ -0,0 +1,173 @@
+package org.qpython.qpy.main.fragment;
+
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.qpython.qpy.R;
+import org.qpython.qpy.main.adapter.GistAdapter;
+import org.qpython.qpy.main.server.gist.GistEvent;
+import org.qpython.qpy.main.server.gist.myScreen.MyGistControler;
+import org.qpython.qpy.main.server.gist.myScreen.MyGistView;
+import org.qpython.qpy.main.server.gist.response.GistBean;
+
+import java.util.List;
+
+import static org.qpython.qpy.main.server.gist.GistEvent.ADD_COMMENT;
+import static org.qpython.qpy.main.server.gist.GistEvent.DELETE;
+import static org.qpython.qpy.main.server.gist.GistEvent.FAVORITE;
+import static org.qpython.qpy.main.server.gist.GistEvent.REFRESH_COLLECTION;
+import static org.qpython.qpy.main.server.gist.GistEvent.UNFAVORITE;
+import static org.qpython.qpy.main.server.gist.GistEvent.UPDATE_GIST_SUC;
+
+/**
+ * 文 件 名: MyGistFragment
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2017/12/26 14:45
+ * 邮   箱: qq798435167@gmail.com
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class MyGistFragment extends Fragment implements MyGistView {
+    public static final String TYPE       = "TYPE";
+    public static final int    GIST       = 0;
+    public static final int    COLLECTION = 1;
+
+    private int             type;
+    private View            mView;
+    private GistAdapter     mNewsAdapter;
+    private MyGistControler mMyGistControler;
+
+    private TextView    hint;
+    private ProgressBar mProgressBar;
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mMyGistControler = new MyGistControler(this);
+        EventBus.getDefault().register(this);
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        mMyGistControler.onDestroy();
+        EventBus.getDefault().unregister(this);
+    }
+
+    public static MyGistFragment newInstance(int type) {
+        MyGistFragment myShareFragment = new MyGistFragment();
+        Bundle data = new Bundle();
+        data.putInt(TYPE, type);
+        myShareFragment.setArguments(data);
+        return myShareFragment;
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        if (mView == null) {
+            type = getArguments().getInt(TYPE);
+            mView = inflater.inflate(R.layout.fragment_my_share, container, false);
+            mProgressBar = mView.findViewById(R.id.progress_bar);
+            hint = mView.findViewById(R.id.empty);
+            RecyclerView mRecyclerView = mView.findViewById(R.id.rv_myshare);
+            mRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+            mNewsAdapter = new GistAdapter(getContext(), this);
+            mNewsAdapter.setShowDelete(type == GIST);
+            mRecyclerView.setAdapter(mNewsAdapter);
+        }
+        return mView;
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        refresh();
+    }
+
+    public void refresh() {
+        if (type == GIST) {
+            mMyGistControler.getMyGists();
+        } else if (type == COLLECTION) {
+            mMyGistControler.getMyFavorites();
+        }
+    }
+
+    @Subscribe
+    public void onEvent(GistEvent event) {
+        switch (event.name) {
+            case DELETE:
+                if (type == GIST) mMyGistControler.deleteGist(event.content);
+                break;
+            case ADD_COMMENT:
+                mNewsAdapter.addCommentNum(event.content);
+                break;
+            case REFRESH_COLLECTION:
+                if (type == COLLECTION) refresh();
+                break;
+            case FAVORITE:
+                if (type == COLLECTION) mNewsAdapter.addFav(event.content, true);
+                break;
+            case UNFAVORITE:
+                if (type == COLLECTION) mNewsAdapter.delete(event.content);
+                break;
+            case UPDATE_GIST_SUC:
+                if (type == GIST) refresh();
+                break;
+
+        }
+    }
+
+
+    @Override
+    public void showLoading() {
+        mProgressBar.setVisibility(View.VISIBLE);
+    }
+
+    @Override
+    public void hideLoading() {
+        mProgressBar.setVisibility(View.GONE);
+    }
+
+    @Override
+    public void showToast(String msg) {
+        Toast.makeText(getContext(), msg, Toast.LENGTH_SHORT).show();
+    }
+
+    @Override
+    public void deleteSuccess(String id) {
+        mNewsAdapter.delete(id);
+    }
+
+    @Override
+    public void addFavorites(List<GistBean> list) {
+        if (list == null || list.size() == 0) {
+            showHint(true);
+        } else {
+            showHint(false);
+            mNewsAdapter.setData(list);
+        }
+    }
+
+    public void showHint(boolean isShow) {
+        hint.setVisibility(isShow ? View.VISIBLE : View.GONE);
+    }
+
+    @Override
+    public void addGists(List<GistBean> list) {
+        addFavorites(list);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/fragment/RefreshFragment.java b/qpython/src/main/java/org/qpython/qpy/main/fragment/RefreshFragment.java
new file mode 100644
index 00000000..309a1ed4
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/fragment/RefreshFragment.java
@@ -0,0 +1,179 @@
+package org.qpython.qpy.main.fragment;
+
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.graphics.Color;
+import android.net.Uri;
+import android.preference.PreferenceManager;
+import android.support.v4.app.Fragment;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.widget.RecyclerView;
+import android.view.ViewGroup;
+
+import com.quseit.util.FileHelper;
+import com.quseit.util.ImageUtil;
+import com.quseit.util.NAction;
+import com.yanzhenjie.recyclerview.swipe.SwipeMenuBridge;
+import com.yanzhenjie.recyclerview.swipe.SwipeMenuCreator;
+import com.yanzhenjie.recyclerview.swipe.SwipeMenuItem;
+import com.yanzhenjie.recyclerview.swipe.SwipeMenuItemClickListener;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.console.TermActivity;
+import org.qpython.qpy.main.adapter.LibListAdapter;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.CONF;
+import org.qpython.qpy.main.server.model.BaseLibModel;
+import org.qpython.qpy.main.utils.Utils;
+
+import java.util.List;
+
+
+public abstract class RefreshFragment extends Fragment {
+    private static final int SCRIPT_CONSOLE_CODE = 1237;
+    private              int WIDTH               = (int) ImageUtil.dp2px(60);
+    public SwipeMenuItemClickListener listener;
+    public int installPosition = -1; // For update download state
+
+    public abstract void refresh(boolean forceRefresh);
+
+    String tostring(Object obj) {
+        return App.getGson().toJson(obj);
+    }
+
+    public String getDownloadPath(String sModule) {
+        return CONF.qpypiPath() +
+                sModule;
+    }
+
+    public SwipeMenuCreator getTypeMenu() {
+        SwipeMenuItem detail = new SwipeMenuItem(getContext())
+                .setBackgroundColor(Color.parseColor("#FF4A4A4A"))
+                .setImage(R.drawable.ic_library_detail)
+                .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+                .setWidth(WIDTH);
+        SwipeMenuItem delete = new SwipeMenuItem(getContext())
+                .setBackgroundColor(Color.parseColor("#FFD2483D"))
+                .setImage(R.drawable.ic_library_delete)
+                .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+                .setWidth(WIDTH);
+
+        return (swipeLeftMenu, swipeRightMenu, viewType) -> {
+            switch (viewType) {
+                case LibListAdapter.INSTALLED:
+                    swipeRightMenu.addMenuItem(detail);
+                    swipeRightMenu.addMenuItem(delete);
+                    break;
+                case LibListAdapter.UN_INSTALLED:
+                    SwipeMenuItem download = new SwipeMenuItem(getContext())
+                            .setBackgroundColor(Color.parseColor("#FFECCD00"))
+                            .setImage(R.drawable.ic_library_download)
+                            .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+                            .setWidth(WIDTH);
+                    swipeRightMenu.addMenuItem(detail);
+                    swipeRightMenu.addMenuItem(download);
+                    break;
+                case LibListAdapter.UPGRADE:
+                    SwipeMenuItem upgrade = new SwipeMenuItem(getContext())
+                            .setBackgroundColor(Color.parseColor("#FF595959"))
+                            .setImage(R.drawable.ic_library_upgrade)
+                            .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+                            .setWidth(WIDTH);
+                    swipeRightMenu.addMenuItem(upgrade);
+                    swipeRightMenu.addMenuItem(detail);
+                    swipeRightMenu.addMenuItem(delete);
+                    break;
+            }
+        };
+    }
+
+    public SwipeMenuItemClickListener getListener(List<? extends BaseLibModel> dataList, RecyclerView.Adapter adapter) {
+        return listener = menuBridge -> {
+            menuBridge.closeMenu();
+            BaseLibModel item = dataList.get(menuBridge.getAdapterPosition());
+            switch (adapter.getItemViewType(menuBridge.getAdapterPosition())) {
+                case LibListAdapter.INSTALLED:
+                    switch (menuBridge.getPosition()) {
+                        case 0:
+                            // detail
+                            openDetail(item);
+                            break;
+                        case 1:
+                            // delete
+                            FileHelper.clearDir(getDownloadPath(item.getTmodule()), 0, true);
+                            item.setInstalled(false);
+                            adapter.notifyItemChanged(menuBridge.getAdapterPosition());
+                            break;
+                    }
+                    break;
+                case LibListAdapter.UPGRADE:
+                    switch (menuBridge.getPosition()) {
+                        case 0:
+                            // upgrade
+                            FileHelper.clearDir(getDownloadPath(item.getTmodule()), 0, true);
+                            item.setInstalled(false);
+                            adapter.notifyItemChanged(menuBridge.getAdapterPosition());
+                            installPosition = menuBridge.getAdapterPosition();
+                            downloadLib(item);
+                            item.setInstalled(true);
+                            adapter.notifyItemChanged(menuBridge.getAdapterPosition());
+                            break;
+                        case 1:
+                            // detail
+                            openDetail(item);
+                            break;
+                        case 2:
+                            // delete
+                            FileHelper.clearDir(getDownloadPath(item.getSmodule()), 0, true);
+                            item.setInstalled(false);
+                            adapter.notifyItemChanged(menuBridge.getAdapterPosition());
+                    }
+                    break;
+                case LibListAdapter.UN_INSTALLED:
+                    // UN INSTALL
+                    switch (menuBridge.getPosition()) {
+                        case 0:
+                            // detail
+                            openDetail(item);
+                            break;
+                        case 1:
+                            // download
+                            installPosition = menuBridge.getAdapterPosition();
+                            downloadLib(item);
+                            break;
+                    }
+                    break;
+            }
+
+        };
+    }
+
+    private void openDetail(BaseLibModel item) {
+        if (item.getSrc().equals("")) {
+            AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
+            AlertDialog alertDialog = builder.setTitle(R.string.location)
+                    .setMessage(CONF.qpypiPath() + "/" + item.getTitle())
+                    .setPositiveButton(R.string.confirm, null)
+                    .create();
+            alertDialog.show();
+        } else {
+
+            Utils.startWebActivityWithUrl(getActivity(), item.getTitle(), item.getSrc());
+
+        }
+    }
+
+    private void downloadLib(BaseLibModel item) {
+        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getContext());
+        String DIR = getContext().getApplicationContext().getFilesDir().getAbsolutePath();
+        String[] args = {DIR+"/bin/qpypi.py", "install", item.getSmodule()};
+
+        execPyInConsole(args);
+    }
+
+    public void execPyInConsole(String[] args) {
+        Intent intent = new Intent(getContext(), TermActivity.class);
+        intent.putExtra(TermActivity.ARGS, args);
+        startActivityForResult(intent, SCRIPT_CONSOLE_CODE);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/fragment/SettingFragment.java b/qpython/src/main/java/org/qpython/qpy/main/fragment/SettingFragment.java
new file mode 100644
index 00000000..f5624c51
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/fragment/SettingFragment.java
@@ -0,0 +1,995 @@
+package org.qpython.qpy.main.fragment;
+
+import android.app.ActivityManager;
+import android.app.AlarmManager;
+import android.app.PendingIntent;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.res.Resources;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Environment;
+import android.preference.CheckBoxPreference;
+import android.preference.Preference;
+import android.preference.PreferenceFragment;
+import android.preference.PreferenceManager;
+import android.preference.PreferenceScreen;
+import android.preference.SwitchPreference;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AlertDialog;
+import android.text.InputType;
+import android.util.Log;
+import android.view.Gravity;
+import android.view.View;
+import android.widget.ListView;
+import android.widget.Toast;
+
+import com.loopj.android.http.JsonHttpResponseHandler;
+import com.quseit.base.QBaseApp;
+import com.quseit.common.updater.downloader.Downloader;
+import com.quseit.util.NAction;
+import com.quseit.util.NStorage;
+
+import org.apache.http.Header;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.qpython.qpy.R;
+import org.qpython.qpy.main.activity.AboutActivity;
+import org.qpython.qpy.main.activity.CourseActivity;
+import org.qpython.qpy.main.activity.HomeMainActivity;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.service.FTPServerService;
+import org.qpython.qpy.main.widget.LoadingDialog;
+import org.qpython.qpy.texteditor.ui.view.EnterDialog;
+import org.qpython.qpy.utils.NotebookUtil;
+import org.qpython.qpysdk.QPyConstants;
+import org.qpython.qpysdk.QPySDK;
+import org.qpython.qpysdk.utils.Utils;
+import org.qpython.qsl4a.QPyScriptService;
+import org.swiftp.Util;
+
+import java.io.File;
+import java.net.InetAddress;
+import java.text.MessageFormat;
+
+import rx.Observable;
+import rx.Observer;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+
+public class SettingFragment extends PreferenceFragment {
+    private static final String TAG = "SettingFragment";
+
+    private static final String URL_COMMUNITY = "https://www.qpython.org/community.html";
+
+    private LoadingDialog mLoadingDialog;
+
+    private SharedPreferences settings;
+    private Resources         resources;
+    private Preference        mPassWordPref, username_pref, portnum_pref, chroot_pref, lastlog;
+    private CheckBoxPreference sl4a, running_state, root, display_pwd, notebook_run;
+
+    private PreferenceScreen py_inter,notebook_page;
+    private Preference py3,py2; //notebook_res, py2compatible
+    //private Preference update_qpy3,update_qpy2compatible;
+
+    private SwitchPreference log, app;
+    private BroadcastReceiver ftpServerReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            Log.v(TAG, "FTPServerService action received: " + intent.getAction());
+            if (intent.getAction().equals(FTPServerService.ACTION_STARTED)) {
+                running_state.setChecked(true);
+                // Fill in the FTP server address
+                setFtpAddress();
+            } else if (intent.getAction().equals(FTPServerService.ACTION_STOPPED)) {
+                running_state.setChecked(false);
+                running_state.setSummary(org.swiftp.R.string.running_summary_stopped);
+            } else if (intent.getAction().equals(FTPServerService.ACTION_FAILEDTOSTART)) {
+                running_state.setChecked(false);
+                running_state.setSummary(org.swiftp.R.string.running_summary_failed);
+            }
+        }
+    };
+
+    static private String transformPassword(String password) {
+        StringBuilder sb = new StringBuilder(password.length());
+        for (int i = 0; i < password.length(); ++i)
+            sb.append('*');
+        return sb.toString();
+    }
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        addPreferencesFromResource(R.xml.qpython_setting);
+        settings = PreferenceManager.getDefaultSharedPreferences(getActivity());
+        resources = getResources();
+        initSettings();
+        initListener();
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        //Disable scrollbar
+        ListView listView = view.findViewById(android.R.id.list);
+        if (listView != null) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                listView.setFocusedByDefault(false);
+            }
+        }
+        mLoadingDialog = new LoadingDialog(getActivity());
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+    }
+
+    private void initSettings() {
+        Preference ipaddress = findPreference("ipaddress");
+        InetAddress ip;
+        try {
+            ip = FTPServerService.getWifiIp();
+        } catch (NullPointerException e) {
+            ip = null;
+
+        }
+        if (ip!=null) {
+            ipaddress.setSummary(ip.getHostAddress());
+        } else {
+            ipaddress.setSummary(R.string.ip_address_need_wifi);
+        }
+        lastlog = (Preference) findPreference("lastlog");
+        py_inter = (PreferenceScreen) findPreference(getString(R.string.key_py_inter));
+        notebook_page = (PreferenceScreen) findPreference(getString(R.string.key_notebook_page));
+        notebook_page.setTitle(MessageFormat.format(getString(R.string.notebook_for_py), NAction.getPyVer(getActivity())));
+        if (NAction.isQPy3(getActivity())) {
+            notebook_page.setSummary(NotebookUtil.isNotebookLibInstall(getActivity()) ? R.string.notebook_installed : R.string.notebook_not_started);
+
+        } else {
+            notebook_page.setSummary( R.string.notebook_py3_support);
+
+        }
+
+        //notebook_res = (Preference) findPreference(getString(R.string.key_notebook));
+        //notebook_res.setSummary((NotebookUtil.isNotebookLibInstall(getActivity())||NotebookUtil.isNotebookInstall(getActivity()))?R.string.choose_notebook_inter:R.string.install_notebook_first);
+        notebook_run = (CheckBoxPreference) findPreference(getString(R.string.key_notebook_run));
+
+        //update_qpy3 = (Preference)findPreference(getString(R.string.key_update_qpy3));
+        //update_qpy2compatible = (Preference)findPreference(getString(R.string.key_update_qpy2compatible));
+        py2 = (Preference) findPreference(getString(R.string.key_py2));
+        //py2compatible = (Preference) findPreference(getString(R.string.key_py2compatible));
+        py3 = (Preference) findPreference(getString(R.string.key_py3));
+
+
+        root = (CheckBoxPreference) findPreference(resources.getString(R.string.key_root));
+        sl4a = (CheckBoxPreference) findPreference(resources.getString(R.string.key_sl4a));
+        app = (SwitchPreference) findPreference(getString(R.string.key_hide_push));
+        log = (SwitchPreference) findPreference(resources.getString(R.string.key_hide_noti));
+        //qpypi = findPreference(resources.getString(R.string.key_qpypi));
+        username_pref = findPreference(resources.getString(R.string.key_username));
+        running_state = (CheckBoxPreference) findPreference(resources.getString(R.string.key_ftp_state));
+        display_pwd = (CheckBoxPreference) findPreference(resources.getString(R.string.key_show_pwd));
+        mPassWordPref = findPreference(resources.getString(R.string.key_ftp_pwd));
+        portnum_pref = findPreference(resources.getString(R.string.key_port_num));
+        chroot_pref = findPreference(resources.getString(R.string.key_root_dir));
+
+        boolean isRoot, isRunning, isSaverOn;
+        isRoot = settings.getBoolean(getString(R.string.key_root), false);
+        root.setChecked(isRoot);
+        root.setSummary(isRoot ? R.string.enable_root : R.string.disable_root);
+
+        isRunning = isMyServiceRunning(QPyScriptService.class);
+        sl4a.setChecked(isRunning);
+        sl4a.setSummary(isRunning ? R.string.sl4a_running : R.string.sl4a_un_running);
+
+        app.setChecked(settings.getBoolean(getString(R.string.key_hide_push), true));
+        log.setChecked(settings.getBoolean(getString(R.string.key_hide_noti), true));
+
+        //qpypi.setSummary(settings.getString(getString(R.string.key_qpypi), org.qpython.qpy.main.app.CONF.QPYPI_URL));
+        username_pref.setSummary(settings.getString(resources.getString(R.string.key_username), resources.getString(org.swiftp.R.string.username_default)));
+        boolean isFTPRunning = FTPServerService.isRunning();
+        running_state.setChecked(isFTPRunning);
+        if (isFTPRunning) {
+            setFtpAddress();
+        } else {
+            running_state.setSummary(R.string.running_summary_stopped);
+        }
+        portnum_pref.setSummary(settings.getString(resources.getString(R.string.key_port_num),
+                resources.getString(org.swiftp.R.string.portnumber_default)));
+        chroot_pref.setSummary(settings.getString(resources.getString(R.string.key_root_dir),
+                Environment.getExternalStorageDirectory().getPath()));
+
+        py_inter.setSummary(NAction.isQPy3(getActivity()) ? R.string.py3_now : R.string.py2_now);
+        //setNotebookCheckbox();
+
+        SharedPreferences.Editor editor = settings.edit();
+        editor.putBoolean(getString(R.string.key_root), root.isChecked());
+        //editor.putString(getString(R.string.key_qpypi), qpypi.getSummary().toString());
+        editor.putString(getString(R.string.key_username), username_pref.getSummary().toString());
+        editor.putString(getString(R.string.key_ftp_pwd), settings.getString(mPassWordPref.getKey(), "ftp"));
+        editor.putString(getString(R.string.key_port_num), portnum_pref.getSummary().toString());
+        editor.putString(getString(R.string.key_root_dir), chroot_pref.getSummary().toString());
+        editor.putBoolean(getString(R.string.key_hide_noti), log.isChecked());
+        //editor.putBoolean(getString(R.string.key_py3), py3.isChecked());
+        editor.apply();
+    }
+
+    private void setFtpAddress() {
+        InetAddress address = FTPServerService.getWifiIp();
+        if (address == null) {
+            Log.v(TAG, "Unable to retreive wifi ip address");
+            running_state.setSummary(org.swiftp.R.string.cant_get_url);
+        } else {
+            String iptext = "ftp://" + address.getHostAddress() + ":"
+                    + FTPServerService.getPort() + "/";
+            String summary = getString(R.string.running_summary_started,
+                    iptext);
+            running_state.setSummary(summary);
+        }
+    }
+
+    private boolean isMyServiceRunning(Class<?> serviceClass) {
+        ActivityManager manager = (ActivityManager) getActivity().getSystemService(Context.ACTIVITY_SERVICE);
+        for (ActivityManager.RunningServiceInfo service : manager.getRunningServices(Integer.MAX_VALUE)) {
+            if (serviceClass.getName().equals(service.service.getClassName())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+
+    private void initListener() {
+
+        lastlog.setOnPreferenceClickListener(preference -> {
+            Utils.checkRunTimeLog(getActivity(), getString(R.string.last_log), QPyConstants.ABSOLUTE_LOG);
+
+            return false;
+        });
+
+        if (!NAction.isQPy3(getActivity())) {
+            notebook_run.setSummary(getString(R.string.notebook_py3_support));
+            notebook_run.setEnabled(false);
+
+        } else {
+            notebook_run.setChecked(NotebookUtil.isNBSrvSet(getActivity()));
+
+            notebook_run.setOnPreferenceChangeListener((preference, newValue) -> {
+                if ((boolean)newValue) {
+                    NotebookUtil.startNotebookService2(getActivity());
+
+                } else {
+                    NotebookUtil.killNBSrv(getActivity());
+                }
+                notebook_page.setSummary(NotebookUtil.isNotebookEnable(getActivity())?R.string.notebook_installed : R.string.notebook_not_started);
+
+                return true;
+            });
+        }
+
+        py2.setOnPreferenceClickListener(preference -> {
+            Log.d(TAG, "py2.setOnPreferenceClickListener");
+            NotebookUtil.killNBSrv(getActivity());
+
+            releasePython2Standard(preference);
+            return false;
+        });
+
+        py3.setOnPreferenceClickListener(preference -> {
+            NotebookUtil.killNBSrv(getActivity());
+            releasePython3(preference);
+
+            return false;
+        });
+
+        root.setOnPreferenceChangeListener((preference, newValue) ->
+        {
+            if ((boolean) newValue) {
+                if (NAction.isRootSystem()) {
+                    NStorage.setSP(getActivity(), "app.root", "1");
+                    return true;
+                } else {
+                    Toast.makeText(getActivity(), R.string.not_root_yet, Toast.LENGTH_SHORT).show();
+                    return false;
+                }
+            } else {
+                NStorage.setSP(getActivity(), "app.root", "0");
+                return true;
+            }
+        });
+
+        sl4a.setOnPreferenceChangeListener((preference, newValue) ->
+
+        {
+            boolean isCheck = (boolean) newValue;
+            if (isCheck) {
+                getActivity().startService(new Intent(getActivity(), QPyScriptService.class));
+            } else {
+                getActivity().stopService(new Intent(getActivity(), QPyScriptService.class));
+            }
+            return true;
+        });
+
+        app.setOnPreferenceChangeListener((preference, newValue) ->
+
+        {
+            boolean isCheck = (boolean) newValue;
+            settings.edit().putBoolean(getString(R.string.key_hide_push), isCheck).apply();
+            return true;
+        });
+        log.setOnPreferenceChangeListener((preference, newValue) ->
+
+        {
+            boolean isCheck = (boolean) newValue;
+            settings.edit().putBoolean(getString(R.string.key_hide_noti), isCheck).apply();
+            return true;
+        });
+
+        findPreference(resources.getString(R.string.key_reset)).
+            setOnPreferenceClickListener(preference ->
+            {
+                NAction.startInstalledAppDetailsActivity(getActivity());
+                return false;
+            });
+
+        findPreference(resources.getString(R.string.key_about)).
+            setOnPreferenceClickListener(preference ->
+            {
+                AboutActivity.start(getActivity());
+                return true;
+            });
+
+        findPreference("course").
+            setOnPreferenceClickListener(preference ->
+            {
+                CourseActivity.start(getActivity());
+                return true;
+            });
+
+        findPreference("community").
+            setOnPreferenceClickListener(preference ->
+            {
+                startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(URL_COMMUNITY+"?from="+NAction.getCode(this.getActivity()))));
+                return true;
+            });
+        /*  ====================FTP====================   */
+        running_state.setOnPreferenceChangeListener((preference, newValue) ->
+        {
+            if ((Boolean) newValue) {
+                startServer();
+            } else {
+                stopServer();
+            }
+            return true;
+        });
+
+        username_pref.setOnPreferenceClickListener(preference ->
+
+        {
+            new EnterDialog(getActivity())
+                    .setTitle(preference.getKey())
+                    .setText(preference.getSummary().toString())
+                    .setConfirmListener(name -> {
+                        preference.setSummary(name);
+                        updatePreference(preference);
+                        stopServer();
+                        return true;
+                    })
+                    .show();
+            return true;
+        });
+
+        display_pwd.setOnPreferenceChangeListener(((preference, newValue) ->
+
+        {
+            boolean check = (boolean) newValue;
+            String pwd = settings.getString(getString(R.string.key_ftp_pwd), "ftp");
+            if (check) {
+                mPassWordPref.setSummary(pwd);
+            } else {
+                mPassWordPref.setSummary(transformPassword(pwd));
+            }
+            return true;
+        }));
+
+        String password = settings.getString(resources.getString(R.string.key_ftp_pwd), "ftp");
+        mPassWordPref.setSummary(display_pwd.isChecked() ? password :
+
+                transformPassword(password));
+        mPassWordPref.setOnPreferenceClickListener(preference ->
+
+        {
+            new EnterDialog(getActivity())
+                    .setTitle(mPassWordPref.getKey())
+                    .setText(password)
+                    .setEnterType(InputType.TYPE_TEXT_VARIATION_PASSWORD)
+                    .setConfirmListener(name -> {
+                        settings.edit().putString(mPassWordPref.getKey(), name).apply();
+                        mPassWordPref.setSummary(display_pwd.isChecked() ? name : transformPassword(name));
+                        stopServer();
+                        return true;
+                    })
+                    .show();
+            return true;
+        });
+
+        portnum_pref.setOnPreferenceClickListener(preference ->
+
+        {
+            new EnterDialog(getActivity())
+                    .setTitle(preference.getKey())
+                    .setText(preference.getSummary().toString())
+                    .setEnterType(InputType.TYPE_CLASS_NUMBER)
+                    .setConfirmListener(name -> {
+                        int portNum = Integer.parseInt(name);
+                        if (portNum <= 0 || portNum > 65535) {
+                            Toast.makeText(getActivity(), org.swiftp.R.string.port_validation_error, Toast.LENGTH_LONG).show();
+                            return false;
+                        }
+                        preference.setSummary(name);
+                        updatePreference(preference);
+                        stopServer();
+                        return true;
+                    })
+                    .show();
+            return true;
+        });
+
+        chroot_pref.setOnPreferenceClickListener(preference ->
+
+        {
+            new EnterDialog(getActivity())
+                    .setTitle(preference.getKey())
+                    .setText(preference.getSummary().toString())
+                    .setConfirmListener(name -> {
+                        if (preference.getSummary().equals(name)) {
+                            return true;
+                        }
+                        File chrootTest = new File(name);
+                        if (!chrootTest.isDirectory() || !chrootTest.canRead()) {
+                            Toast.makeText(getActivity(), R.string.dir_not_valid, Toast.LENGTH_SHORT).show();
+                            return false;
+                        }
+                        preference.setSummary(name);
+                        updatePreference(preference);
+                        stopServer();
+                        return true;
+                    })
+                    .show();
+            return true;
+
+        });
+
+        final CheckBoxPreference wakelock_pref = (CheckBoxPreference) findPreference(resources.getString(R.string.key_stay_awake));
+        wakelock_pref.setOnPreferenceChangeListener((preference, newValue) ->
+        {
+            stopServer();
+            return true;
+        });
+    }
+
+    private void releaseNotebook(Preference preference) {
+        Observable.create((Observable.OnSubscribe<Boolean>) subscriber -> {
+            try {
+                String nbfile = NStorage.getSP(App.getContext(), NotebookUtil.getNbResFk(getActivity()));
+                if (!nbfile.equals("") && new File(nbfile).exists()) {    //
+                    extractNotebookRes(nbfile);
+                }
+                if (!NotebookUtil.isNotebookLibInstall(getActivity())) {
+                    NotebookUtil.extraData(getActivity());
+                }
+
+                subscriber.onNext(true);
+                subscriber.onCompleted();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+
+        })
+        .subscribeOn(Schedulers.io())
+        .doOnSubscribe(() -> mLoadingDialog.show())
+        .subscribeOn(AndroidSchedulers.mainThread())
+        .observeOn(AndroidSchedulers.mainThread())
+        .doOnTerminate(() -> mLoadingDialog.dismiss())
+        .subscribe(new Observer<Boolean>() {
+            @Override
+            public void onCompleted() {
+
+            }
+
+            @Override
+            public void onError(Throwable e) {
+
+            }
+
+            @Override
+            public void onNext(Boolean aBoolean) {
+                Log.d(TAG, "onNext");
+
+                NotebookUtil.startNotebookService2(getActivity());
+                notebook_page.setSummary(NotebookUtil.isNotebookLibInstall(getActivity())?R.string.notebook_installed : R.string.notebook_not_started);
+
+
+            }
+        });
+    }
+
+    private void installNotebook() {
+        new Thread(() -> {
+            QPySDK qpySDK = new QPySDK(App.getContext(), getActivity());
+            qpySDK.extractRes("notebook" + (NAction.isQPy3(getActivity()) ? "3" : "2"), new File(NotebookUtil.RELEASE_PATH));
+        }).run();
+//        new AlertDialog.Builder(getActivity(), R.style.MyDialog)
+//            .setTitle(R.string.notice)
+//            .setMessage(R.string.install_notebook_hint)
+//            .setPositiveButton(R.string.download_it, (dialog1, which)->getNotebook())
+//            .setNegativeButton(R.string.cancel, (dialog1, which) -> dialog1.dismiss())
+//            .create()
+//            .show();
+    }
+
+
+    private void extractNotebookRes(String path) {
+        final String extarget = NotebookUtil.RELEASE_PATH;
+
+        if (path!=null && !path.equals("")) {
+            File resf = new File(path);
+            if (resf.exists()) {
+                QPySDK qpySDK = new QPySDK(App.getContext(), getActivity());
+                qpySDK.extractRes(resf, new File(extarget), false);
+            }
+        }
+    }
+
+
+    private void releaseQPycRes(String path) {
+        final String extarget = QPyConstants.PY_CACHE_PATH;
+
+        if (path!=null && !path.equals("")) {
+            File res = new File(path);
+
+            if (res.exists()) {
+                QPySDK qpySDK = new QPySDK(App.getContext(), getActivity());
+                qpySDK.extractRes(res, new File(extarget), false);
+            }
+        }
+    }
+
+    private void releasePython2Standard(Preference preference) {
+        Observable.create((Observable.OnSubscribe<Boolean>) subscriber -> {
+            try {
+                //removeQPyc2Core();
+                QPySDK qpysdk = new QPySDK(getActivity(), getActivity());
+                qpysdk.extractRes("private1", getActivity().getFilesDir(), true);
+                qpysdk.extractRes("private2", getActivity().getFilesDir(), true);
+                qpysdk.extractRes("private3", getActivity().getFilesDir(),true);
+
+                subscriber.onNext(true);
+                subscriber.onCompleted();
+            } catch (Exception e) {
+                e.printStackTrace();
+                subscriber.onError(new Throwable("Failed to release Py2 resources"));
+            }
+        })
+        .subscribeOn(Schedulers.io())
+        .doOnSubscribe(() -> mLoadingDialog.show())
+        .subscribeOn(AndroidSchedulers.mainThread())
+        .observeOn(AndroidSchedulers.mainThread())
+        .doOnTerminate(() -> mLoadingDialog.dismiss())
+        .subscribe(new Observer<Boolean>() {
+            @Override
+            public void onCompleted() {
+
+            }
+
+            @Override
+            public void onError(Throwable e) {
+                Toast.makeText(getActivity(), "Faild to extract Py2 resource", Toast.LENGTH_SHORT).show();
+            }
+
+            @Override
+            public void onNext(Boolean aBoolean) {
+                NAction.setQPyInterpreter(getActivity(), "2.x");
+                py_inter.setSummary(R.string.py2_now);
+
+                getActivity().recreate();
+            }
+        });
+    }
+
+    private void releasePython2Compatable(Preference preference) {
+        Observable.create((Observable.OnSubscribe<Boolean>) subscriber -> {
+            try {
+
+                //removeQPyc2Core();
+
+                extractQPyCore(true);
+
+                subscriber.onNext(true);
+                subscriber.onCompleted();
+            } catch (Exception e) {
+                e.printStackTrace();
+                subscriber.onError(new Throwable("Failed to release Py2 resources"));
+            }
+        })
+        .subscribeOn(Schedulers.io())
+        .doOnSubscribe(() -> mLoadingDialog.show())
+        .subscribeOn(AndroidSchedulers.mainThread())
+        .observeOn(AndroidSchedulers.mainThread())
+        .doOnTerminate(() -> mLoadingDialog.dismiss())
+        .subscribe(new Observer<Boolean>() {
+            @Override
+            public void onCompleted() {
+
+            }
+
+            @Override
+            public void onError(Throwable e) {
+                Toast.makeText(getActivity(), "Faild to extract Py2 resource", Toast.LENGTH_SHORT).show();
+            }
+
+            @Override
+            public void onNext(Boolean aBoolean) {
+                NAction.setQPyInterpreter(getActivity(), "2.x");
+                py_inter.setSummary(R.string.py2_now);
+
+                getActivity().recreate();
+            }
+        });
+    }
+
+
+    private void releasePython3(Preference preference) {
+        QPySDK qpysdk = new QPySDK(this.getActivity(), this.getActivity());
+        Observable.create((Observable.OnSubscribe<Boolean>) subscriber -> {
+            try {
+                releaseQPycRes(NStorage.getSP(App.getContext(),QPyConstants.KEY_PY3_RES));
+                //extractQPyCore(false);
+
+                qpysdk.extractRes("private31", getActivity().getFilesDir(), true);
+                qpysdk.extractRes("private32", getActivity().getFilesDir(), true);
+                qpysdk.extractRes("private33", getActivity().getFilesDir(),true);
+                qpysdk.extractRes("notebook3", getActivity().getFilesDir(), true);
+
+                File externalStorage = new File(Environment.getExternalStorageDirectory(), "qpython");
+
+                qpysdk.extractRes("publi3c", new File(externalStorage + "/lib"));
+
+                subscriber.onNext(true);
+                subscriber.onCompleted();
+            } catch (Exception e) {
+                e.printStackTrace();
+                subscriber.onError(new Throwable("Failed to release Py3 resources"));
+            }
+        })
+        .subscribeOn(Schedulers.io())
+        .doOnSubscribe(() -> mLoadingDialog.show())
+        .subscribeOn(AndroidSchedulers.mainThread())
+        .observeOn(AndroidSchedulers.mainThread())
+        .doOnTerminate(() -> mLoadingDialog.dismiss())
+        .subscribe(new Observer<Boolean>() {
+            @Override
+            public void onCompleted() {
+
+            }
+
+            @Override
+            public void onError(Throwable e) {
+                Toast.makeText(getActivity(), "Faild to extract Py3 resource", Toast.LENGTH_SHORT).show();
+            }
+
+            @Override
+            public void onNext(Boolean aBoolean) {
+                NAction.setQPyInterpreter(getActivity(), "3.x");
+                py_inter.setSummary(R.string.py3_now);
+
+                getActivity().recreate();
+            }
+        });
+
+    }
+
+    private void updatePreference(Preference preference) {
+        SharedPreferences.Editor editor = settings.edit();
+        if (preference instanceof CheckBoxPreference) {
+            editor.putBoolean(preference.getKey(), ((CheckBoxPreference) preference).isChecked());
+        } else {
+            editor.putString(preference.getKey(), preference.getSummary().toString());
+        }
+        editor.apply();
+    }
+
+    private void restartApp() {
+        Intent mStartActivity = new Intent(getActivity(), HomeMainActivity.class);
+        int mPendingIntentId = 123456;
+        PendingIntent mPendingIntent = PendingIntent.getActivity(getActivity(), mPendingIntentId, mStartActivity, PendingIntent.FLAG_CANCEL_CURRENT);
+        AlarmManager mgr = (AlarmManager) getActivity().getSystemService(Context.ALARM_SERVICE);
+        mgr.set(AlarmManager.RTC, System.currentTimeMillis() + 100, mPendingIntent);
+        System.exit(0);
+    }
+
+    private void startServer() {
+        Context context = getActivity();
+        Intent serverService = new Intent(context, FTPServerService.class);
+        if (!FTPServerService.isRunning()) {
+            warnIfNoExternalStorage();
+            context.startService(serverService);
+        }
+    }
+
+    private void stopServer() {
+        Context context = getActivity();
+        Intent serverService = new Intent(context, FTPServerService.class);
+        context.stopService(serverService);
+    }
+
+    /**
+     * Will check if the device contains external storage (sdcard) and display a warning
+     * for the user if there is no external storage. Nothing more.
+     */
+    private void warnIfNoExternalStorage() {
+        String storageState = Environment.getExternalStorageState();
+        if (!storageState.equals(Environment.MEDIA_MOUNTED)) {
+            Log.v(TAG, "Warning due to storage state " + storageState);
+            Toast toast = Toast.makeText(getActivity(), org.swiftp.R.string.storage_warning,
+                    Toast.LENGTH_LONG);
+            toast.setGravity(Gravity.CENTER, 0, 0);
+            toast.show();
+        }
+    }
+
+    public BroadcastReceiver getFtpServerReceiver() {
+        return ftpServerReceiver;
+    }
+
+    /*
+    TODO: Make it configuration
+     */
+    private void getNotebook() {
+
+        mLoadingDialog.show();
+
+        QBaseApp.getInstance().getAsyncHttpClient().get(getActivity(), NotebookUtil.getNBLink(getActivity()),
+        null, new JsonHttpResponseHandler() {
+            @Override
+            public void onSuccess(int statusCode, Header[] headers, JSONObject result) {
+                final String KEY_RES = "setting.notebookresource.ver";
+
+                try {
+
+                    final String notebook_resource_ver = NStorage.getSP(getActivity(), KEY_RES);
+                    final String url = result.getString("link");
+                    final String target = result.getString("target");
+                    final String vercode = result.getString("vercode");
+                    final String title = result.getString("title");
+                    final String vername = result.getString("vername");
+                    final String path = NotebookUtil.RELEASE_PATH+"/"+target;
+
+                    NStorage.setSP(App.getContext(),  NotebookUtil.getNbResFk(getActivity()), path);
+
+                    Log.d(TAG, "getNotebook:onSuccess:"+notebook_resource_ver+"["+vercode+"]");
+
+                    if (notebook_resource_ver.equals(vercode) && new File(path).exists()) {
+                        mLoadingDialog.dismiss();
+
+                        new AlertDialog.Builder(getActivity(), R.style.MyDialog)
+                            .setTitle(title)
+                            .setMessage(R.string.newest_resource)
+                            .setPositiveButton(R.string.ok, (dialog1, which) -> {
+                                try {
+                                    extractNotebookRes(path);
+                                } catch (Exception e) {
+
+                                }
+                                dialog1.dismiss();
+                            })
+                            .create()
+                            .show();
+
+                    } else {
+                        App.getDownloader().download(getString(R.string.download_notebook), url, path, new Downloader.Callback() {
+
+                            @Override
+                            public void pending(String name) {
+                                mLoadingDialog.cancel();
+
+                                new AlertDialog.Builder(getActivity(), R.style.MyDialog)
+                                    .setTitle(R.string.notice)
+                                    .setMessage(R.string.download_progress_need_sometime)
+                                    .setPositiveButton(R.string.ok, (dialog1, which) -> {
+                                    })
+                                    .create()
+                                    .show();
+                            }
+
+                            @Override
+                            public void complete(String name, File installer) {
+
+                                Log.d(TAG, "getNotebook:complete:" + name + "[" + installer.getAbsolutePath() + "]");
+                                mLoadingDialog.dismiss();
+
+
+                                NStorage.setSP(App.getContext(),KEY_RES, vercode);
+
+                                // UNZIP resources && install
+                                try {
+                                    extractNotebookRes(installer.getAbsolutePath());
+                                    Toast.makeText(App.getContext(), R.string.file_downloaded, Toast.LENGTH_SHORT).show();
+
+                                } catch (Exception e) {
+
+                                }
+                            }
+
+                            @Override
+                            public void error(String err) {
+                                mLoadingDialog.cancel();
+                                try {
+                                    Toast.makeText(getActivity(), err, Toast.LENGTH_SHORT).show();
+                                } catch (Exception e) {
+
+                                }
+                            }
+                        });
+                    }
+                } catch (JSONException e) {
+                    e.printStackTrace();
+                }
+            }
+            @Override
+            public void onFailure(int statusCode, Header[] headers, String responseString, Throwable throwable) {
+                // waitingWindow.dismiss();
+                Log.d(TAG, "Error in checkConfUpdate:" + throwable.getMessage());
+            }
+        });
+
+    }
+    private void getQPYC(boolean ispy2compatible) {
+        mLoadingDialog.show();
+
+        String conf_url = (ispy2compatible?QPyConstants.QPYC2COMPATIBLE:QPyConstants.QPYC3)+"?"+NAction.getUserUrl(getActivity());
+
+        QBaseApp.getInstance().getAsyncHttpClient().get(getActivity(), conf_url,
+        null, new JsonHttpResponseHandler() {
+                @Override
+                public void onSuccess(int statusCode, Header[] headers, JSONObject result) {
+                    final String KEY_RES = ispy2compatible?QPyConstants.QPYC2COMPATIBLE_VER_KEY:QPyConstants.QPYC3_VER_KEY;
+
+                    try {
+
+                        final String py_resource_ver = NStorage.getSP(getActivity(), KEY_RES);
+
+                        final String url = result.getString("link");
+                        final String target = result.getString("target");
+                        final String vercode = result.getString("vercode");
+                        final String title = result.getString("title");
+                        final String vername = result.getString("vername");
+                        final String path = QPyConstants.PY_CACHE_PATH + "/" + target;
+
+                        NStorage.setSP(App.getContext(), QPyConstants.KEY_PY3_RES, path);
+
+                        Log.d(TAG, "getQPYC:onSuccess:"+py_resource_ver+"["+vercode+"]");
+
+                        if (py_resource_ver.equals(vercode) && new File(path).exists()) {
+                            mLoadingDialog.dismiss();
+
+                            new AlertDialog.Builder(getActivity(), R.style.MyDialog)
+                                .setTitle(title)
+                                .setMessage(R.string.newest_resource)
+                                .setPositiveButton(R.string.ok, (dialog1, which) -> {
+                                    try {
+                                        releaseQPycRes(path);
+                                    } catch (Exception e) {
+
+                                    }
+
+                                    dialog1.dismiss();
+                                })
+                                .create()
+                                .show();
+
+                        } else {
+
+                            App.getDownloader().download(getString(R.string.download_py), url, path, new Downloader.Callback() {
+
+                                @Override
+                                public void pending(String name) {
+                                    mLoadingDialog.cancel();
+
+                                    new AlertDialog.Builder(getActivity(), R.style.MyDialog)
+                                            .setTitle(R.string.notice)
+                                            .setMessage(R.string.download_progress_need_sometime)
+                                            //.setNegativeButton(R.string.cancel, (dialog1, which) -> dialog1.dismiss())
+                                            .setPositiveButton(R.string.ok, (dialog1, which) -> {
+                                            })
+                                            .create()
+                                            .show();
+                                }
+
+                                @Override
+                                public void complete(String name, File installer) {
+
+                                    Log.d(TAG, "getQPYC:complete:" + name + "[" + installer.getAbsolutePath() + "]");
+                                    mLoadingDialog.dismiss();
+
+                                    NStorage.setSP(App.getContext(),KEY_RES, vercode);
+                                    // UNZIP resources && install
+                                    try {
+                                        releaseQPycRes(installer.getAbsolutePath());
+
+                                    } catch (Exception e) {
+
+                                    }
+                                }
+
+                                @Override
+                                public void error(String err) {
+                                    mLoadingDialog.cancel();
+                                    try {
+                                        Toast.makeText(getActivity(), err, Toast.LENGTH_SHORT).show();
+                                    } catch (Exception e) {
+
+                                    }
+                                }
+                            });
+                        }
+                } catch (JSONException e) {
+                    e.printStackTrace();
+                }
+            }
+            @Override
+            public void onFailure(int statusCode, Header[] headers, String responseString, Throwable throwable) {
+                // waitingWindow.dismiss();
+                Log.d(TAG, "Error in getQPYC:" + throwable.getMessage());
+            }
+        });
+    }
+
+    private boolean isQPycRelease(boolean ispy2compatible) {
+        boolean isRelease = true;
+        String[] py3Mp3File = getActivity().getResources().getStringArray(ispy2compatible?R.array.qpy2compatible_zip:R.array.qpy3_zip);
+        for (String s : py3Mp3File) {
+            isRelease = isRelease && new File(QPyConstants.PY_CACHE_PATH + "/" + s).exists();
+        }
+        return isRelease;
+    }
+
+    private void removeQPyc2Core() {
+        Log.d(TAG, "removeQPyc2Core");
+        String files = getActivity().getFilesDir().getAbsolutePath();
+        String[] files2del = {files+"/lib/notebook.zip", files+"/lib/python27.zip", files+"/lib/python2.7"};
+        for (int i=0;i<files2del.length;i++) {
+            QPySDK.recursiveDelete(files2del[i]);
+        }
+    }
+
+    /**
+     * 应该在工作线程处理文件的解压释放
+     */
+    private void extractQPyCore(Boolean ispy2Compatible) {
+        QPySDK qpySDK = new QPySDK(getActivity(), getActivity());
+        File libFolder = new File(QPyConstants.ABSOLUTE_PATH, QPyConstants.PY_CACHE);
+        String[] pyMp3File = getActivity().getResources().getStringArray(ispy2Compatible?R.array.qpy2compatible_zip:R.array.qpy3_zip);
+
+        for (String s : pyMp3File) {
+
+            File unzipFile = new File(libFolder, s);
+            if (s.contains("public")) {
+                File externalStorage = new File(QPyConstants.ABSOLUTE_PATH);
+
+                qpySDK.extractRes(unzipFile, new File(externalStorage + "/lib"), false);
+
+            } else {
+                qpySDK.extractRes(unzipFile, getActivity().getFilesDir(), false);
+            }
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/qpython/src/main/java/org/qpython/qpy/main/fragment/TedSettingFragment.java b/qpython/src/main/java/org/qpython/qpy/main/fragment/TedSettingFragment.java
new file mode 100644
index 00000000..e78341a3
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/fragment/TedSettingFragment.java
@@ -0,0 +1,101 @@
+package org.qpython.qpy.main.fragment;
+
+import android.app.Activity;
+import android.content.ActivityNotFoundException;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.preference.ListPreference;
+import android.preference.PreferenceFragment;
+import android.support.annotation.Nullable;
+import android.util.Log;
+import android.widget.Toast;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.texteditor.TedFontActivity;
+import org.qpython.qpy.texteditor.TedSettingsActivity;
+import org.qpython.qpy.texteditor.common.Settings;
+import org.qpython.qpy.texteditor.widget.crouton.Crouton;
+import org.qpython.qpy.texteditor.widget.crouton.Style;
+
+import static org.qpython.qpy.texteditor.common.Constants.PREFERENCE_COLOR_THEME;
+import static org.qpython.qpy.texteditor.common.Constants.PREFERENCE_MAX_LINES_NUM_WITH_SYNTAX;
+import static org.qpython.qpy.texteditor.common.Constants.PREFERENCE_SELECT_FONT;
+import static org.qpython.qpy.texteditor.common.Constants.PREFERENCE_TEXT_SIZE;
+import static org.qpython.qpy.texteditor.common.Constants.REQUEST_FONT;
+
+/**
+ * Created by Hmei
+ * 1/15/18.
+ */
+
+public class TedSettingFragment extends PreferenceFragment {
+    private TedSettingsActivity activity;
+    private String TAG = "TedSettingFragment";
+
+    @Override
+    public void onAttach(Activity activity) {
+        Log.d(TAG, "onAttach activity");
+        super.onAttach(activity);
+        this.activity = (TedSettingsActivity) activity;
+
+    }
+        @Override
+    public void onAttach(Context context) {
+        Log.d(TAG, "onAttach context");
+        super.onAttach(context);
+        activity = (TedSettingsActivity) context;
+    }
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        addPreferencesFromResource(R.xml.ted_prefs);
+
+        getPreferenceManager().getSharedPreferences()
+                .registerOnSharedPreferenceChangeListener(activity);
+
+        Settings.updateFromPreferences(getPreferenceManager()
+                .getSharedPreferences());
+
+        findPreference(PREFERENCE_SELECT_FONT).setOnPreferenceClickListener(
+                preference -> {
+                    try {
+                        Intent selectFont = new Intent();
+                        selectFont.setClass(this.getActivity().getApplicationContext(),
+                                TedFontActivity.class);
+                        try {
+                            startActivityForResult(selectFont, REQUEST_FONT);
+                        } catch (ActivityNotFoundException e) {
+                            Crouton.showText(this.getActivity(),
+                                    R.string.toast_activity_open, Style.ALERT);
+                        }
+                    } catch (Exception e) {
+                        Toast.makeText(this.getActivity(),"Exception occured when setting fonts, please retry or report to dev",Toast.LENGTH_SHORT).show();
+                    }
+                    return true;
+                });
+        updateSummaries();
+    }
+
+    public void updateSummaries() {
+        Log.d("TedSettingFragment", "updateSummaries");
+
+        ListPreference listPref = (ListPreference) findPreference(PREFERENCE_COLOR_THEME);
+        listPref.setSummary(listPref.getEntry());
+
+        ListPreference textSize = (ListPreference) findPreference(PREFERENCE_TEXT_SIZE);
+        textSize.setSummary(textSize.getEntry());
+
+        ListPreference maxLine = (ListPreference) findPreference(PREFERENCE_MAX_LINES_NUM_WITH_SYNTAX);
+
+        try {
+            // DON'T CHANGE THIS LINE
+            if (maxLine!=null) {
+                maxLine.setSummary(activity.getString(R.string.max_lines_num_with_syntax_summary, maxLine.getEntry()));
+            }
+        } catch (Exception ignore) {
+        }
+    }
+
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/listener/LoadmoreListener.java b/qpython/src/main/java/org/qpython/qpy/main/listener/LoadmoreListener.java
new file mode 100644
index 00000000..4d2ea764
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/listener/LoadmoreListener.java
@@ -0,0 +1,52 @@
+package org.qpython.qpy.main.listener;
+
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+
+/**
+ * 文 件 名: LoadmoreListener
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2017/12/29 10:51
+ * 邮   箱: qq798435167@gmail.com
+ * 修改时间：
+ * 修改备注：
+ */
+
+public abstract class LoadmoreListener extends RecyclerView.OnScrollListener {
+
+    //用来标记是否正在向最后一个滑动
+    boolean isSlidingToLast = false;
+
+    @Override
+    public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
+        super.onScrollStateChanged(recyclerView, newState);
+        LinearLayoutManager manager = (LinearLayoutManager) recyclerView.getLayoutManager();
+        // 当不滚动时
+        if (newState == RecyclerView.SCROLL_STATE_IDLE) {
+            //获取最后一个完全显示的ItemPosition
+            int lastVisibleItem = manager.findLastCompletelyVisibleItemPosition();
+            int totalItemCount = manager.getItemCount();
+
+            // 判断是否滚动到底部，并且是向右滚动
+            if (lastVisibleItem == (totalItemCount - 1) && isSlidingToLast&&totalItemCount>0) {
+                //加载更多功能的代码
+                OnLoadmore();
+            }
+        }
+    }
+
+    @Override
+    public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
+        super.onScrolled(recyclerView, dx, dy);
+        //dx用来判断横向滑动方向，dy用来判断纵向滑动方向
+        if (dy > 0) {
+            //大于0表示正在向上滚动
+            isSlidingToLast = true;
+        } else {
+            //小于等于0表示停止或向下滚动
+            isSlidingToLast = false;
+        }
+    }
+
+    public abstract void OnLoadmore();
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/model/AppModel.java b/qpython/src/main/java/org/qpython/qpy/main/model/AppModel.java
new file mode 100755
index 00000000..ecc60343
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/model/AppModel.java
@@ -0,0 +1,19 @@
+package org.qpython.qpy.main.model;
+
+import android.graphics.drawable.Drawable;
+import android.support.annotation.DrawableRes;
+
+import java.io.Serializable;
+
+/**
+ * @credit http://developer.android.com/reference/android/content/AsyncTaskLoader.html
+ */
+public abstract class AppModel implements Serializable{
+    String   mAppLabel;
+    Drawable mIcon;
+
+    public abstract Drawable getIcon();
+    public abstract String getLabel();
+
+    public abstract @DrawableRes int getIconRes();
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/model/LocalAppModel.java b/qpython/src/main/java/org/qpython/qpy/main/model/LocalAppModel.java
new file mode 100644
index 00000000..3e0bf9df
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/model/LocalAppModel.java
@@ -0,0 +1,78 @@
+package org.qpython.qpy.main.model;
+
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.graphics.drawable.Drawable;
+
+import java.io.File;
+
+
+public class LocalAppModel extends AppModel {
+
+    private final Context         mContext;
+    private final ApplicationInfo mInfo;
+    private final File            mApkFile;
+    private       boolean         mMounted;
+
+    public LocalAppModel(Context context, ApplicationInfo info) {
+        mContext = context;
+        mInfo = info;
+        mApkFile = new File(info.sourceDir);
+    }
+
+    private ApplicationInfo getAppInfo() {
+        return mInfo;
+    }
+
+    public String getApplicationPackageName() {
+        return getAppInfo().packageName;
+    }
+
+    @Override
+    public String getLabel() {
+        return mAppLabel;
+    }
+
+    @Override
+    public int getIconRes() {
+        return 0;
+    }
+
+    @Override
+    public Drawable getIcon() {
+        if (mIcon == null) {
+            if (mApkFile.exists()) {
+                mIcon = mInfo.loadIcon(mContext.getPackageManager());
+                return mIcon;
+            } else {
+                mMounted = false;
+            }
+        } else if (!mMounted) {
+            // If the app wasn't mounted but is now mounted, reload
+            // its icon.
+            if (mApkFile.exists()) {
+                mMounted = true;
+                mIcon = mInfo.loadIcon(mContext.getPackageManager());
+                return mIcon;
+            }
+        } else {
+            return mIcon;
+        }
+
+        return mContext.getResources().getDrawable(android.R.drawable.sym_def_app_icon);
+    }
+
+
+    public void loadLabel(Context context) {
+        if (mAppLabel == null || !mMounted) {
+            if (!mApkFile.exists()) {
+                mMounted = false;
+                mAppLabel = mInfo.packageName;
+            } else {
+                mMounted = true;
+                CharSequence label = mInfo.loadLabel(context.getPackageManager());
+                mAppLabel = label != null ? label.toString() : mInfo.packageName;
+            }
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/model/QPyScriptModel.java b/qpython/src/main/java/org/qpython/qpy/main/model/QPyScriptModel.java
new file mode 100644
index 00000000..fba73205
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/model/QPyScriptModel.java
@@ -0,0 +1,94 @@
+package org.qpython.qpy.main.model;
+
+import android.graphics.drawable.Drawable;
+
+import com.quseit.util.FileHelper;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.main.app.App;
+
+import java.io.File;
+
+/**
+ * QPython script list item model
+ * Created by Hmei on 2017-05-25.
+ */
+
+public class QPyScriptModel extends AppModel {
+    private File    file;
+    private boolean isProj;
+    private int res = -1;
+
+    public QPyScriptModel(File file) {
+        this.file = file;
+    }
+
+
+    private int initRes() {
+        isProj = getPath().contains("/projects");
+        String content;
+        if (isProj) {
+            File mainPy = FileHelper.getMainFileByType(getFile());
+            if (mainPy == null) {
+                res = R.drawable.ic_project_qapp;
+                return res;
+            }
+            content = org.qpython.qpysdk.utils.FileHelper.getFileContents(mainPy.getAbsolutePath());
+        } else {
+            content = org.qpython.qpysdk.utils.FileHelper.getFileContents(getPath());
+        }
+        boolean isWeb = content.contains("#qpy:webapp");
+        boolean isQApp = content.contains("#qpy:quiet") || content.contains("#qpy:qpysrv");
+        boolean isKivy = content.contains("#qpy:kivy");
+        boolean isGame = content.contains("#qpy:pygame");
+        boolean isPy3 = content.contains("#qpy:3");
+
+        if (isWeb) {
+            if (isPy3) {
+                res = (isProj ? R.drawable.ic_project_webapp3 : R.drawable.ic_pyfile_webapp3);
+            } else {
+                res = (isProj ? R.drawable.ic_project_webapp : R.drawable.ic_pyfile_webapp);
+            }
+        } else if (isKivy || isGame) {
+            if (isPy3) {
+                res = (isProj ? R.drawable.ic_project_kivy3 : R.drawable.ic_pyfile_kivy3);
+            } else {
+                res = (isProj ? R.drawable.ic_project_kivy : R.drawable.ic_pyfile_kivy);
+            }
+        } else {
+            if (isPy3) {
+                res = (isProj ? R.drawable.ic_project_qapp3 : R.drawable.ic_pyfile_qapp3);
+            } else {
+                res = (isProj ? R.drawable.ic_project_qapp : R.drawable.ic_pyfile_qapp);
+            }
+        }
+        return res;
+    }
+
+    @Override
+    public Drawable getIcon() {
+        return App.getContext().getResources().getDrawable(res == -1 ? initRes() : res);
+    }
+
+    @Override
+    public String getLabel() {
+        return file.getName();
+    }
+
+    @Override
+    public int getIconRes() {
+        return res == -1 ? initRes() : res;
+    }
+
+    public String getPath() {
+        return file.getAbsolutePath();
+    }
+
+    public File getFile() {
+        return file;
+    }
+
+    public boolean isProj() {
+        return isProj;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/model/UpdateJson.java b/qpython/src/main/java/org/qpython/qpy/main/model/UpdateJson.java
new file mode 100644
index 00000000..3cac283d
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/model/UpdateJson.java
@@ -0,0 +1,139 @@
+package org.qpython.qpy.main.model;
+
+import java.util.List;
+
+public class UpdateJson {
+    private AppBean app;
+
+    private List<PluginsBean> plugins;
+
+    public AppBean getApp() {
+        return app;
+    }
+
+    public void setApp(AppBean app) {
+        this.app = app;
+    }
+
+    public List<PluginsBean> getPlugins() {
+        return plugins;
+    }
+
+    public void setPlugins(List<PluginsBean> plugins) {
+        this.plugins = plugins;
+    }
+
+    public static class AppBean {
+        private String link;
+        private int ver;
+        private String ver_desc;
+        private String ver_name;
+
+        public String getLink() {
+            return link;
+        }
+
+        public void setLink(String link) {
+            this.link = link;
+        }
+
+        public int getVer() {
+            return ver;
+        }
+
+        public void setVer(int ver) {
+            this.ver = ver;
+        }
+
+        public String getVer_desc() {
+            return ver_desc;
+        }
+
+        public void setVer_desc(String ver_desc) {
+            this.ver_desc = ver_desc;
+        }
+
+        public String getVer_name() {
+            return ver_name;
+        }
+
+        public void setVer_name(String ver_name) {
+            this.ver_name = ver_name;
+        }
+    }
+
+    public static class PluginsBean {
+        private String src;
+        private int ver;
+        private String plugin;
+        private String link;
+        private String dst;
+        private String title;
+        private String ver_desc;
+        private String desc;
+
+        public String getSrc() {
+            return src;
+        }
+
+        public void setSrc(String src) {
+            this.src = src;
+        }
+
+        public int getVer() {
+            return ver;
+        }
+
+        public void setVer(int ver) {
+            this.ver = ver;
+        }
+
+        public String getPlugin() {
+            return plugin;
+        }
+
+        public void setPlugin(String plugin) {
+            this.plugin = plugin;
+        }
+
+        public String getLink() {
+            return link;
+        }
+
+        public void setLink(String link) {
+            this.link = link;
+        }
+
+        public String getDst() {
+            return dst;
+        }
+
+        public void setDst(String dst) {
+            this.dst = dst;
+        }
+
+        public String getTitle() {
+            return title;
+        }
+
+        public void setTitle(String title) {
+            this.title = title;
+        }
+
+        public String getVer_desc() {
+            return ver_desc;
+        }
+
+        public void setVer_desc(String ver_desc) {
+            this.ver_desc = ver_desc;
+        }
+
+        public String getDesc() {
+            return desc;
+        }
+
+        public void setDesc(String desc) {
+            this.desc = desc;
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/receiver/BootBroadcastReceiver.java b/qpython/src/main/java/org/qpython/qpy/main/receiver/BootBroadcastReceiver.java
new file mode 100644
index 00000000..c3bbb41c
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/receiver/BootBroadcastReceiver.java
@@ -0,0 +1,33 @@
+package org.qpython.qpy.main.receiver;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.util.Log;
+import android.os.Build;
+
+import org.qpython.qsl4a.QPyScriptService;
+
+
+public class BootBroadcastReceiver extends BroadcastReceiver {
+
+    private static final String TAG = "QPyScriptServiceR";
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+
+        Log.d(TAG, "BootReceiver.onReceive: " + intent.getAction());
+        System.out.println("QPYSL4A程序即将执行");
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+
+        } else {
+
+            try {
+                context.startService(new Intent(context, QPyScriptService.class));
+            } catch (RuntimeException e) {
+
+            }
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/receiver/DownloadNotebookReceiver.java b/qpython/src/main/java/org/qpython/qpy/main/receiver/DownloadNotebookReceiver.java
new file mode 100644
index 00000000..15bf2a13
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/receiver/DownloadNotebookReceiver.java
@@ -0,0 +1,52 @@
+package org.qpython.qpy.main.receiver;
+
+import android.app.DownloadManager;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.database.Cursor;
+import android.widget.Toast;
+
+import org.greenrobot.eventbus.EventBus;
+import org.qpython.qpy.R;
+import org.qpython.qpy.main.activity.QWebViewActivity;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.fragment.LibProjectFragment;
+
+/**
+ *
+ * Created by Hmei on 2017-06-09.
+ */
+
+public class DownloadNotebookReceiver extends BroadcastReceiver {
+    private long enqueue;
+
+    public DownloadNotebookReceiver() {
+    }
+
+    public void setEnqueue(long enqueue) {
+        this.enqueue = enqueue;
+    }
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        String action = intent.getAction();
+        if (DownloadManager.ACTION_DOWNLOAD_COMPLETE.equals(action)) {
+            DownloadManager.Query query = new DownloadManager.Query();
+            query.setFilterById(enqueue);
+            Cursor c = ((DownloadManager) App.getContext().getSystemService(Context.DOWNLOAD_SERVICE)).query(query);
+            if (c.moveToFirst()) {
+                int columnIndex = c.getColumnIndex(DownloadManager.COLUMN_STATUS);
+                if (DownloadManager.STATUS_SUCCESSFUL == c.getInt(columnIndex)) {
+                    String title = c.getString(c.getColumnIndex(DownloadManager.COLUMN_TITLE));
+
+                    QWebViewActivity.CreateNotebookDownloadFinishEvent event = new QWebViewActivity.CreateNotebookDownloadFinishEvent();
+                    event.fileName = title;
+                    EventBus.getDefault().post(event);
+                } else {
+                    Toast.makeText(context, R.string.download_fail, Toast.LENGTH_SHORT).show();
+                }
+            }
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/receiver/DownloadReceiver.java b/qpython/src/main/java/org/qpython/qpy/main/receiver/DownloadReceiver.java
new file mode 100644
index 00000000..60d4c610
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/receiver/DownloadReceiver.java
@@ -0,0 +1,51 @@
+package org.qpython.qpy.main.receiver;
+
+import android.app.DownloadManager;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.database.Cursor;
+import android.widget.Toast;
+
+import org.greenrobot.eventbus.EventBus;
+import org.qpython.qpy.R;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.fragment.LibProjectFragment;
+
+/**
+ *
+ * Created by Hmei on 2017-06-09.
+ */
+
+public class DownloadReceiver extends BroadcastReceiver {
+    private long enqueue;
+
+    public DownloadReceiver() {
+    }
+
+    public void setEnqueue(long enqueue) {
+        this.enqueue = enqueue;
+    }
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        String action = intent.getAction();
+        if (DownloadManager.ACTION_DOWNLOAD_COMPLETE.equals(action)) {
+            DownloadManager.Query query = new DownloadManager.Query();
+            query.setFilterById(enqueue);
+            Cursor c = ((DownloadManager) App.getContext().getSystemService(Context.DOWNLOAD_SERVICE)).query(query);
+            if (c.moveToFirst()) {
+                int columnIndex = c.getColumnIndex(DownloadManager.COLUMN_STATUS);
+                if (DownloadManager.STATUS_SUCCESSFUL == c.getInt(columnIndex)) {
+                    String title = c.getString(c.getColumnIndex(DownloadManager.COLUMN_TITLE));
+
+                    LibProjectFragment.CreateLibFinishEvent event = new LibProjectFragment.CreateLibFinishEvent();
+                    event.fileName = title;
+                    EventBus.getDefault().post(event);
+                } else {
+                    Toast.makeText(context, R.string.download_fail, Toast.LENGTH_SHORT).show();
+                }
+            }
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/receiver/NotificationBean.java b/qpython/src/main/java/org/qpython/qpy/main/receiver/NotificationBean.java
new file mode 100644
index 00000000..90b8661c
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/receiver/NotificationBean.java
@@ -0,0 +1,69 @@
+package org.qpython.qpy.main.receiver;
+
+
+public class NotificationBean {
+
+    /**
+     * type : <类型  ext/in 分别为外部浏览器打开或者系统内链接>
+     * title : <状态栏提示>
+     * msg : <详情>
+     * link : <打开的链接, http://xxx  或者 appname://somelink 这种>
+     * extra : <额外参数, | 分割 如果link为 appname://somelink 这种，这块可能就需要>
+     * force : <为true则关闭App notifications也仍然推送>
+     */
+
+    private String type;
+    private String title;
+    private String msg;
+    private String link;
+    private String extra;
+    private boolean force;
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    public String getLink() {
+        return link;
+    }
+
+    public void setLink(String link) {
+        this.link = link;
+    }
+
+    public String getExtra() {
+        return extra;
+    }
+
+    public void setExtra(String extra) {
+        this.extra = extra;
+    }
+
+    public boolean isForce() {
+        return force;
+    }
+
+    public void setForce(boolean force) {
+        this.force = force;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/CacheKey.java b/qpython/src/main/java/org/qpython/qpy/main/server/CacheKey.java
new file mode 100644
index 00000000..f87246b6
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/CacheKey.java
@@ -0,0 +1,17 @@
+package org.qpython.qpy.main.server;
+
+
+public class CacheKey {
+    public static final String LIB   = "lib";
+    public static final String QPYPI = "qpypi";
+    public static final String AIPY  = "aipy";
+
+    public static final String LIB_LAST_REFRESH   = "lib_last_refresh";
+    public static final String QPYPI_LAST_REFRESH = "qpypi_last_refresh";
+    public static final String AIPY_LAST_REFRESH  = "aipy_last_refresh";
+
+    public static final String COURSE_RECOMMEND = "course_recommend";
+    public static final String COURSE_LATEST    = "course_latest";
+
+    public static final String CLOUD_FILE = "cloud_file";
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/MySubscriber.java b/qpython/src/main/java/org/qpython/qpy/main/server/MySubscriber.java
new file mode 100644
index 00000000..ed639ac4
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/MySubscriber.java
@@ -0,0 +1,37 @@
+package org.qpython.qpy.main.server;
+
+import android.widget.Toast;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.main.app.App;
+
+import java.net.ConnectException;
+
+import retrofit2.adapter.rxjava.HttpException;
+import rx.Subscriber;
+
+/**
+ *
+ * Created by Hmei on 2017-06-29.
+ */
+
+public class MySubscriber<T> extends Subscriber<T> {
+    @Override
+    public void onCompleted() {
+
+    }
+
+    @Override
+    public void onError(Throwable e) {
+        if (e instanceof ConnectException | e instanceof HttpException) {
+            Toast.makeText(App.getContext(), R.string.lost_connect, Toast.LENGTH_SHORT).show();
+        } else {
+            Toast.makeText(App.getContext(), e.getMessage(), Toast.LENGTH_SHORT).show();
+        }
+    }
+
+    @Override
+    public void onNext(T o) {
+
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/Service.java b/qpython/src/main/java/org/qpython/qpy/main/server/Service.java
new file mode 100644
index 00000000..ed005d7d
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/Service.java
@@ -0,0 +1,189 @@
+package org.qpython.qpy.main.server;
+
+import android.app.DownloadManager;
+import android.content.Context;
+import android.net.Uri;
+import android.os.Environment;
+import android.util.Log;
+import android.widget.Toast;
+
+import com.google.gson.reflect.TypeToken;
+import com.quseit.util.ACache;
+import com.quseit.util.DateTimeHelper;
+import com.quseit.util.NAction;
+
+import org.greenrobot.eventbus.EventBus;
+import org.qpython.qpy.BuildConfig;
+import org.qpython.qpy.main.activity.LibActivity;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.server.model.BaseLibModel;
+import org.qpython.qpy.main.server.model.CourseAdModel;
+import org.qpython.qpy.main.server.model.CourseModel;
+import org.qpython.qpy.main.server.model.LibModel;
+import org.qpython.qpy.main.server.model.MyCourse;
+import org.qpython.qpy.main.server.model.PayStatusModel;
+import org.qpython.qpy.main.server.model.QpypiModel;
+import org.qpython.qpy.main.server.model.UpdateModel;
+import org.qpython.qpy.main.utils.Utils;
+
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.List;
+
+import rx.Observable;
+import rx.Subscriber;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+import static org.qpython.qpy.main.app.CONF.LIB_DOWNLOAD_TEMP;
+
+
+public class Service extends CacheKey {
+    private static final String BASE_URL = "https://";
+    private ServiceRequest request;
+    private ApuQuseit      apuQuseit;
+
+    public Service() {
+        request = App.getRetrofit()
+                .baseUrl(BASE_URL + "dl.qpy.io")
+                .build()
+                .create(ServiceRequest.class);
+
+        apuQuseit = App.getRetrofit()
+                .baseUrl(BASE_URL + "apu2.quseit.com/")
+                .build()
+                .create(ApuQuseit.class);
+    }
+
+    /**
+     * retrofit 线程管理
+     */
+    private static <T> void toSubscribe(Observable<T> o, Subscriber<T> s) {
+        o.subscribeOn(Schedulers.io())
+                .unsubscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(s);
+    }
+
+    public void getLibs(boolean forceRefresh, Subscriber<List<LibModel>> subscriber) {
+        List<LibModel> libList = getObject(new TypeToken<ArrayList<LibModel>>() {
+        }.getType(), LIB);
+        if (libList == null || forceRefresh) {
+            toSubscribe(NAction.isQPy3(App.getContext()) ? request.getLibs3() : request.getLibs(), subscriber);
+            ACache.get(App.getContext()).put(CacheKey.LIB_LAST_REFRESH, DateTimeHelper.getDate());
+        } else {
+            toSubscribe(Observable.just(libList), subscriber);
+        }
+    }
+
+    public void getQPyPi(boolean forceRefresh, Subscriber<List<QpypiModel>> subscriber) {
+        List<QpypiModel> qpypiList = getObject(new TypeToken<ArrayList<QpypiModel>>() {
+        }.getType(), QPYPI);
+        if (qpypiList == null || forceRefresh) {
+            toSubscribe(NAction.isQPy3(App.getContext()) ? request.getQPyPi3() : request.getQPyPi(), subscriber);
+            ACache.get(App.getContext()).put(CacheKey.QPYPI_LAST_REFRESH, DateTimeHelper.getDate());
+        } else {
+            toSubscribe(Observable.just(qpypiList), subscriber);
+        }
+    }
+
+    public void checkUpdate(Subscriber<UpdateModel> subscriber) {
+        toSubscribe(request.checkUpdate(), subscriber);
+    }
+
+    public Observable<List<CourseModel>> getCourse() {
+//        List<CourseModel> courseModels = new ArrayList<>();
+//        List<CourseModel> latest = getObject(new TypeToken<ArrayList<CourseModel>>() {
+//        }.getType(), COURSE_LATEST);
+//        List<CourseModel> recommend = getObject(new TypeToken<ArrayList<CourseModel>>() {
+//        }.getType(), COURSE_RECOMMEND);
+//        if (latest != null) courseModels.addAll(latest);
+//        if (recommend != null) courseModels.addAll(recommend);
+//        if (courseModels.size() != 0) {
+//            return Observable.just(courseModels);
+//        } else {
+        EduRequest eduRequest = App.getRetrofit()
+                .baseUrl(BASE_URL + "edu.qpython.org")
+                .build()
+                .create(EduRequest.class);
+        if (Utils.isZn()) {
+            return eduRequest.getCourseZn();
+        } else {
+            return eduRequest.getCourse();
+        }
+//        }
+    }
+
+    public void getMyCourse(String email, Subscriber<MyCourse> subscriber) {
+        toSubscribe(apuQuseit
+                        .getMyCourse(App.getContext().getPackageName(), email),
+                subscriber);
+    }
+
+    public Observable<CourseAdModel> getCourseAd() {
+        return apuQuseit.getCourseAd(BuildConfig.VERSION_CODE);
+    }
+
+    public void getArticleSupportNum(String articleId, Subscriber<Object> callback) {
+        toSubscribe(apuQuseit.getSupportNum(articleId), callback);
+    }
+
+    public void getAIPyList(boolean isQpy3, boolean forceRefresh, Subscriber<List<BaseLibModel>> subscriber) {
+        List<BaseLibModel> aipyList = getObject(new TypeToken<ArrayList<BaseLibModel>>() {
+        }.getType(), AIPY);
+        if (aipyList == null || forceRefresh) {
+            toSubscribe(isQpy3?request.getAIPy3():request.getAIPy(), subscriber);
+            ACache.get(App.getContext()).put(CacheKey.AIPY_LAST_REFRESH, DateTimeHelper.getDate());
+        } else {
+            toSubscribe(Observable.just(aipyList), subscriber);
+        }
+    }
+
+    public void downloadLib(String url, String fileName, String description) {
+        DownloadManager.Request request = new DownloadManager.Request(Uri.parse(url));
+        request.setDescription(description);
+        request.setTitle(fileName);
+        request.allowScanningByMediaScanner();
+        request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
+        request.setDestinationInExternalPublicDir(LIB_DOWNLOAD_TEMP, fileName);
+
+        // get download service and enqueue file
+        DownloadManager manager = (DownloadManager) App.getContext().getSystemService(Context.DOWNLOAD_SERVICE);
+        LibActivity.DownloadFinishedEvent event = new LibActivity.DownloadFinishedEvent();
+        event.queueId = manager.enqueue(request);
+        EventBus.getDefault().post(event);
+    }
+
+    public void downloadFile(String url, String fileName, String description) {
+        downloadFile(App.getContext(), url, fileName, description, null);
+    }
+
+    public void downloadFile(Context context, String url, String fileName, String description, String dir) {
+        Log.d("LOG", "DOWNLOAD CALLED:"+dir);
+        DownloadManager.Request request = new DownloadManager.Request(Uri.parse(url));
+        request.setDescription(description);
+        request.setTitle(fileName);
+        request.allowScanningByMediaScanner();
+        request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
+        request.setDestinationInExternalPublicDir(dir == null ? Environment.DIRECTORY_DOWNLOADS : dir, fileName);
+
+        // get download service and enqueue file
+        DownloadManager manager = (DownloadManager) App.getContext().getSystemService(Context.DOWNLOAD_SERVICE);
+        LibActivity.DownloadFinishedEvent event = new LibActivity.DownloadFinishedEvent();
+        try {
+            event.queueId = manager.enqueue(request);
+            EventBus.getDefault().post(event);
+        } catch (IllegalArgumentException e) {
+            Toast.makeText(App.getContext(), "Faile to download:"+url, Toast.LENGTH_SHORT).show();
+        }
+    }
+
+    public void getPayStatus(String account, String sModule, MySubscriber<PayStatusModel> callback) {
+        toSubscribe(apuQuseit.getPayStatus(account, sModule), callback);
+    }
+
+    private <T> T getObject(Type type, String key) {
+        String cacheStr = ACache.get(App.getContext()).getAsString(key);
+        return cacheStr == null ? null : App.getGson().fromJson(cacheStr, type);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/ServiceRequest.java b/qpython/src/main/java/org/qpython/qpy/main/server/ServiceRequest.java
new file mode 100644
index 00000000..7dbdb267
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/ServiceRequest.java
@@ -0,0 +1,90 @@
+package org.qpython.qpy.main.server;
+
+import org.qpython.qpy.main.server.model.BaseLibModel;
+import org.qpython.qpy.main.server.model.CourseAdModel;
+import org.qpython.qpy.main.server.model.CourseModel;
+import org.qpython.qpy.main.server.model.LibModel;
+import org.qpython.qpy.main.server.model.MyCourse;
+import org.qpython.qpy.main.server.model.PayStatusModel;
+import org.qpython.qpy.main.server.model.QpypiModel;
+import org.qpython.qpy.main.server.model.UpdateModel;
+
+import java.util.List;
+
+import retrofit2.Call;
+import retrofit2.http.GET;
+import retrofit2.http.Path;
+import retrofit2.http.Url;
+import rx.Observable;
+
+/**
+ * Requests
+ * Created by Hmei on 2017-06-01.
+ */
+
+interface ServiceRequest {
+    /**
+     * Domain: http://dl.qpy.io
+     */
+
+    @GET("/libs-2x-715.json")
+    Observable<List<LibModel>> getLibs();
+
+    @GET("/libs-3x-66.json")
+    Observable<List<LibModel>> getLibs3();
+
+    @GET("/qpypi-2x-715.json")
+    Observable<List<QpypiModel>> getQPyPi();
+
+    @GET("/qpypi-3x-66.json")
+    Observable<List<QpypiModel>> getQPyPi3();
+
+    @GET("/aipy-2x-715.json")
+    Observable<List<BaseLibModel>> getAIPy();
+
+    @GET("/aipy-3x-66.json")
+    Observable<List<BaseLibModel>> getAIPy3();
+
+    @GET("/update.json")
+    Observable<UpdateModel> checkUpdate();
+
+    @GET("/courses-2x.json ")
+    Observable<List<CourseModel>> getCourse();
+
+
+}
+
+interface ApuQuseit {
+    /**
+     * Domain: http://apu.quseit.com/
+     */
+
+    @GET("/conf/update/org.qpython.qpy/{verCode}")
+    Observable<CourseAdModel> getCourseAd(@Path("verCode") int verCode);
+
+    @GET("conf/iaplognum/org.qpython.qpy/{articleId}")
+    Observable<Object> getSupportNum(@Path("articleId") String articleId);
+
+    @GET("/iap/items/{packageId}/{email}")
+    Observable<MyCourse> getMyCourse(@Path("packageId") String packageId, @Path("email") String email);
+
+    @GET("/iap/hasitem/org.qpython.qpy/{email}/{smodule}/")
+    Observable<PayStatusModel> getPayStatus(@Path("email") String email, @Path("smodule") String
+            smodule);
+}
+
+interface EduRequest {
+    /**
+     * Domain : http://edu.qpython.org
+     */
+
+    @GET("/index/default.json")
+    Observable<List<CourseModel>> getCourse();
+
+    @Deprecated
+    @GET("/index/zh.json")
+    Observable<List<CourseModel>> getZnCourse();
+
+    @GET("/index/zhv2.json")
+    Observable<List<CourseModel>> getCourseZn();
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/Api.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/Api.java
new file mode 100644
index 00000000..dbeec056
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/Api.java
@@ -0,0 +1,13 @@
+package org.qpython.qpy.main.server.gist;
+
+/**
+ * 文 件 名: Api
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/8 17:28
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class Api {
+    public static final String BASE_URL = "http://gist.qpython.org";
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/BaseView.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/BaseView.java
new file mode 100644
index 00000000..a2cf2a4d
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/BaseView.java
@@ -0,0 +1,15 @@
+package org.qpython.qpy.main.server.gist;
+
+/**
+ * 文 件 名: BaseView
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/8 16:42
+ * 修改时间：
+ * 修改备注：
+ */
+
+public interface BaseView {
+    void showLoading();
+    void hideLoading();
+    void showToast(String msg);
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/Controler.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/Controler.java
new file mode 100644
index 00000000..8eb05011
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/Controler.java
@@ -0,0 +1,63 @@
+package org.qpython.qpy.main.server.gist;
+
+
+import org.qpython.qpy.main.server.gist.response.ResponseBean;
+import org.qpython.qpy.main.server.gist.service.GistService;
+import org.qpython.qpy.main.server.gist.service.GistServiceFactory;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import rx.Observable;
+import rx.Subscription;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+/**
+ * 文 件 名: Controler
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/8 16:22
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class Controler<V extends BaseView> {
+    protected GistService mGistService;
+    protected V mView;
+    private List<Subscription> mSubscriptions = new LinkedList<>();
+
+    public Controler(V view) {
+        mGistService = GistServiceFactory.gist();
+        mView = view;
+    }
+
+    protected  <T extends ResponseBean> void logic(Observable<T> observable, boolean loading,
+                                                   ResponseHandler<T>
+            handler) {
+        Subscription subscription = observable
+                .subscribeOn(Schedulers.io())
+                .doOnSubscribe(() -> {
+                    if (loading)
+                        mView.showLoading();
+                })
+                .subscribeOn(AndroidSchedulers.mainThread())
+                .observeOn(AndroidSchedulers.mainThread())
+                .doOnTerminate(() -> {
+                    if (loading)
+                        mView.hideLoading();
+                })
+                .subscribe(handler);
+        mSubscriptions.add(subscription);
+    }
+
+    public void onDestroy() {
+        //解除订阅
+        if (mSubscriptions != null)
+            for (Subscription subscription : mSubscriptions) {
+                if (subscription != null && !subscription.isUnsubscribed()) {
+                    subscription.unsubscribe();
+                }
+            }
+        mView = null;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/GistEvent.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/GistEvent.java
new file mode 100644
index 00000000..7306e49e
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/GistEvent.java
@@ -0,0 +1,37 @@
+package org.qpython.qpy.main.server.gist;
+
+/**
+ * Created by Hmei
+ * 4/2/18.
+ */
+
+public class GistEvent {
+    public static final String FAVORITE_REQUEST   = "FAVORITE_REQUEST";
+    public static final String FAVORITE           = "FAVORITE";
+    public static final String UNFAVORITE         = "UNFAVORITE";
+    public static final String DELETE             = "DELETE";
+    public static final String DELETE_SUC         = "DELETE_SUC";
+    public static final String COMMENT_EVENT      = "COMMENT_EVENT";
+    public static final String FORK               = "FORK";
+    public static final String ADD_COMMENT        = "ADD_COMMENT";
+    public static final String RUN_SCRIPT         = "RUN_EVENT";
+    public static final String RUN_NOTEBOOK       = "RUN_NOTEBOOK";
+    public static final String CODE_REVIEW_EVENT  = "CODE_REVIEW_EVENT";
+    public static final String REPLY_EVENT        = "REPLY_EVENT";
+    public static final String DIVIDER            = "divider_string_distr";
+    public static final String UPDATE_GIST_SUC    = "update_gist_suc";
+    public static final String REFRESH_COLLECTION = "refresh_collection";
+
+
+    public String name;
+    public String content;
+
+    public GistEvent(String name) {
+        this.name = name;
+    }
+
+    public GistEvent(String name, String content) {
+        this.name = name;
+        this.content = content;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/ResponseHandler.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/ResponseHandler.java
new file mode 100644
index 00000000..2938a6ae
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/ResponseHandler.java
@@ -0,0 +1,48 @@
+package org.qpython.qpy.main.server.gist;
+
+import org.qpython.qpy.main.server.gist.response.ResponseBean;
+
+import rx.Observer;
+
+/**
+ * 文 件 名: ResponseHandler
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/8 16:26
+ * 修改时间：
+ * 修改备注：
+ */
+
+public abstract class ResponseHandler<T extends ResponseBean> implements Observer<T> {
+    private BaseView baseView;
+
+    public ResponseHandler() {
+    }
+
+    public ResponseHandler(BaseView baseView) {
+        this.baseView = baseView;
+    }
+
+    @Override
+    public void onNext(T t) {
+        if (t.getCode() == 0) {
+            onSuccess(t);
+        } else {
+            onError(t.getMessage());
+        }
+    }
+
+    @Override
+    public void onCompleted() {
+    }
+
+    @Override
+    public void onError(Throwable e) {
+        e.getMessage();
+    }
+
+    public abstract void onSuccess(T t);
+
+    public void onError(String msg) {
+        if (baseView != null) baseView.showToast(msg);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/TokenManager.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/TokenManager.java
new file mode 100644
index 00000000..edbe18d9
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/TokenManager.java
@@ -0,0 +1,30 @@
+package org.qpython.qpy.main.server.gist;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+
+/**
+ * 文 件 名: TokenManager
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/8 16:13
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class TokenManager {
+    private static SharedPreferences sharedPreferences;
+    private static final String TOKEN_KEY = "token";
+    private static final String GIST_KEY = "gist";
+
+    public static void init(Context context){
+        sharedPreferences = context.getSharedPreferences(GIST_KEY,Context.MODE_PRIVATE);
+    }
+
+    public static String getToken(){
+        return sharedPreferences.getString(TOKEN_KEY,"");
+    }
+
+    public static void saveToken(String token){
+        sharedPreferences.edit().putString(TOKEN_KEY,token).apply();
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/createScreen/CreateGistControler.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/createScreen/CreateGistControler.java
new file mode 100644
index 00000000..1588f82b
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/createScreen/CreateGistControler.java
@@ -0,0 +1,60 @@
+package org.qpython.qpy.main.server.gist.createScreen;
+
+import android.util.Log;
+
+import org.qpython.qpy.main.server.gist.Controler;
+import org.qpython.qpy.main.server.gist.ResponseHandler;
+import org.qpython.qpy.main.server.gist.TokenManager;
+import org.qpython.qpy.main.server.gist.request.CreateRequest;
+import org.qpython.qpy.main.server.gist.request.UpdateGistRequest;
+import org.qpython.qpy.main.server.gist.response.ResponseBean;
+
+/**
+ * 文 件 名: PublishControler
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/9 10:32
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class CreateGistControler extends Controler<CreateGistView> {
+
+    public CreateGistControler(CreateGistView view) {
+        super(view);
+    }
+
+    public void createGist(String title, String desc, String source, String sourceType, boolean isShare) {
+        Log.d("createGist", "T:"+TokenManager.getToken());
+        logic(mGistService.createGist(TokenManager.getToken(), new CreateRequest(title, source,
+                desc, TokenManager.getToken(), sourceType, isShare)), true, new ResponseHandler<ResponseBean<String>>() {
+            @Override
+            public void onSuccess(ResponseBean<String> responseBean) {
+                if (responseBean.success()) {
+                    mView.onSuccess(responseBean.getData());
+                } else {
+                    mView.showToast(responseBean.getMessage());
+                }
+            }
+
+            @Override
+            public void onError(String msg) {
+                mView.showToast(msg);
+            }
+        });
+    }
+
+    public void updateGist(String id, String title, String desc, String source) {
+        logic(mGistService.updateGist(TokenManager.getToken(), new UpdateGistRequest(id, title,
+                desc, source)), true, new ResponseHandler<ResponseBean<String>>(mView) {
+            @Override
+            public void onSuccess(ResponseBean<String> responseBean) {
+                mView.showToast(responseBean.getMessage());
+                if (responseBean.success()) {
+                    mView.onSuccess(responseBean.getData());
+                } else {
+                    mView.showToast(responseBean.getMessage());
+                }
+            }
+        });
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/createScreen/CreateGistView.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/createScreen/CreateGistView.java
new file mode 100644
index 00000000..a5896758
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/createScreen/CreateGistView.java
@@ -0,0 +1,15 @@
+package org.qpython.qpy.main.server.gist.createScreen;
+
+import org.qpython.qpy.main.server.gist.BaseView;
+
+/**
+ * 文 件 名: CreateView
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/9 10:50
+ * 修改时间：
+ * 修改备注：
+ */
+
+public interface CreateGistView extends BaseView {
+    void onSuccess(String id);
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/detailScreen/DetailControler.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/detailScreen/DetailControler.java
new file mode 100644
index 00000000..0291be06
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/detailScreen/DetailControler.java
@@ -0,0 +1,142 @@
+package org.qpython.qpy.main.server.gist.detailScreen;
+
+import org.greenrobot.eventbus.EventBus;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.server.gist.Controler;
+import org.qpython.qpy.main.server.gist.GistEvent;
+import org.qpython.qpy.main.server.gist.ResponseHandler;
+import org.qpython.qpy.main.server.gist.TokenManager;
+import org.qpython.qpy.main.server.gist.request.BaseRequest;
+import org.qpython.qpy.main.server.gist.request.CommentRequest;
+import org.qpython.qpy.main.server.gist.request.UpdateGistRequest;
+import org.qpython.qpy.main.server.gist.response.CommentBean;
+import org.qpython.qpy.main.server.gist.response.GistBean;
+import org.qpython.qpy.main.server.gist.response.ResponseBean;
+
+import java.util.List;
+
+/**
+ * 文 件 名: DetailControler
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/9 10:57
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class DetailControler extends Controler<DetailView> {
+
+    private int page = 1;
+
+    public DetailControler(DetailView view) {
+        super(view);
+    }
+
+    public void getDetail(String id) {
+        logic(mGistService.getGistDetail(id), true, new ResponseHandler<ResponseBean<GistBean>>(mView) {
+            @Override
+            public void onSuccess(ResponseBean<GistBean> gistBeanResponseBean) {
+                if (gistBeanResponseBean.success()) {
+                    GistBean bean = gistBeanResponseBean.getData();
+                    bean.setFavorite(App.getFavorites().contains(bean.getId()));
+                    mView.setData(bean);
+                } else {
+                    mView.showToast(gistBeanResponseBean.getMessage());
+                }
+            }
+
+        });
+    }
+
+    public void loadMoreComment(String id) {
+        logic(mGistService.getCommentMore(id, page), true, new ResponseHandler<ResponseBean<List<CommentBean>>>(mView) {
+            @Override
+            public void onSuccess(ResponseBean<List<CommentBean>> listResponseBean) {
+                if (listResponseBean.success()) {
+                    mView.loadMoreComments(listResponseBean.getData());
+                    page++;
+                } else {
+                    mView.showToast(listResponseBean.getMessage());
+                }
+            }
+
+        });
+    }
+
+    public void refresh(String id) {
+        page = 1;
+        getDetail(id);
+    }
+
+    public void favoriteGist(String id) {
+        logic(mGistService.favoriteGist(TokenManager.getToken(), new BaseRequest(id)), false, new
+                ResponseHandler<ResponseBean>(mView) {
+                    @Override
+                    public void onSuccess(ResponseBean responseBean) {
+                        if (responseBean.success()) {
+                            boolean isFav = (Boolean) responseBean.getData();
+                            mView.favorite(isFav);
+                            if (isFav) {
+                                App.getFavorites().add(id);
+                                EventBus.getDefault().post(new GistEvent(GistEvent.FAVORITE,id));
+                            } else {
+                                App.getFavorites().remove(id);
+                                EventBus.getDefault().post(new GistEvent(GistEvent.UNFAVORITE,id));
+                            }
+                        }
+                    }
+                });
+    }
+
+    public void comment(String gistId, String comment, String toId) {
+        logic(mGistService.commentGist(TokenManager.getToken(), new CommentRequest(comment, toId, gistId)), true, new
+                ResponseHandler<ResponseBean<CommentBean>>(mView) {
+                    @Override
+                    public void onSuccess(ResponseBean<CommentBean> responseBean) {
+                        if (responseBean.success()) {
+                            mView.addComment(responseBean.getData());
+                        } else {
+                            mView.showToast(responseBean.getMessage());
+                        }
+                    }
+
+                });
+    }
+
+    public void forkGist(String id) {
+        logic(mGistService.forkGist(TokenManager.getToken(), new BaseRequest(id)), false, new ResponseHandler<ResponseBean>(mView) {
+            @Override
+            public void onSuccess(ResponseBean responseBean) {
+                if (responseBean.success()) {
+                    mView.forkSuccess();
+                } else {
+                    mView.showToast(responseBean.getMessage());
+                }
+            }
+
+        });
+    }
+
+    public void publishGist(String id) {
+        logic(mGistService.publishGist(TokenManager.getToken(), new BaseRequest(id)), true, new ResponseHandler<ResponseBean<String>>(mView) {
+            @Override
+            public void onSuccess(ResponseBean<String> responseBean) {
+                if (responseBean.success()) {
+                    mView.refresh(responseBean.getData());
+                } else {
+                    mView.showToast(responseBean.getMessage());
+                }
+            }
+
+        });
+    }
+
+//    public void updateGist(String id, String title, String desc, String source) {
+//        logic(mGistService.updateGist(TokenManager.getToken(), new UpdateGistRequest(id, title, desc, source)), true, new ResponseHandler<ResponseBean>(mView) {
+//            @Override
+//            public void onSuccess(ResponseBean responseBean) {
+//                mView.showToast(responseBean.getMessage());
+//            }
+//        });
+//    }
+
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/detailScreen/DetailView.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/detailScreen/DetailView.java
new file mode 100644
index 00000000..5b609d82
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/detailScreen/DetailView.java
@@ -0,0 +1,31 @@
+package org.qpython.qpy.main.server.gist.detailScreen;
+
+import org.qpython.qpy.main.server.gist.BaseView;
+import org.qpython.qpy.main.server.gist.response.CommentBean;
+import org.qpython.qpy.main.server.gist.response.GistBean;
+
+import java.util.List;
+
+/**
+ * 文 件 名: DetailView
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/9 10:57
+ * 修改时间：
+ * 修改备注：
+ */
+
+public interface DetailView extends BaseView {
+    void setData(GistBean gistBean);
+
+    void loadMoreComments(List<CommentBean> list);
+
+    void favorite(boolean is);
+
+    void addComment(CommentBean comment);
+
+    void fork();
+
+    void forkSuccess();
+
+    void refresh(String id);
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/indexScreen/GistHomeControler.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/indexScreen/GistHomeControler.java
new file mode 100644
index 00000000..e7f127e3
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/indexScreen/GistHomeControler.java
@@ -0,0 +1,134 @@
+package org.qpython.qpy.main.server.gist.indexScreen;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.server.gist.Controler;
+import org.qpython.qpy.main.server.gist.ResponseHandler;
+import org.qpython.qpy.main.server.gist.TokenManager;
+import org.qpython.qpy.main.server.gist.request.BaseRequest;
+import org.qpython.qpy.main.server.gist.response.ADBean;
+import org.qpython.qpy.main.server.gist.response.GistBean;
+import org.qpython.qpy.main.server.gist.response.ResponseBean;
+import org.qpython.qpy.main.server.model.CourseAdModel;
+
+import java.util.List;
+
+import rx.Subscriber;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+/**
+ * 文 件 名: GistHomeControler
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/9 11:47
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class GistHomeControler extends Controler<GistHomeView> {
+
+    private int page = 0;
+
+    public GistHomeControler(GistHomeView view) {
+        super(view);
+    }
+
+    public void getAD() {
+        App.getService().getCourseAd()
+                .subscribeOn(Schedulers.io())
+                .flatMap(courseAdModel -> rx.Observable.just(courseAdModel.getQpy().getExt_ad()))
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Subscriber<CourseAdModel.QpyBean.ExtAdBean>() {
+                    @Override
+                    public void onCompleted() {
+                    }
+
+                    @Override
+                    public void onError(Throwable e) {
+                        mView.showToast(e.getMessage());
+                        mView.showError(e.getMessage());
+                    }
+
+                    @Override
+                    public void onNext(CourseAdModel.QpyBean.ExtAdBean adBean) {
+                        if (adBean.getGistshare() == null || adBean.getGistshare().size() == 0) {
+                            mView.hideAd();
+                        } else {
+                            mView.setAD(adBean.getGistshare());
+                        }
+                    }
+                });
+    }
+
+    public void getGist() {
+        logic(mGistService.getAllGists(/*page*/), true, new ResponseHandler<ResponseBean<List<GistBean>>>() {
+            @Override
+            public void onSuccess(ResponseBean<List<GistBean>> listResponseBean) {
+                if (listResponseBean.success()) {
+                    page++;
+                    if (listResponseBean.getData() == null || listResponseBean.getData().size() == 0) {
+                        mView.showError(App.getContext().getResources().getString(R.string.no_data));
+                    } else {
+                        mView.setData(listResponseBean.getData());
+                    }
+                } else {
+                    mView.showError(listResponseBean.getMessage());
+                }
+            }
+
+            @Override
+            public void onError(String msg) {
+                mView.showToast(msg);
+                mView.showError("net error");
+            }
+        });
+    }
+
+    public void refresh() {
+        page = 0;
+        getGist();
+    }
+
+    public void loadMore() {
+        if (page == -1) {
+            mView.showToast("no more");
+        } else {
+            logic(mGistService.getAllGists(/*page*/), false, new ResponseHandler<ResponseBean<List<GistBean>>>() {
+                @Override
+                public void onSuccess(ResponseBean<List<GistBean>> listResponseBean) {
+                    if (listResponseBean.success() && listResponseBean.getData().size() > 0) {
+                        page++;
+                        mView.loadMoreGist(listResponseBean.getData());
+                    } else {
+                        mView.showToast(listResponseBean.getMessage());
+                        page = -1;
+                    }
+                }
+
+                @Override
+                public void onError(String msg) {
+                    mView.showToast(msg);
+                }
+            });
+        }
+    }
+
+    public void favoriteGist(String id) {
+        logic(mGistService.favoriteGist(TokenManager.getToken(), new BaseRequest(id)), false, new
+                ResponseHandler<ResponseBean>(mView) {
+                    @Override
+                    public void onSuccess(ResponseBean responseBean) {
+                        if (responseBean.success()) {
+                            boolean isFav = (Boolean) responseBean.getData();
+                            mView.favorite(isFav);
+                            if (isFav) {
+                                App.getFavorites().add(id);
+                            } else {
+                                App.getFavorites().remove(id);
+                            }
+                        }
+
+                    }
+                });
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/indexScreen/GistHomeView.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/indexScreen/GistHomeView.java
new file mode 100644
index 00000000..90c33bb9
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/indexScreen/GistHomeView.java
@@ -0,0 +1,26 @@
+package org.qpython.qpy.main.server.gist.indexScreen;
+
+import org.qpython.qpy.main.server.gist.BaseView;
+import org.qpython.qpy.main.server.gist.response.ADBean;
+import org.qpython.qpy.main.server.gist.response.GistBean;
+import org.qpython.qpy.main.server.model.CourseAdModel;
+
+import java.util.List;
+
+/**
+ * 文 件 名: GistHomeView
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/9 11:47
+ * 修改时间：
+ * 修改备注：
+ */
+
+public interface GistHomeView extends BaseView {
+    void setData(List<GistBean> list);
+    void loadMoreGist(List<GistBean> list);
+    void favorite(boolean is);
+    void showError(String msg);
+    void hideError();
+    void setAD(List<CourseAdModel.QpyBean.ExtAdBean.FeaturedBean> list);
+    void hideAd();
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/loginScreen/LoginControler.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/loginScreen/LoginControler.java
new file mode 100644
index 00000000..9764a998
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/loginScreen/LoginControler.java
@@ -0,0 +1,69 @@
+package org.qpython.qpy.main.server.gist.loginScreen;
+
+import android.util.Log;
+
+import com.quseit.util.NUtil;
+
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.User;
+import org.qpython.qpy.main.server.gist.Controler;
+import org.qpython.qpy.main.server.gist.ResponseHandler;
+import org.qpython.qpy.main.server.gist.TokenManager;
+import org.qpython.qpy.main.server.gist.request.LoginRequest;
+import org.qpython.qpy.main.server.gist.response.LoginResponse;
+import org.qpython.qpy.main.server.gist.response.ResponseBean;
+
+
+/**
+ * 文 件 名: LoginControler
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/8 16:49
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class LoginControler extends Controler<LoginView> {
+
+    public LoginControler(LoginView view) {
+        super(view);
+    }
+
+    public void login(User user){
+
+        String userName = user.getUserName();
+        String nick = user.getNick();
+        String userId = user.getUserId();
+        String email = user.getEmail();
+        String avatarUrl = user.getAvatarUrl();
+        String loginType = (email!=null && email.contains("@")?"google":"wechat");
+        //LoginRequest loginRequest = ;
+        //LogUtil.d("LoginControler", "login:username:"+userName+"-nick:"+nick+"-userId:"+userId+"-email:"+email+"-avatarUrl:"+avatarUrl+"-logintype:"+loginType);
+
+        LoginRequest lr2 = new LoginRequest(userName,nick, email ,userId,avatarUrl,loginType);
+        logic(mGistService.login(lr2),false,new ResponseHandler<ResponseBean<LoginResponse>>() {
+            @Override
+            public void onSuccess(ResponseBean<LoginResponse> loginResponseResponseBean) {
+                mView.hideLoading();
+
+                Log.d("login", "T:"+loginResponseResponseBean.getData().getToken());
+                if (loginResponseResponseBean.success()){
+                    App.setUser(user);
+                    TokenManager.saveToken(loginResponseResponseBean.getData().getToken());
+                    //LogUtil.d("login", "T:"+TokenManager.getToken());
+
+                    //mView.showToast("login successfully");
+                    //mView.hideLoading();
+                    mView.loginSuccess();
+                }else {
+                    mView.showToast("login fail,please retry later");
+                }
+            }
+
+            @Override
+            public void onError(String msg) {
+                mView.hideLoading();
+                mView.showToast(msg);
+            }
+        });
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/loginScreen/LoginView.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/loginScreen/LoginView.java
new file mode 100644
index 00000000..5475c307
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/loginScreen/LoginView.java
@@ -0,0 +1,15 @@
+package org.qpython.qpy.main.server.gist.loginScreen;
+
+import org.qpython.qpy.main.server.gist.BaseView;
+
+/**
+ * 文 件 名: LoginView
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/8 17:12
+ * 修改时间：
+ * 修改备注：
+ */
+
+public interface LoginView extends BaseView {
+    void loginSuccess();
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/myScreen/MyGistControler.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/myScreen/MyGistControler.java
new file mode 100644
index 00000000..afb41ccd
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/myScreen/MyGistControler.java
@@ -0,0 +1,83 @@
+package org.qpython.qpy.main.server.gist.myScreen;
+
+import org.greenrobot.eventbus.EventBus;
+import org.qpython.qpy.main.server.gist.Controler;
+import org.qpython.qpy.main.server.gist.GistEvent;
+import org.qpython.qpy.main.server.gist.ResponseHandler;
+import org.qpython.qpy.main.server.gist.TokenManager;
+import org.qpython.qpy.main.server.gist.request.BaseRequest;
+import org.qpython.qpy.main.server.gist.response.GistBean;
+import org.qpython.qpy.main.server.gist.response.ResponseBean;
+
+import java.util.List;
+
+/**
+ * 文 件 名: MyGistControler
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/9 17:19
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class MyGistControler extends Controler<MyGistView> {
+    public MyGistControler(MyGistView view) {
+        super(view);
+    }
+
+    public void getMyFavorites() {
+        logic(mGistService.getMyFavorites(TokenManager.getToken()), true, new ResponseHandler<ResponseBean<List<GistBean>>>() {
+            @Override
+            public void onSuccess(ResponseBean<List<GistBean>> listResponseBean) {
+                if (listResponseBean.success()) {
+                    mView.addFavorites(listResponseBean.getData());
+                } else {
+                    mView.showToast(listResponseBean.getMessage());
+                }
+            }
+
+            @Override
+            public void onError(String msg) {
+                mView.showToast(msg);
+            }
+        });
+    }
+
+    public void getMyGists() {
+        logic(mGistService.getMyGists(TokenManager.getToken()), true, new ResponseHandler<ResponseBean<List<GistBean>>>() {
+            @Override
+            public void onSuccess(ResponseBean<List<GistBean>> listResponseBean) {
+                if (listResponseBean.success()) {
+                    mView.addGists(listResponseBean.getData());
+                } else {
+                    mView.showToast(listResponseBean.getMessage());
+                }
+            }
+
+            @Override
+            public void onError(String msg) {
+                mView.showToast(msg);
+            }
+        });
+    }
+
+    public void deleteGist(String id) {
+        logic(mGistService.deleteGist(TokenManager.getToken(), new BaseRequest(id)), true, new
+                ResponseHandler<ResponseBean>() {
+                    @Override
+                    public void onSuccess(ResponseBean responseBean) {
+                        if (responseBean.success()) {
+
+                            mView.deleteSuccess((String) responseBean.getData());
+                            EventBus.getDefault().post(new GistEvent(GistEvent.DELETE_SUC, (String) responseBean.getData()));
+                        } else {
+                            mView.showToast(responseBean.getMessage());
+                        }
+                    }
+
+                    @Override
+                    public void onError(String msg) {
+                        mView.showToast(msg);
+                    }
+                });
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/myScreen/MyGistView.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/myScreen/MyGistView.java
new file mode 100644
index 00000000..770bf3cf
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/myScreen/MyGistView.java
@@ -0,0 +1,20 @@
+package org.qpython.qpy.main.server.gist.myScreen;
+
+import org.qpython.qpy.main.server.gist.BaseView;
+import org.qpython.qpy.main.server.gist.response.GistBean;
+
+import java.util.List;
+
+/**
+ * 文 件 名: MyGistView
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/9 17:16
+ * 修改时间：
+ * 修改备注：
+ */
+
+public interface MyGistView extends BaseView {
+    void deleteSuccess(String id);
+    void addFavorites(List<GistBean> list);
+    void addGists(List<GistBean> list);
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/request/BaseRequest.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/request/BaseRequest.java
new file mode 100644
index 00000000..baa43c86
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/request/BaseRequest.java
@@ -0,0 +1,29 @@
+package org.qpython.qpy.main.server.gist.request;
+
+
+import java.io.Serializable;
+
+/**
+ * 文 件 名: BaseRequest
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/9 10:07
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class BaseRequest extends Request implements Serializable{
+    public String gist_id;
+
+    public BaseRequest(String gistId) {
+        this.gist_id = gistId;
+    }
+
+    public String getGist_id() {
+        return gist_id;
+    }
+
+    public void setGist_id(String gist_id) {
+        this.gist_id = gist_id;
+    }
+
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/request/CommentRequest.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/request/CommentRequest.java
new file mode 100644
index 00000000..ae267a48
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/request/CommentRequest.java
@@ -0,0 +1,52 @@
+package org.qpython.qpy.main.server.gist.request;
+
+import com.google.gson.annotations.SerializedName;
+
+/**
+ * 文 件 名: CommentRequest
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/9 10:00
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class CommentRequest {
+
+    @SerializedName("from_content")
+    private String from_content;
+    @SerializedName("to_id")
+    private String to_id;
+    @SerializedName("gist_id")
+    private String gist_id;
+
+    public String getGist_id() {
+        return gist_id;
+    }
+
+    public void setGist_id(String gist_id) {
+        this.gist_id = gist_id;
+    }
+
+
+    public CommentRequest(String from_content, String to_id, String gist_id) {
+        this.from_content = from_content;
+        this.to_id = to_id;
+        this.gist_id = gist_id;
+    }
+
+    public String getFrom_content() {
+        return from_content;
+    }
+
+    public void setFrom_content(String from_content) {
+        this.from_content = from_content;
+    }
+
+    public String getTo_id() {
+        return to_id;
+    }
+
+    public void setTo_id(String to_id) {
+        this.to_id = to_id;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/request/CreateRequest.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/request/CreateRequest.java
new file mode 100644
index 00000000..24c9c4af
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/request/CreateRequest.java
@@ -0,0 +1,62 @@
+package org.qpython.qpy.main.server.gist.request;
+
+import com.google.gson.annotations.SerializedName;
+
+/**
+ * 文 件 名: CreateRequest
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/9 10:18
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class CreateRequest {
+    private String title;
+    private String code;
+    private String desc;
+    @SerializedName(value = "source_type")
+    private String sourceType;
+
+    @SerializedName(value = "is_share")
+    private boolean isSahre;
+
+    public CreateRequest(String title, String source, String desc, String token, String sourceType, boolean isSahre) {
+        this.title = title;
+        this.code = source;
+        this.desc = desc;
+        this.sourceType = sourceType;
+        this.isSahre = isSahre;
+    }
+
+    public String getSourceType() {
+        return sourceType;
+    }
+
+    public void setSourceType(String sourceType) {
+        this.sourceType = sourceType;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/request/LoginRequest.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/request/LoginRequest.java
new file mode 100644
index 00000000..859beb7d
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/request/LoginRequest.java
@@ -0,0 +1,101 @@
+package org.qpython.qpy.main.server.gist.request;
+
+import android.util.Log;
+
+import com.google.gson.annotations.SerializedName;
+
+import org.qpython.qpy.console.compont.Base64;
+
+/**
+ * 文 件 名: LoginRequest
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/8 14:53
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class LoginRequest {
+    @SerializedName(value = "username")
+    private String userName;
+    @SerializedName(value = "email")
+    private String email;
+    @SerializedName(value = "profile")
+    private Profile profile;
+
+    class Profile {
+        @SerializedName(value = "utoken")
+        private String utoken;
+        @SerializedName(value = "avatar")
+        private String avatar;
+        @SerializedName(value = "login_type")
+        private String loginType;
+        @SerializedName(value = "uname")
+        private String uname;
+
+        public Profile(String userId, String uname, String avatar, String loginType) {
+            Log.d("Profile", "Profile:"+userId);
+            this.uname = uname;
+            this.utoken = com.quseit.util.Base64.encode(userId).trim();
+            this.avatar = avatar;
+            this.loginType = loginType;
+            Log.d("Profile", "utoken:"+utoken);
+        }
+
+        public String getUtoken() {
+            return utoken;
+        }
+
+        public void setUtoken(String utoken) {
+            this.utoken = utoken;
+        }
+
+        public String getAvatar() {
+            return avatar;
+        }
+
+        public void setAvatar(String avatar) {
+            this.avatar = avatar;
+        }
+
+        public String getLoginType() {
+            return loginType;
+        }
+
+        public void setLoginType(String loginType) {
+            this.loginType = loginType;
+        }
+
+    }
+    public LoginRequest(String userName, String nick, String email, String userId, String avatar, String loginType) {
+        this.userName = email;
+        this.email = email;
+        this.profile = new Profile(userId, nick, avatar, loginType);
+
+    }
+
+
+    public Profile getProfile() {
+        return profile;
+    }
+
+    public void setProfile(Profile profile) {
+        this.profile = profile;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/request/Request.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/request/Request.java
new file mode 100644
index 00000000..8ef02071
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/request/Request.java
@@ -0,0 +1,15 @@
+package org.qpython.qpy.main.server.gist.request;
+
+import java.io.Serializable;
+
+/**
+ * 文 件 名: Request
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/9 16:43
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class Request implements Serializable{
+
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/request/UpdateGistRequest.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/request/UpdateGistRequest.java
new file mode 100644
index 00000000..0940927c
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/request/UpdateGistRequest.java
@@ -0,0 +1,47 @@
+package org.qpython.qpy.main.server.gist.request;
+
+/**
+ * 文 件 名: UpdateGistRequest
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/9 10:14
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class UpdateGistRequest extends BaseRequest {
+
+    private String title;
+    private String code;
+    private String desc;
+
+    public UpdateGistRequest(String gistId, String title, String desc, String code) {
+        super(gistId);
+        this.title = title;
+        this.code = code;
+        this.desc = desc;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/response/ADBean.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/response/ADBean.java
new file mode 100644
index 00000000..e48bcde5
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/response/ADBean.java
@@ -0,0 +1,39 @@
+package org.qpython.qpy.main.server.gist.response;
+
+/**
+ * 文 件 名: ADBean
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/12 17:47
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class ADBean {
+    private String link;
+    private String imgUrl;
+    private String title;
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getLink() {
+        return link;
+    }
+
+    public void setLink(String link) {
+        this.link = link;
+    }
+
+    public String getImgUrl() {
+        return imgUrl;
+    }
+
+    public void setImgUrl(String imgUrl) {
+        this.imgUrl = imgUrl;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/response/CommentBean.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/response/CommentBean.java
new file mode 100644
index 00000000..5ef148e1
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/response/CommentBean.java
@@ -0,0 +1,127 @@
+package org.qpython.qpy.main.server.gist.response;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.List;
+
+/**
+ * 文 件 名: CommentBean
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/9 09:51
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class CommentBean {
+
+    @SerializedName(value = "id")
+    private String  id;
+    @SerializedName(value = "user_name")
+    private String  userName;
+    @SerializedName(value = "uname")
+    private String  uname;
+
+    @SerializedName(value = "user_avatar")
+    private String  userAvatar;
+    @SerializedName(value = "from_content")
+    private String  comment;
+    @SerializedName(value = "create_at")
+    private long    createAt;
+    @SerializedName(value = "reply_to")
+    private String  replyTo;
+    @SerializedName(value = "replies")
+    private Replies replies;
+
+    public String getReplyTo() {
+        return replyTo;
+    }
+
+    public void setReplyTo(String replyTo) {
+        this.replyTo = replyTo;
+    }
+
+    public Replies getReplies() {
+        return replies;
+    }
+
+    public void setReplies(Replies replies) {
+        this.replies = replies;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+    public String getUName() {
+        return uname;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+    public void setUname(String uname) {
+        this.uname = uname;
+    }
+
+    public String getUserAvatar() {
+        return userAvatar;
+    }
+
+    public void setUserAvatar(String userAvatar) {
+        this.userAvatar = userAvatar;
+    }
+
+    public long getCreateAt() {
+        return createAt;
+    }
+
+    public void setCreateAt(long createAt) {
+        this.createAt = createAt;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getComment() {
+        return comment;
+    }
+
+    public void setComment(String comment) {
+        this.comment = comment;
+    }
+
+    public class Replies {
+        private int    id;
+        private String user_name;
+        private String comment_content;
+
+        public int getId() {
+            return id;
+        }
+
+        public void setId(int id) {
+            this.id = id;
+        }
+
+        public String getUser_name() {
+            return user_name;
+        }
+
+        public void setUser_name(String user_name) {
+            this.user_name = user_name;
+        }
+
+        public String getComment_content() {
+            return comment_content;
+        }
+
+        public void setComment_content(String comment_content) {
+            this.comment_content = comment_content;
+        }
+    }
+
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/response/GistBean.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/response/GistBean.java
new file mode 100644
index 00000000..e43eeb0b
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/response/GistBean.java
@@ -0,0 +1,184 @@
+package org.qpython.qpy.main.server.gist.response;
+
+import android.text.SpannableString;
+import android.text.Spanned;
+import android.text.style.ForegroundColorSpan;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.List;
+import java.util.regex.Matcher;
+
+import static org.qpython.qpy.utils.CodePattern.COLOR_BUILTIN;
+import static org.qpython.qpy.utils.CodePattern.COLOR_COMMENT;
+import static org.qpython.qpy.utils.CodePattern.COLOR_KEYWORD;
+import static org.qpython.qpy.utils.CodePattern.PATTERN_PY_BUILD_IN;
+import static org.qpython.qpy.utils.CodePattern.PATTERN_PY_COMMENT;
+import static org.qpython.qpy.utils.CodePattern.PATTERN_PY_KEYWORD;
+
+/**
+ * 文 件 名: GistBean
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/9 09:36
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class GistBean {
+    @SerializedName(value = "id")
+    private String            id;
+    @SerializedName(value = "title")
+    private String            title;
+    @SerializedName(value = "user")
+    private UserBean          user;
+    @SerializedName(value = "fav_count")
+    private int               star;
+    @SerializedName(value = "comment_count")
+    private int               comment;
+    @SerializedName(value = "create_at")
+    private long              createAt;
+    @SerializedName(value = "desc")
+    private String            description;
+    @SerializedName(value = "code")
+    private String            source;
+    @SerializedName(value = "source_type")
+    private String            sourceType;
+    @SerializedName(value = "is_feature")
+    private boolean           isFeature;
+    @SerializedName(value = "comments")
+    private List<CommentBean> comments;
+
+    private transient boolean isFavorite;
+
+    public boolean isFavorite() {
+        return isFavorite;
+    }
+
+    public void setFavorite(boolean favorite) {
+        isFavorite = favorite;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public SpannableString getSource() {
+        SpannableString sStr = new SpannableString(source);
+        for (Matcher m = PATTERN_PY_KEYWORD.matcher(sStr); m.find(); ) {
+            sStr.setSpan(
+                    new ForegroundColorSpan(COLOR_KEYWORD),
+                    m.start(),
+                    m.end(),
+                    Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+        }
+
+        for (Matcher m = PATTERN_PY_BUILD_IN.matcher(sStr); m.find(); ) {
+            sStr.setSpan(
+                    new ForegroundColorSpan(COLOR_BUILTIN),
+                    m.start(),
+                    m.end(),
+                    Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+        }
+
+        for (Matcher m = PATTERN_PY_COMMENT.matcher(sStr); m.find(); ) {
+            sStr.setSpan(
+                    new ForegroundColorSpan(COLOR_COMMENT),
+                    m.start(),
+                    m.end(),
+                    Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+        }
+        return sStr;
+    }
+
+    public void setSource(String source) {
+        this.source = source;
+    }
+
+    public List<CommentBean> getComments() {
+        return comments;
+    }
+
+    public void setComments(List<CommentBean> comments) {
+        this.comments = comments;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public UserBean getUser() {
+        return user;
+    }
+
+    public void setUser(UserBean user) {
+        this.user = user;
+    }
+
+    public int getStar() {
+        return star;
+    }
+
+    public void setStar(int star) {
+        this.star = star;
+    }
+
+    public void changeStar(boolean isAdd) {
+        if (isAdd) {
+            star++;
+        } else {
+            star--;
+        }
+    }
+
+    public int getComment() {
+        return comment;
+    }
+
+    public void addCommentNum() {
+        comment++;
+    }
+
+    public void setComment(int comment) {
+        this.comment = comment;
+    }
+
+    public long getCreateAt() {
+        return createAt;
+    }
+
+    public void setCreateAt(long createAt) {
+        this.createAt = createAt;
+    }
+
+    public String getSourceType() {
+        return sourceType;
+    }
+
+    public void setSourceType(String sourceType) {
+        this.sourceType = sourceType;
+    }
+
+    public boolean isFeature() {
+        return isFeature;
+    }
+
+    public void setFeature(boolean feature) {
+        isFeature = feature;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/response/LoginResponse.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/response/LoginResponse.java
new file mode 100644
index 00000000..431f0894
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/response/LoginResponse.java
@@ -0,0 +1,24 @@
+package org.qpython.qpy.main.server.gist.response;
+
+import com.google.gson.annotations.SerializedName;
+
+/**
+ * 文 件 名: LoginResponse
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/8 16:09
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class LoginResponse {
+    @SerializedName(value = "token")
+    private String token;
+
+    public String getToken() {
+        return token;
+    }
+
+    public void setToken(String token) {
+        this.token = token;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/response/ResponseBean.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/response/ResponseBean.java
new file mode 100644
index 00000000..32e181e6
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/response/ResponseBean.java
@@ -0,0 +1,48 @@
+package org.qpython.qpy.main.server.gist.response;
+
+import com.google.gson.annotations.SerializedName;
+
+/**
+ * 文 件 名: ResponseBean
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/8 14:46
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class ResponseBean<T> {
+    @SerializedName(value = "msg")
+    private String message;
+    @SerializedName(value = "errno")
+    private int code;
+    @SerializedName(value = "data")
+    private T data;
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public T getData() {
+        return data;
+    }
+
+    public void setData(T data) {
+        this.data = data;
+    }
+
+    public boolean success(){
+        return code == 0;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/response/UserBean.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/response/UserBean.java
new file mode 100644
index 00000000..435b3db3
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/response/UserBean.java
@@ -0,0 +1,42 @@
+package org.qpython.qpy.main.server.gist.response;
+
+import com.google.gson.annotations.SerializedName;
+
+/**
+ * 文 件 名: UserBean
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/9 09:40
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class UserBean {
+    @SerializedName(value = "uname")
+    private String uName;
+
+    @SerializedName(value = "username")
+    private String userName;
+    @SerializedName(value = "avatar")
+    private String avatar;
+
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public String getUName() {
+        return uName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public void setAvatar(String avatar) {
+        this.avatar = avatar;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/service/GistService.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/service/GistService.java
new file mode 100644
index 00000000..63dcdde9
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/service/GistService.java
@@ -0,0 +1,81 @@
+package org.qpython.qpy.main.server.gist.service;
+
+import org.qpython.qpy.main.server.gist.request.BaseRequest;
+import org.qpython.qpy.main.server.gist.request.CommentRequest;
+import org.qpython.qpy.main.server.gist.request.CreateRequest;
+import org.qpython.qpy.main.server.gist.request.LoginRequest;
+import org.qpython.qpy.main.server.gist.request.UpdateGistRequest;
+import org.qpython.qpy.main.server.gist.response.ADBean;
+import org.qpython.qpy.main.server.gist.response.CommentBean;
+import org.qpython.qpy.main.server.gist.response.GistBean;
+import org.qpython.qpy.main.server.gist.response.LoginResponse;
+import org.qpython.qpy.main.server.gist.response.ResponseBean;
+
+import java.util.List;
+
+import retrofit2.http.Body;
+import retrofit2.http.GET;
+import retrofit2.http.Header;
+import retrofit2.http.POST;
+import retrofit2.http.Path;
+import retrofit2.http.Query;
+import rx.Observable;
+
+/**
+ * 文 件 名: GistService
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/8 16:04
+ * 修改时间：
+ * 修改备注：
+ */
+
+public interface GistService {
+
+    @POST("api/login/")
+    Observable<ResponseBean<LoginResponse>> login(@Body LoginRequest loginRequest);
+
+    @GET("api/ad")
+    Observable<ResponseBean<List<ADBean>>> getAD();
+
+    @GET("api/gist/getgist/")/*{page}*/
+    Observable<ResponseBean<List<GistBean>>> getAllGists(/*@Query("page") int page*/);
+
+    @GET("api/gist/mygist/")
+    Observable<ResponseBean<List<GistBean>>> getMyGists(@Header("TOKEN") String token);
+
+    @GET("api/gist/myfav")
+    Observable<ResponseBean<List<GistBean>>> getMyFavorites(@Header("TOKEN") String token);
+
+    @GET("api/gist/detail/{gist_id}")
+    Observable<ResponseBean<GistBean>> getGistDetail(@Path("gist_id") String id);
+
+    @GET("api/gist/comment/{gist_id}/{page}")
+    Observable<ResponseBean<List<CommentBean>>> getCommentMore(@Path("gist_id") String id, @Path("page") int page);
+
+    @POST("api/gist/fav/")
+    Observable<ResponseBean> favoriteGist(@Header("TOKEN") String token, @Body BaseRequest request);
+
+    @POST("api/gist/comment/")
+    Observable<ResponseBean<CommentBean>> commentGist(@Header("TOKEN") String token, @Body
+            CommentRequest request);
+
+    @POST("api/gist/fork/")
+    Observable<ResponseBean> forkGist(@Header("TOKEN") String token, @Body BaseRequest request);
+
+    @POST("api/gist/delete/")
+    Observable<ResponseBean> deleteGist(@Header("TOKEN") String token, @Body BaseRequest request);
+
+    @POST("api/gist/public/")
+    Observable<ResponseBean<String>> publishGist(@Header("TOKEN") String token, @Body BaseRequest
+            request);
+
+    @POST("api/gist/update/")
+    Observable<ResponseBean<String>> updateGist(@Header("TOKEN") String token, @Body
+            UpdateGistRequest
+            request);
+
+    @POST("api/gist/new/")
+    Observable<ResponseBean<String>> createGist(@Header("TOKEN") String token, @Body CreateRequest
+            request);
+
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/service/GistServiceFactory.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/service/GistServiceFactory.java
new file mode 100644
index 00000000..95a8a077
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/service/GistServiceFactory.java
@@ -0,0 +1,18 @@
+package org.qpython.qpy.main.server.gist.service;
+
+import org.qpython.qpy.main.server.http.Retrofitor;
+
+/**
+ * 文 件 名: GistServiceFactory
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/8 16:04
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class GistServiceFactory {
+
+    public static GistService gist(){
+        return Retrofitor.getInstance().createService(GistService.class);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/http/Retrofitor.java b/qpython/src/main/java/org/qpython/qpy/main/server/http/Retrofitor.java
new file mode 100644
index 00000000..742c3b9c
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/http/Retrofitor.java
@@ -0,0 +1,131 @@
+package org.qpython.qpy.main.server.http;
+
+
+import java.io.IOException;
+import java.security.GeneralSecurityException;
+import java.security.KeyStore;
+import java.util.Collections;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.SSLSession;
+
+import okhttp3.ConnectionSpec;
+import okhttp3.Interceptor;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import okhttp3.logging.HttpLoggingInterceptor;
+import retrofit2.Retrofit;
+import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory;
+import retrofit2.converter.gson.GsonConverterFactory;
+
+
+/**
+ * 文 件 名: RetrofitManager
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2017/10/24 11:48
+ * 邮   箱: qq798435167@gmail.com
+ * 博   客: http://zzzzzzzz3.github.io
+ * 修改时间：
+ * 修改备注：网络访问封装类
+ */
+
+public class Retrofitor {
+    private static Retrofitor instance = null;
+    private Retrofit mRetrofit = null;
+    //超时时间
+    public static final int DEFAULT_TIMEOUT = 30;
+    private OkHttpClient.Builder mOkhttpBuilder;
+
+
+    private Retrofitor() {
+        mOkhttpBuilder = new OkHttpClient.Builder().retryOnConnectionFailure(true);
+    }
+
+    public Retrofitor setTimeOut(int timeOut) {
+        mOkhttpBuilder
+                .connectTimeout(timeOut, TimeUnit.SECONDS)
+                .readTimeout(timeOut, TimeUnit.SECONDS)
+                .writeTimeout(timeOut, TimeUnit.SECONDS);
+        return this;
+    }
+
+    public Retrofitor openDebug(boolean debug) {
+        if (debug){
+            HttpLoggingInterceptor interceptor = new HttpLoggingInterceptor();
+            interceptor.setLevel(HttpLoggingInterceptor.Level.BODY);
+            mOkhttpBuilder.addInterceptor(interceptor);
+        }
+        return this;
+    }
+
+    public Retrofitor supportSSL(boolean support) {
+        if (support){
+            //配置ssl
+            try {
+                KeyStore trustStore = KeyStore.getInstance(KeyStore.getDefaultType());
+                trustStore.load(null, null);
+                SSLSocketFactoryImp ssl = new SSLSocketFactoryImp(KeyStore.getInstance(KeyStore.getDefaultType()));
+                mOkhttpBuilder.sslSocketFactory(ssl.getSSLContext().getSocketFactory(), ssl.getTrustManager());
+            } catch (IOException | GeneralSecurityException e) {
+                e.printStackTrace();
+            }
+            HostnameVerifier hostnameVerifier = new HostnameVerifier() {
+                @Override
+                public boolean verify(String s, SSLSession sslSession) {
+                    return true;
+                }
+            };
+            mOkhttpBuilder.hostnameVerifier(hostnameVerifier);
+            //配置支持的协议
+            ConnectionSpec spec = new ConnectionSpec.Builder(ConnectionSpec.MODERN_TLS)
+                    .allEnabledCipherSuites()
+                    .allEnabledTlsVersions()
+                    .build();
+            mOkhttpBuilder.connectionSpecs(Collections.singletonList(spec));
+        }
+        return this;
+    }
+
+    public Retrofitor addHeaders(final Map<String,String> headers){
+        mOkhttpBuilder.addInterceptor(chain -> {
+            Request.Builder requestBuilder = chain.request().newBuilder();
+            for (String key:headers.keySet()){
+                requestBuilder.addHeader(key,headers.get(key));
+            }
+            return chain.proceed(requestBuilder.build());
+        });
+        return this;
+    }
+
+    /**
+     * 初始化retrofit
+     */
+    public void init(String url) {
+        Retrofit.Builder mBuilder = new Retrofit.Builder()
+                .baseUrl(url)
+                .client(mOkhttpBuilder.build())
+                .addConverterFactory(GsonConverterFactory.create())
+                .addCallAdapterFactory(RxJavaCallAdapterFactory.create());
+        mRetrofit = mBuilder.build();
+    }
+
+    public static Retrofitor getInstance() {
+        if (instance == null) {
+            synchronized (Retrofitor.class) {
+                instance = new Retrofitor();
+            }
+        }
+        return instance;
+    }
+
+    /**
+     * 获取到接口
+     */
+    public <T> T createService(Class<T> service) {
+        return mRetrofit.create(service);
+    }
+
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/http/SSLSocketFactoryImp.java b/qpython/src/main/java/org/qpython/qpy/main/server/http/SSLSocketFactoryImp.java
new file mode 100644
index 00000000..bedd0043
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/http/SSLSocketFactoryImp.java
@@ -0,0 +1,94 @@
+package org.qpython.qpy.main.server.http;
+
+
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.net.UnknownHostException;
+import java.security.KeyManagementException;
+import java.security.KeyStore;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSocketFactory;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+
+public class SSLSocketFactoryImp extends SSLSocketFactory {
+    private SSLContext sslContext = SSLContext.getInstance("SSL");
+    private TrustManager trustManager = null;
+
+
+    public SSLContext getSSLContext() {
+        return sslContext;
+    }
+
+    public X509TrustManager getTrustManager() {
+        return (X509TrustManager)trustManager;
+    }
+
+    public SSLSocketFactoryImp(KeyStore keyStore) throws NoSuchAlgorithmException, KeyManagementException {
+        trustManager = new X509TrustManager() {
+            @Override
+            public void checkClientTrusted(X509Certificate[] x509Certificates, String s) throws CertificateException {
+
+            }
+
+            @Override
+            public void checkServerTrusted(X509Certificate[] x509Certificates, String s) throws CertificateException {
+
+            }
+
+            @Override
+            public X509Certificate[] getAcceptedIssuers() {
+               //注意这里不能返回null，否则会报错,如下面错误[1]
+                X509Certificate[] x509Certificates = new X509Certificate[0];
+                return x509Certificates;
+            }
+        };
+
+        sslContext.init(null, new TrustManager[]{trustManager}, null);
+    }
+
+    @Override
+    public String[] getDefaultCipherSuites() {
+        return new String[0];
+    }
+
+    @Override
+    public String[] getSupportedCipherSuites() {
+        return new String[0];
+    }
+
+    @Override
+    public Socket createSocket() throws IOException {
+        return sslContext.getSocketFactory().createSocket();
+    }
+
+    @Override
+    public Socket createSocket(Socket socket, String host, int post, boolean autoClose) throws IOException {
+        return sslContext.getSocketFactory().createSocket(socket, host, post, autoClose);
+    }
+
+    @Override
+    public Socket createSocket(String s, int i) throws IOException, UnknownHostException {
+        return null;
+    }
+
+    @Override
+    public Socket createSocket(String s, int i, InetAddress inetAddress, int i1) throws IOException, UnknownHostException {
+        return null;
+    }
+
+    @Override
+    public Socket createSocket(InetAddress inetAddress, int i) throws IOException {
+        return null;
+    }
+
+    @Override
+    public Socket createSocket(InetAddress inetAddress, int i, InetAddress inetAddress1, int i1) throws IOException {
+        return null;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/model/BaseLibModel.java b/qpython/src/main/java/org/qpython/qpy/main/server/model/BaseLibModel.java
new file mode 100644
index 00000000..24f93360
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/model/BaseLibModel.java
@@ -0,0 +1,114 @@
+package org.qpython.qpy.main.server.model;
+
+import java.io.Serializable;
+
+/**
+ * Created by Hmei on 2017-06-23.
+ */
+
+public class BaseLibModel implements Serializable{
+    protected String src;
+    protected String rdate;
+    protected String link;
+    protected String tmodule;
+    protected String smodule;
+    protected String title;
+    protected String ver;
+    protected String cat;
+    protected String downloads;
+    protected String description;
+
+    boolean installed;
+
+    public BaseLibModel(String title) {
+        this.title = title;
+    }
+
+    public String getSrc() {
+        return src;
+    }
+
+    public void setSrc(String src) {
+        this.src = src;
+    }
+
+    public String getRdate() {
+        return rdate;
+    }
+
+    public void setRdate(String rdate) {
+        this.rdate = rdate;
+    }
+
+    public String getLink() {
+        return link;
+    }
+
+    public void setLink(String link) {
+        this.link = link;
+    }
+
+    public String getTmodule() {
+        return tmodule;
+    }
+
+    public String getSmodule() {
+        return smodule;
+    }
+
+    public void setTmodule(String tmodule) {
+        this.tmodule = tmodule;
+    }
+
+    public void setSmodule(String smodule) {
+        this.smodule = smodule;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getVer() {
+        return ver;
+    }
+
+    public void setVer(String ver) {
+        this.ver = ver;
+    }
+
+    public String getDownloads() {
+        return downloads == null ? "-1" : downloads;
+    }
+
+    public void setDownloads(String downloads) {
+        this.downloads = downloads;
+    }
+
+    public String getCat() {
+        return cat;
+    }
+
+    public void setCat(String cat) {
+        this.cat = cat;
+    }
+
+    public boolean isInstalled() {
+        return installed;
+    }
+
+    public void setInstalled(boolean installed) {
+        this.installed = installed;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/model/CourseAdModel.java b/qpython/src/main/java/org/qpython/qpy/main/server/model/CourseAdModel.java
new file mode 100644
index 00000000..190f9008
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/model/CourseAdModel.java
@@ -0,0 +1,403 @@
+package org.qpython.qpy.main.server.model;
+
+import java.util.List;
+
+/**
+ * Created by Hmei on 2017-08-01.
+ */
+
+public class CourseAdModel {
+
+    /**
+     * qpy : {"website":"http://qpython.org","feedback":"support@qpython.org","ext2":{"adx_setting":"pa|marquee","adx_splash":"pa|full"},"ext_ad":{"featured":[{"ad_man":"qpythonBLfb","ad_market":"Global","ad_link":"http://www.facebook.com/qpython","ad_code":"org.qpython.qpy.fb","ad_point":"10","ad_img":"http://apu.quseit.com/static/adimg/qpy-facebook.png","ad_logo":"","adLink_id":"9"},{"ad_man":"XSocksBL","ad_market":"Global","ad_link":"http://xsvpn.com/","ad_code":"com.quseit.xsocks2","ad_point":"10","ad_img":"http://apu.quseit.com/static/adimg/qpy-xsocks_bSO7gxh.png","ad_logo":"","adLink_id":"10"}],"full":[{"ad_man":"QPython","ad_market":"Global","ad_link":"http://www.qpython.org","ad_code":"org.qpython.qpy","ad_point":"10","ad_img":"http://apu.quseit.com/static/adimg/qpy-748x1062.png","ad_logo":"","adLink_id":"6"}],"marquee":[{"ad_man":"qpythonBLfb","ad_market":"Global","ad_link":"http://www.facebook.com/qpython","ad_code":"org.qpython.qpy.fb","ad_point":"10","ad_img":"http://apu.quseit.com/static/adimg/qpy-facebook.png","ad_logo":"","adLink_id":"9"},{"ad_man":"QPythonBLtw","ad_market":"Global","ad_link":"http://twitter.com/qpython","ad_code":"org.qpython.qpy.tw","ad_point":"10","ad_img":"http://apu.quseit.com/static/adimg/qpy-twitter.png","ad_logo":"","adLink_id":"11"}]}}
+     */
+
+    private QpyBean qpy;
+
+    public QpyBean getQpy() {
+        return qpy;
+    }
+
+    public void setQpy(QpyBean qpy) {
+        this.qpy = qpy;
+    }
+
+    public static class QpyBean {
+        /**
+         * website : http://qpython.org
+         * feedback : support@qpython.org
+         * ext2 : {"adx_setting":"pa|marquee","adx_splash":"pa|full"}
+         * ext_ad : {"featured":[{"ad_man":"qpythonBLfb","ad_market":"Global","ad_link":"http://www.facebook.com/qpython","ad_code":"org.qpython.qpy.fb","ad_point":"10","ad_img":"http://apu.quseit.com/static/adimg/qpy-facebook.png","ad_logo":"","adLink_id":"9"},{"ad_man":"XSocksBL","ad_market":"Global","ad_link":"http://xsvpn.com/","ad_code":"com.quseit.xsocks2","ad_point":"10","ad_img":"http://apu.quseit.com/static/adimg/qpy-xsocks_bSO7gxh.png","ad_logo":"","adLink_id":"10"}],"full":[{"ad_man":"QPython","ad_market":"Global","ad_link":"http://www.qpython.org","ad_code":"org.qpython.qpy","ad_point":"10","ad_img":"http://apu.quseit.com/static/adimg/qpy-748x1062.png","ad_logo":"","adLink_id":"6"}],"marquee":[{"ad_man":"qpythonBLfb","ad_market":"Global","ad_link":"http://www.facebook.com/qpython","ad_code":"org.qpython.qpy.fb","ad_point":"10","ad_img":"http://apu.quseit.com/static/adimg/qpy-facebook.png","ad_logo":"","adLink_id":"9"},{"ad_man":"QPythonBLtw","ad_market":"Global","ad_link":"http://twitter.com/qpython","ad_code":"org.qpython.qpy.tw","ad_point":"10","ad_img":"http://apu.quseit.com/static/adimg/qpy-twitter.png","ad_logo":"","adLink_id":"11"}]}
+         */
+
+        private String    website;
+        private String    feedback;
+        private Ext2Bean  ext2;
+        private ExtAdBean ext_ad;
+        private String    course_open;
+
+        public String getWebsite() {
+            return website;
+        }
+
+        public void setWebsite(String website) {
+            this.website = website;
+        }
+
+        public String getFeedback() {
+            return feedback;
+        }
+
+        public void setFeedback(String feedback) {
+            this.feedback = feedback;
+        }
+
+        public Ext2Bean getExt2() {
+            return ext2;
+        }
+
+        public void setExt2(Ext2Bean ext2) {
+            this.ext2 = ext2;
+        }
+
+        public ExtAdBean getExt_ad() {
+            return ext_ad;
+        }
+
+        public void setExt_ad(ExtAdBean ext_ad) {
+            this.ext_ad = ext_ad;
+        }
+
+        public String getCourse_open() {
+            return course_open == null ? "0" : course_open;
+        }
+
+        public void setCourse_open(String course_open) {
+            this.course_open = course_open;
+        }
+
+
+        public static class Ext2Bean {
+            /**
+             * adx_setting : pa|marquee
+             * adx_splash : pa|full
+             */
+
+            private String adx_setting;
+            private String adx_splash;
+
+            public String getAdx_setting() {
+                return adx_setting;
+            }
+
+            public void setAdx_setting(String adx_setting) {
+                this.adx_setting = adx_setting;
+            }
+
+            public String getAdx_splash() {
+                return adx_splash;
+            }
+
+            public void setAdx_splash(String adx_splash) {
+                this.adx_splash = adx_splash;
+            }
+        }
+
+        public static class ExtAdBean {
+            private List<FeaturedBean> featured;
+            private List<FullBean>     full;
+            private List<MarqueeBean>  marquee;
+            private List<FeaturedBean> gistshare;
+
+            public List<FeaturedBean> getFeatured() {
+                return featured;
+            }
+
+            public void setFeatured(List<FeaturedBean> featured) {
+                this.featured = featured;
+            }
+
+            public List<FullBean> getFull() {
+                return full;
+            }
+
+            public void setFull(List<FullBean> full) {
+                this.full = full;
+            }
+
+            public List<MarqueeBean> getMarquee() {
+                return marquee;
+            }
+
+            public void setMarquee(List<MarqueeBean> marquee) {
+                this.marquee = marquee;
+            }
+
+            public List<FeaturedBean> getGistshare() {
+                return gistshare;
+            }
+
+            public void setGistshare(List<FeaturedBean> gistshare) {
+                this.gistshare = gistshare;
+            }
+
+            public static class FeaturedBean {
+                /**
+                 * ad_man : qpythonBLfb
+                 * ad_market : Global
+                 * ad_link : http://www.facebook.com/qpython
+                 * ad_code : org.qpython.qpy.fb
+                 * ad_point : 10
+                 * ad_img : http://apu.quseit.com/static/adimg/qpy-facebook.png
+                 * ad_logo :
+                 * adLink_id : 9
+                 */
+
+                private String ad_man;
+                private String ad_market;
+                private String ad_link;
+                private String ad_code;
+                private String ad_point;
+                private String ad_img;
+                private String ad_logo;
+                private String adLink_id;
+
+                public String getAd_man() {
+                    return ad_man;
+                }
+
+                public void setAd_man(String ad_man) {
+                    this.ad_man = ad_man;
+                }
+
+                public String getAd_market() {
+                    return ad_market;
+                }
+
+                public void setAd_market(String ad_market) {
+                    this.ad_market = ad_market;
+                }
+
+                public String getAd_link() {
+                    return ad_link;
+                }
+
+                public void setAd_link(String ad_link) {
+                    this.ad_link = ad_link;
+                }
+
+                public String getAd_code() {
+                    return ad_code;
+                }
+
+                public void setAd_code(String ad_code) {
+                    this.ad_code = ad_code;
+                }
+
+                public String getAd_point() {
+                    return ad_point;
+                }
+
+                public void setAd_point(String ad_point) {
+                    this.ad_point = ad_point;
+                }
+
+                public String getAd_img() {
+                    return ad_img;
+                }
+
+                public void setAd_img(String ad_img) {
+                    this.ad_img = ad_img;
+                }
+
+                public String getAd_logo() {
+                    return ad_logo;
+                }
+
+                public void setAd_logo(String ad_logo) {
+                    this.ad_logo = ad_logo;
+                }
+
+                public String getAdLink_id() {
+                    return adLink_id;
+                }
+
+                public void setAdLink_id(String adLink_id) {
+                    this.adLink_id = adLink_id;
+                }
+            }
+
+            public static class FullBean {
+                /**
+                 * ad_man : QPython
+                 * ad_market : Global
+                 * ad_link : http://www.qpython.org
+                 * ad_code : org.qpython.qpy
+                 * ad_point : 10
+                 * ad_img : http://apu.quseit.com/static/adimg/qpy-748x1062.png
+                 * ad_logo :
+                 * adLink_id : 6
+                 */
+
+                private String ad_man;
+                private String ad_market;
+                private String ad_link;
+                private String ad_code;
+                private String ad_point;
+                private String ad_img;
+                private String ad_logo;
+                private String adLink_id;
+
+                public String getAd_man() {
+                    return ad_man;
+                }
+
+                public void setAd_man(String ad_man) {
+                    this.ad_man = ad_man;
+                }
+
+                public String getAd_market() {
+                    return ad_market;
+                }
+
+                public void setAd_market(String ad_market) {
+                    this.ad_market = ad_market;
+                }
+
+                public String getAd_link() {
+                    return ad_link;
+                }
+
+                public void setAd_link(String ad_link) {
+                    this.ad_link = ad_link;
+                }
+
+                public String getAd_code() {
+                    return ad_code;
+                }
+
+                public void setAd_code(String ad_code) {
+                    this.ad_code = ad_code;
+                }
+
+                public String getAd_point() {
+                    return ad_point;
+                }
+
+                public void setAd_point(String ad_point) {
+                    this.ad_point = ad_point;
+                }
+
+                public String getAd_img() {
+                    return ad_img;
+                }
+
+                public void setAd_img(String ad_img) {
+                    this.ad_img = ad_img;
+                }
+
+                public String getAd_logo() {
+                    return ad_logo;
+                }
+
+                public void setAd_logo(String ad_logo) {
+                    this.ad_logo = ad_logo;
+                }
+
+                public String getAdLink_id() {
+                    return adLink_id;
+                }
+
+                public void setAdLink_id(String adLink_id) {
+                    this.adLink_id = adLink_id;
+                }
+            }
+
+            public static class MarqueeBean {
+                /**
+                 * ad_man : qpythonBLfb
+                 * ad_market : Global
+                 * ad_link : http://www.facebook.com/qpython
+                 * ad_code : org.qpython.qpy.fb
+                 * ad_point : 10
+                 * ad_img : http://apu.quseit.com/static/adimg/qpy-facebook.png
+                 * ad_logo :
+                 * adLink_id : 9
+                 */
+
+                private String ad_man;
+                private String ad_market;
+                private String ad_link;
+                private String ad_code;
+                private String ad_point;
+                private String ad_img;
+                private String ad_logo;
+                private String adLink_id;
+
+                public String getAd_man() {
+                    return ad_man;
+                }
+
+                public void setAd_man(String ad_man) {
+                    this.ad_man = ad_man;
+                }
+
+                public String getAd_market() {
+                    return ad_market;
+                }
+
+                public void setAd_market(String ad_market) {
+                    this.ad_market = ad_market;
+                }
+
+                public String getAd_link() {
+                    return ad_link;
+                }
+
+                public void setAd_link(String ad_link) {
+                    this.ad_link = ad_link;
+                }
+
+                public String getAd_code() {
+                    return ad_code;
+                }
+
+                public void setAd_code(String ad_code) {
+                    this.ad_code = ad_code;
+                }
+
+                public String getAd_point() {
+                    return ad_point;
+                }
+
+                public void setAd_point(String ad_point) {
+                    this.ad_point = ad_point;
+                }
+
+                public String getAd_img() {
+                    return ad_img;
+                }
+
+                public void setAd_img(String ad_img) {
+                    this.ad_img = ad_img;
+                }
+
+                public String getAd_logo() {
+                    return ad_logo;
+                }
+
+                public void setAd_logo(String ad_logo) {
+                    this.ad_logo = ad_logo;
+                }
+
+                public String getAdLink_id() {
+                    return adLink_id;
+                }
+
+                public void setAdLink_id(String adLink_id) {
+                    this.adLink_id = adLink_id;
+                }
+            }
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/model/CourseModel.java b/qpython/src/main/java/org/qpython/qpy/main/server/model/CourseModel.java
new file mode 100644
index 00000000..f99d9101
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/model/CourseModel.java
@@ -0,0 +1,338 @@
+package org.qpython.qpy.main.server.model;
+
+import org.qpython.qpy.codeshare.pojo.Gist;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * Created by Hmei
+ * on 2017-06-29.
+ */
+
+public class CourseModel implements Serializable {
+
+    /**
+     * src : http://qpython.org
+     * rdate : 2017-06-15
+     * auth : River
+     * link : http://edu.qpython.org/qpython-quick-start/index.html
+     * smodule : qpython-quick-start
+     * description : QPython Quick Start
+     * title : QPython Quick Start
+     * ver : 1.0.0
+     * downloads : 10,000+
+     * cat : featured
+     * level : 1
+     * logo : http://www.qpython.org/images/bestpython.png
+     * open : 1
+     * courses : [{"rdate":"2017-06-15","link":"http://edu.qpython.org/qpython-quick-start/principles.html","smodule":"qpython-quick-start-principles","description":"Why QPython","title":"QPython Principles","downloads":"10,000+"},{"rdate":"2017-06-15","link":"http://edu.qpython.org/qpython-quick-start/terminal-howto.html","smodule":"qpython-quick-start-terminal-howto","description":"Explore to use QPython's Terminal","title":"Terminal howto","downloads":"10,000+"},{"rdate":"2017-06-15","link":"http://edu.qpython.org/qpython-quick-start/terminal-editor.html","smodule":"qpython-quick-start-editor-howto","description":"Develop with QPython's editor ","title":"Editor howto","downloads":"10,000+"},{"rdate":"2017-06-15","link":"http://edu.qpython.org/qpython-quick-start/qpypi-howto.html","smodule":"qpython-quick-start-qpypi-howto","description":"Install packages & programs on QPython","title":"QPYPI howto","downloads":"10,000+"},{"rdate":"2017-06-15","link":"http://edu.qpython.org/qpython-quick-start/community-howto.html","smodule":"qpython-quick-start-community-howto","description":"Join a QPython community","title":"Community howto","downloads":"10,000+"}]
+     * author : River
+     */
+
+    private String                 src;
+    private String                 rdate;
+    private String                 auth;
+    private String                 link;
+    private String                 smodule;
+    private String                 description;
+    private String                 title;
+    private String                 ver;
+    private String                 downloads;
+    private String                 cat;
+    private int                    level;
+    private String                 logo;
+    private int                    open;
+    private String                 author;
+    private List<CoursesBean>      courses;
+    private int                    crowdfunding;
+    private String                 auth_desc;
+    private String                 auth_avatar;
+    private int                    funding_process;
+    private List<FundingUserBean>  funding_user;
+    private List<Gist.CommentBean> comment;
+    private String                 type; // basic/web/aipy/arvr/database
+
+    public String getExplanation() {
+        return explanation;
+    }
+
+    public void setExplanation(String explanation) {
+        this.explanation = explanation;
+    }
+
+    private String explanation;
+
+    public String getSrc() {
+        return src;
+    }
+
+    public void setSrc(String src) {
+        this.src = src;
+    }
+
+    public String getRdate() {
+        return rdate;
+    }
+
+    public void setRdate(String rdate) {
+        this.rdate = rdate;
+    }
+
+    public String getAuth() {
+        return auth;
+    }
+
+    public void setAuth(String auth) {
+        this.auth = auth;
+    }
+
+    public String getLink() {
+        return link;
+    }
+
+    public void setLink(String link) {
+        this.link = link;
+    }
+
+    public String getSmodule() {
+        return smodule;
+    }
+
+    public void setSmodule(String smodule) {
+        this.smodule = smodule;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getVer() {
+        return ver;
+    }
+
+    public void setVer(String ver) {
+        this.ver = ver;
+    }
+
+    public String getDownloads() {
+        return downloads;
+    }
+
+    public void setDownloads(String downloads) {
+        this.downloads = downloads;
+    }
+
+    public String getCat() {
+        return cat;
+    }
+
+    public void setCat(String cat) {
+        this.cat = cat;
+    }
+
+    public int getLevel() {
+        return level;
+    }
+
+    public void setLevel(int level) {
+        this.level = level;
+    }
+
+    public String getLogo() {
+        return logo;
+    }
+
+    public void setLogo(String logo) {
+        this.logo = logo;
+    }
+
+    public int getOpen() {
+        return open;
+    }
+
+    public void setOpen(int open) {
+        this.open = open;
+    }
+
+    public String getAuthor() {
+        return author;
+    }
+
+    public void setAuthor(String author) {
+        this.author = author;
+    }
+
+    public List<CoursesBean> getCourses() {
+        return courses;
+    }
+
+    public void setCourses(List<CoursesBean> courses) {
+        this.courses = courses;
+    }
+
+    public int getCrowdfunding() {
+        return crowdfunding;
+    }
+
+    public void setCrowdfunding(int crowdfunding) {
+        this.crowdfunding = crowdfunding;
+    }
+
+    public String getAuth_desc() {
+        return auth_desc;
+    }
+
+    public void setAuth_desc(String auth_desc) {
+        this.auth_desc = auth_desc;
+    }
+
+    public String getAuth_avatar() {
+        return auth_avatar == null ? "" : auth_avatar;
+    }
+
+    public void setAuth_avatar(String auth_avatar) {
+        this.auth_avatar = auth_avatar;
+    }
+
+    public int getFunding_process() {
+        return funding_process;
+    }
+
+    public void setFunding_process(int funding_process) {
+        this.funding_process = funding_process;
+    }
+
+    public List<FundingUserBean> getFunding_user() {
+        return funding_user;
+    }
+
+    public void setFunding_user(List<FundingUserBean> funding_user) {
+        this.funding_user = funding_user;
+    }
+
+    public List<Gist.CommentBean> getComment() {
+        return comment;
+    }
+
+    public void setComment(List<Gist.CommentBean> comment) {
+        this.comment = comment;
+    }
+
+    public String getType() {
+        return type == null ? "" : type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public static class FundingUserBean implements Serializable {
+        /**
+         * avatar : data
+         * name : Zoe Saldana
+         */
+
+        private String avatar;
+        private String name;
+
+        public String getAvatar() {
+            return avatar;
+        }
+
+        public void setAvatar(String avatar) {
+            this.avatar = avatar;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+    }
+
+    public static class CoursesBean implements Serializable {
+        /**
+         * rdate : 2017-06-15
+         * link : http://edu.qpython.org/qpython-quick-start/principles.html
+         * smodule : qpython-quick-start-principles
+         * description : Why QPython
+         * title : QPython Principles
+         * downloads : 10,000+
+         */
+
+        private String rdate;
+        private String link;
+        private String smodule;
+        private String description;
+        private String title;
+        private String downloads;
+
+        public String getRdate() {
+            return rdate;
+        }
+
+        public void setRdate(String rdate) {
+            this.rdate = rdate;
+        }
+
+        public String getLink() {
+            return link;
+        }
+
+        public void setLink(String link) {
+            this.link = link;
+        }
+
+        public String getSmodule() {
+            return smodule;
+        }
+
+        public void setSmodule(String smodule) {
+            this.smodule = smodule;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public void setDescription(String description) {
+            this.description = description;
+        }
+
+        public String getTitle() {
+            return title;
+        }
+
+        public void setTitle(String title) {
+            this.title = title;
+        }
+
+        public String getDownloads() {
+            return downloads;
+        }
+
+        public void setDownloads(String downloads) {
+            this.downloads = downloads;
+        }
+
+        @Override
+        public String toString() {
+            return title;
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/model/DownloadProgressModel.java b/qpython/src/main/java/org/qpython/qpy/main/server/model/DownloadProgressModel.java
new file mode 100644
index 00000000..64a6209c
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/model/DownloadProgressModel.java
@@ -0,0 +1,63 @@
+package org.qpython.qpy.main.server.model;
+
+import android.os.RecoverySystem;
+
+import java.io.IOException;
+
+import okhttp3.MediaType;
+import okhttp3.ResponseBody;
+import okio.Buffer;
+import okio.BufferedSource;
+import okio.ForwardingSource;
+import okio.Okio;
+import okio.Source;
+
+/**
+ * Created by Hmei on 2017-07-07.
+ */
+
+public class DownloadProgressModel extends ResponseBody {
+    private final ResponseBody                    responseBody;
+    private final RecoverySystem.ProgressListener progressListener;
+    private       BufferedSource                  bufferedSource;
+
+    public DownloadProgressModel(ResponseBody responseBody, RecoverySystem.ProgressListener progressListener) {
+        this.responseBody = responseBody;
+        //传入回调
+        this.progressListener = progressListener;
+    }
+
+    @Override
+    public MediaType contentType() {
+        return responseBody.contentType();
+    }
+
+    @Override
+    public long contentLength() {
+        return responseBody.contentLength();
+    }
+
+    @Override
+    public BufferedSource source() {
+        if (bufferedSource == null) {
+            bufferedSource = Okio.buffer(source(responseBody.source()));
+        }
+        return bufferedSource;
+    }
+
+    private Source source(Source source) {
+        return new ForwardingSource(source) {
+            long totalBytesRead = 0L;
+
+            @Override
+            public long read(Buffer sink, long byteCount) throws IOException {
+                long bytesRead = super.read(sink, byteCount);
+                // read() returns the number of bytes read, or -1 if this source is exhausted.
+                totalBytesRead += bytesRead != -1 ? bytesRead : 0;
+                //实现回调
+                progressListener.onProgress((int) (totalBytesRead / responseBody.contentLength() * 100));
+                return bytesRead;
+            }
+        };
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/model/GooglePurchaseModel.java b/qpython/src/main/java/org/qpython/qpy/main/server/model/GooglePurchaseModel.java
new file mode 100644
index 00000000..6dbf1944
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/model/GooglePurchaseModel.java
@@ -0,0 +1,82 @@
+package org.qpython.qpy.main.server.model;
+
+/**
+ * Created by Hmei on 2017-07-19.
+ */
+
+public class GooglePurchaseModel {
+
+    /**
+     * orderId : GPA.1234-5678-9012-34567
+     * packageName : com.example.app
+     * productId : exampleSku
+     * purchaseTime : 1345678900000
+     * purchaseState : 0
+     * developerPayload : bGoa+V7g/yqDXvKRqq+JTFn4uQZbPiQJo4pf9RzJ
+     * purchaseToken : opaque-token-up-to-1000-characters
+     */
+
+    private String orderId;
+    private String packageName;
+    private String productId;
+    private long   purchaseTime;
+    private int    purchaseState;
+    private String developerPayload;
+    private String purchaseToken;
+
+    public String getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(String orderId) {
+        this.orderId = orderId;
+    }
+
+    public String getPackageName() {
+        return packageName;
+    }
+
+    public void setPackageName(String packageName) {
+        this.packageName = packageName;
+    }
+
+    public String getProductId() {
+        return productId;
+    }
+
+    public void setProductId(String productId) {
+        this.productId = productId;
+    }
+
+    public long getPurchaseTime() {
+        return purchaseTime;
+    }
+
+    public void setPurchaseTime(long purchaseTime) {
+        this.purchaseTime = purchaseTime;
+    }
+
+    public int getPurchaseState() {
+        return purchaseState;
+    }
+
+    public void setPurchaseState(int purchaseState) {
+        this.purchaseState = purchaseState;
+    }
+
+    public String getDeveloperPayload() {
+        return developerPayload;
+    }
+
+    public void setDeveloperPayload(String developerPayload) {
+        this.developerPayload = developerPayload;
+    }
+
+    public String getPurchaseToken() {
+        return purchaseToken;
+    }
+
+    public void setPurchaseToken(String purchaseToken) {
+        this.purchaseToken = purchaseToken;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/model/LibModel.java b/qpython/src/main/java/org/qpython/qpy/main/server/model/LibModel.java
new file mode 100644
index 00000000..4fc49fe8
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/model/LibModel.java
@@ -0,0 +1,54 @@
+package org.qpython.qpy.main.server.model;
+
+import com.quseit.util.DateTimeHelper;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.main.app.App;
+
+import java.util.Date;
+
+/**
+ * Lib model
+ * Created by Hmei on 2017-05-27.
+ */
+
+public class LibModel extends BaseLibModel{
+
+    /**
+     * src : http://kivy.org
+     * rdate : 2017-06-15
+     * link : http://dl.qpy.io/2x/kivy/kivy-1.9.1.zip
+     * description : kivy 1.9.1 prebuild for qpython
+     * title : kivy
+     * ver : 1
+     * cat : dev
+     * md5sum :
+     * smodule : kivy
+     * icon :
+     */
+
+    private String md5sum;
+    private String icon;
+
+    public LibModel(String title, Date lastModify) {
+        super(title);
+        installed = true;
+        description = App.getContext().getString(R.string.update_time_hint, DateTimeHelper.formatData(lastModify,"yyyy-MM-dd"));
+    }
+
+    public String getMd5sum() {
+        return md5sum;
+    }
+
+    public void setMd5sum(String md5sum) {
+        this.md5sum = md5sum;
+    }
+
+    public String getIcon() {
+        return icon;
+    }
+
+    public void setIcon(String icon) {
+        this.icon = icon;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/model/MyCourse.java b/qpython/src/main/java/org/qpython/qpy/main/server/model/MyCourse.java
new file mode 100644
index 00000000..8f5c8950
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/model/MyCourse.java
@@ -0,0 +1,373 @@
+package org.qpython.qpy.main.server.model;
+
+import java.util.List;
+
+/**
+ * Created by Hmei
+ * 1/22/18.
+ */
+
+public class MyCourse {
+    /**
+     * errorno : 0
+     * data : [{"info":{"src":"http://qpython.org","ver":"1.0.0","description":"Tensorflow Programming","crowdfunding":1,"title":"Tensorflow Programming","open":1,"downloads":"1,000+","level":1,"cat":"new","rdate":"2017-09-15","link":"http://edu.qpython.org/aipy-tensorflow/index.html","logo":"http://edu.qpython.org/static/course-tensorflow.png","funding_process":69,"smodule":"aipy-tensorflow"},"list":[{"gd":"course_0.99","created":"2017122712"}],"type":"notready","course":"aipy-tensorflow-index"},{"info":{"description":"How to start QPython","title":"QPython Quick Start","open":1,"downloads":"10,000+","level":1,"rdate":"2017-06-15","link":"http://edu.qpython.org/qpython-quick-start/index.html","type":"free","logo":"http://edu.qpython.org/static/course-qpython-quick-start.png","smodule":"qpython-quick-start"},"list":[{"gd":"course_free","created":"2018021109"}],"type":"free","course":"qpython-quick-start"}]
+     */
+
+    private int errorno;
+    private List<DataBean> data;
+
+    public int getErrorno() {
+        return errorno;
+    }
+
+    public void setErrorno(int errorno) {
+        this.errorno = errorno;
+    }
+
+    public List<DataBean> getData() {
+        return data;
+    }
+
+    public void setData(List<DataBean> data) {
+        this.data = data;
+    }
+
+    public static class DataBean {
+        /**
+         * info : {"src":"http://qpython.org","ver":"1.0.0","description":"Tensorflow Programming","crowdfunding":1,"title":"Tensorflow Programming","open":1,"downloads":"1,000+","level":1,"cat":"new","rdate":"2017-09-15","link":"http://edu.qpython.org/aipy-tensorflow/index.html","logo":"http://edu.qpython.org/static/course-tensorflow.png","funding_process":69,"smodule":"aipy-tensorflow"}
+         * list : [{"gd":"course_0.99","created":"2017122712"}]
+         * type : notready
+         * course : aipy-tensorflow-index
+         */
+
+        private InfoBean info;
+        private String         course;
+        private String type; // free/crowdfunding/notready
+        private List<ListBean> list;
+
+        public InfoBean getInfo() {
+            return info;
+        }
+
+        public void setInfo(InfoBean info) {
+            this.info = info;
+        }
+
+        public String getType() {
+            return type;
+        }
+
+        public void setType(String type) {
+            this.type = type;
+        }
+
+        public String getCourse() {
+            return course;
+        }
+
+        public void setCourse(String course) {
+            this.course = course;
+        }
+
+        public List<ListBean> getList() {
+            return list;
+        }
+
+        public void setList(List<ListBean> list) {
+            this.list = list;
+        }
+
+        public static class InfoBean {
+            /**
+             * src : http://qpython.org
+             * ver : 1.0.0
+             * description : Tensorflow Programming
+             * crowdfunding : 1
+             * title : Tensorflow Programming
+             * open : 1
+             * downloads : 1,000+
+             * level : 1
+             * cat : new
+             * rdate : 2017-09-15
+             * link : http://edu.qpython.org/aipy-tensorflow/index.html
+             * logo : http://edu.qpython.org/static/course-tensorflow.png
+             * funding_process : 69
+             * smodule : aipy-tensorflow
+             */
+
+            private String src;
+            private String ver;
+            private String description;
+            private int    crowdfunding;
+            private String title;
+            private int    open;
+            private String downloads;
+            private int    level;
+            private String cat;
+            private String rdate;
+            private String link;
+            private String logo;
+            private int    funding_process;
+            private String smodule;
+            private String auth;
+
+            public String getSrc() {
+                return src;
+            }
+
+            public void setSrc(String src) {
+                this.src = src;
+            }
+
+            public String getVer() {
+                return ver;
+            }
+
+            public void setVer(String ver) {
+                this.ver = ver;
+            }
+
+            public String getDescription() {
+                return description;
+            }
+
+            public void setDescription(String description) {
+                this.description = description;
+            }
+
+            public int getCrowdfunding() {
+                return crowdfunding;
+            }
+
+            public void setCrowdfunding(int crowdfunding) {
+                this.crowdfunding = crowdfunding;
+            }
+
+            public String getTitle() {
+                return title;
+            }
+
+            public void setTitle(String title) {
+                this.title = title;
+            }
+
+            public int getOpen() {
+                return open;
+            }
+
+            public void setOpen(int open) {
+                this.open = open;
+            }
+
+            public String getDownloads() {
+                return downloads;
+            }
+
+            public void setDownloads(String downloads) {
+                this.downloads = downloads;
+            }
+
+            public int getLevel() {
+                return level;
+            }
+
+            public void setLevel(int level) {
+                this.level = level;
+            }
+
+            public String getCat() {
+                return cat;
+            }
+
+            public void setCat(String cat) {
+                this.cat = cat;
+            }
+
+            public String getRdate() {
+                return rdate;
+            }
+
+            public void setRdate(String rdate) {
+                this.rdate = rdate;
+            }
+
+            public String getLink() {
+                return link;
+            }
+
+            public void setLink(String link) {
+                this.link = link;
+            }
+
+            public String getLogo() {
+                return logo;
+            }
+
+            public void setLogo(String logo) {
+                this.logo = logo;
+            }
+
+            public int getFunding_process() {
+                return funding_process;
+            }
+
+            public void setFunding_process(int funding_process) {
+                this.funding_process = funding_process;
+            }
+
+            public String getSmodule() {
+                return smodule;
+            }
+
+            public void setSmodule(String smodule) {
+                this.smodule = smodule;
+            }
+
+            public String getAuth() {
+                return auth;
+            }
+
+            public void setAuth(String auth) {
+                this.auth = auth;
+            }
+        }
+
+        public static class ListBean {
+            /**
+             * gd : course_0.99
+             * created : 2017122712
+             */
+
+            private String gd;
+            private String created;
+
+            public String getGd() {
+                return gd;
+            }
+
+            public void setGd(String gd) {
+                this.gd = gd;
+            }
+
+            public String getCreated() {
+                return created;
+            }
+
+            public void setCreated(String created) {
+                this.created = created;
+            }
+        }
+    }
+
+
+//
+//    /**
+//     * errorno : 0
+//     * data : [{"info":{"src":"http://qpython.org","ver":"1.0.0","description":"Python Basic","title":"Python Basic","open":0,"downloads":"1,000+","level":1,"cat":"new","rdate":"2017-09-15","link":"http://edu.qpython.org/python-base/index.html","logo":"http://edu.qpython.org/static/course-python-basic.png","smodule":"python-base"},"list":[{"gd":"course_4.99","created":"2018011017"},{"gd":"course_3.99","created":"2018011017"},{"gd":"course_2.99","created":"2018011017"},{"gd":"course_1.99","created":"2018011017"},{"gd":"course_0.99","created":"2018011017"}],"type":"course","course":"python-base-index"}]
+//     */
+//
+//    private int errorno;
+//    private List<DataBean> data;
+//
+//    public int getErrorno() {
+//        return errorno;
+//    }
+//
+//    public void setErrorno(int errorno) {
+//        this.errorno = errorno;
+//    }
+//
+//    public List<DataBean> getData() {
+//        return data;
+//    }
+//
+//    public void setData(List<DataBean> data) {
+//        this.data = data;
+//    }
+//
+//    public static class DataBean {
+//        /**
+//         * info : {"src":"http://qpython.org","ver":"1.0.0","description":"Python Basic","title":"Python Basic","open":0,"downloads":"1,000+","level":1,"cat":"new","rdate":"2017-09-15","link":"http://edu.qpython.org/python-base/index.html","logo":"http://edu.qpython.org/static/course-python-basic.png","smodule":"python-base"}
+//         * list : [{"gd":"course_4.99","created":"2018011017"},{"gd":"course_3.99","created":"2018011017"},{"gd":"course_2.99","created":"2018011017"},{"gd":"course_1.99","created":"2018011017"},{"gd":"course_0.99","created":"2018011017"}]
+//         * type : course
+//         * course : python-base-index
+//         */
+//
+//        private InfoBean info;
+//        private String         type;
+//        private String         course;
+//        private List<ListBean> list;
+//
+//        public InfoBean getInfo() {
+//            return info;
+//        }
+//
+//        public void setInfo(InfoBean info) {
+//            this.info = info;
+//        }
+//
+//        public String getType() {
+//            return type;
+//        }
+//
+//        public void setType(String type) {
+//            this.type = type;
+//        }
+//
+//        public String getCourse() {
+//            return course;
+//        }
+//
+//        public void setCourse(String course) {
+//            this.course = course;
+//        }
+//
+//        public List<ListBean> getList() {
+//            return list;
+//        }
+//
+//        public void setList(List<ListBean> list) {
+//            this.list = list;
+//        }
+//
+//        public static class InfoBean extends CourseModel{
+//            private String type; // free/crowdfunding/notready
+//
+//            @Override
+//            public String getType() {
+//                return type;
+//            }
+//
+//            @Override
+//            public void setType(String type) {
+//                this.type = type;
+//            }
+//        }
+//
+//        public static class ListBean {
+//            /**
+//             * gd : course_4.99
+//             * created : 2018011017
+//             */
+//
+//            private String gd;
+//            private String created;
+//
+//            public String getGd() {
+//                return gd;
+//            }
+//
+//            public void setGd(String gd) {
+//                this.gd = gd;
+//            }
+//
+//            public String getCreated() {
+//                return created;
+//            }
+//
+//            public void setCreated(String created) {
+//                this.created = created;
+//            }
+//        }
+//    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/model/PayStatusModel.java b/qpython/src/main/java/org/qpython/qpy/main/server/model/PayStatusModel.java
new file mode 100644
index 00000000..abae7359
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/model/PayStatusModel.java
@@ -0,0 +1,44 @@
+package org.qpython.qpy.main.server.model;
+
+/**
+ * Created by Hmei
+ * 2/11/18.
+ */
+
+public class PayStatusModel {
+
+
+    /**
+     * errorno : 0
+     * payed : 1
+     * msg :
+     */
+
+    private int errorno;
+    private int    payed; // >0 -> 已参与众筹/购买
+    private String msg;
+
+    public int getErrorno() {
+        return errorno;
+    }
+
+    public void setErrorno(int errorno) {
+        this.errorno = errorno;
+    }
+
+    public int getPayed() {
+        return payed;
+    }
+
+    public void setPayed(int payed) {
+        this.payed = payed;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/model/QpypiModel.java b/qpython/src/main/java/org/qpython/qpy/main/server/model/QpypiModel.java
new file mode 100644
index 00000000..0c1b00c3
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/model/QpypiModel.java
@@ -0,0 +1,19 @@
+package org.qpython.qpy.main.server.model;
+
+public class QpypiModel extends BaseLibModel{
+    public QpypiModel(String title) {
+        super(title);
+    }
+
+    /**
+     * src : http://qpypi.qpython.org/pyshop/package/numpy
+     * rdate : 2017-06-01
+     * link : http://pip:qpython@qpypi.qpython.org:11000/simple
+     * smodule : numpy
+     * description : numPy is the fundamental package needed for scientific computing with Python
+     * title : Numpy
+     * ver : 1.9.2
+     * downloads : 20229
+     * cat : qpypi
+     */
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/model/SettingModel.java b/qpython/src/main/java/org/qpython/qpy/main/server/model/SettingModel.java
new file mode 100644
index 00000000..807642b1
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/model/SettingModel.java
@@ -0,0 +1,208 @@
+package org.qpython.qpy.main.server.model;
+
+import java.util.List;
+
+/**
+ * Created by Hmei on 2017-06-29.
+ */
+
+public class SettingModel {
+    /**
+     * qpy : {"website":"http://qpython.org","feedback":"support@qpython.org","ext2":{"adx_setting":"pa|marquee","adx_splash":"pa|full"},"ext_ad":{"full":[{"ad_man":"QPython","ad_market":"Global","ad_link":"http://www.qpython.org","ad_code":"org.qpython.qpy","ad_point":"10","ad_img":"http://apu.quseit.com/static/adimg/qpy-748x1062.png","ad_logo":"","adLink_id":"6"}],"marquee":[{"ad_man":"QPython","ad_market":"Global","ad_link":"http://www.qpython.org","ad_code":"org.qpython.qpy","ad_point":"10","ad_img":"http://apu.quseit.com/static/adimg/qpy-600x200.png","ad_logo":"","adLink_id":"6"}]}}
+     */
+
+    private QpyBean      qpy;
+
+    public QpyBean getQpy() {
+        return qpy;
+    }
+
+    public void setQpy(QpyBean qpy) {
+        this.qpy = qpy;
+    }
+
+    public static class QpyBean {
+
+        /**
+         * website : http://qpython.org
+         * feedback : support@qpython.org
+         * ext2 : {"adx_setting":"pa|marquee","adx_splash":"pa|full"}
+         * ext_ad : {"full":[{"ad_man":"QPython","ad_market":"Global","ad_link":"http://www.qpython.org","ad_code":"org.qpython.qpy","ad_point":"10","ad_img":"http://apu.quseit.com/static/adimg/qpy-748x1062.png","ad_logo":"","adLink_id":"6"}],"marquee":[{"ad_man":"QPython","ad_market":"Global","ad_link":"http://www.qpython.org","ad_code":"org.qpython.qpy","ad_point":"10","ad_img":"http://apu.quseit.com/static/adimg/qpy-600x200.png","ad_logo":"","adLink_id":"6"}]}
+         */
+
+        private String website;
+        private String    feedback;
+        private Ext2Bean  ext2;
+        private ExtAdBean ext_ad;
+        public String getWebsite() {
+            return website;
+        }
+
+        public void setWebsite(String website) {
+            this.website = website;
+        }
+
+        public String getFeedback() {
+            return feedback;
+        }
+
+        public void setFeedback(String feedback) {
+            this.feedback = feedback;
+        }
+
+        public Ext2Bean getExt2() {
+            return ext2;
+        }
+
+        public void setExt2(Ext2Bean ext2) {
+            this.ext2 = ext2;
+        }
+
+        public ExtAdBean getExt_ad() {
+            return ext_ad;
+        }
+
+        public void setExt_ad(ExtAdBean ext_ad) {
+            this.ext_ad = ext_ad;
+        }
+
+        public static class Ext2Bean {
+
+            /**
+             * adx_setting : pa|marquee
+             * adx_splash : pa|full
+             */
+
+            private String adx_setting;
+            private String adx_splash;
+            public String getAdx_setting() {
+                return adx_setting;
+            }
+
+            public void setAdx_setting(String adx_setting) {
+                this.adx_setting = adx_setting;
+            }
+
+            public String getAdx_splash() {
+                return adx_splash;
+            }
+
+            public void setAdx_splash(String adx_splash) {
+                this.adx_splash = adx_splash;
+            }
+
+        }
+        public static class ExtAdBean {
+
+            private List<ADBean> full;
+            private List<ADBean> marquee;
+            public List<ADBean> getFull() {
+                return full;
+            }
+
+            public void setFull(List<ADBean> full) {
+                this.full = full;
+            }
+
+            public List<ADBean> getMarquee() {
+                return marquee;
+            }
+
+            public void setMarquee(List<ADBean> marquee) {
+                this.marquee = marquee;
+            }
+
+            public List<ADBean> getList(String name) {
+                if (name.equals("full"))
+                    return full;
+                else
+                    return marquee;
+            }
+        }
+    }
+    public static class ADBean {
+        /**
+         * ad_man : QPython
+         * ad_market : Global
+         * ad_link : http://www.qpython.org
+         * ad_code : org.qpython.qpy
+         * ad_point : 10
+         * ad_img : http://apu.quseit.com/static/adimg/qpy-748x1062.png
+         * ad_logo :
+         * adLink_id : 6
+         */
+
+        private String ad_man;
+        private String ad_market;
+        private String ad_link;
+        private String ad_code;
+        private String ad_point;
+        private String ad_img;
+        private String ad_logo;
+        private String adLink_id;
+
+        public String getAd_man() {
+            return ad_man;
+        }
+
+        public void setAd_man(String ad_man) {
+            this.ad_man = ad_man;
+        }
+
+        public String getAd_market() {
+            return ad_market;
+        }
+
+        public void setAd_market(String ad_market) {
+            this.ad_market = ad_market;
+        }
+
+        public String getAd_link() {
+            return ad_link;
+        }
+
+        public void setAd_link(String ad_link) {
+            this.ad_link = ad_link;
+        }
+
+        public String getAd_code() {
+            return ad_code;
+        }
+
+        public void setAd_code(String ad_code) {
+            this.ad_code = ad_code;
+        }
+
+        public String getAd_point() {
+            return ad_point;
+        }
+
+        public void setAd_point(String ad_point) {
+            this.ad_point = ad_point;
+        }
+
+        public String getAd_img() {
+            return ad_img;
+        }
+
+        public void setAd_img(String ad_img) {
+            this.ad_img = ad_img;
+        }
+
+        public String getAd_logo() {
+            return ad_logo;
+        }
+
+        public void setAd_logo(String ad_logo) {
+            this.ad_logo = ad_logo;
+        }
+
+        public String getAdLink_id() {
+            return adLink_id;
+        }
+
+        public void setAdLink_id(String adLink_id) {
+            this.adLink_id = adLink_id;
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/model/UpdateModel.java b/qpython/src/main/java/org/qpython/qpy/main/server/model/UpdateModel.java
new file mode 100644
index 00000000..c7a76d5d
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/model/UpdateModel.java
@@ -0,0 +1,90 @@
+package org.qpython.qpy.main.server.model;
+
+import java.util.List;
+
+/**
+ * Created by Hmei on 2017-06-27.
+ */
+
+public class UpdateModel {
+
+    /**
+     * app : {"link":"http://www.qpython.org","ver":200,"ver_plugin":"0","ver_desc":"Newest version you should upgrade","ver_name":"2.0.0"}
+     * plugins : []
+     */
+
+    private AppBean app;
+    private List<?> plugins;
+
+    public AppBean getApp() {
+        return app;
+    }
+
+    public void setApp(AppBean app) {
+        this.app = app;
+    }
+
+    public List<?> getPlugins() {
+        return plugins;
+    }
+
+    public void setPlugins(List<?> plugins) {
+        this.plugins = plugins;
+    }
+
+    public static class AppBean {
+        /**
+         * link : http://www.qpython.org
+         * ver : 200
+         * ver_plugin : 0
+         * ver_desc : Newest version you should upgrade
+         * ver_name : 2.0.0
+         */
+
+        private String link;
+        private int    ver;
+        private String ver_plugin;
+        private String ver_desc;
+        private String ver_name;
+
+        public String getLink() {
+            return link;
+        }
+
+        public void setLink(String link) {
+            this.link = link;
+        }
+
+        public int getVer() {
+            return ver;
+        }
+
+        public void setVer(int ver) {
+            this.ver = ver;
+        }
+
+        public String getVer_plugin() {
+            return ver_plugin;
+        }
+
+        public void setVer_plugin(String ver_plugin) {
+            this.ver_plugin = ver_plugin;
+        }
+
+        public String getVer_desc() {
+            return ver_desc;
+        }
+
+        public void setVer_desc(String ver_desc) {
+            this.ver_desc = ver_desc;
+        }
+
+        public String getVer_name() {
+            return ver_name;
+        }
+
+        public void setVer_name(String ver_name) {
+            this.ver_name = ver_name;
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/service/FTPServerService.java b/qpython/src/main/java/org/qpython/qpy/main/service/FTPServerService.java
new file mode 100644
index 00000000..a0e5c482
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/service/FTPServerService.java
@@ -0,0 +1,14 @@
+package org.qpython.qpy.main.service;
+
+import org.qpython.qpy.main.activity.SettingActivity;
+
+/**
+ * Created by Hmei on 2017-06-13.
+ */
+
+public class FTPServerService extends org.swiftp.FTPServerService {
+    @Override
+    protected Class<?> getSettingClass() {
+        return SettingActivity.class;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/service/QPyService.java b/qpython/src/main/java/org/qpython/qpy/main/service/QPyService.java
new file mode 100644
index 00000000..0da10af6
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/service/QPyService.java
@@ -0,0 +1,26 @@
+package org.qpython.qpy.main.service;
+
+import android.app.IntentService;
+import android.content.Intent;
+import android.support.annotation.Nullable;
+
+/**
+ * Receive QPY broadcast and exec python programs
+ * Created by Hmei on 2017-07-25.
+ */
+
+public class QPyService extends IntentService {
+
+    /**
+     * Creates an IntentService.  Invoked by your subclass's constructor.
+     *
+//     * @param name Used to name the worker thread, important only for debugging.
+     */
+    public QPyService() {
+        super("QPyService");
+    }
+
+    @Override
+    protected void onHandleIntent(@Nullable Intent intent) {
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/utils/Bus.java b/qpython/src/main/java/org/qpython/qpy/main/utils/Bus.java
new file mode 100644
index 00000000..89cd731d
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/utils/Bus.java
@@ -0,0 +1,12 @@
+package org.qpython.qpy.main.utils;
+
+
+import org.greenrobot.eventbus.EventBus;
+
+public class Bus {
+    private static final EventBus INSTANCE = new EventBus();
+
+    public static EventBus getDefault() {
+        return INSTANCE;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/utils/Utils.java b/qpython/src/main/java/org/qpython/qpy/main/utils/Utils.java
new file mode 100644
index 00000000..0ffb03b8
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/utils/Utils.java
@@ -0,0 +1,186 @@
+package org.qpython.qpy.main.utils;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+import android.net.Uri;
+import android.os.Environment;
+import android.util.Log;
+
+import org.qpython.qpy.main.activity.QWebViewActivity;
+import org.qpython.qpysdk.utils.FileHelper;
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Locale;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Created by mathiasluo on 16-6-1.
+ */
+
+public class Utils extends org.qpython.qpysdk.utils.Utils {
+    static final String TAG = "Utils";
+
+    public static void startWebActivityWithUrl(Context context, String title, String url) {
+        Utils.startWebActivityWithUrl(context, title, url, "", false, false);
+    }
+    public static void startWebActivityWithUrl(Context context, String title, String url, String script, boolean isNoHead, boolean isDrawer) {
+        Intent intent = new Intent(context, QWebViewActivity.class);
+        if (script.equals("")) {
+            Uri u = Uri.parse(url);
+            intent.setData(u);
+        }
+
+        intent.putExtra(QWebViewActivity.ACT, "main");
+        intent.putExtra(QWebViewActivity.TITLE, title);
+        intent.putExtra(QWebViewActivity.SRC, url);
+        intent.putExtra(QWebViewActivity.LOG_PATH, script);
+        intent.putExtra(QWebViewActivity.IS_NO_HEADER, isNoHead ? "1" : "0");
+        intent.putExtra(QWebViewActivity.IS_DRAWER, isDrawer ? "drawer" : "");
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+        context.startActivity(intent);
+
+    }
+
+    public static void createDirectoryOnExternalStorage(String path) {
+        try {
+            if (Environment.getExternalStorageState().equalsIgnoreCase("mounted")) {
+                File file = new File(Environment.getExternalStorageDirectory(), path);
+                if (!file.exists()) {
+                    try {
+                        file.mkdirs();
+
+                        Log.d(TAG, "createDirectoryOnExternalStorage created " + Environment.getExternalStorageDirectory().getAbsolutePath() + "/" + path);
+                    } catch (Exception e) {
+                        Log.e(TAG, "createDirectoryOnExternalStorage error: ", e);
+                    }
+                }
+            } else {
+                Log.e(TAG, "createDirectoryOnExternalStorage error: " + "External storage is not mounted");
+            }
+        } catch (Exception e) {
+            Log.e(TAG, "createDirectoryOnExternalStorage error: " + e);
+        }
+
+    }
+
+
+    public static boolean netOk(Context context) {
+        try {
+            ConnectivityManager nInfo = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+            nInfo.getActiveNetworkInfo().isConnectedOrConnecting();
+
+
+            ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+            NetworkInfo netInfo = cm.getActiveNetworkInfo();
+            if (netInfo != null && netInfo.isConnectedOrConnecting()) {
+                return true;
+            } else {
+                return false;
+            }
+
+        } catch (Exception e) {
+            Log.d(TAG, "Network available:false");
+
+            return false;
+        }
+    }
+
+    public static String getLang() {
+        return Locale.getDefault().getLanguage();
+    }
+
+    public static int getVersinoCode(Context context) {
+        int intVersioinCode = 0;
+        try {
+            PackageInfo info = context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
+            intVersioinCode = info.versionCode;
+        } catch (PackageManager.NameNotFoundException e) {
+            e.printStackTrace();
+        }
+        return intVersioinCode;
+    }
+
+    public static Intent openRemoteLink(Context context, String link) {
+        //LogUtil.d(TAG, "openRemoteLink:"+link);
+        String vlowerFileName = link.toLowerCase();
+        if (vlowerFileName.startsWith("lgmarket:")) {
+            String[] xx = link.split(":");
+            //LogUtil.d(TAG, "lgmarket:"+xx[1]);
+
+            Intent intent = new Intent("com.lge.lgworld.intent.action.VIEW");
+            intent.setClassName("com.lge.lgworld", "com.lge.lgworld.LGReceiver");
+            intent.putExtra("lgworld.receiver", "LGSW_INVOKE_DETAIL");
+            intent.putExtra("APP_PID", xx[1]);
+
+			/*Intent intent = new Intent();
+            intent.setClassName("com.lg.apps.cubeapp", "com.lg.apps.cubeapp.PreIntroActivity");
+			intent.putExtra("type", "APP_DETAIL ");
+			intent.putExtra("codeValue", ""); // value is not needed when moving to Detail page
+			intent.putExtra("content_id", xx[1]);   */
+
+            context.sendBroadcast(intent);
+
+            return null;
+
+        } else {
+            Uri uLink = Uri.parse(link);
+
+            Intent intent = new Intent(Intent.ACTION_VIEW, uLink);
+
+            return intent;
+        }
+    }
+
+    public static String getCode(Context context) {
+        String packageName = context.getPackageName();
+        String[] xcode = packageName.split("\\.");
+        String code = xcode[xcode.length - 1];
+        return code;
+    }
+
+    public static boolean isQPy3(Context context) {
+        String code = Utils.getCode(context);
+        if (code.contains("qpy3")) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public static String getSrv(String script) {
+        //LogUtil.d(TAG, "getSrv:"+script);
+
+        String content = FileHelper.getFileContents(script);
+
+        String srv = "http://localhost";
+        Pattern srvPattern = Pattern.compile("#qpy://(.+)[\\s]+", Pattern.CASE_INSENSITIVE);
+        Matcher matcher1 = srvPattern.matcher(content);
+
+        if (matcher1.find()) {
+            srv = "http://" + matcher1.group(1);
+
+            //LogUtil.d(TAG, "URL2:"+srv);
+
+        }
+        try {
+            URL n = new URL(srv);
+            srv = n.getProtocol() + "://" + n.getHost() + ":" + (n.getPort() > 0 ? n.getPort() : 80);
+            //LogUtil.d(TAG, "getsrv:"+srv);
+        } catch (MalformedURLException e) {
+            e.printStackTrace();
+        }
+        return srv;
+    }
+
+    public static boolean isZn() {
+        String local = Locale.getDefault().getDisplayLanguage();
+        return "中文".equals(local);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/widget/CodeReviewDialog.java b/qpython/src/main/java/org/qpython/qpy/main/widget/CodeReviewDialog.java
new file mode 100644
index 00000000..8220a377
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/widget/CodeReviewDialog.java
@@ -0,0 +1,49 @@
+package org.qpython.qpy.main.widget;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.text.SpannableString;
+import android.text.Spanned;
+import android.text.style.ForegroundColorSpan;
+import android.view.Gravity;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.TextView;
+
+import org.qpython.qpy.R;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static org.qpython.qpy.utils.CodePattern.COLOR_BUILTIN;
+import static org.qpython.qpy.utils.CodePattern.COLOR_COMMENT;
+import static org.qpython.qpy.utils.CodePattern.COLOR_KEYWORD;
+import static org.qpython.qpy.utils.CodePattern.PATTERN_PY_BUILD_IN;
+import static org.qpython.qpy.utils.CodePattern.PATTERN_PY_COMMENT;
+import static org.qpython.qpy.utils.CodePattern.PATTERN_PY_KEYWORD;
+
+/**
+ * 文 件 名: CodeReviewDialog
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2017/12/28 09:30
+ * 邮   箱: qq798435167@gmail.com
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class CodeReviewDialog extends Dialog {
+    private TextView mTextView;
+
+    public CodeReviewDialog(@NonNull Context context) {
+        super(context, R.style.Dialog);
+        setContentView(R.layout.dialog_code_review);
+        mTextView = findViewById(R.id.code_content_tv);
+        findViewById(R.id.root_layout).setOnClickListener(v -> dismiss());
+
+    }
+
+    public void setContent(SpannableString content) {
+        mTextView.setText(content);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/widget/CodeSendComment.java b/qpython/src/main/java/org/qpython/qpy/main/widget/CodeSendComment.java
new file mode 100644
index 00000000..99f1859d
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/widget/CodeSendComment.java
@@ -0,0 +1,139 @@
+package org.qpython.qpy.main.widget;
+
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.content.Context;
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.text.Editable;
+import android.text.Html;
+import android.text.TextWatcher;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.RelativeLayout;
+import android.widget.Toast;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.codeshare.ShareCodeUtil;
+import org.qpython.qpy.databinding.WidgetSendCommentBinding;
+
+public class CodeSendComment extends DialogFragment {
+    private static final String GIST_ID = "gist_id", IS_PROJ = "is_proj";
+    private ShareCodeUtil.CommentCallback callback;
+    private WidgetSendCommentBinding      binding;
+    private String                        gistId, to, reComment;
+    private boolean isProj;
+
+    public static CodeSendComment newInstance(String gistId, boolean isProj) {
+        CodeSendComment f = new CodeSendComment();
+
+        Bundle args = new Bundle();
+        args.putString(GIST_ID, gistId);
+        args.putBoolean(IS_PROJ, isProj);
+        f.setArguments(args);
+
+        return f;
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        // the content
+        final RelativeLayout root = new RelativeLayout(getActivity());
+        root.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
+
+        // creating the fullscreen dialog
+        final Dialog dialog = new Dialog(getActivity());
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+        dialog.setContentView(root);
+        dialog.getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+        dialog.getWindow().getAttributes().windowAnimations = R.style.DialogAnimation;
+        return dialog;
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        gistId = getArguments().getString(GIST_ID);
+        isProj = getArguments().getBoolean(IS_PROJ);
+        View view = inflater.inflate(R.layout.widget_send_comment, container, false);
+        binding = DataBindingUtil.bind(view);
+        binding.btnSend.setOnClickListener(v -> {
+            String reply = binding.edit.getText().toString();
+            if (reply.length() == 0) {
+                Toast.makeText(getActivity(), R.string.null_comment_hint, Toast.LENGTH_SHORT).show();
+                return;
+            }
+            if (reply.startsWith(getString(R.string.re_format, to, ""))) {
+                reply = reply.replace(getString(R.string.re_format, to, ""), "");
+//                ShareCodeUtil.getInstance().sendComment(gist_id, to, reply, reComment, isProj, callback);
+//                binding.edit.setText("");
+            } else {
+//                ShareCodeUtil.getInstance().sendComment(gist_id, reply, isProj, callback);
+//                binding.edit.setText("");
+            }
+            InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
+            imm.hideSoftInputFromWindow(binding.edit.getWindowToken(), 0);
+        });
+        getDialog().getWindow().setGravity(Gravity.BOTTOM);
+        getDialog().getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+        return view;
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        getView().post(() -> {
+            Window dialogWindow = getDialog().getWindow();
+
+            // Make the dialog possible to be outside touch
+            dialogWindow.setFlags(WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL,
+                    WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL);
+            dialogWindow.clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);
+
+            getView().invalidate();
+        });
+    }
+
+    public void setCallback(ShareCodeUtil.CommentCallback callback) {
+        this.callback = callback;
+    }
+
+    public void setReply(String toName, String reCommentContent) {
+        to = toName;
+        reComment = reCommentContent;
+
+        binding.edit.setText(Html.fromHtml(getString(R.string.re_format, to, "")));
+        binding.edit.setSelection(binding.edit.getText().length());
+        InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
+        imm.showSoftInput(binding.edit, InputMethodManager.SHOW_IMPLICIT);
+
+        binding.edit.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+                if (!to.equals("")) {
+                    if (!s.toString().startsWith(getString(R.string.re_format, to, ""))) {
+                        to = "";
+                        binding.edit.setText(s.toString());
+                        binding.edit.setSelection(s.length());
+                    }
+                }
+            }
+        });
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/widget/DividerItemDecoration.java b/qpython/src/main/java/org/qpython/qpy/main/widget/DividerItemDecoration.java
new file mode 100644
index 00000000..dcbb8cf3
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/widget/DividerItemDecoration.java
@@ -0,0 +1,96 @@
+package org.qpython.qpy.main.widget;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Canvas;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+
+/**
+ * Created by mathiasluo on 16-4-6.
+ */
+public class DividerItemDecoration extends RecyclerView.ItemDecoration {
+
+    private static final int[] ATTRS = new int[]{
+            android.R.attr.listDivider
+    };
+
+    public static final int HORIZONTAL_LIST = LinearLayoutManager.HORIZONTAL;
+
+    public static final int VERTICAL_LIST = LinearLayoutManager.VERTICAL;
+
+    private Drawable mDivider;
+
+    private int mOrientation;
+
+    public DividerItemDecoration(Context context, int orientation) {
+        final TypedArray a = context.obtainStyledAttributes(ATTRS);
+        mDivider = a.getDrawable(0);
+        a.recycle();
+        setOrientation(orientation);
+    }
+
+    public void setOrientation(int orientation) {
+        if (orientation != HORIZONTAL_LIST && orientation != VERTICAL_LIST) {
+            throw new IllegalArgumentException("invalid orientation");
+        }
+        mOrientation = orientation;
+    }
+
+    @Override
+    public void onDraw(Canvas c, RecyclerView parent) {
+
+        if (mOrientation == VERTICAL_LIST) {
+            drawVertical(c, parent);
+        } else {
+            drawHorizontal(c, parent);
+        }
+
+    }
+
+
+    public void drawVertical(Canvas c, RecyclerView parent) {
+        final int left = parent.getPaddingLeft();
+        final int right = parent.getWidth() - parent.getPaddingRight();
+
+        final int childCount = parent.getChildCount();
+        for (int i = 0; i < childCount; i++) {
+            final View child = parent.getChildAt(i);
+            android.support.v7.widget.RecyclerView v = new android.support.v7.widget.RecyclerView(parent.getContext());
+            final RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) child
+                    .getLayoutParams();
+            final int top = child.getBottom() + params.bottomMargin;
+            final int bottom = top + mDivider.getIntrinsicHeight();
+            mDivider.setBounds(left, top, right, bottom);
+            mDivider.draw(c);
+        }
+    }
+
+    public void drawHorizontal(Canvas c, RecyclerView parent) {
+        final int top = parent.getPaddingTop();
+        final int bottom = parent.getHeight() - parent.getPaddingBottom();
+
+        final int childCount = parent.getChildCount();
+        for (int i = 0; i < childCount; i++) {
+            final View child = parent.getChildAt(i);
+            final RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) child
+                    .getLayoutParams();
+            final int left = child.getRight() + params.rightMargin;
+            final int right = left + mDivider.getIntrinsicHeight();
+            mDivider.setBounds(left, top, right, bottom);
+            mDivider.draw(c);
+        }
+    }
+
+    @Override
+    public void getItemOffsets(Rect outRect, int itemPosition, RecyclerView parent) {
+        if (mOrientation == VERTICAL_LIST) {
+            outRect.set(0, 0, 0, mDivider.getIntrinsicHeight());
+        } else {
+            outRect.set(0, 0, mDivider.getIntrinsicWidth(), 0);
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/widget/GridSpace.java b/qpython/src/main/java/org/qpython/qpy/main/widget/GridSpace.java
new file mode 100644
index 00000000..08d64a55
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/widget/GridSpace.java
@@ -0,0 +1,44 @@
+package org.qpython.qpy.main.widget;
+
+import android.graphics.Rect;
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+
+/**
+ * Created by Hmei on 2017-07-19.
+ */
+
+public class GridSpace extends RecyclerView.ItemDecoration {
+
+    private int spanCount;
+    private int spacing;
+    private boolean includeEdge;
+
+    public GridSpace(int spanCount, int spacing, boolean includeEdge) {
+        this.spanCount = spanCount;
+        this.spacing = spacing;
+        this.includeEdge = includeEdge;
+    }
+
+    @Override
+    public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
+        int position = parent.getChildAdapterPosition(view); // item position
+        int column = position % spanCount; // item column
+
+        if (includeEdge) {
+            outRect.left = spacing - column * spacing / spanCount; // spacing - column * ((1f / spanCount) * spacing)
+            outRect.right = (column + 1) * spacing / spanCount; // (column + 1) * ((1f / spanCount) * spacing)
+
+            if (position < spanCount) { // top edge
+                outRect.top = spacing;
+            }
+            outRect.bottom = spacing; // item bottom
+        } else {
+            outRect.left = column * spacing / spanCount; // column * ((1f / spanCount) * spacing)
+            outRect.right = spacing - (column + 1) * spacing / spanCount; // spacing - (column + 1) * ((1f /    spanCount) * spacing)
+            if (position >= spanCount) {
+                outRect.top = spacing; // item top
+            }
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/widget/Indent.java b/qpython/src/main/java/org/qpython/qpy/main/widget/Indent.java
new file mode 100644
index 00000000..b70ed535
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/widget/Indent.java
@@ -0,0 +1,15 @@
+package org.qpython.qpy.main.widget;
+
+/**
+ * Created by Hmei
+ * 11/20/17
+ */
+public interface Indent {
+    void rightIndent();
+
+    void leftIndent();
+
+    void tabIndent();
+
+    void delIndent();
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/widget/LoadingDialog.java b/qpython/src/main/java/org/qpython/qpy/main/widget/LoadingDialog.java
new file mode 100644
index 00000000..b5abeb42
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/widget/LoadingDialog.java
@@ -0,0 +1,23 @@
+package org.qpython.qpy.main.widget;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.support.annotation.NonNull;
+
+import org.qpython.qpy.R;
+
+/**
+ * 文 件 名: LoadingDialog
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/1/10 10:07
+ * 邮   箱: qq798435167@gmail.com
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class LoadingDialog extends Dialog {
+    public LoadingDialog(@NonNull Context context) {
+        super(context, R.style.BaseDialog);
+        setContentView(R.layout.dialog_loading);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/widget/MyNestedScrollView.java b/qpython/src/main/java/org/qpython/qpy/main/widget/MyNestedScrollView.java
new file mode 100644
index 00000000..5c192858
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/widget/MyNestedScrollView.java
@@ -0,0 +1,51 @@
+package org.qpython.qpy.main.widget;
+
+import android.content.Context;
+import android.support.v4.widget.NestedScrollView;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewConfiguration;
+import android.view.ViewGroup;
+
+/**
+ * 替代ScrollView ,解决ScrollView 嵌套RecycleView滑动卡顿
+ * Created by Hmei on 16/11/29.
+ */
+
+public class MyNestedScrollView extends NestedScrollView {
+    private int downY;
+    private int mTouchSlop;
+
+    public MyNestedScrollView(Context context) {
+        super(context);
+        mTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop();
+    }
+
+    public MyNestedScrollView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        mTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop();
+    }
+
+    public MyNestedScrollView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        mTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop();
+    }
+
+    @Override
+    public boolean onInterceptTouchEvent(MotionEvent e) {
+        int action = e.getAction();
+        switch (action) {
+            case MotionEvent.ACTION_DOWN:
+                downY = (int) e.getRawY();
+                break;
+            case MotionEvent.ACTION_MOVE:
+                int moveY = (int) e.getRawY();
+                if (Math.abs(moveY - downY) > mTouchSlop) {
+                    return true;
+                }
+        }
+        return super.onInterceptTouchEvent(e);
+    }
+
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/widget/NonScrollListView.java b/qpython/src/main/java/org/qpython/qpy/main/widget/NonScrollListView.java
new file mode 100644
index 00000000..de7b0584
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/widget/NonScrollListView.java
@@ -0,0 +1,36 @@
+package org.qpython.qpy.main.widget;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ListView;
+
+/**
+ * Created by Hmei
+ * 1/17/18.
+ */
+
+public class NonScrollListView extends ListView {
+
+    public NonScrollListView(Context context) {
+        super(context);
+    }
+
+    public NonScrollListView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public NonScrollListView(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    @Override
+    public void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        int heightMeasureSpec_custom = View.MeasureSpec.makeMeasureSpec(
+                Integer.MAX_VALUE >> 2, View.MeasureSpec.AT_MOST);
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec_custom);
+        ViewGroup.LayoutParams params = getLayoutParams();
+        params.height = getMeasuredHeight();
+    }
+}
\ No newline at end of file
diff --git a/qpython/src/main/java/org/qpython/qpy/main/widget/NotebookDialog.java b/qpython/src/main/java/org/qpython/qpy/main/widget/NotebookDialog.java
new file mode 100644
index 00000000..ed55d5bd
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/widget/NotebookDialog.java
@@ -0,0 +1,64 @@
+package org.qpython.qpy.main.widget;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.view.View;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
+import android.widget.TextView;
+
+import org.qpython.qpy.R;
+
+/**
+ * 文 件 名: NotebookDialog
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/2/7 18:25
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class NotebookDialog extends Dialog {
+
+    private CheckBox app, libs;
+
+    public NotebookDialog(@NonNull Context context) {
+        super(context, R.style.BaseDialog);
+        setContentView(R.layout.dialog__setting_notebook);
+        app = findViewById(R.id.notebook_app);
+        libs = findViewById(R.id.notebook_lib);
+    }
+
+    public void show(boolean installApp, boolean installLib, InstallCallback callback) {
+        if (installApp) {
+            app.setChecked(true);
+            app.setEnabled(false);
+            if (installLib) {
+                libs.setChecked(true);
+                libs.setEnabled(false);
+            } else {
+                libs.setEnabled(true);
+                libs.setOnClickListener(v -> {
+                    dismiss();
+                    callback.installLibs();
+                });
+            }
+        } else {
+            libs.setChecked(false);
+            libs.setEnabled(false);
+            app.setEnabled(true);
+            app.setOnClickListener(v -> {
+                dismiss();
+                callback.installApp();
+            });
+        }
+
+        show();
+    }
+
+    public interface InstallCallback {
+        void installApp();
+
+        void installLibs();
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/widget/PercentView.java b/qpython/src/main/java/org/qpython/qpy/main/widget/PercentView.java
new file mode 100644
index 00000000..2a8370d1
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/widget/PercentView.java
@@ -0,0 +1,104 @@
+package org.qpython.qpy.main.widget;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.RectF;
+import android.support.annotation.Nullable;
+import android.util.AttributeSet;
+import android.view.View;
+
+import org.qpython.qpy.R;
+
+/**
+ * Created by Hmei
+ * 1/10/18.
+ */
+
+public class PercentView extends View {
+    public static final int CIRCLE_ANGLE = 360;
+
+    private int percent = 0;
+    private int   lightColor;
+    private int   dimColor;
+    private float width;
+    private float textSize;
+    private Paint paint;
+    private RectF rect;
+
+    {
+        paint = new Paint(Paint.ANTI_ALIAS_FLAG);
+        paint.setStyle(Paint.Style.STROKE);
+        rect = new RectF();
+    }
+
+    public PercentView(Context context) {
+        super(context);
+    }
+
+    public PercentView(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        TypedArray typedArray = getContext().obtainStyledAttributes(attrs, R.styleable.PercentView);
+        lightColor = typedArray.getInt(R.styleable.PercentView_pv_light_color, getResources().getColor(R.color.theme_yellow));
+        dimColor = typedArray.getInt(R.styleable.PercentView_pv_dim_color, getResources().getColor(R.color.white));
+        width = typedArray.getFloat(R.styleable.PercentView_pv_width, 10);
+        typedArray.recycle();
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        int size = MeasureSpec.getSize(widthMeasureSpec);
+        setMeasuredDimension(size, size);
+        rect.set(width / 2, width / 2, size - width / 2, size - width / 2);
+        paint.setStrokeWidth(width);
+        textSize = size / 4;
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+        float lightAngle = CIRCLE_ANGLE * (percent / 100.00f);
+
+        // draw circle
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setColor(lightColor);
+        canvas.drawArc(rect, -90, lightAngle, false, paint);
+        paint.setColor(dimColor);
+        canvas.drawArc(rect, lightAngle - 90, CIRCLE_ANGLE - lightAngle, false, paint);
+
+        // draw text
+        paint.setColor(lightColor);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setTextAlign(Paint.Align.CENTER);
+        paint.setTextSize(textSize);
+        paint.setFakeBoldText(true);
+        canvas.drawText(percent + "%", (rect.right - rect.left + width) / 2, (rect.bottom - rect.top - width) / 2 + paint.getFontSpacing() / 2, paint);
+    }
+
+    public int getPercent() {
+        return percent;
+    }
+
+    public void setPercent(int percent) {
+        this.percent = percent;
+        invalidate();
+    }
+
+    public int getLightColor() {
+        return lightColor;
+    }
+
+    public void setLightColor(int lightColor) {
+        this.lightColor = lightColor;
+    }
+
+    public int getDimColor() {
+        return dimColor;
+    }
+
+    public void setDimColor(int dimColor) {
+        this.dimColor = dimColor;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/widget/RatioImageView.java b/qpython/src/main/java/org/qpython/qpy/main/widget/RatioImageView.java
new file mode 100644
index 00000000..ffc10a54
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/widget/RatioImageView.java
@@ -0,0 +1,31 @@
+package org.qpython.qpy.main.widget;
+
+import android.content.Context;
+import android.support.v7.widget.AppCompatImageView;
+import android.util.AttributeSet;
+
+/**
+ * Created by Hmei on 2017-08-04.
+ */
+
+public class RatioImageView extends AppCompatImageView {
+
+    public RatioImageView(Context context) {
+        super(context);
+    }
+
+    public RatioImageView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public RatioImageView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        int measuredWidth = MeasureSpec.getSize(widthMeasureSpec);
+        setMeasuredDimension(measuredWidth, measuredWidth / 3);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/widget/ShareDialog.java b/qpython/src/main/java/org/qpython/qpy/main/widget/ShareDialog.java
new file mode 100644
index 00000000..72b46623
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/widget/ShareDialog.java
@@ -0,0 +1,68 @@
+package org.qpython.qpy.main.widget;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.view.Gravity;
+import android.view.Window;
+import android.view.WindowManager;
+
+import org.qpython.qpy.R;
+
+/**
+ * 文 件 名: ShareDialog
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2017/12/26 12:05
+ * 邮   箱: qq798435167@gmail.com
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class ShareDialog extends Dialog{
+
+    public static final int FACEBOOK = 0X001;
+    public static final int TWITTER = 0X002;
+    public static final int COPY_LINK = 0X099;
+
+    public ShareDialog(@NonNull Context context) {
+        super(context, R.style.Dialog);
+        setContentView(R.layout.dialog_share);
+    }
+
+    public void setOnClickListener(OnClickListener listener) {
+        findViewById(R.id.facebook_iv).setOnClickListener(v -> {
+            dismiss();
+            if (listener!=null){
+                listener.onClick(FACEBOOK);
+            }
+        });
+        findViewById(R.id.twitter_iv).setOnClickListener(v -> {
+            dismiss();
+            if (listener!=null){
+                listener.onClick(TWITTER);
+            }
+        });
+        findViewById(R.id.copy_link_iv).setOnClickListener(v -> {
+            dismiss();
+            if (listener!=null){
+                listener.onClick(COPY_LINK);
+            }
+        });
+    }
+
+    public interface OnClickListener{
+        void onClick(int index);
+    }
+
+    @Override
+    public void show() {
+        super.show();
+        Window window = getWindow();
+        WindowManager.LayoutParams lp = window.getAttributes();
+        lp.gravity = Gravity.BOTTOM;
+        lp.width = WindowManager.LayoutParams.MATCH_PARENT;
+        lp.height = WindowManager.LayoutParams.WRAP_CONTENT;
+        window.setAttributes(lp);
+        window.setWindowAnimations(R.style.BottomAnim);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/widget/ShortcutLayout.java b/qpython/src/main/java/org/qpython/qpy/main/widget/ShortcutLayout.java
new file mode 100644
index 00000000..815004c3
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/widget/ShortcutLayout.java
@@ -0,0 +1,166 @@
+package org.qpython.qpy.main.widget;
+
+import android.content.Context;
+import android.support.annotation.Nullable;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ImageButton;
+import android.widget.LinearLayout;
+
+import org.qpython.qpy.R;
+import jackpal.androidterm.emulatorview.ShortcutBean;
+
+/**
+ * Created by Hmei
+ * 11/20/17
+ */
+public class ShortcutLayout extends LinearLayout {
+    EditText editText;
+    Indent   indent;
+
+    public void init(EditText editText, Indent indent) {
+        this.editText = editText;
+        this.indent = indent;
+    }
+
+    public ShortcutLayout(Context context) {
+        super(context);
+    }
+
+    public ShortcutLayout(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public ShortcutLayout(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+        initShortcut();
+    }
+
+    private void initShortcut() {
+//        shortcutLayout = (LinearLayout) binding.control.vsShortcut.getViewStub().inflate();
+        LayoutInflater inflater = (LayoutInflater) getContext().getSystemService( Context.LAYOUT_INFLATER_SERVICE );
+        String[] shortcuts = getResources().getStringArray(R.array.term_shortcut);
+        for (String shortcut : shortcuts) {
+            ShortcutBean shortcutBean = new ShortcutBean(shortcut, true);
+            switch (shortcutBean.getName()) {
+                case "tab":
+                    shortcutBean.setListener(v -> editText.getText().insert(editText.getSelectionStart(), getContext().getString(R.string.insert_tab)));
+
+                    //shortcutBean.setListener(view -> indent.tabIndent());
+                    break;
+                case "del":
+                    shortcutBean.setListener(view -> indent.delIndent());
+                    break;
+                case "ltab":
+                    shortcutBean.setListener(v -> indent.leftIndent());
+                    break;
+                case "rtab":
+                    shortcutBean.setListener(v -> indent.rightIndent());
+                    break;
+                case "def":
+                    shortcutBean.setListener(v -> {
+                        int startIndex = editText.getSelectionStart();
+                        editText.getText().insert(startIndex, getContext().getString(R.string.insert_def));
+                        editText.setSelection(startIndex + shortcutBean.getName().length() + 1);
+                    });
+                    break;
+                case "if":
+                    shortcutBean.setListener(v -> {
+                        int startIndex = editText.getSelectionStart();
+                        editText.getText().insert(startIndex, getContext().getString(R.string.insert_if));
+                        editText.setSelection(startIndex + shortcutBean.getName().length() + 1);
+                    });
+                    break;
+                case "for":
+                    shortcutBean.setListener(v -> {
+                        int startIndex = editText.getSelectionStart();
+                        editText.getText().insert(startIndex, getContext().getString(R.string.insert_for));
+                        editText.setSelection(startIndex + shortcutBean.getName().length() + 1);
+                    });
+                    break;
+                case "imt":
+                    shortcutBean.setListener(v -> {
+                        final String IMPORT = "import ";
+                        String text = editText.getText().toString();
+                        if (text.contains(IMPORT)) {
+                            int index = text.indexOf(IMPORT);
+                            int lineEndIndex = text.indexOf("\n", index);
+                            editText.getText().insert(lineEndIndex + 1, getContext().getString(R.string.insert_import));
+                            editText.setSelection(lineEndIndex + 1 + IMPORT.length());
+                        } else {
+                            editText.getText().append(IMPORT);
+                        }
+                    });
+                    break;
+                case "imf":
+                    shortcutBean.setListener(v -> {
+                        final String FROM = "from ";
+                        String text = editText.getText().toString();
+                        if (text.contains(FROM)) {
+                            int index = text.indexOf(FROM);
+                            int lineEndIndex = text.indexOf("\n", index);
+                            editText.getText().insert(lineEndIndex + 1, getContext().getString(R.string.insert_import_f));
+                            editText.setSelection(lineEndIndex + 1 + FROM.length());
+                        } else {
+                            editText.getText().append(getContext().getString(R.string.insert_import_f));
+                        }
+                    });
+                    break;
+                case "clz":
+                    shortcutBean.setListener(v -> {
+                        int startIndex = editText.getSelectionStart();
+                        editText.getText().insert(startIndex, getContext().getString(R.string.insert_clz));
+                        editText.setSelection(startIndex + "class".length() + 1);
+                    });
+                    break;
+                case "ef":
+                    shortcutBean.setListener(v -> {
+                        int startIndex = editText.getSelectionStart();
+                        editText.getText().insert(startIndex, getContext().getString(R.string.insert_ef));
+                        editText.setSelection(startIndex + "elif".length() + 1);
+                    });
+                    break;
+                case "frm":
+                    shortcutBean.setListener(v -> editText.getText().insert(editText.getSelectionStart(), getContext().getString(R.string.insert_frm)));
+                    break;
+                case "el":
+                    shortcutBean.setListener(v -> editText.getText().insert(editText.getSelectionStart(), getContext().getString(R.string.insert_el)));
+                    break;
+                case "ret":
+                    shortcutBean.setListener(v -> editText.getText().insert(editText.getSelectionStart(), getContext().getString(R.string.insert_ret)));
+                    break;
+                default:
+                    shortcutBean.setListener(v -> editText.getText().insert(editText.getSelectionStart(), shortcutBean.getName()));
+                    break;
+            }
+
+            switch (shortcutBean.getName()) {
+                case "ltab":
+                    ImageButton tab = (ImageButton) inflater.inflate(R.layout.widget_shortcut_imgbtn, null);
+                    tab.setImageResource(R.drawable.tab1);
+                    tab.setOnClickListener(shortcutBean.getListener());
+                    addView(tab);
+                    break;
+                case "rtab":
+                    ImageButton rtab = (ImageButton) inflater.inflate(R.layout.widget_shortcut_imgbtn, null);
+                    rtab.setImageResource(R.drawable.tab2);
+                    rtab.setOnClickListener(shortcutBean.getListener());
+                    addView(rtab);
+                    break;
+                default:
+                    Button button = (Button)inflater.inflate(R.layout.widget_shortcut_btn, null);
+                    button.setText(shortcutBean.getName());
+                    button.setOnClickListener(shortcutBean.getListener());
+                    addView(button);
+                    break;
+            }
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/widget/ToggleView.java b/qpython/src/main/java/org/qpython/qpy/main/widget/ToggleView.java
new file mode 100644
index 00000000..9e436d4e
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/widget/ToggleView.java
@@ -0,0 +1,885 @@
+package org.qpython.qpy.main.widget;
+
+import android.animation.Animator;
+import android.animation.ArgbEvaluator;
+import android.animation.ValueAnimator;
+import android.content.Context;
+import android.content.res.Resources;
+import android.content.res.TypedArray;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.os.Build;
+import android.support.annotation.Nullable;
+import android.support.annotation.RequiresApi;
+import android.util.AttributeSet;
+import android.util.TypedValue;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.Checkable;
+
+import org.qpython.qpy.R;
+
+/**
+ * Toggle button
+ * Created by Hmei on 2017-05-27.
+ */
+
+public class ToggleView extends View implements Checkable {
+
+    private static final int DEFAULT_WIDTH                = dp2pxInt(48);
+    private static final int DEFAULT_HEIGHT               = dp2pxInt(30);
+    /**
+     * 动画状态：
+     * 1.静止
+     * 2.进入拖动
+     * 3.处于拖动
+     * 4.拖动-复位
+     * 5.拖动-切换
+     * 6.点击切换
+     **/
+    private final        int ANIMATE_STATE_NONE           = 0;
+    private final        int ANIMATE_STATE_PENDING_DRAG   = 1;
+    private final        int ANIMATE_STATE_DRAGING        = 2;
+    private final        int ANIMATE_STATE_PENDING_RESET  = 3;
+    private final        int ANIMATE_STATE_PENDING_SETTLE = 4;
+    private final        int ANIMATE_STATE_SWITCH         = 5;
+    private final android.animation.ArgbEvaluator argbEvaluator
+            = new android.animation.ArgbEvaluator();
+    /**
+     * 阴影半径
+     */
+    private int shadowRadius;
+    /**
+     * 阴影Y偏移px
+     */
+    private int shadowOffset;
+    /**
+     * 阴影颜色
+     */
+    private int shadowColor;
+    /**
+     * 背景半径
+     */
+    private float viewRadius;
+    /**
+     * 按钮半径
+     */
+    private float buttonRadius;
+    /**
+     * 背景高
+     */
+    private float height;
+    /**
+     * 背景宽
+     */
+    private float width;
+    /**
+     * 背景位置
+     */
+    private float left;
+    private float top;
+    private float right;
+    private float bottom;
+    private float centerX;
+    private float centerY;
+    /**
+     * 背景底色
+     */
+    private int background;
+    /**
+     * 背景关闭颜色
+     */
+    private int uncheckColor;
+    /**
+     * 背景打开颜色
+     */
+    private int checkedColor;
+    /**
+     * 边框宽度px
+     */
+    private int borderWidth;
+    /**
+     * 打开指示线颜色
+     */
+    private int   checkLineColor;
+    /**
+     * 按钮最左边
+     */
+    private float buttonMinX;
+    /**
+     * 按钮最右边
+     */
+    private float buttonMaxX;
+    /**
+     * 按钮画笔
+     */
+    private Paint buttonPaint;
+    /**
+     * 背景画笔
+     */
+    private Paint paint;
+    /**
+     * 当前状态
+     */
+    private ViewState viewState;
+    private ViewState beforeState;
+    private ViewState afterState;
+    /**
+     * 动画状态
+     */
+    private int   animateState = ANIMATE_STATE_NONE;
+    /**
+     *
+     */
+    private ValueAnimator valueAnimator;
+    /**
+     * 是否选中
+     */
+    private boolean isChecked;
+    /**
+     * 是否启用动画
+     */
+    private boolean enableEffect;
+    /**
+     * 是否启用阴影效果
+     */
+    private boolean shadowEffect;
+    /**
+     * 收拾是否按下
+     */
+    private boolean isTouchingDown   = false;
+    /**
+     *
+     */
+    private boolean isUiInited       = false;
+    /**
+     *
+     */
+    private boolean isEventBroadcast = false;
+    /**
+     * 估值器
+     */
+    private ArgbEvaluator evaluator;
+    private OnCheckedChangeListener onCheckedChangeListener;
+    /*******************************************************/
+    /**
+     * 手势按下的时刻
+     */
+    private long touchDownTime;
+    private Runnable postPendingDrag = () -> {
+        if (!isInAnimating()) {
+            pendingDragState();
+        }
+    };
+    private ValueAnimator.AnimatorUpdateListener animatorUpdateListener
+            = new ValueAnimator.AnimatorUpdateListener() {
+        @Override
+        public void onAnimationUpdate(ValueAnimator animation) {
+            float value = (Float) animation.getAnimatedValue();
+            switch (animateState) {
+                case ANIMATE_STATE_PENDING_SETTLE: {
+                }
+                case ANIMATE_STATE_PENDING_RESET: {
+                }
+                case ANIMATE_STATE_PENDING_DRAG: {
+                    viewState.checkedLineColor = (int) argbEvaluator.evaluate(
+                            value,
+                            beforeState.checkedLineColor,
+                            afterState.checkedLineColor
+                    );
+
+                    viewState.radius = beforeState.radius
+                            + (afterState.radius - beforeState.radius) * value;
+
+                    if (animateState != ANIMATE_STATE_PENDING_DRAG) {
+                        viewState.buttonX = beforeState.buttonX
+                                + (afterState.buttonX - beforeState.buttonX) * value;
+                    }
+
+                    viewState.checkStateColor = (int) argbEvaluator.evaluate(
+                            value,
+                            beforeState.checkStateColor,
+                            afterState.checkStateColor
+                    );
+
+                    break;
+                }
+                case ANIMATE_STATE_SWITCH: {
+                    viewState.buttonX = beforeState.buttonX
+                            + (afterState.buttonX - beforeState.buttonX) * value;
+
+                    float fraction = (viewState.buttonX - buttonMinX) / (buttonMaxX - buttonMinX);
+
+                    viewState.checkStateColor = (int) argbEvaluator.evaluate(
+                            fraction,
+                            uncheckColor,
+                            checkedColor
+                    );
+
+                    viewState.radius = fraction * viewRadius;
+                    viewState.checkedLineColor = (int) argbEvaluator.evaluate(
+                            fraction,
+                            Color.TRANSPARENT,
+                            checkLineColor
+                    );
+                    break;
+                }
+                default:
+                case ANIMATE_STATE_DRAGING: {
+                }
+                case ANIMATE_STATE_NONE: {
+                    break;
+                }
+            }
+            postInvalidate();
+        }
+    };
+    private Animator.AnimatorListener animatorListener
+            = new Animator.AnimatorListener() {
+        @Override
+        public void onAnimationStart(Animator animation) {
+        }
+
+        @Override
+        public void onAnimationEnd(Animator animation) {
+            switch (animateState) {
+                case ANIMATE_STATE_DRAGING: {
+                    break;
+                }
+                case ANIMATE_STATE_PENDING_DRAG: {
+                    animateState = ANIMATE_STATE_DRAGING;
+                    viewState.checkedLineColor = Color.TRANSPARENT;
+                    viewState.radius = viewRadius;
+
+                    postInvalidate();
+                    break;
+                }
+                case ANIMATE_STATE_PENDING_RESET: {
+                    animateState = ANIMATE_STATE_NONE;
+                    postInvalidate();
+                    break;
+                }
+                case ANIMATE_STATE_PENDING_SETTLE: {
+                    animateState = ANIMATE_STATE_NONE;
+                    postInvalidate();
+                    broadcastEvent();
+                    break;
+                }
+                case ANIMATE_STATE_SWITCH: {
+                    isChecked = !isChecked;
+                    animateState = ANIMATE_STATE_NONE;
+                    postInvalidate();
+                    broadcastEvent();
+                    break;
+                }
+                default:
+                case ANIMATE_STATE_NONE: {
+                    break;
+                }
+            }
+        }
+
+        @Override
+        public void onAnimationCancel(Animator animation) {
+        }
+
+        @Override
+        public void onAnimationRepeat(Animator animation) {
+        }
+    };
+    public ToggleView(Context context) {
+        super(context);
+        init(context, null);
+    }
+
+    public ToggleView(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init(context, attrs);
+    }
+    public ToggleView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init(context, attrs);
+    }
+    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
+    public ToggleView(Context context, @Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+        init(context, attrs);
+    }
+
+    /*******************************************************/
+    private static float dp2px(float dp) {
+        Resources r = Resources.getSystem();
+        return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, r.getDisplayMetrics());
+    }
+
+    private static int dp2pxInt(float dp) {
+        return (int) dp2px(dp);
+    }
+
+    private static int optInt(TypedArray typedArray, int index, int def) {
+        if (typedArray == null) {
+            return def;
+        }
+        return typedArray.getInt(index, def);
+    }
+
+    private static float optPixelSize(TypedArray typedArray,
+                                      int index,
+                                      float def) {
+        if (typedArray == null) {
+            return def;
+        }
+        return typedArray.getDimension(index, def);
+    }
+
+    private static int optPixelSize(TypedArray typedArray,
+                                    int index,
+                                    int def) {
+        if (typedArray == null) {
+            return def;
+        }
+        return typedArray.getDimensionPixelOffset(index, def);
+    }
+
+    private static int optColor(TypedArray typedArray, int index, int def) {
+        if (typedArray == null) {
+            return def;
+        }
+        return typedArray.getColor(index, def);
+    }
+
+    private static boolean optBoolean(TypedArray typedArray, int index, boolean def) {
+        if (typedArray == null) {
+            return def;
+        }
+        return typedArray.getBoolean(index, def);
+    }
+
+    @Override
+    public final void setPadding(int left, int top, int right, int bottom) {
+        super.setPadding(0, 0, 0, 0);
+    }
+
+    /**
+     * 初始化参数
+     */
+    private void init(Context context, AttributeSet attrs) {
+
+        TypedArray typedArray = null;
+        if (attrs != null) {
+            typedArray = context.obtainStyledAttributes(attrs, R.styleable.ToggleView);
+        }
+
+        shadowEffect = optBoolean(typedArray,
+                R.styleable.ToggleView_sb_shadow_effect,
+                true);
+
+        shadowRadius = optPixelSize(typedArray,
+                R.styleable.ToggleView_sb_shadow_radius,
+                dp2pxInt(2.5f));//dp2pxInt(2.5f);
+
+        shadowOffset = optPixelSize(typedArray,
+                R.styleable.ToggleView_sb_shadow_offset,
+                dp2pxInt(1.5f));//dp2pxInt(1.5f);
+
+        shadowColor = optColor(typedArray,
+                R.styleable.ToggleView_sb_shadow_color,
+                0X33000000);//0X33000000;
+
+        uncheckColor = optColor(typedArray,
+                R.styleable.ToggleView_sb_uncheck_color,
+                0XffDDDDDD);//0XffDDDDDD;
+
+        checkedColor = optColor(typedArray,
+                R.styleable.ToggleView_sb_checked_color,
+                0Xff51d367);//0Xff51d367;
+
+        borderWidth = optPixelSize(typedArray,
+                R.styleable.ToggleView_sb_border_width,
+                dp2pxInt(1));//dp2pxInt(1);
+
+        checkLineColor = optColor(typedArray,
+                R.styleable.ToggleView_sb_checkline_color,
+                Color.WHITE);//Color.WHITE;
+
+        int buttonColor = optColor(typedArray,
+                R.styleable.ToggleView_sb_button_color,
+                Color.WHITE);//Color.WHITE;
+
+        int effectDuration = optInt(typedArray,
+                R.styleable.ToggleView_sb_effect_duration,
+                300);//300;
+
+        isChecked = optBoolean(typedArray,
+                R.styleable.ToggleView_sb_checked,
+                false);
+
+        background = optColor(typedArray,
+                R.styleable.ToggleView_sb_background,
+                Color.WHITE);//Color.WHITE;
+
+        enableEffect = optBoolean(typedArray,
+                R.styleable.ToggleView_sb_enable_effect,
+                true);
+
+        evaluator = new ArgbEvaluator();
+
+        if (typedArray != null) {
+            typedArray.recycle();
+        }
+
+
+        paint = new Paint(Paint.ANTI_ALIAS_FLAG);
+        buttonPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+        buttonPaint.setColor(buttonColor);
+
+        if (shadowEffect) {
+            buttonPaint.setShadowLayer(
+                    shadowRadius,
+                    0, shadowOffset,
+                    shadowColor);
+        }
+
+
+        viewState = new ViewState();
+        beforeState = new ViewState();
+        afterState = new ViewState();
+
+        valueAnimator = ValueAnimator.ofFloat(0f, 1f);
+        valueAnimator.setDuration(effectDuration);
+        valueAnimator.setRepeatCount(0);
+
+        valueAnimator.addUpdateListener(animatorUpdateListener);
+        valueAnimator.addListener(animatorListener);
+
+        super.setClickable(true);
+        this.setPadding(0, 0, 0, 0);
+        setLayerType(LAYER_TYPE_SOFTWARE, null);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        final int widthMode = MeasureSpec.getMode(widthMeasureSpec);
+        final int heightMode = MeasureSpec.getMode(heightMeasureSpec);
+
+        if (widthMode == MeasureSpec.UNSPECIFIED
+                || widthMode == MeasureSpec.AT_MOST) {
+            widthMeasureSpec = MeasureSpec.makeMeasureSpec(DEFAULT_WIDTH, MeasureSpec.EXACTLY);
+        }
+        if (heightMode == MeasureSpec.UNSPECIFIED
+                || heightMode == MeasureSpec.AT_MOST) {
+            heightMeasureSpec = MeasureSpec.makeMeasureSpec(DEFAULT_HEIGHT, MeasureSpec.EXACTLY);
+        }
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+    }
+
+    @Override
+    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
+        super.onSizeChanged(w, h, oldw, oldh);
+
+
+        float viewPadding = Math.max(shadowRadius + shadowOffset, borderWidth);
+
+        height = h - viewPadding - viewPadding;
+        width = w - viewPadding - viewPadding;
+
+        viewRadius = height * .5f;
+        buttonRadius = viewRadius;
+
+        left = viewPadding;
+        top = viewPadding;
+        right = w - viewPadding;
+        bottom = h - viewPadding;
+
+        centerX = (left + right) * .5f;
+        centerY = (top + bottom) * .5f;
+
+        buttonMinX = left + viewRadius;
+        buttonMaxX = right - viewRadius;
+
+        if (isChecked()) {
+            setCheckedViewState(viewState);
+        } else {
+            setUncheckViewState(viewState);
+        }
+
+        isUiInited = true;
+
+        postInvalidate();
+
+    }
+
+    /**
+     * @param viewState
+     */
+    private void setUncheckViewState(ViewState viewState) {
+        viewState.radius = 0;
+        viewState.checkStateColor = uncheckColor;
+        viewState.checkedLineColor = Color.TRANSPARENT;
+        viewState.buttonX = buttonMinX;
+    }
+
+    /**
+     * @param viewState
+     */
+    private void setCheckedViewState(ViewState viewState) {
+        viewState.radius = viewRadius;
+        viewState.checkStateColor = checkedColor;
+        viewState.checkedLineColor = checkLineColor;
+        viewState.buttonX = buttonMaxX;
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+
+        paint.setStrokeWidth(5);
+        paint.setStyle(Paint.Style.FILL);
+        //绘制白色背景
+        paint.setColor(background);
+        canvas.drawLine(left, centerY, right, centerY, paint);
+
+        //绘制按钮
+        drawButton(canvas, viewState.buttonX, centerY);
+    }
+
+    /**
+     * @param canvas
+     * @param x      px
+     * @param y      px
+     */
+    private void drawButton(Canvas canvas, float x, float y) {
+        int btnColor = (int) evaluator.evaluate((x - buttonMinX) / (buttonMaxX - buttonMinX), 0XFF9B9B9B, 0XFF4BAC07);
+        buttonPaint.setColor(btnColor);
+        canvas.drawCircle(x, y, buttonRadius, buttonPaint);
+    }
+
+    @Override
+    public boolean isChecked() {
+        return isChecked;
+    }
+
+    @Override
+    public void setChecked(boolean checked) {
+        if (checked == isChecked()) {
+            postInvalidate();
+            return;
+        }
+        toggle(enableEffect, false);
+    }
+
+    @Override
+    public void toggle() {
+        toggle(true);
+    }
+
+    /**
+     * 切换状态
+     *
+     * @param animate
+     */
+    public void toggle(boolean animate) {
+        toggle(animate, true);
+    }
+
+    private void toggle(boolean animate, boolean broadcast) {
+        if (!isEnabled()) {
+            return;
+        }
+
+        if (isEventBroadcast) {
+            throw new RuntimeException("should NOT switch the state in method: [onCheckedChanged]!");
+        }
+        if (!isUiInited) {
+            isChecked = !isChecked;
+            if (broadcast) {
+                broadcastEvent();
+            }
+            return;
+        }
+
+        if (valueAnimator.isRunning()) {
+            valueAnimator.cancel();
+        }
+
+        if (!enableEffect || !animate) {
+            isChecked = !isChecked;
+            if (isChecked()) {
+                setCheckedViewState(viewState);
+            } else {
+                setUncheckViewState(viewState);
+            }
+            postInvalidate();
+            if (broadcast) {
+                broadcastEvent();
+            }
+            return;
+        }
+
+        animateState = ANIMATE_STATE_SWITCH;
+        beforeState.copy(viewState);
+
+        if (isChecked()) {
+            //切换到unchecked
+            setUncheckViewState(afterState);
+        } else {
+            setCheckedViewState(afterState);
+        }
+        valueAnimator.start();
+    }
+
+    /**
+     *
+     */
+    private void broadcastEvent() {
+        if (onCheckedChangeListener != null) {
+            isEventBroadcast = true;
+            onCheckedChangeListener.onCheckedChanged(this, isChecked());
+        }
+        isEventBroadcast = false;
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        if (!isEnabled()) {
+            return false;
+        }
+        int actionMasked = event.getActionMasked();
+
+        switch (actionMasked) {
+            case MotionEvent.ACTION_DOWN: {
+                isTouchingDown = true;
+                touchDownTime = System.currentTimeMillis();
+                //取消准备进入拖动状态
+                removeCallbacks(postPendingDrag);
+                //预设100ms进入拖动状态
+                postDelayed(postPendingDrag, 100);
+                break;
+            }
+            case MotionEvent.ACTION_MOVE: {
+                float eventX = event.getX();
+                if (isPendingDragState()) {
+                    //在准备进入拖动状态过程中，可以拖动按钮位置
+                    float fraction = eventX / getWidth();
+                    fraction = Math.max(0f, Math.min(1f, fraction));
+
+                    viewState.buttonX = buttonMinX
+                            + (buttonMaxX - buttonMinX)
+                            * fraction;
+
+                } else if (isDragState()) {
+                    //拖动按钮位置，同时改变对应的背景颜色
+                    float fraction = eventX / getWidth();
+                    fraction = Math.max(0f, Math.min(1f, fraction));
+
+                    viewState.buttonX = buttonMinX
+                            + (buttonMaxX - buttonMinX)
+                            * fraction;
+
+                    viewState.checkStateColor = (int) argbEvaluator.evaluate(
+                            fraction,
+                            uncheckColor,
+                            checkedColor
+                    );
+                    postInvalidate();
+
+                }
+                break;
+            }
+            case MotionEvent.ACTION_UP: {
+                isTouchingDown = false;
+                //取消准备进入拖动状态
+                removeCallbacks(postPendingDrag);
+
+                if (System.currentTimeMillis() - touchDownTime <= 300) {
+                    //点击时间小于300ms，认为是点击操作
+                    toggle();
+                } else if (isDragState()) {
+                    //在拖动状态，计算按钮位置，设置是否切换状态
+                    float eventX = event.getX();
+                    float fraction = eventX / getWidth();
+                    fraction = Math.max(0f, Math.min(1f, fraction));
+                    boolean newCheck = fraction > .5f;
+                    if (newCheck == isChecked()) {
+                        pendingCancelDragState();
+                    } else {
+                        isChecked = newCheck;
+                        pendingSettleState();
+                    }
+                } else if (isPendingDragState()) {
+                    //在准备进入拖动状态过程中，取消之，复位
+                    pendingCancelDragState();
+                }
+                break;
+            }
+            case MotionEvent.ACTION_CANCEL: {
+                isTouchingDown = false;
+
+                removeCallbacks(postPendingDrag);
+
+                if (isPendingDragState()
+                        || isDragState()) {
+                    //复位
+                    pendingCancelDragState();
+                }
+                break;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * 是否在动画状态
+     *
+     * @return
+     */
+    private boolean isInAnimating() {
+        return animateState != ANIMATE_STATE_NONE;
+    }
+
+    /**
+     * 是否在进入拖动或离开拖动状态
+     *
+     * @return
+     */
+    private boolean isPendingDragState() {
+        return animateState == ANIMATE_STATE_PENDING_DRAG
+                || animateState == ANIMATE_STATE_PENDING_RESET;
+    }
+
+    /**
+     * 是否在手指拖动状态
+     *
+     * @return
+     */
+    private boolean isDragState() {
+        return animateState == ANIMATE_STATE_DRAGING;
+    }
+
+    /**
+     * 开始进入拖动状态
+     */
+    private void pendingDragState() {
+        if (isInAnimating()) {
+            return;
+        }
+        if (!isTouchingDown) {
+            return;
+        }
+
+        if (valueAnimator.isRunning()) {
+            valueAnimator.cancel();
+        }
+
+        animateState = ANIMATE_STATE_PENDING_DRAG;
+
+        beforeState.copy(viewState);
+        afterState.copy(viewState);
+
+        if (isChecked()) {
+            afterState.checkStateColor = checkedColor;
+            afterState.buttonX = buttonMaxX;
+            afterState.checkedLineColor = checkedColor;
+        } else {
+            afterState.checkStateColor = uncheckColor;
+            afterState.buttonX = buttonMinX;
+            afterState.radius = viewRadius;
+        }
+
+        valueAnimator.start();
+    }
+
+    /**
+     * 取消拖动状态
+     */
+    private void pendingCancelDragState() {
+        if (isDragState() || isPendingDragState()) {
+            if (valueAnimator.isRunning()) {
+                valueAnimator.cancel();
+            }
+
+            animateState = ANIMATE_STATE_PENDING_RESET;
+            beforeState.copy(viewState);
+
+            if (isChecked()) {
+                setCheckedViewState(afterState);
+            } else {
+                setUncheckViewState(afterState);
+            }
+            valueAnimator.start();
+        }
+    }
+
+    /**
+     * 动画-设置新的状态
+     */
+    private void pendingSettleState() {
+        if (valueAnimator.isRunning()) {
+            valueAnimator.cancel();
+        }
+
+        animateState = ANIMATE_STATE_PENDING_SETTLE;
+        beforeState.copy(viewState);
+
+        if (isChecked()) {
+            setCheckedViewState(afterState);
+        } else {
+            setUncheckViewState(afterState);
+        }
+        valueAnimator.start();
+    }
+
+    @Override
+    public final void setOnClickListener(OnClickListener l) {
+    }
+
+    @Override
+    public final void setOnLongClickListener(OnLongClickListener l) {
+    }
+
+    public void setOnCheckedChangeListener(OnCheckedChangeListener l) {
+        onCheckedChangeListener = l;
+    }
+
+    public interface OnCheckedChangeListener {
+        void onCheckedChanged(ToggleView view, boolean isChecked);
+    }
+
+
+    /*******************************************************/
+
+    /**
+     * 保存动画状态
+     */
+    private static class ViewState {
+        /**
+         * 按钮x位置[buttonMinX-buttonMaxX]
+         */
+        float buttonX;
+        /**
+         * 状态背景颜色
+         */
+        int   checkStateColor;
+        /**
+         * 选中线的颜色
+         */
+        int   checkedLineColor;
+        /**
+         * 状态背景的半径
+         */
+        float radius;
+
+        ViewState() {
+        }
+
+        private void copy(ViewState source) {
+            this.buttonX = source.buttonX;
+            this.checkStateColor = source.checkStateColor;
+            this.checkedLineColor = source.checkedLineColor;
+            this.radius = source.radius;
+        }
+    }
+
+}
+
diff --git a/qpython/src/main/java/org/qpython/qpy/main/widget/WebviewEX.java b/qpython/src/main/java/org/qpython/qpy/main/widget/WebviewEX.java
new file mode 100644
index 00000000..7a1d095b
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/widget/WebviewEX.java
@@ -0,0 +1,41 @@
+package org.qpython.qpy.main.widget;
+
+import android.content.Context;
+//import android.os.Handler;
+//import android.os.Message;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.webkit.WebView;
+
+//import com.liulishuo.filedownloader.i.IFileDownloadIPCCallback;
+
+import org.qpython.qpy.utils.SolfKeybroadUtil;
+
+/**
+ * 文 件 名: WebviewEX
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/2/10 15:21
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class WebviewEX extends WebView {
+    public WebviewEX(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+//        if (event.getAction() == MotionEvent.ACTION_UP && isSelected()){
+//            closeKeyboard();
+//            return true;
+//        }
+        return super.onTouchEvent(event);
+    }
+
+    private void closeKeyboard() {
+        SolfKeybroadUtil.showSolfInput(this,false);
+    }
+
+
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/widget/WrapContentHeightViewPager.java b/qpython/src/main/java/org/qpython/qpy/main/widget/WrapContentHeightViewPager.java
new file mode 100644
index 00000000..da17aa82
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/widget/WrapContentHeightViewPager.java
@@ -0,0 +1,41 @@
+package org.qpython.qpy.main.widget;
+
+import android.content.Context;
+import android.support.v4.view.ViewPager;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.View;
+
+/**
+ * Created by Hmei
+ * on 2017-08-02.
+ */
+
+public class WrapContentHeightViewPager extends ViewPager {
+    private View mCurrentView;
+
+    public WrapContentHeightViewPager(Context context) {
+        super(context);
+    }
+
+    public WrapContentHeightViewPager(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        if (mCurrentView == null) {
+            super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+            return;
+        }
+        mCurrentView.measure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED));
+        int h = mCurrentView.getMeasuredHeight();
+        heightMeasureSpec = MeasureSpec.makeMeasureSpec(h > heightMeasureSpec ? h : heightMeasureSpec, MeasureSpec.EXACTLY);
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+    }
+
+    public void measureCurrentView(View currentView) {
+        mCurrentView = currentView;
+        requestLayout();
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/widget/expandableview/ExpandableLayout.java b/qpython/src/main/java/org/qpython/qpy/main/widget/expandableview/ExpandableLayout.java
new file mode 100644
index 00000000..0658f0f8
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/widget/expandableview/ExpandableLayout.java
@@ -0,0 +1,115 @@
+package org.qpython.qpy.main.widget.expandableview;
+
+import android.animation.TimeInterpolator;
+import android.support.annotation.IntDef;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+public interface ExpandableLayout {
+
+    /**
+     * Duration of expand animation
+     */
+    int DEFAULT_DURATION = 300;
+    /**
+     * Visibility of the layout when the layout attaches
+     */
+    boolean DEFAULT_EXPANDED = false;
+    /**
+     * Orientation of child views
+     */
+    int HORIZONTAL = 0;
+    /**
+     * Orientation of child views
+     */
+    int VERTICAL = 1;
+
+    /**
+     * Orientation of layout
+     */
+    @Retention(RetentionPolicy.SOURCE)
+    @IntDef({HORIZONTAL, VERTICAL})
+    @interface Orientation {
+    }
+
+    /**
+     * Starts animation the state of the view to the inverse of its current state.
+     */
+    void toggle();
+
+    /**
+     * Starts animation the state of the view to the inverse of its current state.
+     *
+     * @param duration
+     * @param interpolator use the default interpolator if the argument is null.
+     */
+    void toggle(final long duration, @Nullable final TimeInterpolator interpolator);
+
+    /**
+     * Starts expand animation.
+     */
+    void expand();
+
+    /**
+     * Starts expand animation.
+     *
+     * @param duration
+     * @param interpolator use the default interpolator if the argument is null.
+     */
+    void expand(final long duration, @Nullable final TimeInterpolator interpolator);
+
+    /**
+     * Starts collapse animation.
+     */
+    void collapse();
+
+    /**
+     * Starts collapse animation.
+     *
+     * @param duration
+     * @param interpolator use the default interpolator if the argument is null.
+     */
+    void collapse(final long duration, @Nullable final TimeInterpolator interpolator);
+
+    /**
+     * Sets the expandable layout listener.
+     *
+     * @param listener ExpandableLayoutListener
+     */
+    void setListener(@NonNull final ExpandableLayoutListener listener);
+
+    /**
+     * Sets the length of the animation.
+     * The default duration is 300 milliseconds.
+     *
+     * @param duration
+     */
+    void setDuration(final int duration);
+
+    /**
+     * Sets state of expanse.
+     *
+     * @param expanded The layout is visible if expanded is true
+     */
+    void setExpanded(final boolean expanded);
+
+    /**
+     * Gets state of expanse.
+     *
+     * @return true if the layout is visible
+     */
+    boolean isExpanded();
+
+    /**
+     * The time interpolator used in calculating the elapsed fraction of this animation. The
+     * interpolator determines whether the animation runs with linear or non-linear motion,
+     * such as acceleration and deceleration.
+     * The default value is  {@link android.view.animation.AccelerateDecelerateInterpolator}
+     *
+     * @param interpolator
+     */
+    void setInterpolator(@NonNull final TimeInterpolator interpolator);
+}
\ No newline at end of file
diff --git a/qpython/src/main/java/org/qpython/qpy/main/widget/expandableview/ExpandableLayoutListener.java b/qpython/src/main/java/org/qpython/qpy/main/widget/expandableview/ExpandableLayoutListener.java
new file mode 100644
index 00000000..75ec3b7a
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/widget/expandableview/ExpandableLayoutListener.java
@@ -0,0 +1,35 @@
+package org.qpython.qpy.main.widget.expandableview;
+
+public interface ExpandableLayoutListener {
+    /**
+     * Notifies the start of the animation.
+     * Sync from android.animation.Animator.AnimatorListener.onAnimationStart(Animator animation)
+     */
+    void onAnimationStart();
+
+    /**
+     * Notifies the end of the animation.
+     * Sync from android.animation.Animator.AnimatorListener.onAnimationEnd(Animator animation)
+     */
+    void onAnimationEnd();
+
+    /**
+     * Notifies the layout is going to open.
+     */
+    void onPreOpen();
+
+    /**
+     * Notifies the layout is going to equal close size.
+     */
+    void onPreClose();
+
+    /**
+     * Notifies the layout opened.
+     */
+    void onOpened();
+
+    /**
+     * Notifies the layout size equal closed size.
+     */
+    void onClosed();
+}
\ No newline at end of file
diff --git a/qpython/src/main/java/org/qpython/qpy/main/widget/expandableview/ExpandableRelativeLayout.java b/qpython/src/main/java/org/qpython/qpy/main/widget/expandableview/ExpandableRelativeLayout.java
new file mode 100644
index 00000000..13813d56
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/widget/expandableview/ExpandableRelativeLayout.java
@@ -0,0 +1,556 @@
+package org.qpython.qpy.main.widget.expandableview;
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.TimeInterpolator;
+import android.animation.ValueAnimator;
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.os.Build;
+import android.os.Parcelable;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewTreeObserver;
+import android.view.animation.LinearInterpolator;
+import android.widget.RelativeLayout;
+
+import org.qpython.qpy.R;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ExpandableRelativeLayout extends RelativeLayout implements ExpandableLayout {
+
+    private int duration;
+    private TimeInterpolator interpolator = new LinearInterpolator();
+    private int orientation;
+    /**
+     * Default state of expanse
+     *
+     * @see #defaultChildIndex
+     * @see #defaultPosition
+     */
+    private boolean defaultExpanded;
+    /**
+     * You cannot define {@link #defaultExpanded}, {@link #defaultChildIndex}
+     * and {@link #defaultPosition} at the same time.
+     * {@link #defaultPosition} has priority over {@link #defaultExpanded}
+     * and {@link #defaultChildIndex} if you set them at the same time.
+     * <p>
+     * <p>
+     * Priority
+     * {@link #defaultPosition} > {@link #defaultChildIndex} > {@link #defaultExpanded}
+     */
+    private int defaultChildIndex;
+    private int defaultPosition;
+    /**
+     * The close position is width from left of layout if orientation is horizontal.
+     * The close position is height from top of layout if orientation is vertical.
+     */
+    private int closePosition = 0;
+
+    private ExpandableLayoutListener listener;
+    private ExpandableSavedState savedState;
+    private boolean isExpanded;
+    private int layoutSize = 0;
+    private boolean isArranged = false;
+    private boolean isCalculatedSize = false;
+    private boolean isAnimating = false;
+    /**
+     * view size of children
+     **/
+    private List<Integer> childSizeList = new ArrayList<>();
+    /**
+     * view position top or left of children
+     **/
+    private List<Integer> childPositionList = new ArrayList<>();
+    private ViewTreeObserver.OnGlobalLayoutListener mGlobalLayoutListener;
+
+    public ExpandableRelativeLayout(final Context context) {
+        this(context, null);
+    }
+
+    public ExpandableRelativeLayout(final Context context, final AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public ExpandableRelativeLayout(final Context context, final AttributeSet attrs,
+                                    final int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init(context, attrs, defStyleAttr);
+    }
+
+    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+    public ExpandableRelativeLayout(final Context context, final AttributeSet attrs,
+                                    final int defStyleAttr, final int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+        init(context, attrs, defStyleAttr);
+    }
+
+    private void init(final Context context, final AttributeSet attrs, final int defStyleAttr) {
+        final TypedArray a = context.obtainStyledAttributes(
+                attrs, R.styleable.expandableLayout, defStyleAttr, 0);
+        duration = a.getInteger(R.styleable.expandableLayout_ael_duration, DEFAULT_DURATION);
+        defaultExpanded = a.getBoolean(R.styleable.expandableLayout_ael_expanded, DEFAULT_EXPANDED);
+        orientation = a.getInteger(R.styleable.expandableLayout_ael_orientation, VERTICAL);
+        defaultChildIndex = a.getInteger(R.styleable.expandableLayout_ael_defaultChildIndex,
+                Integer.MAX_VALUE);
+        defaultPosition = a.getDimensionPixelSize(R.styleable.expandableLayout_ael_defaultPosition,
+                Integer.MIN_VALUE);
+        final int interpolatorType = a.getInteger(R.styleable.expandableLayout_ael_interpolator,
+                Utils.LINEAR_INTERPOLATOR);
+        a.recycle();
+        interpolator = Utils.createInterpolator(interpolatorType);
+        isExpanded = defaultExpanded;
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+
+        if (isCalculatedSize) return;
+
+        final int measureSpec = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED);
+        if (isVertical()) {
+            int measuredHeight = getMeasuredHeight();
+
+            super.onMeasure(widthMeasureSpec, measureSpec);
+            layoutSize = getMeasuredHeight();
+
+            setMeasuredDimension(getMeasuredWidth(), measuredHeight);
+        } else {
+            int measuredWidth = getMeasuredWidth();
+
+            super.onMeasure(measureSpec, heightMeasureSpec);
+            layoutSize = getMeasuredWidth();
+
+            setMeasuredDimension(measuredWidth, getMeasuredHeight());
+        }
+
+        // calculate a size of children
+        childSizeList.clear();
+        View view;
+        LayoutParams params;
+        for (int i = 0; i < getChildCount(); i++) {
+            view = getChildAt(i);
+            params = (LayoutParams) view.getLayoutParams();
+
+            childSizeList.add(isVertical()
+                    ? view.getMeasuredHeight() + params.topMargin + params.bottomMargin
+                    : view.getMeasuredWidth() + params.leftMargin + params.rightMargin);
+        }
+        isCalculatedSize = true;
+    }
+
+    @Override
+    protected void onLayout(boolean changed, int l, int t, int r, int b) {
+        super.onLayout(changed, l, t, r, b);
+
+        if (isArranged) return;
+
+        childPositionList.clear();
+        // calculate a top position of children
+        for (int i = 0; i < getChildCount(); i++) {
+            childPositionList.add((int) (isVertical() ? getChildAt(i).getY() : getChildAt(i).getX()));
+        }
+
+        // adjust default position if a user set a value.
+        if (!defaultExpanded) {
+            setLayoutSize(closePosition);
+        }
+        final int childNumbers = childSizeList.size();
+        if (childNumbers > defaultChildIndex && childNumbers > 0) {
+            moveChild(defaultChildIndex, 0, null);
+        }
+        if (defaultPosition > 0 && layoutSize >= defaultPosition && layoutSize > 0) {
+            move(defaultPosition, 0, null);
+        }
+        isArranged = true;
+
+        if (savedState == null) return;
+        setLayoutSize(savedState.getSize());
+    }
+
+    @Override
+    protected Parcelable onSaveInstanceState() {
+        final Parcelable parcelable = super.onSaveInstanceState();
+        final ExpandableSavedState ss = new ExpandableSavedState(parcelable);
+        ss.setSize(getCurrentPosition());
+        return ss;
+    }
+
+    @Override
+    protected void onRestoreInstanceState(final Parcelable state) {
+        if (!(state instanceof ExpandableSavedState)) {
+            super.onRestoreInstanceState(state);
+            return;
+        }
+
+        final ExpandableSavedState ss = (ExpandableSavedState) state;
+        super.onRestoreInstanceState(ss.getSuperState());
+        savedState = ss;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setListener(@NonNull ExpandableLayoutListener listener) {
+        this.listener = listener;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void toggle() {
+        toggle(duration, interpolator);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void toggle(final long duration, final @Nullable TimeInterpolator interpolator) {
+        if (closePosition < getCurrentPosition()) {
+            collapse(duration, interpolator);
+        } else {
+            expand(duration, interpolator);
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void expand() {
+        if (isAnimating) return;
+
+        createExpandAnimator(getCurrentPosition(), layoutSize, duration, interpolator).start();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void expand(final long duration, final @Nullable TimeInterpolator interpolator) {
+        if (isAnimating) return;
+
+        if (duration <= 0) {
+            move(layoutSize, duration, interpolator);
+            return;
+        }
+        createExpandAnimator(getCurrentPosition(), layoutSize, duration, interpolator).start();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void collapse() {
+        if (isAnimating) return;
+
+        createExpandAnimator(getCurrentPosition(), closePosition, duration, interpolator).start();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void collapse(final long duration, final @Nullable TimeInterpolator interpolator) {
+        if (isAnimating) return;
+
+        if (duration <= 0) {
+            move(closePosition, duration, interpolator);
+            return;
+        }
+        createExpandAnimator(getCurrentPosition(), closePosition, duration, interpolator).start();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setDuration(final int duration) {
+        if (duration < 0) {
+            throw new IllegalArgumentException("Animators cannot have negative duration: " +
+                    duration);
+        }
+        this.duration = duration;
+    }
+
+    public int getDuration() {
+        return duration;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setExpanded(boolean expanded) {
+        final int currentPosition = getCurrentPosition();
+        if ((expanded && (currentPosition == layoutSize))
+                || (!expanded && currentPosition == closePosition)) return;
+
+        isExpanded = expanded;
+        setLayoutSize(expanded ? layoutSize : closePosition);
+        requestLayout();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean isExpanded() {
+        return isExpanded;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setInterpolator(@NonNull final TimeInterpolator interpolator) {
+        this.interpolator = interpolator;
+    }
+
+    /**
+     * @param position
+     *
+     * @see #move(int, long, TimeInterpolator)
+     */
+    public void move(int position) {
+        move(position, duration, interpolator);
+    }
+
+    /**
+     * Moves to position.
+     * Sets 0 to duration if you want to move immediately.
+     *
+     * @param position
+     * @param duration
+     * @param interpolator use the default interpolator if the argument is null.
+     */
+    public void move(int position, long duration, @Nullable TimeInterpolator interpolator) {
+        if (isAnimating || 0 > position || layoutSize < position) return;
+
+        if (duration <= 0) {
+            isExpanded = position > closePosition;
+            setLayoutSize(position);
+            requestLayout();
+            notifyListeners();
+            return;
+        }
+        createExpandAnimator(getCurrentPosition(), position, duration,
+                interpolator == null ? this.interpolator : interpolator).start();
+    }
+
+    /**
+     * @param index child view index
+     *
+     * @see #moveChild(int, long, TimeInterpolator)
+     */
+    public void moveChild(int index) {
+        moveChild(index, duration, interpolator);
+    }
+
+    /**
+     * Moves to bottom(VERTICAL) or right(HORIZONTAL) of child view
+     * Sets 0 to duration if you want to move immediately.
+     *
+     * @param index        index child view index
+     * @param duration
+     * @param interpolator use the default interpolator if the argument is null.
+     */
+    public void moveChild(int index, long duration, @Nullable TimeInterpolator interpolator) {
+        if (isAnimating) return;
+
+        final int destination = getChildPosition(index) +
+                (isVertical() ? getPaddingBottom() : getPaddingRight());
+        if (duration <= 0) {
+            isExpanded = destination > closePosition;
+            setLayoutSize(destination);
+            requestLayout();
+            notifyListeners();
+            return;
+        }
+        createExpandAnimator(getCurrentPosition(), destination,
+                duration, interpolator == null ? this.interpolator : interpolator).start();
+    }
+
+    /**
+     * Sets orientation of expanse animation.
+     *
+     * @param orientation Set 0 if orientation is horizontal, 1 if orientation is vertical
+     */
+    public void setOrientation(@Orientation final int orientation) {
+        this.orientation = orientation;
+    }
+
+    /**
+     * Gets the width from left of layout if orientation is horizontal.
+     * Gets the height from top of layout if orientation is vertical.
+     *
+     * @param index index of child view
+     *
+     * @return position from top or left
+     */
+    public int getChildPosition(final int index) {
+        if (0 > index || childSizeList.size() <= index) {
+            throw new IllegalArgumentException("There aren't the view having this index.");
+        }
+        return childPositionList.get(index) + childSizeList.get(index);
+    }
+
+    /**
+     * Gets the width from left of layout if orientation is horizontal.
+     * Gets the height from top of layout if orientation is vertical.
+     *
+     * @return
+     *
+     * @see #closePosition
+     */
+    public int getClosePosition() {
+        return closePosition;
+    }
+
+    /**
+     * Sets the close position directly.
+     *
+     * @param position
+     *
+     * @see #closePosition
+     * @see #setClosePositionIndex(int)
+     */
+    public void setClosePosition(final int position) {
+        this.closePosition = position;
+    }
+
+    /**
+     * Gets the current position.
+     *
+     * @return
+     */
+    public int getCurrentPosition() {
+        return isVertical() ? getMeasuredHeight() : getMeasuredWidth();
+    }
+
+    /**
+     * Sets close position using index of child view.
+     *
+     * @param childIndex
+     *
+     * @see #closePosition
+     * @see #setClosePosition(int)
+     */
+    public void setClosePositionIndex(final int childIndex) {
+        this.closePosition = getChildPosition(childIndex);
+    }
+
+    private boolean isVertical() {
+        return orientation == VERTICAL;
+    }
+
+    private void setLayoutSize(int size) {
+        if (isVertical()) {
+            getLayoutParams().height = size;
+        } else {
+            getLayoutParams().width = size;
+        }
+    }
+
+    /**
+     * Creates value animator.
+     * Expand the layout if {@param to} is bigger than {@param from}.
+     * Collapse the layout if {@param from} is bigger than {@param to}.
+     *
+     * @param from
+     * @param to
+     * @param duration
+     * @param interpolator
+     *
+     * @return
+     */
+    private ValueAnimator createExpandAnimator(
+            final int from, final int to, final long duration, final TimeInterpolator interpolator) {
+        final ValueAnimator valueAnimator = ValueAnimator.ofInt(from, to);
+        valueAnimator.setDuration(duration);
+        valueAnimator.setInterpolator(interpolator);
+        valueAnimator.addUpdateListener(animator -> {
+            if (isVertical()) {
+                getLayoutParams().height = (int) animator.getAnimatedValue();
+            } else {
+                getLayoutParams().width = (int) animator.getAnimatedValue();
+            }
+            requestLayout();
+        });
+        valueAnimator.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationStart(Animator animator) {
+                isAnimating = true;
+                if (listener == null) return;
+
+                listener.onAnimationStart();
+                if (layoutSize == to) {
+                    listener.onPreOpen();
+                    return;
+                }
+                if (closePosition == to) {
+                    listener.onPreClose();
+                }
+            }
+
+            @Override
+            public void onAnimationEnd(Animator animator) {
+                isAnimating = false;
+                isExpanded = to > closePosition;
+
+                if (listener == null) return;
+
+                listener.onAnimationEnd();
+                if (to == layoutSize) {
+                    listener.onOpened();
+                    return;
+                }
+                if (to == closePosition) {
+                    listener.onClosed();
+                }
+            }
+        });
+        return valueAnimator;
+    }
+
+    /**
+     * Notify listeners
+     */
+    private void notifyListeners() {
+        if (listener == null) return;
+
+        listener.onAnimationStart();
+        if (isExpanded) {
+            listener.onPreOpen();
+        } else {
+            listener.onPreClose();
+        }
+        mGlobalLayoutListener = new ViewTreeObserver.OnGlobalLayoutListener() {
+            @Override
+            public void onGlobalLayout() {
+                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) {
+                    getViewTreeObserver().removeGlobalOnLayoutListener(mGlobalLayoutListener);
+                } else {
+                    getViewTreeObserver().removeOnGlobalLayoutListener(mGlobalLayoutListener);
+                }
+
+                listener.onAnimationEnd();
+                if (isExpanded) {
+                    listener.onOpened();
+                } else {
+                    listener.onClosed();
+                }
+            }
+        };
+        getViewTreeObserver().addOnGlobalLayoutListener(mGlobalLayoutListener);
+    }
+}
\ No newline at end of file
diff --git a/qpython/src/main/java/org/qpython/qpy/main/widget/expandableview/ExpandableSavedState.java b/qpython/src/main/java/org/qpython/qpy/main/widget/expandableview/ExpandableSavedState.java
new file mode 100644
index 00000000..d67b3d56
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/widget/expandableview/ExpandableSavedState.java
@@ -0,0 +1,54 @@
+package org.qpython.qpy.main.widget.expandableview;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.view.View;
+
+public class ExpandableSavedState extends View.BaseSavedState {
+    private int size;
+    private float weight;
+
+    ExpandableSavedState(Parcelable superState) {
+        super(superState);
+    }
+
+    private ExpandableSavedState(Parcel in) {
+        super(in);
+        this.size = in.readInt();
+        this.weight = in.readFloat();
+    }
+
+    public int getSize() {
+        return this.size;
+    }
+
+    public void setSize(int size) {
+        this.size = size;
+    }
+
+    public float getWeight() {
+        return this.weight;
+    }
+
+    public void setWeight(float weight) {
+        this.weight = weight;
+    }
+
+    @Override
+    public void writeToParcel(Parcel out, int flags) {
+        super.writeToParcel(out, flags);
+        out.writeInt(this.size);
+        out.writeFloat(this.weight);
+    }
+
+    public static final Creator<ExpandableSavedState> CREATOR =
+            new Creator<ExpandableSavedState>() {
+                public ExpandableSavedState createFromParcel(Parcel in) {
+                    return new ExpandableSavedState(in);
+                }
+
+                public ExpandableSavedState[] newArray(int size) {
+                    return new ExpandableSavedState[size];
+                }
+            };
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/widget/expandableview/Utils.java b/qpython/src/main/java/org/qpython/qpy/main/widget/expandableview/Utils.java
new file mode 100644
index 00000000..d14541b5
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/widget/expandableview/Utils.java
@@ -0,0 +1,65 @@
+package org.qpython.qpy.main.widget.expandableview;
+
+import android.animation.TimeInterpolator;
+import android.support.annotation.IntRange;
+import android.support.v4.view.animation.FastOutLinearInInterpolator;
+import android.support.v4.view.animation.FastOutSlowInInterpolator;
+import android.support.v4.view.animation.LinearOutSlowInInterpolator;
+import android.view.animation.AccelerateDecelerateInterpolator;
+import android.view.animation.AccelerateInterpolator;
+import android.view.animation.AnticipateInterpolator;
+import android.view.animation.AnticipateOvershootInterpolator;
+import android.view.animation.BounceInterpolator;
+import android.view.animation.DecelerateInterpolator;
+import android.view.animation.LinearInterpolator;
+import android.view.animation.OvershootInterpolator;
+
+public class Utils {
+
+    public static final int ACCELERATE_DECELERATE_INTERPOLATOR = 0;
+    public static final int ACCELERATE_INTERPOLATOR = 1;
+    public static final int ANTICIPATE_INTERPOLATOR = 2;
+    public static final int ANTICIPATE_OVERSHOOT_INTERPOLATOR = 3;
+    public static final int BOUNCE_INTERPOLATOR = 4;
+    public static final int DECELERATE_INTERPOLATOR = 5;
+    public static final int FAST_OUT_LINEAR_IN_INTERPOLATOR = 6;
+    public static final int FAST_OUT_SLOW_IN_INTERPOLATOR = 7;
+    public static final int LINEAR_INTERPOLATOR = 8;
+    public static final int LINEAR_OUT_SLOW_IN_INTERPOLATOR = 9;
+    public static final int OVERSHOOT_INTERPOLATOR = 10;
+
+    /**
+     * Creates interpolator.
+     *
+     * @param interpolatorType
+     * @return
+     */
+    public static TimeInterpolator createInterpolator(@IntRange(from = 0, to = 10) final int interpolatorType) {
+        switch (interpolatorType) {
+            case ACCELERATE_DECELERATE_INTERPOLATOR:
+                return new AccelerateDecelerateInterpolator();
+            case ACCELERATE_INTERPOLATOR:
+                return new AccelerateInterpolator();
+            case ANTICIPATE_INTERPOLATOR:
+                return new AnticipateInterpolator();
+            case ANTICIPATE_OVERSHOOT_INTERPOLATOR:
+                return new AnticipateOvershootInterpolator();
+            case BOUNCE_INTERPOLATOR:
+                return new BounceInterpolator();
+            case DECELERATE_INTERPOLATOR:
+                return new DecelerateInterpolator();
+            case FAST_OUT_LINEAR_IN_INTERPOLATOR:
+                return new FastOutLinearInInterpolator();
+            case FAST_OUT_SLOW_IN_INTERPOLATOR:
+                return new FastOutSlowInInterpolator();
+            case LINEAR_INTERPOLATOR:
+                return new LinearInterpolator();
+            case LINEAR_OUT_SLOW_IN_INTERPOLATOR:
+                return new LinearOutSlowInInterpolator();
+            case OVERSHOOT_INTERPOLATOR:
+                return new OvershootInterpolator();
+            default:
+                return new LinearInterpolator();
+        }
+    }
+}
\ No newline at end of file
diff --git a/qpython/src/main/java/org/qpython/qpy/main/widget/scheduleview/DotObj.java b/qpython/src/main/java/org/qpython/qpy/main/widget/scheduleview/DotObj.java
new file mode 100644
index 00000000..af57d023
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/widget/scheduleview/DotObj.java
@@ -0,0 +1,49 @@
+package org.qpython.qpy.main.widget.scheduleview;
+
+import android.content.Context;
+
+import org.qpython.qpy.R;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by Hmei
+ * 1/9/18.
+ */
+
+public class DotObj {
+    private String dotName;
+    private String dotNum;
+
+    public DotObj(String dotName, String dotNum) {
+        this.dotName = dotName;
+        this.dotNum = dotNum;
+    }
+
+    public static List<DotObj> getDefaultList(Context context) {
+        List<DotObj> dotObjs = new ArrayList<>();
+        String[] name = context.getResources().getStringArray(R.array.funding_stage);
+        String[] count = context.getResources().getStringArray(R.array.funding_count_divider);
+        dotObjs.add(new DotObj(name[0], count[0]));
+        dotObjs.add(new DotObj(name[1], count[1]));
+        dotObjs.add(new DotObj(name[2], count[2]));
+        return dotObjs;
+    }
+
+    public String getDotName() {
+        return dotName;
+    }
+
+    public void setDotName(String dotName) {
+        this.dotName = dotName;
+    }
+
+    public String getDotNum() {
+        return dotNum;
+    }
+
+    public void setDotNum(String dotNum) {
+        this.dotNum = dotNum;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/widget/scheduleview/ScheduleView.java b/qpython/src/main/java/org/qpython/qpy/main/widget/scheduleview/ScheduleView.java
new file mode 100644
index 00000000..aa698a22
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/widget/scheduleview/ScheduleView.java
@@ -0,0 +1,231 @@
+package org.qpython.qpy.main.widget.scheduleview;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.Rect;
+import android.support.annotation.Nullable;
+import android.util.AttributeSet;
+import android.view.View;
+
+import org.qpython.qpy.R;
+
+import java.util.List;
+
+/**
+ * Created by Hmei
+ * 1/9/18.
+ */
+public class ScheduleView extends View {
+    private Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG);
+
+    private int   dotCount;
+    private int   lightColor;
+    private int   dimColor;
+    private float radius;
+    private float width;
+    private float margin;
+    private float textSize;
+
+    private int   lightDotCount;
+    private float linePercent;
+
+    private List<DotObj> dotObjs;
+
+
+    public ScheduleView(Context context) {
+        super(context);
+    }
+
+    public ScheduleView(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        TypedArray typedArray = getContext().obtainStyledAttributes(attrs, R.styleable.ScheduleView);
+        init(typedArray);
+        typedArray.recycle();
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        int measuredWidth = MeasureSpec.getSize(widthMeasureSpec);
+        int measuredHeight = (int) (2 * (paint.getFontSpacing() + radius + margin + 1));
+        measuredWidth = resolveSize(measuredWidth, widthMeasureSpec);
+        measuredHeight = resolveSize(measuredHeight, heightMeasureSpec);
+        setMeasuredDimension(measuredWidth, measuredHeight);
+    }
+
+    private void init(TypedArray typedArray) {
+        dotCount = typedArray.getInt(R.styleable.ScheduleView_dot_count, 3);
+        lightColor = typedArray.getInt(R.styleable.ScheduleView_light_color, getResources().getColor(R.color.theme_yellow));
+        dimColor = typedArray.getInt(R.styleable.ScheduleView_dim_color, getResources().getColor(R.color.theme_gray));
+        radius = typedArray.getDimensionPixelSize(R.styleable.ScheduleView_dot_radius, 20);
+        width = typedArray.getDimensionPixelSize(R.styleable.ScheduleView_line_width, 5);
+        margin = typedArray.getDimensionPixelSize(R.styleable.ScheduleView_margin, 8);
+        textSize = typedArray.getDimensionPixelSize(R.styleable.ScheduleView_text_size, 30);
+        paint.setTextSize(textSize);
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+
+        if (dotObjs != null) {
+            drawText(canvas);
+        } else {
+            drawLine(canvas);
+            drawDots(canvas);
+        }
+    }
+
+    private void drawText(Canvas canvas) {
+        Rect textRect = new Rect();
+        paint.getTextBounds(dotObjs.get(dotObjs.size() - 1).getDotName(), 0, dotObjs.get(dotObjs.size() - 1).getDotName().length(), textRect);
+        float lastTextLength = textRect.right - textRect.left;
+
+        paint.getTextBounds(dotObjs.get(0).getDotName(), 0, dotObjs.get(0).getDotName().length(), textRect);
+        float firstTextLength = textRect.right - textRect.left;
+
+        float dotGap = (canvas.getWidth() - (firstTextLength + lastTextLength) / 2) / (dotCount - 1);
+        float[] centerTextX = new float[dotObjs.size()];
+
+        paint.setTextAlign(Paint.Align.CENTER);
+        paint.setTextSize(textSize);
+        invalidate();
+        paint.setColor(lightColor);
+
+        int i = 0;
+
+        for (DotObj dotObj : dotObjs) {
+            if (i == lightDotCount) {
+                paint.setColor(dimColor);
+            }
+            centerTextX[i] = firstTextLength / 2 + i * dotGap + getPaddingLeft();
+            canvas.drawText(dotObj.getDotName(), centerTextX[i], paint.getFontSpacing(), paint);
+            i++;
+        }
+
+        drawTextLine(canvas, centerTextX[0], centerTextX[dotObjs.size() - 1], paint.getFontSpacing());
+        drawTextDot(canvas, centerTextX, paint.getFontSpacing());
+        drawTextNum(canvas, centerTextX, paint.getFontSpacing());
+    }
+
+    private void drawTextLine(Canvas canvas, float start, float end, float textBottom) {
+        float divider = (end - start) * linePercent + start;
+        float top = textBottom + margin + radius;
+
+        paint.setStrokeWidth(width);
+        paint.setColor(lightColor);
+        canvas.drawLine(start, top, divider, top, paint);
+        paint.setColor(dimColor);
+        canvas.drawLine(divider, top, end, top, paint);
+    }
+
+    private void drawTextDot(Canvas canvas, float[] centerTextX, float textBottom) {
+        float cy = textBottom + margin + radius;
+        paint.setColor(lightColor);
+        for (int i = 0; i < centerTextX.length; i++) {
+            if (i == lightDotCount) {
+                paint.setColor(dimColor);
+            }
+            canvas.drawCircle(centerTextX[i], cy, radius, paint);
+        }
+    }
+
+    private void drawTextNum(Canvas canvas, float[] centerTextX, float textBottom) {
+        float startY = textBottom + 2 * (margin + radius) + paint.getFontSpacing();
+        paint.setColor(dimColor);
+        paint.setTextAlign(Paint.Align.CENTER);
+        for (int i = 0; i < centerTextX.length; i++) {
+            canvas.drawText(dotObjs.get(i).getDotNum(), centerTextX[i], startY, paint);
+        }
+    }
+
+    private void drawLine(Canvas canvas) {
+        float top = (canvas.getHeight() - width) / 2;
+        float bottom = (canvas.getHeight() + width) / 2;
+        float divider = canvas.getWidth() * linePercent;
+
+        paint.setColor(lightColor);
+        canvas.drawRect(0, top, divider, bottom, paint);
+        paint.setColor(dimColor);
+        canvas.drawRect(divider, top, canvas.getWidth(), bottom, paint);
+    }
+
+    private void drawDots(Canvas canvas) {
+        float dotGap = (canvas.getWidth() - radius * 2) / (dotCount - 1);
+        paint.setColor(lightColor);
+        for (int i = 0; i < dotCount; i++) {
+            if (i == lightDotCount) {
+                paint.setColor(dimColor);
+            }
+            canvas.drawCircle(radius + i * dotGap,
+                    canvas.getHeight() / 2,
+                    radius, paint);
+        }
+    }
+
+    public void setDotCount(int dotCount) {
+        this.dotCount = dotCount;
+        invalidate();
+        requestLayout();
+    }
+
+    public void setLightColor(int lightColor) {
+        this.lightColor = lightColor;
+        invalidate();
+        requestLayout();
+    }
+
+    public void setDimColor(int dimColor) {
+        this.dimColor = dimColor;
+        invalidate();
+        requestLayout();
+    }
+
+    public void setRadius(float radius) {
+        this.radius = radius;
+        invalidate();
+        requestLayout();
+    }
+
+    public void setWidth(float width) {
+        this.width = width;
+        invalidate();
+        requestLayout();
+    }
+
+    public void setMargin(float margin) {
+        this.margin = margin;
+        invalidate();
+        requestLayout();
+    }
+
+    public void setPercent(float fundingCount) {
+        int[] fundingNum = new int[dotObjs.size()];
+        for (int i = 0; i < dotObjs.size(); i++) {
+            fundingNum[i] = Integer.parseInt(dotObjs.get(i).getDotNum());
+        }
+
+        if (fundingCount < fundingNum[0]) {
+            linePercent = 0;
+            lightDotCount = 0;
+        } else if (fundingCount < fundingNum[1]) {
+            linePercent = (fundingCount - fundingNum[0]) / (fundingNum[1] - fundingNum[0]) / 2;
+            lightDotCount = 1;
+        } else if (fundingCount < fundingNum[2]) {
+            linePercent = 0.5f + ((fundingCount - fundingNum[1]) / (fundingNum[2] - fundingNum[1]) / 2);
+            lightDotCount = 2;
+        } else {
+            this.setVisibility(GONE);
+        }
+        invalidate();
+        requestLayout();
+    }
+
+    public void setDotObj(List<DotObj> dotObjs) {
+        this.dotCount = dotObjs.size();
+        this.dotObjs = dotObjs;
+        invalidate();
+        requestLayout();
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/plugin/CloudPluginManager.java b/qpython/src/main/java/org/qpython/qpy/plugin/CloudPluginManager.java
new file mode 100644
index 00000000..179a6676
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/plugin/CloudPluginManager.java
@@ -0,0 +1,200 @@
+package org.qpython.qpy.plugin;
+
+import android.widget.Toast;
+
+import com.google.gson.Gson;
+import org.qpython.qpy.R;
+
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.model.UpdateJson;
+import org.qpython.qpy.plugin.model.CloudPluginBean;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import io.realm.Realm;
+import io.realm.RealmResults;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import rx.Observable;
+import rx.Subscriber;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+import org.qpython.qpy.utils.FileUtils;
+
+public class CloudPluginManager {
+    private static final String INSTALL_DIR = App.getContext().getFilesDir().getAbsolutePath();
+    private static final String URL = "https://www.qpython.org/conf/";
+    private static OkHttpClient client = new OkHttpClient();
+
+    public static boolean checkInstalled(CloudPluginBean plugin) {
+        return query(plugin.getName()) != null;
+    }
+
+    public static boolean checkUpdate(CloudPluginBean remotePlugin) {
+        CloudPluginBean localPlugin = query(remotePlugin.getName());
+        return localPlugin != null && remotePlugin.getVersionCode() > localPlugin.getVersionCode();
+    }
+
+    public static void install(CloudPluginBean plugin, File file, boolean isSilence) {
+        String destPath = getCompletePath(plugin);
+        File dest = new File(destPath);
+
+        Realm realm = null;
+        try {
+            dest.getParentFile().mkdirs();
+            dest.createNewFile();
+            FileUtils.copyFile(file, dest);
+            realm = Realm.getDefaultInstance();
+            realm.beginTransaction();
+            realm.copyToRealmOrUpdate(plugin);
+            realm.commitTransaction();
+
+            if (!isSilence) {
+                Toast.makeText(App.getContext(), R.string.toast_plugin_install_complete, Toast.LENGTH_SHORT).show();
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            if (realm != null) {
+                realm.close();
+            }
+        }
+    }
+
+    private static CloudPluginBean query(String name) {
+        Realm realm = null;
+        try {
+            realm = Realm.getDefaultInstance();
+            CloudPluginBean cloudPluginBean = realm.where(CloudPluginBean.class)
+                    .equalTo("name", name)
+                    .findFirst();
+
+            if (cloudPluginBean == null) {
+                return null;
+            }
+
+            File file = new File(getCompletePath(cloudPluginBean));
+            if (!file.exists()) {
+                realm.beginTransaction();
+                cloudPluginBean.deleteFromRealm();
+                realm.commitTransaction();
+                return null;
+            }
+
+            // 创建不受 realm 监控的拷贝
+            return realm.copyFromRealm(cloudPluginBean);
+        } catch (Exception e) {
+            return null;
+        } finally {
+            if (realm != null) {
+                realm.close();
+            }
+        }
+    }
+
+    public static RealmResults<CloudPluginBean> queryAll(Realm realm) {
+        RealmResults<CloudPluginBean> plugins = realm.where(CloudPluginBean.class)
+                .findAll();
+
+        for (CloudPluginBean plugin : plugins) {
+            File file = new File(getCompletePath(plugin));
+            if (!file.exists()) {
+                realm.beginTransaction();
+                plugin.deleteFromRealm();
+                realm.commitTransaction();
+            }
+        }
+
+        return plugins;
+    }
+
+    public static void queryFromNet(Callback callback) {
+        Observable
+                .create(new Observable.OnSubscribe<String>() {
+                    @Override
+                    public void call(Subscriber<? super String> subscriber) {
+                        Request request = new Request.Builder()
+                                .url(URL)
+                                .build();
+                        try {
+                            String s = client.newCall(request).execute().body().string();
+                            subscriber.onNext(s);
+                        } catch (IOException e) {
+                            subscriber.onError(e);
+                        }
+                    }
+                })
+                .subscribeOn(Schedulers.io())
+                .observeOn(Schedulers.computation())
+                .map(s -> {
+                    List<CloudPluginBean> plugins = new ArrayList<>();
+                    Gson gson = new Gson();
+                    UpdateJson json = gson.fromJson(s, UpdateJson.class);
+                    for (UpdateJson.PluginsBean bean1 : json.getPlugins()) {
+                        CloudPluginBean cloudPluginBean =
+                                new CloudPluginBean(bean1.getPlugin(), bean1.getTitle(), bean1.getSrc(),
+                                        bean1.getVer(), bean1.getVer_desc(), bean1.getDesc(), bean1.getDst(), bean1.getLink());
+                        plugins.add(cloudPluginBean);
+                    }
+                    return plugins;
+                })
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(plugins -> callback.result(plugins),
+                        e -> e.printStackTrace());
+    }
+
+    public static long count() {
+        Realm realm = null;
+        try {
+            realm = Realm.getDefaultInstance();
+            return realm.where(CloudPluginBean.class)
+                    .count();
+        } finally {
+            if (realm != null) {
+                realm.close();
+            }
+        }
+    }
+
+    public static void uninstall(CloudPluginBean cloudPluginBean) {
+        CloudPluginBean local = query(cloudPluginBean.getName());
+        if (local == null) {
+            return;
+        }
+        Realm realm = null;
+        try {
+            // 清除本地文件
+            File file = new File(getCompletePath(local));
+            if (file.exists()) {
+                file.delete();
+            }
+
+            // 清除数据库数据
+            realm = Realm.getDefaultInstance();
+            realm.beginTransaction();
+            realm.where(CloudPluginBean.class)
+                    .equalTo("name", local.getName())
+                    .findFirst()
+                    .deleteFromRealm();
+            realm.commitTransaction();
+
+            Toast.makeText(App.getContext(), R.string.toast_plugin_uninstall_complete, Toast.LENGTH_SHORT).show();
+        } finally {
+            if (realm != null) {
+                realm.close();
+            }
+        }
+    }
+
+    public static String getCompletePath(CloudPluginBean cloudPluginBean) {
+        return String.format("%s%s%s", INSTALL_DIR, "/", cloudPluginBean.getPath());
+    }
+
+    public interface Callback {
+        void result(List<CloudPluginBean> plugins);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/plugin/Common.java b/qpython/src/main/java/org/qpython/qpy/plugin/Common.java
new file mode 100644
index 00000000..80750800
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/plugin/Common.java
@@ -0,0 +1,7 @@
+package org.qpython.qpy.plugin;
+
+public class Common {
+    public static class PluginChangeEvent {
+
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/plugin/LocalPluginManager.java b/qpython/src/main/java/org/qpython/qpy/plugin/LocalPluginManager.java
new file mode 100644
index 00000000..e46601ef
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/plugin/LocalPluginManager.java
@@ -0,0 +1,108 @@
+package org.qpython.qpy.plugin;
+
+import android.widget.Toast;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.plugin.model.LocalPluginBean;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+
+import io.realm.Realm;
+import io.realm.RealmResults;
+import org.qpython.qpy.utils.FileUtils;
+
+public class LocalPluginManager {
+    private static final String INSTALL_DIR = App.getContext().getFilesDir() + "/user";
+
+    public static boolean install(File plugin) {
+        Realm realm = null;
+        try {
+            LocalPluginBean pluginInfo = checkPluginValid(plugin);
+            File dest = new File(getCompletePath(pluginInfo));
+            dest.getParentFile().mkdirs();
+            dest.createNewFile();
+            FileUtils.copyFile(plugin, dest);
+            realm = Realm.getDefaultInstance();
+            realm.beginTransaction();
+            realm.copyToRealmOrUpdate(pluginInfo);
+            realm.commitTransaction();
+
+            Toast.makeText(App.getContext(), R.string.toast_plugin_install_complete, Toast.LENGTH_SHORT).show();
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            Toast.makeText(App.getContext(), R.string.toast_plugin_install_failure, Toast.LENGTH_SHORT).show();
+            return false;
+        } finally {
+            if (realm != null) {
+                realm.close();
+            }
+        }
+    }
+
+    public static void uninstall(LocalPluginBean plugin) {
+        Realm realm = null;
+        try {
+            File file = new File(getCompletePath(plugin));
+            if (file.exists()) {
+                file.delete();
+            }
+
+            realm = Realm.getDefaultInstance();
+            realm.beginTransaction();
+            realm.where(LocalPluginBean.class)
+                    .equalTo("name", plugin.getName())
+                    .findFirst()
+                    .deleteFromRealm();
+            realm.commitTransaction();
+
+            Toast.makeText(App.getContext(), R.string.toast_plugin_uninstall_complete, Toast.LENGTH_SHORT).show();
+        } finally {
+            if (realm != null) {
+                realm.close();
+            }
+        }
+    }
+
+    public static RealmResults<LocalPluginBean> queryAll(Realm realm) {
+        return realm.where(LocalPluginBean.class).findAll();
+    }
+
+    public static String getCompletePath(LocalPluginBean pluginInfo) {
+        return INSTALL_DIR + "/" + pluginInfo.getName();
+    }
+
+    private static LocalPluginBean checkPluginValid(File file) {
+        BufferedReader reader = null;
+        try {
+            reader = new BufferedReader(new InputStreamReader(new FileInputStream(file)));
+            String head = reader.readLine();
+
+            if (!head.startsWith("#tbplugin")) {
+                throw new IllegalStateException(file.getName() + " is not a valid plugin");
+            }
+
+            String[] info = head.split("\\|\\|");
+            if (info.length != 3) {
+                throw new IllegalStateException(file.getName() + " is not a valid plugin");
+            }
+
+            return new LocalPluginBean(file.getName(), info[1], info[2]);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        } finally {
+            try {
+                reader.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/plugin/PluginDetailDialogFragment.java b/qpython/src/main/java/org/qpython/qpy/plugin/PluginDetailDialogFragment.java
new file mode 100644
index 00000000..fbf68c06
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/plugin/PluginDetailDialogFragment.java
@@ -0,0 +1,38 @@
+package org.qpython.qpy.plugin;
+
+
+import android.support.v7.app.AlertDialog;
+import android.app.Dialog;
+import android.os.Bundle;
+import android.support.v4.app.DialogFragment;
+
+import org.qpython.qpy.R;
+
+
+
+public class PluginDetailDialogFragment extends DialogFragment {
+    public static final String TAG = "PluginDetailDialogFragment";
+    private static final String TITLE = "title";
+    private static final String MSG = "msg";
+
+    public static PluginDetailDialogFragment newInstance(String title, String msg) {
+        Bundle args = new Bundle();
+        args.putString(TITLE, title);
+        args.putString(MSG, msg);
+        PluginDetailDialogFragment fragment = new PluginDetailDialogFragment();
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        String title = getArguments().getString(TITLE);
+        String msg = getArguments().getString(MSG);
+
+        return new AlertDialog.Builder(getActivity())
+                .setTitle(title)
+                .setMessage(msg)
+                .setPositiveButton(R.string.dialog_plugin_detail_positive, (dialog, which) -> dismiss())
+                .create();
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/plugin/SpaceItemDecoration.java b/qpython/src/main/java/org/qpython/qpy/plugin/SpaceItemDecoration.java
new file mode 100644
index 00000000..5ef017d0
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/plugin/SpaceItemDecoration.java
@@ -0,0 +1,18 @@
+package org.qpython.qpy.plugin;
+
+import android.graphics.Rect;
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+
+public class SpaceItemDecoration extends RecyclerView.ItemDecoration {
+    private final int mSpace;
+
+    public SpaceItemDecoration(int space) {
+        mSpace = space;
+    }
+
+    @Override
+    public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
+        outRect.top = mSpace;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/plugin/activity/LocalPluginInstallActivity.java b/qpython/src/main/java/org/qpython/qpy/plugin/activity/LocalPluginInstallActivity.java
new file mode 100644
index 00000000..3776ca18
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/plugin/activity/LocalPluginInstallActivity.java
@@ -0,0 +1,109 @@
+package org.qpython.qpy.plugin.activity;
+
+import android.Manifest;
+import android.content.pm.PackageManager;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Environment;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.app.ActivityCompat;
+import android.support.v4.content.ContextCompat;
+import android.support.v7.widget.Toolbar;
+import android.widget.FrameLayout;
+import android.widget.Toast;
+
+import org.qpython.qpy.R;
+
+import org.qpython.qpy.main.activity.BaseActivity;
+import org.qpython.qpy.plugin.LocalPluginManager;
+import org.qpython.qpy.plugin.view.FileSelectView;
+
+import java.util.HashMap;
+import java.util.Map;
+
+//import butterknife.BindView;
+//import butterknife.ButterKnife;
+//import butterknife.Unbinder;
+
+public class LocalPluginInstallActivity extends BaseActivity {
+    private static final String sPath                         = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).getAbsolutePath();
+    private static final int    REQUEST_READ_EXTERNAL_STORAGE = 0;
+
+    FileSelectView mFileSelectView;
+//    private Unbinder mUnbinder;
+
+    //    @BindView(R.id.container)
+    FrameLayout mContainer;
+
+    //    @BindView(R.id.toolbar)
+    Toolbar mToolbar;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_local_plugin_install);
+//        mUnbinder = ButterKnife.bind(this);
+        mContainer = (FrameLayout) findViewById(R.id.container);
+        mToolbar = (Toolbar) findViewById(R.id.toolbar);
+
+        mToolbar.setNavigationIcon(R.drawable.ic_back);
+        mToolbar.setNavigationOnClickListener(v -> finish());
+        mToolbar.setTitle(R.string.title_select_plugin);
+    }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+        checkPermission();
+    }
+
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        if (requestCode == REQUEST_READ_EXTERNAL_STORAGE) {
+            if (grantResults[0] != PackageManager.PERMISSION_GRANTED) {
+                Toast.makeText(this, R.string.toast_read_permission_deny, Toast.LENGTH_SHORT).show();
+                finish();
+            } else {
+                show();
+            }
+        }
+    }
+
+    private void checkPermission() {
+        if (Build.VERSION.SDK_INT >= 23) {
+            int checkPermission = ContextCompat.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE);
+            if (checkPermission != PackageManager.PERMISSION_GRANTED) {
+                ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE}, REQUEST_READ_EXTERNAL_STORAGE);
+            } else {
+                show();
+            }
+        } else {
+            show();
+        }
+    }
+
+    private void show() {
+        // 初始化文件浏览器
+        Map<String, Integer> icon = new HashMap<>();
+
+        icon.put(FileSelectView.PARENT_DIR, R.drawable.prev);//返回上一层的图标
+        icon.put(FileSelectView.FOLDER, R.drawable.ic_editor_folder);//文件夹图标
+        icon.put("py", R.drawable.ic_home_program);
+
+        mFileSelectView = new FileSelectView(this, file -> {
+            if (LocalPluginManager.install(file)) {
+                LocalPluginInstallActivity.this.finish();
+            }
+        }, icon);
+
+        mFileSelectView.setPath(sPath);
+        mContainer.addView(mFileSelectView);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/plugin/activity/PluginManagerActivity.java b/qpython/src/main/java/org/qpython/qpy/plugin/activity/PluginManagerActivity.java
new file mode 100644
index 00000000..cfdd388c
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/plugin/activity/PluginManagerActivity.java
@@ -0,0 +1,54 @@
+package org.qpython.qpy.plugin.activity;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.design.widget.TabLayout;
+import android.support.v4.view.PagerAdapter;
+import android.support.v4.view.ViewPager;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+
+import org.qpython.qpy.R;
+
+import org.qpython.qpy.plugin.adapter.PluginPagerAdapter;
+
+public class PluginManagerActivity extends AppCompatActivity {
+
+    Toolbar mToolbar;
+
+    TabLayout mTabLayout;
+
+    ViewPager mViewPager;
+
+    public static void start(Context context) {
+        Intent starter = new Intent(context, PluginManagerActivity.class);
+        context.startActivity(starter);
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_plugin_manager);
+        mToolbar = (Toolbar) findViewById(R.id.toolbar);
+        mTabLayout = (TabLayout) findViewById(R.id.tab_layout);
+        mViewPager = (ViewPager) findViewById(R.id.view_pager);
+
+        setSupportActionBar(mToolbar);
+        mToolbar.setNavigationOnClickListener(v -> finish());
+    }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+        PagerAdapter adapter = new PluginPagerAdapter(getSupportFragmentManager());
+        mViewPager.setAdapter(adapter);
+        mTabLayout.setupWithViewPager(mViewPager);
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/plugin/adapter/CloudPluginAdapter.java b/qpython/src/main/java/org/qpython/qpy/plugin/adapter/CloudPluginAdapter.java
new file mode 100644
index 00000000..a6f1e2fc
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/plugin/adapter/CloudPluginAdapter.java
@@ -0,0 +1,142 @@
+package org.qpython.qpy.plugin.adapter;
+
+import android.content.Context;
+import android.support.v4.app.FragmentManager;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.PopupMenu;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.quseit.common.updater.Updater;
+
+import org.qpython.qpy.R;
+
+import org.qpython.qpy.plugin.CloudPluginManager;
+import org.qpython.qpy.plugin.PluginDetailDialogFragment;
+import org.qpython.qpy.plugin.model.CloudPluginBean;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class CloudPluginAdapter extends RecyclerView.Adapter<CloudPluginAdapter.PluginHolder> {
+    private Context               mContext;
+    private List<CloudPluginBean> mPluginBeen;
+
+    public CloudPluginAdapter(Context context) {
+        mContext = context;
+        mPluginBeen = new ArrayList<>();
+    }
+
+    @Override
+    public PluginHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        LayoutInflater inflater = LayoutInflater.from(mContext);
+        View v = inflater.inflate(R.layout.item_plugin_cloud, null);
+        return new PluginHolder(v);
+    }
+
+    @Override
+    public void onBindViewHolder(PluginHolder holder, int position) {
+        CloudPluginBean bean = mPluginBeen.get(position);
+        holder.name.setText(bean.getName());
+        holder.description.setText(bean.getDescription());
+
+        PopupMenu menu = new PopupMenu(mContext, holder.menu);
+        boolean install = CloudPluginManager.checkInstalled(bean);
+        boolean update = CloudPluginManager.checkUpdate(bean);
+        if (install && !update) {
+            holder.menu.setImageResource(R.drawable.ic_plugin);
+            menu.inflate(R.menu.plugin_installed_menu);
+            menu.setOnMenuItemClickListener(item -> {
+                        switch (item.getItemId()) {
+                            case R.id.detail:
+                                showDetail(bean);
+                                break;
+                            case R.id.uninstall:
+                                uninstall(bean);
+                                break;
+                        }
+                        return true;
+                    }
+            );
+        } else if (install) {
+            holder.menu.setImageResource(R.drawable.ic_library_upgrade);
+            menu.inflate(R.menu.plugin_update_menu);
+            menu.setOnMenuItemClickListener(item -> {
+                switch (item.getItemId()) {
+                    case R.id.detail:
+                        showDetail(bean);
+                        break;
+                    case R.id.update:
+                        update(bean);
+                        break;
+                    case R.id.uninstall:
+                        uninstall(bean);
+                        break;
+                }
+                return true;
+            });
+        } else {
+            holder.menu.setImageResource(R.drawable.ic_library_download);
+            menu.inflate(R.menu.plugin_uninstalled_menu);
+            menu.setOnMenuItemClickListener(item -> {
+                switch (item.getItemId()) {
+                    case R.id.install:
+                        install(bean);
+                        break;
+                }
+                return true;
+            });
+        }
+        holder.itemView.setOnClickListener(v -> menu.show());
+    }
+
+    private void showDetail(CloudPluginBean plugin) {
+        FragmentManager manager = ((AppCompatActivity) mContext).getSupportFragmentManager();
+        PluginDetailDialogFragment.newInstance(plugin.getName(), CloudPluginManager.getCompletePath(plugin))
+                .show(manager, PluginDetailDialogFragment.TAG);
+    }
+
+    private void install(CloudPluginBean plugin) {
+        update(plugin);
+    }
+
+    private void update(CloudPluginBean plugin) {
+        Updater.update(plugin);
+    }
+
+    private void uninstall(CloudPluginBean plugin) {
+        mPluginBeen.remove(plugin);
+        CloudPluginManager.uninstall(plugin);
+    }
+
+    @Override
+    public int getItemCount() {
+        return mPluginBeen == null ? 0 : mPluginBeen.size();
+    }
+
+    public void setData(List<CloudPluginBean> plugins) {
+        mPluginBeen.clear();
+        mPluginBeen.addAll(plugins);
+        notifyDataSetChanged();
+    }
+
+    public static class PluginHolder extends RecyclerView.ViewHolder {
+        TextView name;
+
+        TextView description;
+
+        ImageView menu;
+
+        public PluginHolder(View itemView) {
+            super(itemView);
+            name = (TextView) itemView.findViewById(R.id.plugin_name);
+            description = (TextView) itemView.findViewById(R.id.plugin_description);
+            menu = (ImageView) itemView.findViewById(R.id.plugin_menu);
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/plugin/adapter/LocalPluginAdapter.java b/qpython/src/main/java/org/qpython/qpy/plugin/adapter/LocalPluginAdapter.java
new file mode 100644
index 00000000..4f14ae41
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/plugin/adapter/LocalPluginAdapter.java
@@ -0,0 +1,97 @@
+package org.qpython.qpy.plugin.adapter;
+
+import android.content.Context;
+import android.support.v4.app.FragmentManager;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.PopupMenu;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import org.qpython.qpy.R;
+
+import org.qpython.qpy.plugin.LocalPluginManager;
+import org.qpython.qpy.plugin.PluginDetailDialogFragment;
+import org.qpython.qpy.plugin.model.LocalPluginBean;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class LocalPluginAdapter extends RecyclerView.Adapter<LocalPluginAdapter.PluginHolder> {
+    private Context               mContext;
+    private List<LocalPluginBean> mList;
+
+    public LocalPluginAdapter(Context context) {
+        mContext = context;
+        mList = new ArrayList<>();
+    }
+
+    @Override
+    public PluginHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        View v = LayoutInflater.from(mContext).inflate(R.layout.item_plugin_local, null);
+        return new PluginHolder(v);
+    }
+
+    @Override
+    public void onBindViewHolder(PluginHolder holder, int position) {
+        LocalPluginBean pluginInfo = mList.get(position);
+        holder.name.setText(pluginInfo.getName());
+        holder.description.setText(pluginInfo.getTitle());
+        PopupMenu menu = new PopupMenu(mContext, holder.menu);
+        menu.inflate(R.menu.plugin_installed_menu);
+        menu.setOnMenuItemClickListener(item -> {
+            switch (item.getItemId()) {
+                case R.id.detail:
+                    showDetail(pluginInfo);
+                    break;
+                case R.id.uninstall:
+                    uninstall(pluginInfo);
+                    break;
+            }
+
+            return true;
+        });
+
+        holder.itemView.setOnClickListener(v -> menu.show());
+    }
+
+    @Override
+    public int getItemCount() {
+        return mList == null ? 0 : mList.size();
+    }
+
+    private void showDetail(LocalPluginBean plugin) {
+        FragmentManager manager = ((AppCompatActivity) mContext).getSupportFragmentManager();
+        PluginDetailDialogFragment.newInstance(plugin.getName(), LocalPluginManager.getCompletePath(plugin))
+                .show(manager, PluginDetailDialogFragment.TAG);
+    }
+
+    private void uninstall(LocalPluginBean plugin) {
+        mList.remove(plugin);
+        LocalPluginManager.uninstall(plugin);
+    }
+
+    public void setData(List<LocalPluginBean> data) {
+        mList.clear();
+        mList.addAll(data);
+        notifyDataSetChanged();
+    }
+
+    public static class PluginHolder extends RecyclerView.ViewHolder {
+        TextView name;
+
+        TextView description;
+
+        ImageView menu;
+
+        public PluginHolder(View itemView) {
+            super(itemView);
+            name = (TextView) itemView.findViewById(R.id.plugin_name);
+            description = (TextView) itemView.findViewById(R.id.plugin_description);
+            menu = (ImageView) itemView.findViewById(R.id.plugin_menu);
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/plugin/adapter/PluginPagerAdapter.java b/qpython/src/main/java/org/qpython/qpy/plugin/adapter/PluginPagerAdapter.java
new file mode 100644
index 00000000..5a0ef67f
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/plugin/adapter/PluginPagerAdapter.java
@@ -0,0 +1,45 @@
+package org.qpython.qpy.plugin.adapter;
+
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentPagerAdapter;
+
+
+import org.qpython.qpy.R;
+
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.plugin.fragment.CloudPluginFragment;
+import org.qpython.qpy.plugin.fragment.LocalPluginFragment;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PluginPagerAdapter extends FragmentPagerAdapter {
+    private String[] mTitles;
+    private List<Fragment> mFragments;
+
+
+    public PluginPagerAdapter(FragmentManager fm) {
+        super(fm);
+
+        mTitles = App.getContext().getResources().getStringArray(R.array.plugin_tab);
+        mFragments = new ArrayList<>();
+        mFragments.add(LocalPluginFragment.newInstance());
+        mFragments.add(CloudPluginFragment.newInstance());
+    }
+
+    @Override
+    public Fragment getItem(int position) {
+        return mFragments.get(position);
+    }
+
+    @Override
+    public int getCount() {
+        return mFragments.size();
+    }
+
+    @Override
+    public CharSequence getPageTitle(int position) {
+        return mTitles[position];
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/plugin/fragment/CloudPluginFragment.java b/qpython/src/main/java/org/qpython/qpy/plugin/fragment/CloudPluginFragment.java
new file mode 100644
index 00000000..75a5cca9
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/plugin/fragment/CloudPluginFragment.java
@@ -0,0 +1,84 @@
+package org.qpython.qpy.plugin.fragment;
+
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+
+import org.qpython.qpy.R;
+
+import org.qpython.qpy.plugin.CloudPluginManager;
+import org.qpython.qpy.plugin.SpaceItemDecoration;
+import org.qpython.qpy.plugin.adapter.CloudPluginAdapter;
+import org.qpython.qpy.plugin.model.CloudPluginBean;
+
+import java.util.List;
+
+import io.realm.Realm;
+import rx.Subscription;
+
+public class CloudPluginFragment extends Fragment {
+    RecyclerView rvPlugin;
+    LinearLayout noneItemBackground;
+    private CloudPluginAdapter mCloudPluginAdapter;
+    private Realm mRealm;
+    private Subscription mRefreshDataSubscription;
+
+    public static CloudPluginFragment newInstance() {
+        return new CloudPluginFragment();
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        View v = inflater.inflate(R.layout.fragment_plugin_cloud, container, false);
+        rvPlugin = (RecyclerView) v.findViewById(R.id.rv_plugin);
+        noneItemBackground = (LinearLayout) v.findViewById(R.id.none_item_bg);
+
+        mRealm = Realm.getDefaultInstance();
+        return v;
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        mCloudPluginAdapter = new CloudPluginAdapter(getActivity());
+        rvPlugin.addItemDecoration(new SpaceItemDecoration(1));
+        rvPlugin.setLayoutManager(new LinearLayoutManager(getContext()));
+        rvPlugin.setAdapter(mCloudPluginAdapter);
+
+        mRefreshDataSubscription = CloudPluginManager.queryAll(mRealm).asObservable()
+                .subscribe(this::showData);
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        mRealm.close();
+        mRefreshDataSubscription.unsubscribe();
+    }
+
+    private void showData(List<CloudPluginBean> local) {
+        if (local == null || local.isEmpty()) {
+            noneItemBackground.setVisibility(View.VISIBLE);
+        } else {
+            noneItemBackground.setVisibility(View.GONE);
+        }
+
+        mCloudPluginAdapter.setData(local);
+
+        CloudPluginManager.queryFromNet(plugins -> {
+            if (plugins == null || plugins.isEmpty()) {
+                noneItemBackground.setVisibility(View.VISIBLE);
+            } else {
+                noneItemBackground.setVisibility(View.GONE);
+            }
+            mCloudPluginAdapter.setData(plugins);
+        });
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/plugin/fragment/LocalPluginFragment.java b/qpython/src/main/java/org/qpython/qpy/plugin/fragment/LocalPluginFragment.java
new file mode 100644
index 00000000..f2c8d3a1
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/plugin/fragment/LocalPluginFragment.java
@@ -0,0 +1,77 @@
+package org.qpython.qpy.plugin.fragment;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+
+import org.qpython.qpy.R;
+
+import org.qpython.qpy.plugin.LocalPluginManager;
+import org.qpython.qpy.plugin.activity.LocalPluginInstallActivity;
+import org.qpython.qpy.plugin.adapter.LocalPluginAdapter;
+import org.qpython.qpy.plugin.model.LocalPluginBean;
+
+import java.util.List;
+
+import io.realm.Realm;
+import rx.Subscription;
+
+public class LocalPluginFragment extends Fragment {
+    RecyclerView mRvPlugin;
+    LinearLayout noneItemBackground;
+    private LocalPluginAdapter mLocalPluginAdapter;
+    private Realm              mRealm;
+    private Subscription       mRefreshDataSubscription;
+
+    public static LocalPluginFragment newInstance() {
+        return new LocalPluginFragment();
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        View v = inflater.inflate(R.layout.fragment_plugin_local, container, false);
+        mRvPlugin = (RecyclerView) v.findViewById(R.id.rv_plugin);
+        noneItemBackground = (LinearLayout) v.findViewById(R.id.none_item_bg);
+        mRealm = Realm.getDefaultInstance();
+
+        v.findViewById(R.id.fab).setOnClickListener(v1 -> {
+            Intent intent = new Intent(getActivity(), LocalPluginInstallActivity.class);
+            startActivity(intent);
+        });
+        return v;
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        mLocalPluginAdapter = new LocalPluginAdapter(getContext());
+        mRvPlugin.setLayoutManager(new LinearLayoutManager(getContext()));
+        mRvPlugin.setAdapter(mLocalPluginAdapter);
+        mRefreshDataSubscription = LocalPluginManager.queryAll(mRealm).asObservable()
+                .subscribe(this::showData);
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        mRealm.close();
+        mRefreshDataSubscription.unsubscribe();
+    }
+
+    private void showData(List<LocalPluginBean> list) {
+        if (list == null || list.isEmpty()) {
+            noneItemBackground.setVisibility(View.VISIBLE);
+        } else {
+            noneItemBackground.setVisibility(View.GONE);
+        }
+        mLocalPluginAdapter.setData(list);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/plugin/model/CloudPluginBean.java b/qpython/src/main/java/org/qpython/qpy/plugin/model/CloudPluginBean.java
new file mode 100644
index 00000000..15e7bac1
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/plugin/model/CloudPluginBean.java
@@ -0,0 +1,131 @@
+package org.qpython.qpy.plugin.model;
+
+import com.quseit.common.updater.updatepkg.UpdatePackage;
+import org.qpython.qpy.plugin.CloudPluginManager;
+
+import java.io.File;
+
+import io.realm.RealmObject;
+import io.realm.annotations.Ignore;
+import io.realm.annotations.PrimaryKey;
+
+public class CloudPluginBean extends RealmObject implements UpdatePackage {
+    @PrimaryKey
+    private String name;
+
+    private String title;
+
+    private String src;
+
+    private int versionCode;
+
+    private String versionDescription;
+
+    private String description;
+
+    private String path;
+
+    @Ignore
+    private String url;
+
+    public CloudPluginBean() {
+
+    }
+
+    public CloudPluginBean(String name, String title, String src, int versionCode,
+                           String versionDescription, String description, String path, String url) {
+        this.name = name;
+        this.title = title;
+        this.src = src;
+        this.versionCode = versionCode;
+        this.versionDescription = versionDescription;
+        this.path = path;
+        this.url = url;
+        this.description = description;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getSrc() {
+        return src;
+    }
+
+    public void setSrc(String src) {
+        this.src = src;
+    }
+
+    public int getVersionCode() {
+        return versionCode;
+    }
+
+    public void setVersionCode(int versionCode) {
+        this.versionCode = versionCode;
+    }
+
+    public void setVersionDescription(String versionDescription) {
+        this.versionDescription = versionDescription;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    public void setPath(String path) {
+        this.path = path;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    @Override
+    public String getVersion() {
+        return String.valueOf(versionCode);
+    }
+
+    public String getVersionDescription() {
+        return versionDescription;
+    }
+
+    @Override
+    public String getDownloadUrl() {
+        return url;
+    }
+
+    @Override
+    public boolean checkVersion() {
+        return CloudPluginManager.checkUpdate(this);
+    }
+
+    @Override
+    public void install(File file) {
+        CloudPluginManager.install(this, file, false);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/plugin/model/LocalPluginBean.java b/qpython/src/main/java/org/qpython/qpy/plugin/model/LocalPluginBean.java
new file mode 100644
index 00000000..e00b4f21
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/plugin/model/LocalPluginBean.java
@@ -0,0 +1,47 @@
+package org.qpython.qpy.plugin.model;
+
+import io.realm.RealmObject;
+import io.realm.annotations.PrimaryKey;
+
+public class LocalPluginBean extends RealmObject {
+
+    @PrimaryKey
+    private String name;
+
+    private String title;
+
+    private String src;
+
+    public LocalPluginBean() {
+    }
+
+    public LocalPluginBean(String name, String title, String src) {
+        this.name = name;
+        this.title = title;
+        this.src = src;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getSrc() {
+        return src;
+    }
+
+    public void setSrc(String src) {
+        this.src = src;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/plugin/view/FileSelectView.java b/qpython/src/main/java/org/qpython/qpy/plugin/view/FileSelectView.java
new file mode 100644
index 00000000..a9c60780
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/plugin/view/FileSelectView.java
@@ -0,0 +1,203 @@
+package org.qpython.qpy.plugin.view;
+
+import android.content.Context;
+import android.os.Environment;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ListView;
+import android.widget.SimpleAdapter;
+import android.widget.Toast;
+
+import org.qpython.qpy.R;
+
+
+import java.io.File;
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Deque;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class FileSelectView extends ListView implements AdapterView.OnItemClickListener {
+
+    public final static String TAG = "FileSelectView";
+    public static final String ON_ERROR_MSG = "No rights to access!";
+
+    private static final String sRoot = Environment.getExternalStorageDirectory().getAbsolutePath();
+    public static final String PARENT_DIR = "..";
+    public static final String FOLDER = ".";
+    public static final String EMPTY = "";
+
+    private Deque<Integer> mTopStack = new ArrayDeque<>();
+    private Deque<Integer> mPositionStack = new ArrayDeque<>();
+    private Callback mCallback = null;
+    private String mPath = sRoot;
+    private List<Map<String, Object>> list = null;
+    private Map<String, Integer> mIconMap = null;
+
+
+    // 参数说明
+    // context:上下文
+    // mCallback:一个传递Bundle参数的回调接口
+    // iconMap:用来根据后缀显示的图标资源ID。
+    //  根目录图标的索引为sRoot;
+    //  父目录的索引为sParent;
+    //  文件夹的索引为sFolder;
+    //  默认图标的索引为sEmpty;
+    //  其他的直接根据后缀进行索引，比如.wav文件图标的索引为"wav"
+    public FileSelectView(Context context, Callback callback, Map<String, Integer> iconMap) {
+        super(context);
+
+        mIconMap = new HashMap<>();
+        for (Map.Entry<String, Integer> entry : iconMap.entrySet()) {
+            mIconMap.put(entry.getKey().toLowerCase(), entry.getValue());
+        }
+
+        mCallback = callback;
+        setOnItemClickListener(this);
+        refreshFileList();
+    }
+
+    public void setPath(String mPath) {
+        this.mPath = mPath;
+        refreshFileList();
+    }
+
+    private String getSuffix(String filename) {
+        int dix = filename.lastIndexOf('.');
+        if (dix < 0) {
+            return "";
+        } else {
+            return filename.substring(dix + 1);
+        }
+    }
+
+    private int getImageId(String s) {
+        if (mIconMap == null) {
+            return 0;
+        } else if (mIconMap.containsKey(s)) {
+            return mIconMap.get(s);
+        } else if (mIconMap.containsKey(EMPTY)) {
+            return mIconMap.get(EMPTY);
+        } else {
+            return 0;
+        }
+    }
+
+    public int refreshFileList() {
+        // 刷新文件列表
+        File[] files = null;
+        try {
+            files = new File(mPath).listFiles();
+        } catch (Exception e) {
+            files = null;
+        }
+        if (files == null) {
+            // 访问出错
+            Toast.makeText(getContext(), ON_ERROR_MSG, Toast.LENGTH_SHORT).show();
+            return -1;
+        }
+        if (list != null) {
+            list.clear();
+        } else {
+            list = new ArrayList<>(files.length);
+        }
+        // 用来先保存文件夹和文件夹的两个列表
+        ArrayList<Map<String, Object>> folderList = new ArrayList<>();
+        ArrayList<Map<String, Object>> fileList = new ArrayList<>();
+
+        // 顶级目录不显示上一级
+        if (!this.mPath.equals(sRoot)) {
+            Map<String, Object> map = new HashMap<>();
+            map.put("name", PARENT_DIR);
+            map.put("mPath", mPath);
+            map.put("img", getImageId(PARENT_DIR));
+            list.add(map);
+        }
+
+        for (File file : files) {
+            // 空文件夹不显示
+            if (file.isDirectory() && !(file.listFiles().length == 0)) {
+                // 添加有目录或含有指定文件类型的文件夹
+                for (File subFile : file.listFiles()) {
+                    if (subFile.isDirectory() || mIconMap.containsKey(getSuffix(subFile.getName()))) {
+                        Map<String, Object> map = new HashMap<>();
+                        map.put("name", file.getName());
+                        map.put("mPath", file.getPath());
+                        map.put("img", getImageId(FOLDER));
+                        folderList.add(map);
+                        break;
+                    }
+                }
+            } else if (file.isFile()) {
+                // 添加文件
+                String sf = getSuffix(file.getName()).toLowerCase();
+                if (mIconMap.containsKey(sf.toLowerCase())) {
+                    Map<String, Object> map = new HashMap<>();
+                    map.put("name", file.getName());
+                    map.put("mPath", file.getPath());
+                    map.put("img", getImageId(sf));
+                    fileList.add(map);
+                }
+            }
+        }
+
+        //移除根目录
+        list.addAll(folderList); // 先添加文件夹，确保文件夹显示在上面
+        list.addAll(fileList);    //再添加文件
+
+        SimpleAdapter adapter = new SimpleAdapter(getContext(), list, R.layout.list_file_item,
+                new String[]{"img", "name", "mPath"},
+                new int[]{R.id.file_dialog_item_img, R.id.file_dialog_item_name, R.id.file_dialog_item_path});
+        this.setAdapter(adapter);
+        return files.length;
+    }
+
+    @Override
+    public void onItemClick(AdapterView<?> parent, View v, int position, long id) {
+        int lastPosition = 0;
+        int lastTop = 0;
+
+        // 条目选择  ?
+        String pt = (String) list.get(position).get("mPath");
+        String fn = (String) list.get(position).get("name");
+        if (fn.equals(sRoot) || fn.equals(PARENT_DIR)) {
+            // 如果是更目录或者上一层
+            File fl = new File(pt);
+            String ppt = fl.getParent();
+            if (ppt != null) {
+                // 返回上一层
+                mPath = ppt;
+                if (!mPositionStack.isEmpty() && !mTopStack.isEmpty()) {
+                    lastPosition = mPositionStack.pop();
+                    lastTop = mTopStack.pop();
+                }
+            } else {
+                // 返回根目录
+                mPath = sRoot;
+                mPositionStack.clear();
+                mTopStack.clear();
+            }
+        } else {
+            File fl = new File(pt);
+            if (fl.isFile()) {
+                mCallback.onSelect(fl);
+                return;
+            } else if (fl.isDirectory()) {
+                // 如果是文件夹
+                // 那么进入选中的文件夹
+                mPath = pt;
+                mPositionStack.push(position);
+                mTopStack.push(v.getTop());
+            }
+        }
+
+        refreshFileList();
+        setSelectionFromTop(lastPosition, lastTop);
+    }
+
+    public interface Callback {
+        void onSelect(File file);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/program/BindingHolder.java b/qpython/src/main/java/org/qpython/qpy/program/BindingHolder.java
new file mode 100644
index 00000000..7f9e7761
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/program/BindingHolder.java
@@ -0,0 +1,14 @@
+package org.qpython.qpy.program;
+
+
+import android.databinding.ViewDataBinding;
+import android.support.v7.widget.RecyclerView;
+
+public class BindingHolder<T extends ViewDataBinding> extends RecyclerView.ViewHolder {
+    public final T binding;
+
+    public BindingHolder(T binding) {
+        super(binding.getRoot());
+        this.binding = binding;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/program/ItemMenuLayout.java b/qpython/src/main/java/org/qpython/qpy/program/ItemMenuLayout.java
new file mode 100644
index 00000000..aa3f4f0f
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/program/ItemMenuLayout.java
@@ -0,0 +1,130 @@
+package org.qpython.qpy.program;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.Gravity;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.animation.Animation;
+import android.view.animation.TranslateAnimation;
+import android.widget.FrameLayout;
+
+public class ItemMenuLayout extends FrameLayout {
+    private static final String TAG = "ItemMenuLayout";
+
+    private static ItemMenuLayout sOpenMenuView = null;
+    private View mMenu;
+    private OnClickListener mListener;
+    private int mDuration = 300;
+
+    public ItemMenuLayout(Context context) {
+        super(context);
+    }
+
+    public ItemMenuLayout(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public ItemMenuLayout(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+
+        if (getChildCount() != 2) {
+            throw new IllegalStateException("Must be have two child view");
+        }
+
+        mMenu = getChildAt(1);
+        LayoutParams params = (LayoutParams) mMenu.getLayoutParams();
+        params.gravity = Gravity.RIGHT;
+        mMenu.setLayoutParams(params);
+
+        super.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (mListener != null) {
+                    mListener.onClick(v);
+                } else {
+                    if (!isMenuVisible()) {
+                        showMenu();
+                    }
+                }
+            }
+        });
+    }
+
+    @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+        mMenu.setVisibility(GONE);
+    }
+
+    @Override
+    public boolean onInterceptTouchEvent(MotionEvent ev) {
+        if (MotionEvent.ACTION_UP == ev.getAction()) {
+            if (sOpenMenuView != null) {
+                sOpenMenuView.hideMenu();
+            }
+        }
+
+        return super.onInterceptTouchEvent(ev);
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        if (sOpenMenuView != null) {
+            sOpenMenuView.hideMenu();
+            ;
+        }
+        return super.onTouchEvent(event);
+    }
+
+    @Override
+    public void setOnClickListener(OnClickListener l) {
+        mListener = l;
+    }
+
+    private boolean isMenuVisible() {
+        return mMenu.getVisibility() == View.VISIBLE;
+    }
+
+    private void showMenu() {
+        sOpenMenuView = this;
+        mMenu.setVisibility(VISIBLE);
+        Animation anim = new TranslateAnimation(Animation.RELATIVE_TO_SELF, 1.0f,
+                Animation.RELATIVE_TO_SELF, 0,
+                Animation.RELATIVE_TO_SELF, 0,
+                Animation.RELATIVE_TO_SELF, 0);
+        anim.setDuration(mDuration);
+        mMenu.startAnimation(anim);
+    }
+
+    private void hideMenu() {
+        sOpenMenuView = null;
+        Animation anim = new TranslateAnimation(Animation.RELATIVE_TO_SELF, 0,
+                Animation.RELATIVE_TO_SELF, 1.0f,
+                Animation.RELATIVE_TO_SELF, 0,
+                Animation.RELATIVE_TO_SELF, 0);
+        anim.setDuration(mDuration);
+        anim.setAnimationListener(new Animation.AnimationListener() {
+            @Override
+            public void onAnimationStart(Animation animation) {
+
+            }
+
+            @Override
+            public void onAnimationEnd(Animation animation) {
+                mMenu.setVisibility(GONE);
+            }
+
+            @Override
+            public void onAnimationRepeat(Animation animation) {
+
+            }
+        });
+        mMenu.startAnimation(anim);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/AndroidCompat.java b/qpython/src/main/java/org/qpython/qpy/texteditor/AndroidCompat.java
new file mode 100644
index 00000000..e7fec546
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/AndroidCompat.java
@@ -0,0 +1,38 @@
+package org.qpython.qpy.texteditor;
+
+/**
+ * The classes in this package take advantage of the fact that the VM does
+ * not attempt to load a class until it's accessed, and the verifier
+ * does not run until a class is loaded.  By keeping the methods which
+ * are unavailable on older platforms in subclasses which are only ever
+ * accessed on platforms where they are available, we can preserve
+ * compatibility with older platforms without resorting to reflection.
+ *
+ * See http://developer.android.com/resources/articles/backward-compatibility.html
+ * and http://android-developers.blogspot.com/2010/07/how-to-have-your-cupcake-and-eat-it-too.html
+ * for further discussion of this technique.
+ */
+
+public class AndroidCompat {
+    public final static int SDK = getSDK();
+
+    private final static int getSDK() {
+        int result;
+        try {
+            result = AndroidLevel4PlusCompat.getSDKInt();
+        } catch (VerifyError e) {
+            try {
+                result = Integer.valueOf(android.os.Build.VERSION.SDK);
+            } catch (NumberFormatException e2) {
+                result = 1;
+            }
+        }
+        return result;
+    }
+}
+
+class AndroidLevel4PlusCompat {
+    static int getSDKInt() {
+        return android.os.Build.VERSION.SDK_INT;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/ApplicationAdapter.java b/qpython/src/main/java/org/qpython/qpy/texteditor/ApplicationAdapter.java
new file mode 100644
index 00000000..edc792f4
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/ApplicationAdapter.java
@@ -0,0 +1,73 @@
+package org.qpython.qpy.texteditor;
+
+import java.util.List;
+
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import org.qpython.qpy.R;
+
+// http://javatechig.com/android/how-to-get-list-of-installed-apps-in-android 
+
+public class ApplicationAdapter extends ArrayAdapter<ApplicationInfo> {
+    private List<ApplicationInfo> appsList = null;
+    private Context context;
+    private PackageManager packageManager;
+ 
+    /**
+     * @param context
+     * @param textViewResourceId
+     * @param appsList
+     */
+    public ApplicationAdapter(Context context, int textViewResourceId,
+            List<ApplicationInfo> appsList) {
+        super(context, textViewResourceId, appsList);
+        this.context = context;
+        this.appsList = appsList;
+        packageManager = context.getPackageManager();
+    }
+ 
+    @Override
+    public int getCount() {
+        return ((null != appsList) ? appsList.size() : 0);
+    }
+ 
+    @Override
+    public ApplicationInfo getItem(int position) {
+        return ((null != appsList) ? appsList.get(position) : null);
+    }
+ 
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+ 
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        View view = convertView;
+        if (null == view) {
+            LayoutInflater layoutInflater = (LayoutInflater) context
+                    .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+            view = layoutInflater.inflate(R.layout.snippet_list_row, null);
+        }
+ 
+        ApplicationInfo data = appsList.get(position);
+        if (null != data) {
+            TextView appName = (TextView) view.findViewById(R.id.app_name);
+            TextView packageName = (TextView) view.findViewById(R.id.app_paackage);
+            ImageView iconview = (ImageView) view.findViewById(R.id.app_icon);
+ 
+            appName.setText(data.loadLabel(packageManager));
+            packageName.setText(data.packageName);
+            iconview.setImageDrawable(data.loadIcon(packageManager));
+        }
+        return view;
+    }
+};
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/BaseActivity.java b/qpython/src/main/java/org/qpython/qpy/texteditor/BaseActivity.java
new file mode 100644
index 00000000..26c2728a
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/BaseActivity.java
@@ -0,0 +1,45 @@
+package org.qpython.qpy.texteditor;
+
+import android.content.res.Configuration;
+import android.view.View;
+import com.quseit.base.QBaseActivity;
+import com.quseit.util.NAction;
+import com.quseit.util.NUtil;
+
+import org.qpython.qpysdk.QPyConstants;
+
+public class BaseActivity extends QBaseActivity {
+    protected static final int SCRIPT_EXEC_PY = 2235;  
+    protected static final int SCRIPT_EXEC_CODE = 1235;
+    private static final int SCRIPT_CONSOLE_CODE = 1237;
+
+    @Override
+    protected void onDestroy() {
+    	super.onDestroy();
+    }
+
+    @Override
+	public void onConfigurationChanged(Configuration newConfig) {
+    	super.onConfigurationChanged(newConfig);
+    }
+
+	@Override
+	public Class<?> getUpdateSrv() {
+		return null;
+	}
+	
+
+	@Override
+	public String confGetUpdateURL(int flag) {
+		if (flag == 2) {
+			return QPyConstants.LOG_URL+this.getPackageName()+"/"+NUtil.getVersinoCode(this);
+		} else if (flag == 3) {
+			return QPyConstants.AD_URL+this.getPackageName()+"/"+NUtil.getVersinoCode(this)+"?"
+					+ NAction.getUserUrl(getApplicationContext());
+
+		} else {
+			return QPyConstants.UPDATE_URL+this.getPackageName()+"/"+NUtil.getVersinoCode(this);
+
+		}
+	}
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/Bean.java b/qpython/src/main/java/org/qpython/qpy/texteditor/Bean.java
new file mode 100644
index 00000000..82516919
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/Bean.java
@@ -0,0 +1,21 @@
+package org.qpython.qpy.texteditor;
+
+import android.content.Context;
+
+public class Bean{
+	protected String title;
+    protected Context context;
+    //private final String TAG = "BEAN";
+ 
+    public Bean(Context context) {
+    	this.context = context;
+    }
+
+    public String getTitle(){
+        return this.title;
+    }
+
+    public void setTitle(String title){
+        this.title = title;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/EditorActivity.java b/qpython/src/main/java/org/qpython/qpy/texteditor/EditorActivity.java
new file mode 100644
index 00000000..db16f157
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/EditorActivity.java
@@ -0,0 +1,959 @@
+package org.qpython.qpy.texteditor;
+
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.database.Cursor;
+import android.databinding.DataBindingUtil;
+import android.graphics.Rect;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Environment;
+import android.preference.PreferenceManager;
+import android.provider.MediaStore;
+import android.provider.OpenableColumns;
+import android.support.annotation.Nullable;
+import android.support.v4.widget.DrawerLayout;
+import android.support.v7.app.ActionBarDrawerToggle;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.widget.LinearLayoutManager;
+import android.text.TextUtils;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.view.Gravity;
+import android.view.KeyEvent;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewTreeObserver;
+import android.view.inputmethod.InputMethodManager;
+
+import com.quseit.util.FileHelper;
+import com.quseit.util.NAction;
+import com.quseit.util.NStorage;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+import org.qpython.qpy.R;
+import org.qpython.qpy.console.ScriptExec;
+import org.qpython.qpy.databinding.DrawerEditorBinding;
+import org.qpython.qpy.main.activity.BaseActivity;
+import org.qpython.qpy.main.activity.GistEditActivity;
+import org.qpython.qpy.main.adapter.EditorFileTreeAdapter;
+import org.qpython.qpy.texteditor.common.RecentFiles;
+import org.qpython.qpy.texteditor.common.Settings;
+import org.qpython.qpy.texteditor.common.TextFileUtils;
+import org.qpython.qpy.texteditor.ui.adapter.bean.PopupItemBean;
+import org.qpython.qpy.texteditor.ui.view.EditorPopUp;
+import org.qpython.qpy.texteditor.ui.view.EnterDialog;
+import org.qpython.qpy.texteditor.widget.crouton.Crouton;
+import org.qpython.qpy.texteditor.widget.crouton.Style;
+import org.qpython.qpysdk.QPyConstants;
+import org.qpython.qpysdk.utils.Utils;
+import org.swiftp.Util;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Stack;
+import java.util.concurrent.TimeUnit;
+
+import rx.Observable;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+import static com.quseit.util.FileHelper.LoadDataFromAssets;
+import static com.quseit.util.FileHelper.writeToFile;
+import static org.qpython.qpy.texteditor.TedFragment.LOGIN_REQUEST_CODE;
+import static org.qpython.qpy.texteditor.TedLocalActivity.REQUEST_OPEN;
+import static org.qpython.qpy.texteditor.TedLocalActivity.REQUEST_RECENT;
+import static org.qpython.qpy.texteditor.TedLocalActivity.REQUEST_SAVE_AS;
+import static org.qpython.qpy.texteditor.androidlib.data.FileUtils.deleteItem;
+import static org.qpython.qpy.texteditor.androidlib.data.FileUtils.getCanonizePath;
+import static org.qpython.qpy.texteditor.androidlib.data.FileUtils.renameItem;
+import static org.qpython.qpy.texteditor.common.Constants.ACTION_WIDGET_OPEN;
+import static org.qpython.qpy.texteditor.common.Constants.EXTRA_FORCE_READ_ONLY;
+
+public class EditorActivity extends BaseActivity implements ViewTreeObserver.OnGlobalLayoutListener {
+    private DrawerEditorBinding   binding;
+    private TedFragment           textFragment;
+    private EditorFileTreeAdapter fileTreeAdapter;
+    private final String TAG = "EditorActivity";
+
+    private static final int OPEN_REQUEST_CODE = 5233;
+
+    private static final String DEFAULT_ACTION = "empty";
+    private static final String TEXT_ACTION    = "text";
+    private static final String QR_CODE_ACTION = "qrcode";
+    private static final String FILE_ACTION    = "file";
+    private static final String PROJECT_ACTION = "project";
+
+    private static final String EXTRA_PROJECT_PATH = "project_path";
+    private static final String EXTRA_TEXT         = "EXTRA_TEXT";
+    public static final  String EXTRA_TITLE        = "EXTRA_TITLE";
+
+    protected String mCurrentFilePath;
+    protected String mCurrentFileName;
+
+    protected boolean mReadOnly;
+    protected boolean mDirty;
+    protected boolean isKeyboardVisible;
+
+    private boolean isDrawerShowing = false;
+    private String  projPath        = "";
+
+    private EditorPopUp editorPopUp;
+
+    private int height;
+
+    public static void start(Context context) {
+        Intent starter = new Intent(context, EditorActivity.class);
+        starter.setAction(DEFAULT_ACTION);
+        context.startActivity(starter);
+    }
+
+    public static void start(Context context, String text) {
+        Intent starter = new Intent(context, EditorActivity.class);
+        starter.putExtra(EXTRA_TEXT, text);
+        starter.setAction(TEXT_ACTION);
+        context.startActivity(starter);
+    }
+
+    public static void start(Context context, String text, String title) {
+        Intent starter = new Intent(context, EditorActivity.class);
+        starter.putExtra(EXTRA_TEXT, text);
+        starter.putExtra(EXTRA_TITLE, title);
+        starter.setAction(QR_CODE_ACTION);
+        context.startActivity(starter);
+    }
+
+    public static void start(Context context, Uri path) {
+        Intent starter = new Intent(context, EditorActivity.class);
+        starter.setAction(FILE_ACTION);
+        starter.setData(path);
+        context.startActivity(starter);
+    }
+
+    public static void start(String projectPath, Context context) {
+        Intent starter = new Intent(context, EditorActivity.class);
+        starter.putExtra(EXTRA_PROJECT_PATH, projectPath);
+        starter.setAction(PROJECT_ACTION);
+        context.startActivity(starter);
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        EventBus.getDefault().register(this);
+        binding = DataBindingUtil.setContentView(this, R.layout.drawer_editor);
+
+        DisplayMetrics displayMetrics = new DisplayMetrics();
+        getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
+        height = displayMetrics.heightPixels;
+
+        initView();
+        initListener();
+        updateSetting();
+        initFiles();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (needLog && event != null) {
+            showLogDialog(event);
+            needLog = false;
+        }
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        EventBus.getDefault().unregister(this);
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onOpenFileEvent(OpenFileEvent openFileEvent) {
+        binding.drawerLayout.closeDrawer(Gravity.START);
+        if (openFileEvent.filePath == null) {
+            Crouton.showText(this, R.string.not_support_yet, Style.ALERT);
+
+            return;
+        }
+        mCurrentFilePath = openFileEvent.filePath;
+        mCurrentFileName = new File(openFileEvent.filePath).getName();
+        doOpenFile(new File(mCurrentFilePath), mReadOnly);
+    }
+
+    public static class OpenFileEvent {
+        public String filePath;
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        SharedPreferences preferences = getPreferences(MODE_PRIVATE);
+        SharedPreferences.Editor editor = preferences.edit();
+        editor.putString("LAST_OPEN_PATH", mCurrentFilePath);
+        editor.apply();
+    }
+
+    private void initView() {
+        setSupportActionBar(binding.lt.toolbar);
+        binding.lt.toolbar.setNavigationIcon(R.drawable.ic_back);
+
+        switch (getIntent().getAction() == null ? DEFAULT_ACTION : getIntent().getAction()) {
+            case DEFAULT_ACTION:
+                textFragment = TedFragment.newInstance(openLastFile());
+                if (!projPath.isEmpty()) {
+                    fileTreeAdapter = new EditorFileTreeAdapter(projPath);
+                    binding.leftDrawer.setLayoutManager(new LinearLayoutManager(this));
+                    binding.leftDrawer.setAdapter(fileTreeAdapter);
+                } else {
+                    binding.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED);
+                }
+                break;
+            case TEXT_ACTION:
+                textFragment = TedFragment.newInstance(getIntent().getStringExtra(EXTRA_TEXT));
+                binding.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED);
+                mDirty = true;
+                break;
+            case QR_CODE_ACTION:
+                textFragment = TedFragment.newInstance(getIntent().getStringExtra(EXTRA_TEXT));
+                binding.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED);
+                mCurrentFileName = getIntent().getStringExtra(EXTRA_TITLE);
+                mDirty = true;
+                break;
+            case FILE_ACTION:
+                try {
+                    String uri = getIntent().getDataString();
+                    if (uri != null) {
+                        File file = new File(new URI(uri));
+                        textFragment = TedFragment.newInstance(doOpenFile(file, false));
+                        binding.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED);
+                    } else {
+                        Crouton.showText(this, R.string.toast_intent_invalid_uri, Style.ALERT);
+
+                        return;
+                    }
+                } catch (URISyntaxException ignore) {
+                }
+                break;
+            case PROJECT_ACTION:
+                projPath = getIntent().getStringExtra(EXTRA_PROJECT_PATH);
+                fileTreeAdapter = new EditorFileTreeAdapter(projPath);
+                binding.leftDrawer.setLayoutManager(new LinearLayoutManager(this));
+                binding.leftDrawer.setAdapter(fileTreeAdapter);
+                break;
+            case Intent.ACTION_VIEW:
+            case Intent.ACTION_EDIT:
+                if (textFragment == null) textFragment = TedFragment.newInstance("");
+                binding.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED);
+                Uri uri = getIntent().getData();
+                if (uri == null) {
+                    doDefaultAction();
+                } else if ("file".equals(uri.getScheme())) {
+                    doOpenFile(new File(uri.getPath()), false);
+                } else if ("content".equals(uri.getScheme())) {
+                    //LogUtil.d(TAG, "");
+                    openFromOther(uri);
+                }
+                break;
+            case ACTION_WIDGET_OPEN:
+                if (textFragment == null) textFragment = TedFragment.newInstance("");
+                try {
+                    binding.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED);
+                    File file = new File(new URI(getIntent().getData().toString()));
+                    doOpenFile(file, getIntent().getBooleanExtra(EXTRA_FORCE_READ_ONLY, false));
+                } catch (URISyntaxException e) {
+                    Crouton.showText(this, R.string.toast_intent_invalid_uri, Style.ALERT);
+                    return;
+                } catch (IllegalArgumentException e) {
+                    Crouton.showText(this, R.string.toast_intent_illegal, Style.ALERT);
+                    return;
+                }
+                break;
+        }
+
+        if (textFragment == null) {
+            textFragment = TedFragment.newInstance(openLastFile());
+        }
+        getSupportFragmentManager()
+                .beginTransaction()
+                .add(R.id.content_frame, textFragment, "TED")
+                .commit();
+        updateTitle();
+    }
+
+    private void initListener() {
+        binding.lt.toolbar.setNavigationOnClickListener((View v) -> {
+            if (isDrawerShowing) {
+                binding.drawerLayout.closeDrawer(Gravity.START);
+            } else {
+                finishEdit();
+            }
+        });
+
+        binding.drawerLayout.addDrawerListener(new ActionBarDrawerToggle(this, binding.drawerLayout, R.string.toolbar_showing, R.string.toolbar_close) {
+            @Override
+            public void onDrawerOpened(View drawerView) {
+                super.onDrawerOpened(drawerView);
+                isDrawerShowing = true;
+            }
+
+            @Override
+            public void onDrawerClosed(View drawerView) {
+                super.onDrawerClosed(drawerView);
+                isDrawerShowing = false;
+            }
+        });
+    }
+
+
+    private void openFromOther(Uri uri) {
+        Cursor returnCursor =
+                getContentResolver().query(uri, null, null, null, null);
+        try {
+            returnCursor.moveToFirst();
+            int column_index = returnCursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA);//Instead of "MediaStore.Images.Media.DATA" can be used "_data"
+            //表中可能没有数据
+            if (null == returnCursor.getString(column_index)) {
+                return;
+            }
+            Uri filePathUri = Uri.parse(returnCursor.getString(column_index));
+            String path = filePathUri.getPath();
+            doOpenFile(new File(path), false);
+        } catch (IllegalArgumentException e) {
+            Crouton.showText(this, R.string.read_only, Style.INFO);
+            InputStream inputStream = null;
+            try {
+                inputStream = getContentResolver().openInputStream(uri);
+            } catch (FileNotFoundException e1) {
+                e1.printStackTrace();
+            }
+            BufferedReader r = new BufferedReader(new InputStreamReader(inputStream));
+            StringBuilder total = new StringBuilder();
+            String line;
+            try {
+                while ((line = r.readLine()) != null) {
+                    total.append(line).append('\n');
+                }
+                mCurrentFileName = returnCursor.getString(returnCursor.getColumnIndex(OpenableColumns.DISPLAY_NAME)).replace("[", "").replace("]", "");
+                mReadOnly = true;
+                textFragment = TedFragment.newInstance(total.toString());
+                mReadOnly = true;
+            } catch (IOException e1) {
+                e1.printStackTrace();
+            }
+        }
+    }
+
+    private void updateSetting() {
+        Settings.updateFromPreferences(PreferenceManager.getDefaultSharedPreferences(this));
+    }
+
+    private void initFiles() {
+        //File externalStorage = new File(Environment.getExternalStorageDirectory(), "qpython");
+
+        //if (checkExpired("public", new File(externalStorage + "/lib").getAbsolutePath(), "programs"+NAction.getPyVer(this))) {
+
+            //String code = NAction.getCode(this);
+        boolean isQpy3 = NAction.isQPy3(getApplication());
+        String baseDir = QPyConstants.ABSOLUTE_PATH;
+        File root = new File(baseDir);
+        if (!(root.exists() && root.isDirectory())) {
+            root.mkdir();
+        }
+        String path = baseDir + (isQpy3 ? "/snippets3" : "/snippets");
+        File folder = new File(path);
+        if (!(folder.exists() && folder.isDirectory())) {
+            folder.mkdir();
+        }
+
+        // init snipples
+        String[] filesList = {"Apache_License", "The_MIT_License", "QPy_WebApp", "QPy_ConsoleApp", "QPy_SL4AApp", "QPy_PygameApp"};
+        for (int i=0;i<filesList.length;i++) {
+            String fn = filesList[i];
+            File f = new File(path + "/" + fn);
+            if (!f.exists()) {
+                String file1 = LoadDataFromAssets(this, fn);
+                writeToFile(path + "/" + fn, file1);
+            }
+
+        }
+
+        //}
+    }
+
+    private String openLastFile() {
+        String lastFile = NStorage.getSP(this, "qedit.last_filename");
+        Log.d(TAG, "openLastFile:"+lastFile);
+
+        if (!lastFile.equals("")) {
+            File f2 = new File(lastFile);
+            if (f2.exists()) {
+                mCurrentFileName = f2.getName();
+                if (mCurrentFileName.equals("main.py")) {
+                    projPath = f2.getParent();
+
+                }
+
+                return doOpenFile(f2, false);
+            }
+        }
+        return "";
+    }
+
+    protected void updateTitle() {
+        String title;
+        String name = getString(R.string.title_untitled);
+        if ((mCurrentFileName != null) && (mCurrentFileName.length() > 0))
+            name = mCurrentFileName;
+
+        if (mReadOnly) {
+            title = getString(R.string.title_editor_readonly, name);
+        } else if (mDirty) {
+            title = getString(R.string.title_editor_dirty, name);
+        } else {
+            title = getString(R.string.title_editor, name);
+        }
+
+        setTitle(title);
+        supportInvalidateOptionsMenu();
+    }
+
+    protected String doOpenFile(File file, boolean forceReadOnly) {
+        Log.d(TAG, "doOpenFile:"+file);
+        if (file == null) {
+            return "";
+        } else {
+            String text = TextFileUtils.readTextFile(file);
+            mCurrentFilePath = getCanonizePath(file);
+            mCurrentFileName = file.getName();
+            mReadOnly = !(file.canWrite() && (!forceReadOnly));
+            if (textFragment != null) {
+                if (text != null) {
+                    textFragment.setEditorText(text);
+                    NStorage.setSP(this, "qedit.last_filename", mCurrentFilePath);
+                } else {
+                    Crouton.showText(this, R.string.toast_file_cant_read, Style.ALERT);
+
+
+                }
+            }
+            updateTitle();
+            return text != null ? text : "";
+        }
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.editor_menu, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.menu_add:
+                if (binding.drawerLayout.isDrawerOpen(binding.leftDrawer)) {
+                    binding.drawerLayout.closeDrawer(binding.leftDrawer);
+                }
+                if (editorPopUp == null) {
+                    List<PopupItemBean> itemBeanList = new ArrayList<>();
+                    itemBeanList.add(new PopupItemBean(getString(R.string.file_new), v -> {
+                        if (mDirty) {
+                            promptSaveDirty(((dialog, which) -> newContent()));
+                        } else {
+                            newContent();
+                        }
+                    }));
+
+
+                    itemBeanList.add(new PopupItemBean(getString(R.string.console_app_project), v -> {
+                        if (mDirty) {
+                            promptSaveDirty(((dialog, which) -> newProject(QPyConstants.CONSOLE_PROJECT)));
+                        } else {
+                            newProject(QPyConstants.CONSOLE_PROJECT);
+                        }
+                    }));
+                    itemBeanList.add(new PopupItemBean(getString(R.string.webapp_project), v -> {
+                        if (mDirty) {
+                            promptSaveDirty(((dialog, which) -> newProject(QPyConstants.WEB_PROJECT)));
+                        } else {
+                            newProject(QPyConstants.WEB_PROJECT);
+                        }
+                    }));
+                    itemBeanList.add(new PopupItemBean(getString(R.string.qsl4a_app_project), v -> {
+                        if (mDirty) {
+                            promptSaveDirty(((dialog, which) -> newProject(QPyConstants.QSL4A_PROJECT)));
+                        } else {
+                            newProject(QPyConstants.QSL4A_PROJECT);
+                        }
+                    }));
+
+                    itemBeanList.add(new PopupItemBean(getString(R.string.pygame_app_project), v -> {
+                        if (mDirty) {
+                            promptSaveDirty(((dialog, which) -> newProject(QPyConstants.PYGAME_PROJECT)));
+                        } else {
+                            newProject(QPyConstants.PYGAME_PROJECT);
+                        }
+                    }));
+
+//                    itemBeanList.add(new PopupItemBean(getString(R.string.kivy_app_project), v -> {
+//                        if (mDirty) {
+//                            promptSaveDirty(((dialog, which) -> newProject(QPyConstants.KIVY_PROJECT)));
+//                        } else {
+//                            newProject(QPyConstants.KIVY_PROJECT);
+//                        }
+//                    }));
+
+                    editorPopUp = new EditorPopUp(this, itemBeanList);
+                }
+                editorPopUp.show(binding.lt.toolbar);
+                break;
+            case R.id.menu_open:
+                TedLocalActivity.start(this, REQUEST_OPEN, OPEN_REQUEST_CODE,"");
+                break;
+            case R.id.menu_more:
+                TedSettingsActivity.start(this);
+                break;
+        }
+        return true;
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        Bundle extras;
+        if (resultCode == RESULT_CANCELED) {
+            return;
+        }
+
+        if ((resultCode != RESULT_OK) || (data == null)) {
+            return;
+        }
+
+        extras = data.getExtras();
+        if (extras == null) {
+            return;
+        }
+
+        switch (requestCode) {
+            case REQUEST_SAVE_AS:
+                doSaveFile(extras.getString("path"), true);
+                break;
+            case REQUEST_OPEN:
+                doOpenFile(new File(extras.getString("path")), false);
+                break;
+            case REQUEST_RECENT:
+                if (extras.getString("path") == null) {
+                    return;
+                }
+                doOpenFile(new File(extras.getString("path")), false);
+                break;
+            case LOGIN_REQUEST_CODE:
+                GistEditActivity.start(this, mCurrentFilePath);
+                break;
+            case OPEN_REQUEST_CODE:
+                if (extras.getBoolean("isProj")) {
+                    projPath = extras.getString("path");
+                    fileTreeAdapter = new EditorFileTreeAdapter(projPath);
+                    binding.leftDrawer.setLayoutManager(new LinearLayoutManager(this));
+                    binding.leftDrawer.setAdapter(fileTreeAdapter);
+                    binding.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED);
+
+                    doOpenFile(FileHelper.findFile(new File(projPath), "main.py"), false);
+                } else {
+                    binding.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED);
+                    doOpenFile(new File(extras.getString("path")), false);
+                }
+                break;
+        }
+    }
+
+    boolean              needLog;
+    ScriptExec.LogDialog event;
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onEventMainThread(ScriptExec.LogDialog event) {
+        this.event = event;
+        needLog = true;
+    }
+
+    public void showLogDialog(ScriptExec.LogDialog event) {
+        new android.app.AlertDialog.Builder(this)
+                .setTitle(R.string.last_log)
+                .setMessage(com.quseit.qpyengine.R.string.open_log)
+                .setNegativeButton(R.string.no, ((dialog, which) -> dialog.dismiss()))
+                .setPositiveButton(R.string.ok, (dialog, which) -> {
+                    dialog.dismiss();
+                    Utils.checkRunTimeLog(this, event.title, event.path);
+                })
+                .create()
+                .show();
+    }
+
+    /**
+     * 一个work around，点击返回时软键盘的事件会先触发，所以延迟0.2秒更新状态
+     */
+    @Override
+    public void onGlobalLayout() {
+        Rect bottom = new Rect();
+        binding.drawerLayout.getWindowVisibleDisplayFrame(bottom);
+        Observable.just(null)
+                .delay(200, TimeUnit.MICROSECONDS)
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribeOn(Schedulers.newThread())
+                .subscribe(o -> isKeyboardVisible = bottom.bottom < height);
+    }
+
+    protected void hideKeyboard() {
+        ((InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE)).hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 0);
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCoder, KeyEvent event) {
+        boolean isCtr = event.isCtrlPressed();
+        if (keyCoder == KeyEvent.KEYCODE_BACK) {
+            if (textFragment.isSearchShowing()) {
+                textFragment.setSearchState();
+            } else if (isKeyboardVisible) {
+                hideKeyboard();
+            } else if (binding.drawerLayout.isDrawerOpen(binding.leftDrawer)) {
+                binding.drawerLayout.closeDrawer(binding.leftDrawer);
+            } else {
+                finishEdit();
+            }
+            return true;
+        } else if (isCtr) {
+            switch (keyCoder) {
+                case KeyEvent.KEYCODE_F:
+                    textFragment.setSearch();
+                    break;
+                case KeyEvent.KEYCODE_S:
+                    saveContent(true, false);
+                    break;
+                case KeyEvent.KEYCODE_O:
+//                    openFile();
+                    break;
+                case KeyEvent.KEYCODE_Z:
+                    textFragment.undo();
+                    break;
+                case KeyEvent.KEYCODE_L:
+                    textFragment.goToLine();
+                    break;
+                case KeyEvent.KEYCODE_LEFT_BRACKET:
+                    textFragment.leftIndent();
+                    break;
+                case KeyEvent.KEYCODE_RIGHT_BRACKET:
+                    textFragment.rightIndent();
+                    break;
+                case KeyEvent.KEYCODE_R:
+//                    runScript();
+                    break;
+                case KeyEvent.KEYCODE_SOFT_LEFT:
+
+                default:
+                    break;
+            }
+        } else {
+            switch (keyCoder) {
+                // F5 ,run the code
+                case KeyEvent.KEYCODE_F5:
+                    // Toast.makeText(this,"f5 f5 f5", Toast.LENGTH_SHORT).show();
+//                    runScript();
+                    break;
+                case KeyEvent.KEYCODE_TAB:
+                    textFragment.rightIndent();
+                    break;
+                case KeyEvent.KEYCODE_SEARCH:
+                    textFragment.setSearchState();
+                    break;
+            }
+        }
+
+        return super.onKeyDown(keyCoder, event);
+    }
+
+    private void finishEdit() {
+        if (NAction.getCode(this).contains("qedit")) {
+            if (mCurrentFilePath == null) {
+                if (mDirty) {
+                    promptSaveDirty();
+                } else {
+                    finish();
+                }
+            } else {
+                Intent intent = getIntent();
+                String action = intent.getAction();
+                if (action == null) {
+                    newContent();
+                } else {
+                    if (mDirty) {
+                        promptSaveDirty();
+                    } else {
+                        finish();
+                    }
+                }
+            }
+        } else {
+            if (mDirty) {
+                promptSaveDirty();
+            } else {
+                finish();
+            }
+        }
+    }
+
+    protected boolean doOpenBackup() {
+        try {
+            String text = TextFileUtils.readInternal(this);
+            if (!TextUtils.isEmpty(text)) {
+                textFragment = TedFragment.newInstance(text);
+                mCurrentFilePath = getPreferences(MODE_PRIVATE).getString("LAST_OPEN_PATH", "");
+                String[] findName = mCurrentFilePath.split("/");
+                mCurrentFileName = findName.length == 0 ? "" : findName[findName.length - 1];
+                mDirty = false;
+                mReadOnly = false;
+                return true;
+            } else {
+                return false;
+            }
+        } catch (OutOfMemoryError e) {
+            Crouton.showText(this, R.string.toast_memory_open, Style.ALERT);
+
+        }
+
+        return true;
+    }
+
+    protected void doDefaultAction() {
+        File file;
+        boolean loaded;
+        loaded = doOpenBackup();
+
+        if ((!loaded) && Settings.USE_HOME_PAGE) {
+            file = new File(Settings.HOME_PAGE_PATH);
+            if (!file.exists()) {
+                Crouton.showText(this, R.string.toast_open_home_page_error, Style.ALERT);
+
+            } else if (!file.canRead()) {
+                Crouton.showText(this, R.string.toast_home_page_cant_read, Style.ALERT);
+
+            } else {
+                doOpenFile(file, false);
+            }
+        }
+
+//        if (!loaded) doClearContents(); todo
+    }
+
+    protected void promptSaveDirty() {
+        promptSaveDirty(((dialog, which) -> finish()));
+    }
+
+    protected void promptSaveDirty(DialogInterface.OnClickListener listener) {
+        AlertDialog.Builder builder;
+
+        builder = new AlertDialog.Builder(this, R.style.MyDialog);
+        builder.setTitle(R.string.warning);
+        builder.setMessage(R.string.ui_save_text);
+
+        builder.setPositiveButton(R.string.ui_save, (dialog, which) -> {
+            saveContent(true, false);
+            listener.onClick(dialog, which);
+        });
+        builder.setNegativeButton(R.string.ui_cancel, null);
+        builder.setNeutralButton(R.string.ui_no_save, listener);
+
+        builder.create().show();
+    }
+
+    protected void doSaveFile(String path, boolean showToast) {
+        if (path == null) {
+            Crouton.showText(this, R.string.toast_save_null, Style.ALERT);
+
+            return;
+        }
+        String content = textFragment.getEditorString();
+        if (!TextFileUtils.writeTextFile(path + ".tmp", content)) {
+            Crouton.showText(this, R.string.toast_save_temp, Style.ALERT);
+
+            return;
+        }
+
+        if (!deleteItem(path)) {
+            Crouton.showText(this, R.string.toast_save_delete, Style.ALERT);
+
+            return;
+        }
+
+        if (!renameItem(path + ".tmp", path)) {
+            Crouton.showText(this, R.string.toast_save_rename, Style.ALERT);
+
+            return;
+        }
+
+        mCurrentFilePath = getCanonizePath(new File(path));
+        mCurrentFileName = (new File(path)).getName();
+        RecentFiles.updateRecentList(path);
+        RecentFiles.saveRecentList(PreferenceManager.getDefaultSharedPreferences(this));
+        mReadOnly = false;
+        mDirty = false;
+        updateTitle();
+
+        NStorage.setSP(this, "qedit.last_filename", mCurrentFilePath);
+        if (showToast) {
+            Crouton.showText(this, R.string.toast_save_success, Style.INFO);
+        }
+    }
+
+    protected void saveAs() {
+        TedLocalActivity.start(this, TedLocalActivity.REQUEST_SAVE_AS, REQUEST_SAVE_AS,mCurrentFileName!=null?mCurrentFileName:".py");
+    }
+
+    protected void saveContent(boolean showToast, boolean auto) {
+        if (!mDirty) {
+            if (showToast)  {
+                Crouton.showText(this, R.string.no_change, Style.INFO);
+            }
+            return;
+        }
+        if ((mCurrentFilePath == null) || (mCurrentFilePath.length() == 0)) {
+            if (auto) {
+                //when edit, if didn't save before, it wont save still
+            } else {
+                TedLocalActivity.start(this, TedLocalActivity.REQUEST_SAVE_AS, REQUEST_SAVE_AS, mCurrentFileName!=null?mCurrentFileName:".py");
+            }
+        } else {
+            doSaveFile(mCurrentFilePath, showToast);
+        }
+    }
+
+    protected void newContentInProject() {
+        if (projPath != null && !projPath.equals("")) {
+            new EnterDialog(this)
+                    .setTitle(getString(R.string.new_file))
+                    .setExt(".py")
+                    .setConfirmListener(name -> {
+                        String path = new File(mCurrentFilePath).getParent() + "/" + name;
+                        File file = new File(path);
+                        if (file.exists()) {
+                            Crouton.showText(this, R.string.file_exists, Style.ALERT);
+
+                            return false;
+                        }
+                        updateTitle();
+                        try {
+                            file.createNewFile();
+                            mCurrentFilePath = file.getAbsolutePath();
+                            doOpenFile(file, false);
+                            fileTreeAdapter.addNewFile(path);
+                            return true;
+                        } catch (IOException e) {
+                            e.printStackTrace();
+                            return false;
+                        }
+                    })
+                    .show();
+        }
+    }
+    protected void newContent() {
+
+        mCurrentFileName = null;
+        mCurrentFilePath = null;
+        textFragment.setEditorText("");
+        binding.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED);
+        updateTitle();
+    }
+
+    protected void newScript() {
+        final boolean isQpy3 = NAction.isQPy3(getApplicationContext());
+
+        new EnterDialog(this)
+                .setTitle(getString(R.string.new_script))
+                .setExt(".py")
+                .setConfirmListener(name -> {
+                    File file = new File(QPyConstants.ABSOLUTE_PATH + "/" + (isQpy3? QPyConstants.DFROM_QPY3:QPyConstants.DFROM_QPY2) + "/" + name);
+                    if (file.exists()) {
+                        Crouton.showText(this, R.string.file_exists, Style.ALERT);
+
+                        return false;
+                    }
+                    mCurrentFileName = null;
+                    mCurrentFilePath = null;
+                    textFragment.setEditorText("");
+                    binding.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED);
+                    try {
+                        file.createNewFile();
+                        mCurrentFilePath = file.getAbsolutePath();
+                        doOpenFile(file, false);
+                        return true;
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                        return false;
+                    }
+                })
+                .show();
+    }
+
+    /**
+     * @param type WEB_PROJECT/CONSOLE_PROJECT/QSL4A_PROJECT
+     */
+    protected void newProject(final String type) {
+        NStorage.setSP(getApplicationContext(), "qedit.last_filename", "");
+        new EnterDialog(this)
+            .setTitle(getString(R.string.new_project))
+            .setHint(getString(R.string.project_name))
+            .setConfirmListener(name -> {
+                Stack<String> curArtistDir = new Stack<>();
+                final boolean isQpy3 = NAction.isQPy3(getApplicationContext());
+
+                curArtistDir.push(QPyConstants.ABSOLUTE_PATH
+                        + "/" + (isQpy3 ? QPyConstants.DFROM_PRJ3 : QPyConstants.DFROM_PRJ2) + "/" + name);
+
+                File fileN = new File(curArtistDir.peek());
+                if (fileN.exists()) {
+                    Crouton.showText(this, R.string.file_exists, Style.ALERT);
+
+                    return false;
+                } else {
+                    try {
+                        if (fileN.mkdirs()) {
+                            File mainPy = new File(fileN.getAbsolutePath(), "main.py");
+                            if (mainPy.createNewFile()) {
+                                mCurrentFilePath = mainPy.getAbsolutePath();
+                                doOpenFile(mainPy, false);
+                                textFragment.insertSnippet(type);
+                                saveContent(true, false);
+                            }
+                        }
+                    } catch (IOException e) {
+                        Crouton.showText(this, R.string.error_dont_kn, Style.ALERT);
+
+                        e.printStackTrace();
+                        return false;
+                    }
+                    Crouton.showText(this, R.string.success, Style.INFO);
+
+                    return true;
+                }
+            })
+            .show();
+    }
+}
\ No newline at end of file
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/FTPServerService.java b/qpython/src/main/java/org/qpython/qpy/texteditor/FTPServerService.java
new file mode 100644
index 00000000..033ac22e
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/FTPServerService.java
@@ -0,0 +1,9 @@
+package org.qpython.qpy.texteditor;
+
+public class FTPServerService extends org.swiftp.FTPServerService {
+
+	@Override
+	protected Class<?> getSettingClass() {
+		return MFTPSettingActivity.class;
+	}
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/MFTPSettingActivity.java b/qpython/src/main/java/org/qpython/qpy/texteditor/MFTPSettingActivity.java
new file mode 100644
index 00000000..b3b45626
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/MFTPSettingActivity.java
@@ -0,0 +1,225 @@
+package org.qpython.qpy.texteditor;
+
+import android.support.v7.app.AlertDialog;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.os.Environment;
+import android.util.Log;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.quseit.base.QBaseDialog;
+import com.quseit.util.NAction;
+import com.quseit.util.NUtil;
+
+import org.qpython.qpy.R;
+import org.qpython.qpysdk.QPyConstants;
+import org.swiftp.Defaults;
+
+import java.io.File;
+import java.net.InetAddress;
+import java.text.MessageFormat;
+
+public class MFTPSettingActivity extends BaseActivity {
+	private static final String TAG = "MSettingActivity";
+    //private static final int SCRIPT_EXEC_CODE = 1235;  
+    BroadcastReceiver ftpServerReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            Log.v(TAG, "FTPServerService action received: " + intent.getAction());
+            TextView running_state = (TextView) findViewById(R.id.ftp_service_value);
+            Button ftpOpBtn = (Button)findViewById(R.id.ftp_op_btn);
+
+            if (intent.getAction().equals(org.swiftp.FTPServerService.ACTION_STARTED)) {
+                // Fill in the FTP server address
+                InetAddress address = org.swiftp.FTPServerService.getWifiIp();
+                if (address == null) {
+                    Log.v(TAG, "Unable to retreive wifi ip address");
+                    running_state.setText(getString(R.string.cant_get_url));
+                    return;
+                }
+                String iptext = "ftp://" + address.getHostAddress() + ":"
+                        + org.swiftp.FTPServerService.getPort() + "/";
+                Resources resources = getResources();
+                String summary = resources.getString(R.string.running_summary_started, iptext);
+                running_state.setText(summary);
+
+                ftpOpBtn.setText(getString(R.string.ftp_stop));
+
+            } else if (intent.getAction().equals(org.swiftp.FTPServerService.ACTION_STOPPED)) {
+                running_state.setText("");
+                running_state.setText(R.string.running_summary_stopped);
+
+                ftpOpBtn.setText(getString(R.string.ftp_start));
+
+            } else if (intent.getAction().equals(org.swiftp.FTPServerService.ACTION_FAILEDTOSTART)) {
+                running_state.setText(R.string.running_summary_failed);
+            	ftpOpBtn.setText(getString(R.string.ftp_start));
+            }
+        }
+    };
+    
+    public static void start(Context context) {
+        Intent starter = new Intent(context, MFTPSettingActivity.class);
+        context.startActivity(starter);
+    }
+    
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.m_ftp_setting);
+        setTitle(R.string.swiftp_name);
+
+        //initWidgetTabItem(4);
+
+        String externalStorage = new File(Environment.getExternalStorageDirectory(), QPyConstants.BASE_PATH).getAbsolutePath();
+        String frv = MessageFormat.format(getString(R.string.ftp_root), externalStorage);
+        TextView fr = (TextView)findViewById(R.id.ftp_root_value);
+        fr.setText(frv);
+
+        displayAccount();
+        //
+        Button ftpOpBtn = (Button)findViewById(R.id.ftp_op_btn);
+        if (org.swiftp.FTPServerService.isRunning()) {
+        	ftpOpBtn.setText(getString(R.string.ftp_stop));
+
+        } else {
+        	ftpOpBtn.setText(getString(R.string.ftp_start));
+
+        }
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(org.swiftp.FTPServerService.ACTION_STARTED);
+        filter.addAction(org.swiftp.FTPServerService.ACTION_STOPPED);
+        filter.addAction(org.swiftp.FTPServerService.ACTION_FAILEDTOSTART);
+        registerReceiver(ftpServerReceiver, filter);
+
+//        MNApp mnApp = (MNApp) this.getApplication();
+//
+//        QBaseApp.getInstance().addActivity(this);
+    }
+    
+    @Override
+	public void onDestroy() {
+        Log.v(TAG, "onPause");
+        super.onDestroy();
+
+        Log.v(TAG, "Unregistering the FTPServer actions");
+        unregisterReceiver(ftpServerReceiver);
+    }
+
+    public void onFTPOp(View v) {
+    	if (org.swiftp.FTPServerService.isRunning()) {
+    		stopServer();
+    	} else {
+    		startServer();
+    	}
+    }
+    
+    private void startServer() {
+        Context context = getApplicationContext();
+        NAction.setFtpRoot(context, Environment.getExternalStorageDirectory()+"/"+ QPyConstants.BASE_PATH);
+        Intent serverService = new Intent(context, FTPServerService.class);
+        if (!org.swiftp.FTPServerService.isRunning()) {
+            startService(serverService);
+        }
+    }
+   
+    private void stopServer() {
+        Context context = getApplicationContext();
+        Intent serverService = new Intent(context, FTPServerService.class);
+        stopService(serverService);
+    }
+ 
+    public void displayAccount() {
+    	String ftpPort = NAction.getFtpPort(getApplicationContext());
+    	if (ftpPort.equals("")) {
+    		ftpPort = String.valueOf(Defaults.getPortNumber());
+    	}
+    	String ftpUsername = NAction.getFtpUsername(getApplicationContext());
+    	if (ftpUsername.equals("")) {
+    		ftpUsername = NAction.getCode(getApplicationContext());
+    	}
+    	String ftpPwd = NAction.getFtpPwd(getApplicationContext());
+    	if (ftpPwd.equals("")) {
+    		ftpPwd = NAction.getCode(getApplicationContext());
+    	}
+
+    	TextView ftpPortValue = (TextView)findViewById(R.id.ftp_port_value);
+    	ftpPortValue.setText(ftpPort);
+
+    	TextView ftpAccountValue = (TextView)findViewById(R.id.plugin_ftp_account_value);
+    	ftpAccountValue.setText(ftpUsername+" / "+ftpPwd);
+    }
+	
+    @SuppressWarnings("deprecation")
+	public void onFtpAccountSetting(View v) {
+    	String ftpUsername = NAction.getFtpUsername(getApplicationContext());
+    	if (ftpUsername.equals("")) {
+    		ftpUsername = NAction.getCode(getApplicationContext());
+    	}
+    	String ftpPwd = NAction.getFtpPwd(getApplicationContext());
+    	if (ftpPwd.equals("")) {
+    		ftpPwd = NAction.getCode(getApplicationContext());
+    	}
+
+		WBase.setTxtDialogParam2(0, R.string.ftp_account_setting, getString(R.string.ftp_username), getString(R.string.ftp_pwd), ftpUsername, ftpPwd,
+				(dialog, which) -> {
+                    AlertDialog ad = (AlertDialog) dialog;
+                    EditText t1 = (EditText) ad.findViewById(R.id.editText_prompt1);
+                    EditText t2 = (EditText) ad.findViewById(R.id.editText_prompt2);
+
+                    String username = t1.getText().toString();
+                    String pwd = t2.getText().toString();
+                    if (!username.equals("") && !pwd.equals("")) {
+                        NAction.setFtpUsername(getApplicationContext(), username);
+                        NAction.setFtpPwd(getApplicationContext(), pwd);
+
+                    } else {
+                        Toast.makeText(getApplicationContext(), R.string.err_need_input, Toast.LENGTH_SHORT).show();
+
+                    }
+
+                    displayAccount();
+
+                },null);
+		showDialog(QBaseDialog.DIALOG_TEXT_ENTRY2+dialogIndex);
+		dialogIndex++;
+    }
+
+	@SuppressWarnings("deprecation")
+	public void onFtpPortSetting(View v) {
+		final TextView port = (TextView)findViewById(R.id.ftp_port_value);
+		String portVal = port.getText().toString();
+		WBase.setTxtDialogParam(0, R.string.ftp_port, portVal,
+				new DialogInterface.OnClickListener() {
+					@Override
+					public void onClick(DialogInterface dialog, int which) {
+				        AlertDialog ad = (AlertDialog) dialog;
+				        EditText t = (EditText) ad.findViewById(R.id.editText_prompt);
+				        String content = t.getText().toString();
+
+				        if (!content.equals("")) {
+					        if (NUtil.isInt(content)) {
+					        	NAction.setFtpPort(getApplicationContext(), content);
+					        	displayAccount();
+					        } else {
+					        	Toast.makeText(getApplicationContext(), R.string.err_need_int, Toast.LENGTH_SHORT).show();
+					        }
+				        } else {
+					        NAction.setProxyPort(getApplicationContext(), "");
+							port.setText("");
+				        }
+					}
+				},null);
+		showDialog(QBaseDialog.DIALOG_TEXT_ENTRY+dialogIndex);
+		dialogIndex++;
+	}
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/MNApp.java b/qpython/src/main/java/org/qpython/qpy/texteditor/MNApp.java
new file mode 100644
index 00000000..c30486d7
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/MNApp.java
@@ -0,0 +1,41 @@
+package org.qpython.qpy.texteditor;
+
+import android.app.Application;
+import android.content.Context;
+import android.content.Intent;
+
+import com.quseit.common.CrashHandler;
+
+//import greendroid.app.GDApplication;
+
+public class MNApp extends Application {
+
+	//Map<String, Integer> movieDirs = null;
+
+	//GoogleAnalyticsTracker tracker;
+
+	@Override  
+    public void onCreate() {  
+        super.onCreate();  
+        CrashHandler crashHandler = CrashHandler.getInstance();
+        //注册crashHandler类  
+        crashHandler.init(getApplicationContext());
+    	//tracker = GoogleAnalyticsTracker.getInstance();
+//    	String x = NAction.getExtP(getApplicationContext(), "ga_gap");
+//    	int xq = 30;
+//    	if (!x.equals("")) {
+//    		xq = Integer.valueOf(x);
+//    	}
+//    	String gtid = CONF.GOOGLE_TRACKER_ID;
+//    	String gtid2 = NAction.getExtP(getApplicationContext(), "ga_gtid");
+//    	if (!gtid2.equals("")) {
+//    		gtid = gtid2;
+//    	}
+        //tracker.startNewSession(gtid, xq, getApplicationContext());
+    }  
+
+    public void logout(Context context) {
+    }
+
+
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/RunRules.java b/qpython/src/main/java/org/qpython/qpy/texteditor/RunRules.java
new file mode 100644
index 00000000..230e903f
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/RunRules.java
@@ -0,0 +1,192 @@
+package org.qpython.qpy.texteditor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+import android.support.v7.app.AlertDialog;
+import android.app.ListActivity;
+import android.app.ProgressDialog;
+import android.content.ActivityNotFoundException;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ListView;
+import android.widget.Toast;
+
+import org.qpython.qpy.R;
+
+/**
+ * @author kyle kersey
+ *
+ */
+public class RunRules extends ListActivity {
+    private PackageManager packageManager = null;
+    private List<ApplicationInfo> applist = null;
+    private ApplicationAdapter listadaptor = null;
+ 
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.run_rules);
+        
+        Button addRuleButton = (Button) findViewById(R.id.add_rule_button);
+        addRuleButton.setOnClickListener(new OnClickListener() {
+			
+			@Override
+			public void onClick(View v) {
+				// uncomment this PATTERN_LINE to see the application picker
+				//new LoadApplications().execute();
+				startRunRuleDialog();
+			}
+		});
+        
+        packageManager = getPackageManager();        
+        //new LoadApplications().execute();
+    }
+ 
+ 
+    @Override
+    protected void onListItemClick(ListView l, View v, int position, long id) {
+        super.onListItemClick(l, v, position, id);
+ 
+        ApplicationInfo app = applist.get(position);
+        try {
+            Intent intent = packageManager
+                    .getLaunchIntentForPackage(app.packageName);
+ 
+            if (null != intent) {
+                startActivity(intent);
+            }
+        } catch (ActivityNotFoundException e) {
+            Toast.makeText(RunRules.this, e.getMessage(),
+                    Toast.LENGTH_LONG).show();
+        } catch (Exception e) {
+            Toast.makeText(RunRules.this, e.getMessage(),
+                    Toast.LENGTH_LONG).show();
+        }
+    }
+ 
+    private List<ApplicationInfo> checkForLaunchIntent(List<ApplicationInfo> list) {
+        ArrayList<ApplicationInfo> applist = new ArrayList<ApplicationInfo>();
+        for (ApplicationInfo info : list) {
+            try {
+                if (null != packageManager.getLaunchIntentForPackage(info.packageName)) {
+                    applist.add(info);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+ 
+        return applist;
+    }
+ 
+    public void startRunRuleDialog() {
+    	final Context context = this;
+    	LayoutInflater li = LayoutInflater.from(context);
+		View promptsView = li.inflate(R.layout.new_rule_dialog, null);
+
+		AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(
+				context);
+
+		// set prompts.xml to alertdialog builder
+		alertDialogBuilder.setView(promptsView);
+
+		final EditText shouldEndWith = (EditText) promptsView.findViewById(R.id.should_endwith);
+		final Button pickAppButton = (Button) promptsView.findViewById(R.id.pick_app_button);
+		pickAppButton.setOnClickListener(new OnClickListener() {
+
+			@Override
+			public void onClick(View v) {
+				// TODO Auto-generated method stub
+				Intent mainIntent = new Intent(Intent.ACTION_MAIN, null);
+
+				// http://developer.android.com/training/basics/intents/sending.html
+				// Verify it resolves
+				PackageManager packageManager = getPackageManager();
+				List<ResolveInfo> activities = packageManager.queryIntentActivities(mainIntent, 0);
+				boolean isIntentSafe = activities.size() > 0;
+				Intent chooser = Intent.createChooser(mainIntent, "Pick a App");
+
+				// Start an activity if it's safe
+				if (isIntentSafe) {
+				    startActivity(mainIntent);
+				}
+			}
+		});
+
+
+		// set dialog message
+		alertDialogBuilder
+			.setCancelable(false)
+			.setPositiveButton("OK",
+			  new DialogInterface.OnClickListener() {
+			    public void onClick(DialogInterface dialog,int id) {
+
+			    }
+			  })
+			.setNegativeButton("Cancel",
+			  new DialogInterface.OnClickListener() {
+			    public void onClick(DialogInterface dialog,int id) {
+				dialog.cancel();
+			    }
+			  });
+
+		// create alert dialog
+		AlertDialog alertDialog = alertDialogBuilder.create();
+
+		// show it
+		alertDialog.show();
+
+    }
+
+    private class LoadApplications extends AsyncTask<Void, Void, Void> {
+        private ProgressDialog progress = null;
+
+        @Override
+        protected Void doInBackground(Void... params) {
+            applist = checkForLaunchIntent(packageManager.getInstalledApplications(PackageManager.GET_META_DATA));
+            listadaptor = new ApplicationAdapter(RunRules.this,
+                    R.layout.snippet_list_row, applist);
+
+            return null;
+        }
+
+        @Override
+        protected void onCancelled() {
+            super.onCancelled();
+        }
+
+        @Override
+        protected void onPostExecute(Void result) {
+            setListAdapter(listadaptor);
+            progress.dismiss();
+            super.onPostExecute(result);
+        }
+
+        @Override
+        protected void onPreExecute() {
+            progress = ProgressDialog.show(RunRules.this, null,
+                    "Loading application info...");
+            super.onPreExecute();
+        }
+
+        @Override
+        protected void onProgressUpdate(Void... values) {
+            super.onProgressUpdate(values);
+        }
+
+
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/TedAppWidgetProvider.java b/qpython/src/main/java/org/qpython/qpy/texteditor/TedAppWidgetProvider.java
new file mode 100644
index 00000000..7e78751f
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/TedAppWidgetProvider.java
@@ -0,0 +1,89 @@
+package org.qpython.qpy.texteditor;
+
+import java.io.File;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.texteditor.common.Constants;
+import org.qpython.qpy.texteditor.common.WidgetPrefs;
+
+import android.app.PendingIntent;
+import android.appwidget.AppWidgetManager;
+import android.appwidget.AppWidgetProvider;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.util.Log;
+import android.widget.RemoteViews;
+import org.qpython.qpy.BuildConfig;
+
+public class TedAppWidgetProvider extends AppWidgetProvider implements Constants {
+
+	public static void updateWidget(Context context, AppWidgetManager manager, int widgetId) {
+		Intent intent;
+		PendingIntent pendingIntent;
+		RemoteViews views;
+		WidgetPrefs pref;
+		File targetFile;
+
+		pref = new WidgetPrefs();
+		pref.load(context, widgetId);
+
+		if (BuildConfig.DEBUG)
+			Log.i(TAG, "Updating widgetId " + String.valueOf(widgetId));
+
+		targetFile = new File(pref.mTargetPath);
+
+		intent = new Intent(context, TedFragment.class);
+		intent.setAction(ACTION_WIDGET_OPEN);
+		intent.setData(Uri.fromFile(targetFile));
+		intent.putExtra(EXTRA_FORCE_READ_ONLY, pref.mReadOnly);
+
+		pendingIntent = PendingIntent.getActivity(context, 0, intent, 0);
+
+		views = new RemoteViews(context.getPackageName(), R.layout.widget);
+
+		views.setOnClickPendingIntent(R.id.widgetLayout, pendingIntent);
+		if (pref.mReadOnly)
+			views.setImageViewResource(R.id.icon, R.drawable.ic_editor_file);
+		else
+			views.setImageViewResource(R.id.icon, R.drawable.ic_editor_unknown);
+		views.setTextViewText(R.id.textFileName, targetFile.getName());
+
+		manager.updateAppWidget(widgetId, views);
+	}
+
+	/**
+	 * @see android.appwidget.AppWidgetProvider#onUpdate(android.content.Context,
+	 *      android.appwidget.AppWidgetManager, int[])
+	 */
+	@Override
+	public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
+
+		AppWidgetManager manager;
+		ComponentName widgetName;
+
+		if (BuildConfig.DEBUG)
+			Log.i(TAG, "onUpdate widgets");
+
+		manager = AppWidgetManager.getInstance(context);
+		widgetName = new ComponentName(context, TedAppWidgetProvider.class);
+		int[] widgetIds = manager.getAppWidgetIds(widgetName);
+
+		for (int widgetId : widgetIds) {
+			updateWidget(context, manager, widgetId);
+		}
+	}
+
+	/**
+	 * @see android.appwidget.AppWidgetProvider#onDeleted(android.content.Context,
+	 *      int[])
+	 */
+	@Override
+	public void onDeleted(Context context, int[] appWidgetIds) {
+
+		for (int widgetId : appWidgetIds) {
+			WidgetPrefs.delete(context, widgetId);
+		}
+	}
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/TedFontActivity.java b/qpython/src/main/java/org/qpython/qpy/texteditor/TedFontActivity.java
new file mode 100644
index 00000000..7fe46a28
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/TedFontActivity.java
@@ -0,0 +1,97 @@
+package org.qpython.qpy.texteditor;
+
+import java.io.File;
+import java.util.LinkedList;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.texteditor.ui.adapter.FontListAdapter;
+
+import org.qpython.qpy.texteditor.widget.crouton.Crouton;
+import org.qpython.qpy.texteditor.widget.crouton.Style;
+
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.View.OnClickListener;
+
+import org.qpython.qpy.texteditor.androidlib.ui.activity.BrowsingActivity;
+
+public class TedFontActivity extends BrowsingActivity implements
+        OnClickListener {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.layout_open);
+        mExtensionsWhiteList.add("ttf");
+
+        // set default result
+        setResult(RESULT_CANCELED, null);
+
+        // buttons
+        findViewById(R.id.buttonCancel).setOnClickListener(this);
+
+        mListAdapter = new FontListAdapter(this, new LinkedList<>());
+    }
+
+    @Override
+    protected void onFileClick(File file) {
+        if (setOpenResult(file))
+            finish();
+    }
+
+    @Override
+    protected boolean onFolderClick(File folder) {
+        return true;
+    }
+
+    @Override
+    protected void onFolderViewFilled() {
+
+    }
+
+    @Override
+    public boolean onKeyUp(int keyCode, KeyEvent event) {
+        if (event.getKeyCode() == KeyEvent.KEYCODE_BACK) {
+            // navigate to parent folder
+            if (!mCurrentFolder.getPath().equals("/storage/emulated/0")) {
+                File parent = mCurrentFolder.getParentFile();
+                if ((parent != null) && (parent.exists())) {
+                    fillFolderView(parent);
+                    return true;
+                }
+            }
+        }
+        return super.onKeyUp(keyCode, event);
+    }
+
+    @Override
+    public void onClick(View v) {
+        if (v.getId() == R.id.buttonCancel) {
+            setResult(RESULT_CANCELED);
+            finish();
+        }
+    }
+
+    /**
+     * @param file the file to return
+     * @return if the result was set correctly
+     */
+    protected boolean setOpenResult(File file) {
+        Intent result;
+
+        if (!file.canRead()) {
+            Crouton.showText(this, R.string.toast_file_cant_read, Style.ALERT);
+            return false;
+        }
+
+        result = new Intent();
+        result.setData(Uri.fromFile(file));
+
+        setResult(RESULT_OK, result);
+        return true;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/TedFragment.java b/qpython/src/main/java/org/qpython/qpy/texteditor/TedFragment.java
new file mode 100644
index 00000000..7b1ee0ce
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/TedFragment.java
@@ -0,0 +1,814 @@
+package org.qpython.qpy.texteditor;
+
+import android.animation.Animator;
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.net.Uri;
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
+import android.os.Bundle;
+import android.os.Environment;
+import android.support.annotation.Nullable;
+import android.support.annotation.RequiresApi;
+import android.support.v4.app.Fragment;
+import android.support.v7.app.AlertDialog;
+import android.text.Editable;
+import android.text.InputType;
+import android.text.TextWatcher;
+import android.util.DisplayMetrics;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewAnimationUtils;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+import com.quseit.util.NAction;
+import com.quseit.util.NStorage;
+
+import org.markdown4j.Markdown4jProcessor;
+import org.qpython.qpy.R;
+import org.qpython.qpy.console.ScriptExec;
+import org.qpython.qpy.databinding.LayoutEditorBinding;
+import org.qpython.qpy.databinding.SearchTopBinding;
+import org.qpython.qpy.main.activity.GistEditActivity;
+import org.qpython.qpy.main.activity.QWebViewActivity;
+import org.qpython.qpy.main.activity.SignInActivity;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.widget.Indent;
+import org.qpython.qpy.main.widget.ShortcutLayout;
+import org.qpython.qpy.texteditor.common.Constants;
+import org.qpython.qpy.texteditor.common.RecentFiles;
+import org.qpython.qpy.texteditor.common.Settings;
+import org.qpython.qpy.texteditor.ui.view.EnterDialog;
+import org.qpython.qpy.texteditor.undo.TextChangeWatcher;
+import org.qpython.qpy.texteditor.widget.crouton.Crouton;
+import org.qpython.qpy.texteditor.widget.crouton.Style;
+import org.qpython.qpysdk.QPyConstants;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Scanner;
+
+import static android.content.Context.MODE_PRIVATE;
+import static org.qpython.qpy.texteditor.androidlib.data.FileUtils.deleteItem;
+import static org.qpython.qpy.texteditor.androidlib.data.FileUtils.renameItem;
+import static org.qpython.qpy.texteditor.androidlib.ui.Toaster.showToast;
+
+/**
+ * @author River
+ */
+
+public class TedFragment extends Fragment implements Constants, TextWatcher, Indent {
+    public static final String TAG                = "TED";
+    public static final int    LOGIN_REQUEST_CODE = 5106;
+    public static final int    OPEN_REQUEST_CODE  = 5233;
+
+
+    private static final String Apache_License  = "Apache_License";
+    private static final String The_MIT_License = "The_MIT_License";
+
+    final int DOC_FLAG = 10001;
+
+    protected boolean mInUndo;
+    protected boolean mDoNotBackup;
+
+    protected TextChangeWatcher mWatcher = new TextChangeWatcher();
+    private EditorActivity activity;
+
+    private LayoutEditorBinding binding;
+    private SearchTopBinding    searchTopBinding;
+    private ShortcutLayout      shortcutLayout;
+
+    public static TedFragment newInstance(String content) {
+        TedFragment myFragment = new TedFragment();
+
+        Bundle args = new Bundle();
+        args.putString(TAG, content);
+        myFragment.setArguments(args);
+
+        return myFragment;
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.layout_editor, null);
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        binding = DataBindingUtil.bind(view);
+        if (activity.mReadOnly) {
+            binding.editor.setEnabled(false);
+        }
+        initListener();
+        initContent();
+    }
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        activity = (EditorActivity) context;
+        //此处view未进行初始化不应该对view进行操作
+    }
+
+    @SuppressLint("RestrictedApi")
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (binding != null) {
+            binding.editor.updateFromSettings("");
+
+            if (Settings.SHOW_GIST) {
+                //binding.share.setVisibility(View.VISIBLE);
+
+            } else {
+                binding.share.setVisibility(View.GONE);
+
+            }
+        }
+    }
+
+    private void initListener() {
+        binding.ibMore.setOnClickListener(view -> {
+            if (view.isSelected()) {
+                shortcutLayout.setVisibility(View.GONE);
+                binding.control.llControl.setVisibility(View.VISIBLE);
+                binding.ibMore.setImageResource(R.drawable.ic_editcode);
+            } else {
+                if (!binding.control.vsShortcut.isInflated()) {
+                    shortcutLayout = (ShortcutLayout) binding.control.vsShortcut.getViewStub().inflate();
+                    shortcutLayout.init(binding.editor,this);
+                }
+                if (binding.control.ibLock.isSelected()) {
+                    binding.control.ibLock.setSelected(false);
+                    binding.control.ibLock.setImageResource(R.drawable.ic_editor_keyboard);
+                    binding.editor.setEnabled(true);
+                }
+                shortcutLayout.setVisibility(View.VISIBLE);
+                binding.control.llControl.setVisibility(View.GONE);
+                binding.ibMore.setImageResource(R.drawable.ic_edittext);
+            }
+            view.setSelected(!view.isSelected());
+        });
+        binding.control.ibSave.setOnClickListener(v -> ((EditorActivity) getActivity()).saveContent(true, false));
+        binding.control.ibSaveAs.setOnClickListener(v -> ((EditorActivity) getActivity()).saveAs());
+
+
+        binding.control.ibSave.setOnLongClickListener(v -> {
+            TedLocalActivity.start(getActivity(), TedLocalActivity.REQUEST_SAVE_AS, REQUEST_SAVE_AS,"");
+            return true;
+        });
+        binding.control.ibSnippet.setOnClickListener(v -> onSnippets());
+        binding.control.ibRecent.setOnClickListener(v -> {
+            TedLocalActivity.start(getActivity(), TedLocalActivity.REQUEST_RECENT, OPEN_REQUEST_CODE,"");
+            binding.ibMore.setImageResource(R.drawable.ic_editor_more_horiz);
+            binding.ibMore.setSelected(false);
+        });
+        binding.control.ibSave.setOnClickListener(v -> ((EditorActivity) getActivity()).saveContent(true, false));
+        binding.control.ibJumpTo.setOnClickListener(v -> goToLine());
+        binding.control.playBtn.setOnClickListener(view -> {
+            if (activity.mDirty) {
+                AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
+                builder.setTitle(R.string.warning)
+                        .setMessage(R.string.run_dirty_hint)
+                        .setPositiveButton(R.string.yes, (dialog, which) -> {
+                            ((EditorActivity) getActivity()).saveContent(false, false);
+                            runFile();
+                        })
+                        .setNegativeButton(R.string.no_im_good, ((dialog, which) -> runFile()))
+                        .show();
+            } else {
+                runFile();
+            }
+        });
+        binding.control.ibSearch.setOnClickListener(view -> {
+            if (!binding.vsSearchTop.isInflated()) {
+                searchTopBinding = DataBindingUtil.bind(binding.vsSearchTop.getViewStub().inflate());
+                initSearchBarListener();
+                setSearchState();
+            }
+            if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) {
+                startAnim();
+            }
+            binding.searchBottom.rlSearchBottom.setVisibility(View.VISIBLE);
+            searchTopBinding.llSearch.setVisibility(View.VISIBLE);
+            searchTopBinding.textSearch.requestFocus();
+        });
+        binding.control.ibUndo.setOnClickListener(v -> undo());
+        binding.control.ibRedo.setOnClickListener(v -> redo());
+        binding.getRoot().getViewTreeObserver().addOnGlobalLayoutListener((EditorActivity) getActivity());
+
+        if (Settings.SHOW_GIST) {
+            binding.share.setOnClickListener(v -> {
+                if (activity.mCurrentFilePath == null) {
+                    Toast.makeText(getContext(), R.string.share_empty_hint, Toast.LENGTH_SHORT).show();
+                    return;
+                }
+                if (activity.mDirty) {
+                    ((EditorActivity) getActivity()).promptSaveDirty();
+                    return;
+                }
+                if (App.getUser() != null) {
+                    GistEditActivity.start(getContext(), activity.mCurrentFilePath);
+                } else {
+                    Intent intent = new Intent(getContext(), SignInActivity.class);
+                    startActivityForResult(intent, LOGIN_REQUEST_CODE);
+                }
+            });
+        } else {
+            binding.share.setVisibility(View.GONE);
+        }
+
+        binding.control.ibLock.setOnClickListener(v -> {
+            if (v.isSelected()) {
+                binding.control.ibLock.setImageResource(R.drawable.ic_editor_keyboard);
+                binding.editor.setEnabled(true);
+            } else {
+                binding.control.ibLock.setImageResource(R.drawable.ic_editor_keyboardlock);
+                binding.editor.setEnabled(false);
+            }
+
+            v.setSelected(!v.isSelected());
+        });
+    }
+
+    private void initContent() {
+        binding.editor.setText(getArguments().getString(TAG));
+        binding.editor.setEnabled(!activity.mReadOnly);
+        binding.editor.addTextChangedListener(this);
+        binding.editor.setOnKeyListener(((v, keyCode, event) -> {
+            if (KeyEvent.ACTION_UP == event.getAction()
+                    && (KeyEvent.KEYCODE_NUMPAD_ENTER == event.getKeyCode()
+                    || KeyEvent.KEYCODE_ENTER == event.getKeyCode())) {
+                activity.saveContent(false, true);
+            }
+            return false;
+        }));
+        updateType();
+    }
+
+    private void runFile() {
+        if (activity.mCurrentFilePath != null
+                && (activity.mCurrentFilePath.endsWith(".py") || activity.mCurrentFilePath.endsWith(".md")
+                || activity.mCurrentFilePath.endsWith(".html") || activity.mCurrentFilePath.endsWith(".htm")
+                || activity.mCurrentFilePath.endsWith(".lua") || activity.mCurrentFilePath.endsWith(".sh"))) {
+            if (activity.mCurrentFileName.endsWith(".html")) {
+                String content = binding.editor.getText().toString();
+                QWebViewActivity.loadHtml(getContext(), content, activity.mCurrentFileName);
+            } else if (activity.mCurrentFileName.endsWith(".md")) {
+                String content = binding.editor.getText().toString();
+                try {
+                    String markdown = new Markdown4jProcessor().process(content);
+                    QWebViewActivity.loadHtml(getContext(), markdown, activity.mCurrentFileName);
+                } catch (IOException e) {
+                    e.printStackTrace();
+                    Crouton.showText(getActivity(), getResources().getString(R.string.convert_fail), Style.ALERT);
+                }
+            } else {
+                if (activity.mCurrentFilePath.contains("/projects")) {
+                    ScriptExec.getInstance().playProject(getActivity(), activity.mCurrentFilePath.replace("/main.py", ""), false);
+                } else {
+                    ScriptExec.getInstance().playScript(getActivity(), activity.mCurrentFilePath, null, false);
+                }
+            }
+        } else {
+            Toast.makeText(getContext(), R.string.qedit_not_support, Toast.LENGTH_SHORT).show();
+        }
+    }
+
+    protected void updateType() {
+        if (activity.mCurrentFileName != null) {
+            String[] syntaxExts = getResources().getStringArray(R.array.syntax_ext);
+            for (String syntaxExt : syntaxExts) {
+                if (activity.mCurrentFileName.endsWith(syntaxExt)) {
+                    binding.editor.updateFromSettings(syntaxExt);
+                }
+            }
+
+            if (activity.mCurrentFileName.endsWith(".py") || activity.mCurrentFileName.endsWith(".sh")) {
+                binding.control.playBtn.setImageResource(R.drawable.ic_editor_run);
+            } else if (activity.mCurrentFileName.endsWith(".md")
+                    || activity.mCurrentFileName.endsWith(".html") || activity.mCurrentFileName.endsWith(".htm")) {
+                binding.control.playBtn.setImageResource(R.drawable.ic_editor_web);
+            }
+        }
+    }
+
+    @RequiresApi(api = VERSION_CODES.LOLLIPOP)
+    private void startAnim() {
+        DisplayMetrics displayMetrics = new DisplayMetrics();
+        getActivity().getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
+        int width = displayMetrics.widthPixels;
+        Animator anim = ViewAnimationUtils.createCircularReveal(searchTopBinding.getRoot(), width, 0, 0, width);
+        anim.start();
+    }
+
+    private void initSearchBarListener() {
+        searchTopBinding.ibClear.setOnClickListener(v -> searchTopBinding.textSearch.setText(""));
+        searchTopBinding.ibClose.setOnClickListener(v -> {
+            searchTopBinding.llSearch.setVisibility(View.GONE);
+            binding.searchBottom.rlSearchBottom.setVisibility(View.GONE);
+        });
+
+        binding.searchBottom.ivSearch.setOnClickListener(v -> searchNext());
+        binding.searchBottom.buttonSearchNext.setOnClickListener(v -> searchNext());
+
+        binding.searchBottom.buttonSearchPrev.setOnClickListener(v -> searchPrevious());
+    }
+
+    /**
+     * Create a list of snippet
+     */
+    public void SnippetsList() {
+        boolean isQpy3 = NAction.isQPy3(getContext());
+        List<String> listItems = new ArrayList<>();
+        String baseDir = Environment.getExternalStorageDirectory().getAbsolutePath()
+                + "/" + QPyConstants.BASE_PATH;
+        String path = baseDir + (isQpy3 ? "/snippets3/" : "/snippets/");
+        String files;
+        File folder = new File(path);
+        if (folder.exists()) {
+            File[] listOfFiles = folder.listFiles();
+            if (listOfFiles != null) {
+                for (File listOfFile : listOfFiles) {
+                    if (listOfFile.isFile()) {
+                        files = listOfFile.getName();
+                        listItems.add(files);
+                    }
+                }
+            }
+        }
+
+        final CharSequence colors[] = listItems.toArray(new CharSequence[listItems.size()]);
+        AlertDialog.Builder builder = new AlertDialog.Builder(getContext(), R.style.MyDialog);
+        builder.setTitle(R.string.info_snippets);
+
+        builder.setItems(colors, (dialog, which) -> {
+            try {
+                insertSnippet("" + colors[which]);
+            } catch (IOException e) {
+                Toast.makeText(getContext().getApplicationContext(), R.string.fail_to_insert, Toast.LENGTH_SHORT).show();
+                e.printStackTrace();
+            }
+        });
+        builder.show();
+    }
+
+    /**
+     * @param snippetName Apache_License/The_MIT_License/WEB_PROJECT/CONSOLE_PROJECT/KIVY_PROJECT
+     */
+    public void insertSnippet(String snippetName) throws IOException {
+        boolean isQPy3 = NAction.isQPy3(getContext());
+        String baseDir = Environment.getExternalStorageDirectory().getAbsolutePath()
+                + "/" + QPyConstants.BASE_PATH;
+        String path = baseDir + (isQPy3 ? "/snippets3/" : "/snippets/");
+        String s;
+        switch (snippetName) {
+            case Apache_License:
+                s = readFile(path + Apache_License);
+                break;
+            case The_MIT_License:
+                s = readFile(path + The_MIT_License);
+                break;
+            case QPyConstants.WEB_PROJECT:
+                s = readFile(path + "QPy_WebApp");
+                break;
+            case QPyConstants.CONSOLE_PROJECT:
+                s = readFile(path + "QPy_ConsoleApp");
+                break;
+//            case QPyConstants.KIVY_PROJECT:
+//                s = readFile(path + "QPy_KivyApp");
+//                break;
+            case QPyConstants.PYGAME_PROJECT:
+                s = readFile(path + "QPy_PygameApp");
+                break;
+            case QPyConstants.QSL4A_PROJECT:
+                s = readFile(path + "QPy_SL4AApp");
+                break;
+            default:
+                s = readFile(path + "QPy_ConsoleApp");
+        }
+        binding.editor.getText().insert(0, s);
+    }
+
+    public void saveCodeSnippet(String selectText) {
+        boolean isQPy3 = NAction.isQPy3(getContext());
+        String baseDir = Environment.getExternalStorageDirectory().getAbsolutePath()
+                + "/" + QPyConstants.BASE_PATH;
+        String path = baseDir + (isQPy3 ? "/snippets3/" : "/snippets/");
+
+        new EnterDialog(getContext())
+                .setTitle(getString(R.string.save_as_snippets))
+                .setHint(getString(R.string.enter_snippet))
+                .setConfirmListener(name -> {
+                    String dir = path + name;
+                    File f = new File(dir);
+                    if (f.exists()) {
+                        Toast.makeText(getContext(), R.string.snippet_exist, Toast.LENGTH_SHORT).show();
+                        return false;
+                    } else {
+                        writeToFile(name, selectText);
+                        Toast.makeText(getContext().getApplicationContext(), getString(R.string.save_as_snippets_1) + name,
+                                Toast.LENGTH_SHORT).show();
+                        return true;
+                    }
+                })
+                .show();
+    }
+
+    public void setSearch() {
+        setSearchState();
+
+        int startSelection = binding.editor.getSelectionStart();
+        int endSelection = binding.editor.getSelectionEnd();
+        String selectedText = binding.editor.getText().toString().substring(startSelection, endSelection);
+        if (selectedText.length() != 0) {
+            searchTopBinding.textSearch.setText(selectedText);
+        }
+    }
+
+    @Override
+    public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+        if (Settings.UNDO && (!mInUndo) && (mWatcher != null))
+            mWatcher.beforeChange(s, start, count, after);
+    }
+
+    @Override
+    public void onTextChanged(CharSequence s, int start, int before, int count) {
+        if (mInUndo)
+            return;
+
+        if (Settings.UNDO && (!mInUndo) && (mWatcher != null))
+            mWatcher.afterChange(s, start, before, count);
+    }
+
+    @Override
+    public void afterTextChanged(Editable s) {
+        if (!activity.mDirty) {
+            activity.mDirty = true;
+            ((EditorActivity) getActivity()).updateTitle();
+        }
+    }
+
+    public boolean setEditorText(String text) {
+        if (text != null) {
+            //view未初始化调用该方法导致空指针
+            if (binding == null){
+                Bundle args = new Bundle();
+                args.putString(TAG, text);
+                setArguments(args);
+                return false;
+            }
+            binding.editor.removeTextChangedListener(this);
+            mInUndo = true;
+            binding.editor.setText(text);
+            binding.editor.setOnKeyListener(null);
+            binding.editor.setEnabled(!activity.mReadOnly);
+            mWatcher = new TextChangeWatcher();
+            if (activity.mCurrentFilePath != null) {
+                RecentFiles.updateRecentList(activity.mCurrentFilePath);
+                RecentFiles.saveRecentList(getContext().getSharedPreferences(PREFERENCES_NAME, MODE_PRIVATE));
+            }
+            activity.mDirty = false;
+            mInUndo = false;
+            mDoNotBackup = false;
+            NStorage.setSP(getContext().getApplicationContext(), "qedit.last_filename", activity.mCurrentFilePath);
+            updateType();
+            binding.editor.addTextChangedListener(this);
+            binding.editor.setOnKeyListener(((v, keyCode, event) -> {
+                if (KeyEvent.ACTION_UP == event.getAction() && (KeyEvent.KEYCODE_NUMPAD_ENTER == event.getKeyCode()
+                        || KeyEvent.KEYCODE_ENTER == event.getKeyCode())) {
+
+                    activity.saveContent(false, true);
+                }
+                return false;
+            }));
+            return true;
+        } else {
+            Toast.makeText(getContext(), R.string.toast_open_error, Toast.LENGTH_SHORT).show();
+            return false;
+        }
+    }
+
+    /**
+     * Undo the last change
+     *
+     * @return if an undo was don
+     */
+    protected boolean undo() {
+        boolean didUndo = false;
+        mInUndo = true;
+        int caret;
+        caret = mWatcher.undo(binding.editor.getText());
+        if (caret >= 0) {
+            binding.editor.setSelection(caret, caret);
+            didUndo = true;
+        }
+        mInUndo = false;
+
+        return didUndo;
+    }
+
+    protected boolean redo() {
+        boolean didRedo = false;
+        int caret;
+        caret = mWatcher.redo(binding.editor.getText());
+        if (caret >= 0) {
+            binding.editor.setSelection(caret);
+            didRedo = true;
+        }
+        return didRedo;
+    }
+
+    protected boolean isSearchShowing() {
+        return searchTopBinding != null && searchTopBinding.llSearch.getVisibility() == View.VISIBLE;
+    }
+
+    protected String getEditorString() {
+        return binding.editor.getText().toString();
+    }
+
+    public void onSnippets() {
+        int startSelection = binding.editor.getSelectionStart();
+        int endSelection = binding.editor.getSelectionEnd();
+        String selectedText = binding.editor.getText().toString().substring(startSelection, endSelection);
+        /**
+         * Detect if the text is selected
+         */
+        if (selectedText.length() != 0) {
+            saveCodeSnippet(selectedText);
+        } else {
+            SnippetsList();
+        }
+    }
+
+    /**
+     * Opens / close the setSearchState interface
+     */
+    protected void setSearchState() {
+        if (searchTopBinding.llSearch!=null) {
+            switch (searchTopBinding.llSearch.getVisibility()) {
+                case View.GONE:
+                    binding.returnBarBox.setVisibility(View.GONE);
+                    searchTopBinding.llSearch.setVisibility(View.VISIBLE);
+                    binding.searchBottom.rlSearchBottom.setVisibility(View.VISIBLE);
+                    searchTopBinding.textSearch.requestFocus();
+                    break;
+                case View.INVISIBLE:
+                    break;
+                case View.VISIBLE:
+                default:
+                    searchTopBinding.llSearch.setVisibility(View.GONE);
+                    binding.searchBottom.rlSearchBottom.setVisibility(View.GONE);
+                    binding.returnBarBox.setVisibility(View.VISIBLE);
+                    break;
+            }
+        }
+        binding.editor.setEnabled(true);
+    }
+
+    /**
+     * Uses the user input to setSearchState a file
+     */
+    @SuppressLint("DefaultLocale")
+    protected void searchNext() {
+        String search, text;
+        int selection, next;
+
+        search = searchTopBinding.textSearch.getText().toString();
+        text = binding.editor.getText().toString();
+        selection = binding.editor.getSelectionEnd();
+
+        if (!Settings.SEARCHMATCHCASE) {
+            search = search.toLowerCase();
+            text = text.toLowerCase();
+        }
+
+        next = text.indexOf(search, selection);
+        if (next > -1) {
+            binding.editor.setSelection(next, next + search.length());
+            if (!binding.editor.isFocused())
+                binding.editor.requestFocus();
+        } else {
+            if (Settings.SEARCHWRAP) {
+                next = text.indexOf(search);
+                if (next > -1) {
+                    binding.editor.setSelection(next, next + search.length());
+                    if (!binding.editor.isFocused())
+                        binding.editor.requestFocus();
+                } else {
+                    Crouton.showText(getActivity(), R.string.toast_search_not_found, Style.ALERT);
+                }
+            } else {
+                Crouton.showText(getActivity(), R.string.toast_search_eof, Style.ALERT);
+            }
+        }
+    }
+
+    /**
+     * Uses the user input to setSearchState a file
+     */
+    @SuppressLint("DefaultLocale")
+    protected void searchPrevious() {
+        String search, text;
+        int selection, next;
+
+        search = searchTopBinding.textSearch.getText().toString();
+        text = binding.editor.getText().toString();
+        selection = binding.editor.getSelectionStart() - 1;
+
+        if (search.length() == 0) {
+            Crouton.showText(getActivity(), R.string.toast_search_no_input, Style.ALERT);
+            return;
+        }
+
+        if (!Settings.SEARCHMATCHCASE) {
+            search = search.toLowerCase();
+            text = text.toLowerCase();
+        }
+
+        next = text.lastIndexOf(search, selection);
+
+        if (next > -1) {
+            binding.editor.setSelection(next, next + search.length());
+            if (!binding.editor.isFocused())
+                binding.editor.requestFocus();
+        } else {
+            if (Settings.SEARCHWRAP) {
+                next = text.lastIndexOf(search);
+                if (next > -1) {
+                    binding.editor.setSelection(next, next + search.length());
+                    if (!binding.editor.isFocused())
+                        binding.editor.requestFocus();
+                } else {
+                    Crouton.showText(getActivity(), R.string.toast_search_not_found, Style.INFO);
+                }
+            } else {
+                Crouton.showText(getActivity(), R.string.toast_search_eof, Style.INFO);
+            }
+        }
+    }
+
+    /**
+     * Indent the text left
+     */
+    @Override
+    public void leftIndent() {
+        int index = binding.editor.getSelectionStart();
+        Editable editable = binding.editor.getText();
+        if (index >= 4) {
+            if (editable.subSequence(index - 4, index).toString().equals("    ")) {
+                editable.delete(index - 4, index);
+            }
+        }
+    }
+
+
+    // same as rightIndent
+    public void tabIndent() {
+        int startSelection = binding.editor.getSelectionStart();
+        int endSelection = binding.editor.getSelectionEnd();
+        String selectedText = binding.editor.getText().toString().substring(startSelection, endSelection);
+        Editable editable = binding.editor.getText();
+        if (selectedText.length() != 0) {
+            String startData = binding.editor.getText().toString();
+            String textData = startData.substring(0, startSelection);
+            if (textData.contains("\n")) {
+                int newLineIndex = textData.lastIndexOf("\n");
+                editable.replace(newLineIndex, newLineIndex, "\n\t");
+            } else {
+                editable.insert(0, "\t");
+            }
+            String indentedText = selectedText.replace("\n", "\n\t");
+            editable.replace(startSelection, endSelection, indentedText);
+        } else {
+            int index = binding.editor.getSelectionStart();
+            editable.insert(index, "\t");
+        }
+
+        binding.editor.setFocusable(true);
+        binding.editor.setFocusableInTouchMode(true);
+        binding.editor.requestFocus();
+        binding.editor.requestFocusFromTouch();
+        binding.editor.findFocus();
+    }
+    //same as leftIndentss
+    public void delIndent() {
+        int index = binding.editor.getSelectionStart();
+        Editable editable = binding.editor.getText();
+        if (index >= 1) {
+            if (editable.subSequence(index - 1, index).toString().equals("    ")) {
+                editable.delete(index - 1, index);
+            }
+        }
+    }
+    /**
+     *
+     * Indent the text right
+     */
+    @Override
+    public void rightIndent() {
+        int startSelection = binding.editor.getSelectionStart();
+        int endSelection = binding.editor.getSelectionEnd();
+        String selectedText = binding.editor.getText().toString().substring(startSelection, endSelection);
+        Editable editable = binding.editor.getText();
+        if (selectedText.length() != 0) {
+            String startData = binding.editor.getText().toString();
+            String textData = startData.substring(0, startSelection);
+            if (textData.contains("\n")) {
+                int newLineIndex = textData.lastIndexOf("\n");
+                editable.replace(newLineIndex, newLineIndex, "\n    ");
+            } else {
+                editable.insert(0, "    ");
+            }
+            String indentedText = selectedText.replace("\n", "\n    ");
+            editable.replace(startSelection, endSelection, indentedText);
+        } else {
+            int index = binding.editor.getSelectionStart();
+            editable.insert(index, "    ");
+        }
+
+        binding.editor.setFocusable(true);
+        binding.editor.setFocusableInTouchMode(true);
+        binding.editor.requestFocus();
+        binding.editor.requestFocusFromTouch();
+        binding.editor.findFocus();
+    }
+
+    /**
+     * Calculate the index of the Nth new PATTERN_LINE
+     *
+     * @param indexNewLine New PATTERN_LINE to find
+     * @return Gives the position of the Nth new PATTERN_LINE
+     */
+    public int NewLineIndex(int indexNewLine) {
+        String data = binding.editor.getText().toString();
+        final StringBuffer sb = new StringBuffer(data);
+        List<Integer> myList = new ArrayList<Integer>();
+        myList.add(0);
+        for (int i = 0; i < sb.length(); i++) {
+            if (sb.charAt(i) == '\n')
+                myList.add(i + 1);
+        }
+        return myList.get(indexNewLine - 1);
+    }
+
+    public void goToLine() {
+        new EnterDialog(getContext()).setTitle(getString(R.string.jump_to))
+                .setEnterType(InputType.TYPE_CLASS_NUMBER)
+                .setHint("Line : 1 - " + binding.editor.getLineCount())
+                .setConfirmListener(content -> {
+                    int line;
+                    try {
+                        line = Integer.parseInt(content);
+                        if (line > binding.editor.getLineCount()) {
+                            Toast.makeText(getContext(), R.string.fail_to_goto, Toast.LENGTH_SHORT).show();
+                            return false;
+                        }
+                        int position = NewLineIndex(line);
+                        binding.editor.setSelection(position);
+
+                    } catch (Exception e) {
+                        Toast.makeText(getContext(), R.string.fail_to_goto, Toast.LENGTH_SHORT).show();
+
+                    }
+                    return true;
+                })
+                .show();
+    }
+
+    private String readFile(String pathname) throws IOException {
+
+        File file = new File(pathname);
+        StringBuilder fileContents = new StringBuilder((int) file.length());
+        String lineSeparator = System.getProperty("PATTERN_LINE.separator");
+        if (lineSeparator==null) {
+            lineSeparator = "\n";
+        }
+        try (Scanner scanner = new Scanner(file)) {
+            while (scanner.hasNextLine()) {
+                fileContents.append(scanner.nextLine()).append(lineSeparator);
+            }
+            return fileContents.toString();
+        }
+    }
+
+    public void writeToFile(String filePath, String data) {
+        try {
+            FileOutputStream fOut = new FileOutputStream(filePath);
+            fOut.write(data.getBytes());
+            fOut.flush();
+            fOut.close();
+        } catch (IOException iox) {
+            iox.printStackTrace();
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/TedOpenRecentActivity.java b/qpython/src/main/java/org/qpython/qpy/texteditor/TedOpenRecentActivity.java
new file mode 100644
index 00000000..ea58d9a6
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/TedOpenRecentActivity.java
@@ -0,0 +1,170 @@
+package org.qpython.qpy.texteditor;
+
+import java.io.File;
+import java.util.ArrayList;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.texteditor.common.Constants;
+import org.qpython.qpy.texteditor.common.RecentFiles;
+import org.qpython.qpy.texteditor.ui.adapter.PathListAdapter;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.ContextMenu;
+import android.view.ContextMenu.ContextMenuInfo;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.AdapterView;
+import android.widget.AdapterView.AdapterContextMenuInfo;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.ListAdapter;
+import android.widget.ListView;
+import org.qpython.qpy.texteditor.androidlib.ui.Toaster;
+
+@SuppressWarnings("deprecation")
+public class TedOpenRecentActivity extends Activity implements Constants, OnClickListener,
+		OnItemClickListener {
+
+	protected String mContextPath;
+	/** the dialog's list view */
+	protected ListView mFilesList;
+	/** the list of recent files */
+	protected ArrayList<String> mList;
+
+	/**
+	 * @see android.app.Activity#onCreate(android.os.Bundle)
+	 */
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+
+		// Setup content view
+		setContentView(R.layout.layout_open);
+        setTitle(R.string.ui_history);
+
+		// buttons
+		findViewById(R.id.buttonCancel).setOnClickListener(this);
+
+		// widgets
+		mFilesList = (ListView) findViewById(android.R.id.list);
+		mFilesList.setOnItemClickListener(this);
+		mFilesList.setOnCreateContextMenuListener(this);
+	}
+
+	/**
+	 * @see android.app.Activity#onResume()
+	 */
+	@Override
+	protected void onResume() {
+		super.onResume();
+
+		fillRecentFilesView();
+	}
+
+	/**
+	 * @see android.app.Activity#onCreateContextMenu(android.view.ContextMenu,
+	 *      android.view.View, android.view.ContextMenu.ContextMenuInfo)
+	 */
+	@Override
+	public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
+		super.onCreateContextMenu(menu, v, menuInfo);
+		AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo;
+		mContextPath = (String) mFilesList.getAdapter().getItem(info.position);
+
+		menu.setHeaderTitle(mContextPath);
+		menu.add(Menu.NONE, 0, Menu.NONE, R.string.ui_delete);
+	}
+
+	/**
+	 * @see android.app.Activity#onContextItemSelected(android.view.MenuItem)
+	 */
+	@Override
+	public boolean onContextItemSelected(MenuItem item) {
+
+		RecentFiles.removePath(mContextPath);
+		RecentFiles.saveRecentList(getSharedPreferences(PREFERENCES_NAME, MODE_PRIVATE));
+
+		fillRecentFilesView();
+		Toaster.showToast(this, R.string.toast_recent_files_deleted, false);
+
+		return true;
+	}
+
+	/**
+	 * @see android.view.View.OnClickListener#onClick(android.view.View)
+	 */
+	@Override
+	public void onClick(View v) {
+		if (v.getId() == R.id.buttonCancel) {
+			setResult(RESULT_CANCELED);
+			finish();
+		}
+	}
+
+	/**
+	 * @see android.widget.AdapterView.OnItemClickListener#onItemClick(android.widget.AdapterView,
+	 *      android.view.View, int, long)
+	 */
+	@Override
+	public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+		String path;
+
+		path = mList.get(position);
+
+		if (setOpenResult(new File(path))) {
+			finish();
+		} else {
+			RecentFiles.removePath(path);
+			RecentFiles.saveRecentList(getSharedPreferences(PREFERENCES_NAME, MODE_PRIVATE));
+//			((PathListAdapter) mListAdapter).notifyDataSetChanged();
+			Toaster.showToast(this, R.string.toast_recent_files_invalid, true);
+		}
+
+	}
+
+	/**
+	 * Fills the files list with the recent files
+	 *
+	 */
+	protected void fillRecentFilesView() {
+		mList = RecentFiles.getRecentFiles();
+
+		if (mList.size() == 0) {
+			setResult(RESULT_CANCELED);
+			finish();
+			return;
+		}
+
+		// create string list adapter
+//		mListAdapter = new PathListAdapter(this, mList);
+
+		// set adpater
+//		mFilesList.setAdapter(mListAdapter);
+	}
+	/** The list adapter */
+//	protected ListAdapter mListAdapter;
+
+	/**
+	 * Set the result of this activity to open a file
+	 *
+	 * @param file
+	 *            the file to return
+	 * @return if the result was set correctly
+	 */
+	protected boolean setOpenResult(File file) {
+		Intent result;
+
+		if ((file == null) || (!file.isFile()) || (!file.canRead())) {
+			return false;
+		}
+
+		result = new Intent();
+		result.putExtra("path", file.getAbsolutePath());
+
+		setResult(RESULT_OK, result);
+		return true;
+	}
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/TedSaveAsActivity.java b/qpython/src/main/java/org/qpython/qpy/texteditor/TedSaveAsActivity.java
new file mode 100644
index 00000000..c31125a9
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/TedSaveAsActivity.java
@@ -0,0 +1,121 @@
+package org.qpython.qpy.texteditor;
+
+import static org.qpython.qpy.texteditor.androidlib.ui.Toaster.showToast;
+
+import java.io.File;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.texteditor.common.Constants;
+
+import android.content.Intent;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import android.widget.EditText;
+import org.qpython.qpy.texteditor.androidlib.ui.activity.BrowsingActivity;
+
+public class TedSaveAsActivity extends BrowsingActivity implements Constants, OnClickListener {
+
+	/** the edit text input */
+	protected EditText mFileName;
+	/** */
+	protected Drawable mWriteable;
+	/** */
+	protected Drawable mLocked;
+
+	/**
+	 * @see android.app.Activity#onCreate(android.os.Bundle)
+	 */
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+
+		// Setup content view
+		setContentView(R.layout.layout_save_as);
+
+		// buttons
+		findViewById(R.id.buttonCancel).setOnClickListener(this);
+		findViewById(R.id.buttonOk).setOnClickListener(this);
+		((Button) findViewById(R.id.buttonOk)).setText(R.string.ui_save);
+
+		// widgets
+		mFileName = (EditText) findViewById(R.id.editFileName);
+
+		// drawables
+		mWriteable = getResources().getDrawable(R.drawable.checked);
+		mLocked = getResources().getDrawable(R.drawable.ic_editor_file_little);
+	}
+
+	/**
+	 * @see android.view.View.OnClickListener#onClick(android.view.View)
+	 */
+	@Override
+	public void onClick(View v) {
+		if (v.getId() == R.id.buttonCancel) {
+			setResult(RESULT_CANCELED);
+			finish();
+		} else if (v.getId() == R.id.buttonOk) {
+			if (setSaveResult())
+				finish();
+		}
+	}
+
+	/**
+	 */
+	@Override
+	protected void onFileClick(File file) {
+		if (file.canWrite())
+			mFileName.setText(file.getName());
+	}
+
+	/**
+	 */
+	@Override
+	protected boolean onFolderClick(File folder) {
+		return true;
+	}
+
+	/**
+	 */
+	@Override
+	protected void onFolderViewFilled() {
+
+	}
+
+	/**
+	 * Sets the result data when the user presses save
+	 *
+	 * @return if the result is OK (if not, it means the user must change its
+	 *         selection / input)
+	 */
+	@SuppressWarnings("deprecation")
+	protected boolean setSaveResult() {
+		Intent result;
+		String fileName;
+
+		if ((mCurrentFolder == null) || (!mCurrentFolder.exists())) {
+			showToast(this, R.string.toast_folder_doesnt_exist, true);
+			return false;
+		}
+
+		if (!mCurrentFolder.canWrite()) {
+			showToast(this, R.string.toast_folder_cant_write, true);
+			return false;
+		}
+
+		fileName = mFileName.getText().toString();
+		if (fileName.length() == 0) {
+			showToast(this, R.string.toast_filename_empty, true);
+			return false;
+		}
+
+		result = new Intent();
+		result.putExtra("path", mCurrentFolder.getAbsolutePath() + File.separator + fileName);
+
+		setResult(RESULT_OK, result);
+		return true;
+	}
+
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/TedSettingsActivity.java b/qpython/src/main/java/org/qpython/qpy/texteditor/TedSettingsActivity.java
new file mode 100644
index 00000000..db846762
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/TedSettingsActivity.java
@@ -0,0 +1,88 @@
+package org.qpython.qpy.texteditor;
+
+import android.content.ActivityNotFoundException;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
+import android.databinding.DataBindingUtil;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.util.Log;
+import android.view.WindowManager;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.LayoutPrefsBinding;
+import org.qpython.qpy.main.fragment.TedSettingFragment;
+import org.qpython.qpy.texteditor.common.Constants;
+import org.qpython.qpy.texteditor.common.Settings;
+import org.qpython.qpy.texteditor.widget.crouton.Crouton;
+import org.qpython.qpy.texteditor.widget.crouton.Style;
+
+public class TedSettingsActivity extends AppCompatActivity implements
+		Constants, OnSharedPreferenceChangeListener {
+
+    private TedSettingFragment fragment;
+    protected boolean mPreviousHP;
+    private LayoutPrefsBinding binding;
+    private final String TAG = "TedSettingsActivity";
+
+    public static void start(Context context) {
+        Intent starter = new Intent(context, TedSettingsActivity.class);
+        context.startActivity(starter);
+    }
+
+    /**
+     * @see android.preference.PreferenceActivity#onCreate(android.os.Bundle)
+     */
+
+    @Override
+    protected void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            WindowManager.LayoutParams localLayoutParams = getWindow().getAttributes();
+            localLayoutParams.flags = (WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS | localLayoutParams.flags);
+        }
+        binding = DataBindingUtil.setContentView(this, R.layout.layout_prefs);
+        binding.topBar.toolbar.setTitle(R.string.settings_label);
+        binding.topBar.toolbar.setNavigationIcon(R.drawable.ic_back);
+        binding.topBar.toolbar.setNavigationOnClickListener(v -> finish());
+
+        binding.sampleEditor.updateFromSettings("");
+        binding.sampleEditor.setEnabled(false);
+
+        fragment = new TedSettingFragment();
+
+        getFragmentManager().beginTransaction()
+                .replace(R.id.setting_fragment, fragment)
+                .commit();
+    }
+
+    @Override
+    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
+                                          String key) {
+        Log.d(TAG, "onSharedPreferenceChanged");
+        Settings.updateFromPreferences(sharedPreferences);
+        binding.sampleEditor.updateFromSettings("");
+        fragment.updateSummaries();
+
+        //CheckBoxPreference checkBox = (CheckBoxPreference) findPreference(PREFERENCE_USE_HOME_PAGE);
+        //checkBox.setSummaryOn(Settings.HOME_PAGE_PATH);
+
+        //CheckBoxPreference shareCheck = (CheckBoxPreference) fragment.findPreference(PREFERENCES_GIST);
+//        if (Settings.USE_HOME_PAGE && !mPreviousHP) {
+//            Intent setHomePage = new Intent();
+//            setHomePage.setClass(this, TedOpenActivity.class);
+//            setHomePage.putExtra(EXTRA_REQUEST_CODE, REQUEST_HOME_PAGE);
+//            try {
+//                startActivityForResult(setHomePage, REQUEST_HOME_PAGE);
+//            } catch (ActivityNotFoundException e) {
+//                Crouton.showText(this, R.string.toast_activity_open,
+//                        Style.ALERT);
+//            }
+//        }
+
+        mPreviousHP = Settings.USE_HOME_PAGE;
+    }
+}
\ No newline at end of file
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/TedWidgetConfigActivity.java b/qpython/src/main/java/org/qpython/qpy/texteditor/TedWidgetConfigActivity.java
new file mode 100644
index 00000000..86fd3d3d
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/TedWidgetConfigActivity.java
@@ -0,0 +1,120 @@
+package org.qpython.qpy.texteditor;
+
+import java.io.File;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.texteditor.common.Constants;
+import org.qpython.qpy.texteditor.common.WidgetPrefs;
+
+import android.appwidget.AppWidgetManager;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.CheckBox;
+import org.qpython.qpy.texteditor.androidlib.data.FileUtils;
+import org.qpython.qpy.texteditor.androidlib.ui.Toaster;
+import org.qpython.qpy.texteditor.androidlib.ui.activity.BrowsingActivity;
+
+@SuppressWarnings("deprecation")
+public class TedWidgetConfigActivity extends BrowsingActivity implements Constants, OnClickListener {
+
+	/** the id of the widget being configured */
+	protected int mAppWidgetId;
+	/** the selected file */
+	protected File mSelectedFile;
+
+	/**
+	 * @see android.app.Activity#onCreate(android.os.Bundle)
+	 */
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.layout_widget_config);
+
+		setResult(RESULT_CANCELED, null);
+
+		// buttons
+		findViewById(R.id.buttonCancel).setOnClickListener(this);
+
+		Toaster.showToast(this, R.string.toast_widget_select, false);
+	}
+
+	/**
+	 * @see android.app.Activity#onResume()
+	 */
+	@Override
+	protected void onResume() {
+		super.onResume();
+
+		// get widget id
+		Intent intent = getIntent();
+		Bundle extras = intent.getExtras();
+		if (extras != null) {
+			mAppWidgetId = extras.getInt(AppWidgetManager.EXTRA_APPWIDGET_ID,
+					AppWidgetManager.INVALID_APPWIDGET_ID);
+		}
+	}
+
+	/**
+	 * @see android.view.View.OnClickListener#onClick(android.view.View)
+	 */
+	@Override
+	public void onClick(View v) {
+		if (v.getId() == R.id.buttonCancel) {
+			setResult(RESULT_CANCELED);
+			finish();
+		}
+	}
+
+	/**
+	 */
+	@Override
+	protected void onFileClick(File file) {
+		if (file.canRead()) {
+			mSelectedFile = file;
+			setResultComplete();
+		}
+	}
+
+	/**
+	 */
+	@Override
+	protected boolean onFolderClick(File folder) {
+		mSelectedFile = null;
+		return true;
+	}
+
+	/**
+	 */
+	@Override
+	protected void onFolderViewFilled() {
+
+	}
+
+	/**
+	 *
+	 */
+	protected void setResultComplete() {
+		AppWidgetManager appWidgetManager;
+		Intent resultValue;
+		WidgetPrefs prefs;
+		boolean readOnly;
+
+		readOnly = ((CheckBox) findViewById(R.id.readOnly)).isChecked();
+
+		prefs = new WidgetPrefs();
+		prefs.mTargetPath = FileUtils.getCanonizePath(mSelectedFile);
+		prefs.mReadOnly = readOnly;
+		prefs.store(this, mAppWidgetId);
+
+		appWidgetManager = AppWidgetManager.getInstance(this);
+		TedAppWidgetProvider.updateWidget(this, appWidgetManager, mAppWidgetId);
+
+		//
+		resultValue = new Intent();
+		resultValue.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, mAppWidgetId);
+		setResult(RESULT_OK, resultValue);
+		finish();
+	}
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/common/ChangeLog.java b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/common/ChangeLog.java
new file mode 100644
index 00000000..99fba672
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/common/ChangeLog.java
@@ -0,0 +1,162 @@
+package org.qpython.qpy.texteditor.androidlib.common;
+
+import android.app.AlertDialog.Builder;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.SharedPreferences;
+import android.content.SharedPreferences.Editor;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.util.Log;
+
+import org.qpython.qpy.R;
+
+
+/**
+ *  
+ */
+public abstract class ChangeLog {
+
+	private static final String PREFERENCE_LAST_VERSION = "previous_version";
+	private int mCurrentVersion = -1;
+
+	public boolean displayChangeLog(Context context, SharedPreferences prefs) {
+
+		boolean firstLaunch = false;
+
+		if (isFirstLaunch(context, prefs)) {
+			firstLaunch = true;
+
+			Builder builder = new Builder(context);
+
+			String message = context.getString(getTitleResource(context))
+					+ "\n\n" + context.getString(getChangeLogResource(context));
+			builder.setTitle(R.string.ui_whats_new);
+			builder.setMessage(message);
+			builder.setCancelable(true);
+			builder.setPositiveButton(android.R.string.ok,
+					new DialogInterface.OnClickListener() {
+						public void onClick(DialogInterface dialog, int which) {
+							dialog.dismiss();
+						}
+					});
+
+			builder.create().show();
+
+		}
+
+		saveCurrentVersion(context, prefs);
+
+		return firstLaunch;
+	}
+
+	/**
+	 * @param version
+	 *            the version code of the application
+	 * @return the string resource for the title to display in the change log
+	 */
+	public abstract int getTitleResourceForVersion(int version);
+
+	/**
+	 * @param context
+	 *            the current application context
+	 * @return the string resource for the title to display in the change log
+	 */
+	public int getTitleResource(Context context) {
+		int version = getCurrentVersion(context);
+		return getTitleResourceForVersion(version);
+	}
+
+	/**
+	 * @param version
+	 *            the version code of the application
+	 * @return the string resource for the changelog to display in the change
+	 *         log
+	 */
+	public abstract int getChangeLogResourceForVersion(int version);
+
+	/**
+	 * @param context
+	 *            the current application context
+	 * @return the string resource for the changelog to display in the change
+	 *         log
+	 */
+	public int getChangeLogResource(Context context) {
+		int version = getCurrentVersion(context);
+		return getChangeLogResourceForVersion(version);
+	}
+
+	/**
+	 * Warning, this automatically saves the current version, so you only get
+	 * one shot. Then again, I guess that's the idea...
+	 *
+	 * @param context
+	 *            the current application context
+	 * @param prefs
+	 *            the shared preferences to use
+	 * @return if this is the first launch since last update
+	 */
+	public boolean isFirstLaunch(Context context, SharedPreferences prefs) {
+		int previous, current;
+
+		previous = getPreviousVersion(context, prefs);
+		current = getCurrentVersion(context);
+
+		return (previous < current);
+	}
+
+	/**
+	 * @param context
+	 *            the current application context
+	 * @param prefs
+	 *            the shared preferences to use
+	 * @return the previously opened version of the application
+	 */
+	protected int getPreviousVersion(Context context, SharedPreferences prefs) {
+
+		int version = prefs.getInt(PREFERENCE_LAST_VERSION, -1);
+
+		return version;
+	}
+
+	/**
+	 * @param context
+	 *            the current application context
+	 * @return the current installed application version
+	 */
+	protected int getCurrentVersion(Context context) {
+		int version = mCurrentVersion;
+
+		if (version < 0) {
+			try {
+				version = context.getPackageManager().getPackageInfo(
+						context.getPackageName(), 0).versionCode;
+			} catch (NameNotFoundException e) {
+				Log.e("Felix", "Unable to get package info for package name "
+						+ context.getPackageName());
+				version = -1;
+			}
+		}
+
+		if (version >= 0) {
+			mCurrentVersion = version;
+		}
+
+		return version;
+	}
+
+	/**
+	 * Saves the current version for next launch
+	 *
+	 * @param context
+	 *            the current application context
+	 * @param prefs
+	 *            the shared preferences for this app
+	 */
+	public void saveCurrentVersion(Context context, SharedPreferences prefs) {
+		Editor editor = prefs.edit();
+
+		editor.putInt(PREFERENCE_LAST_VERSION, getCurrentVersion(context));
+
+		editor.commit();
+	}
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/common/MiscUtils.java b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/common/MiscUtils.java
new file mode 100644
index 00000000..38dd070b
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/common/MiscUtils.java
@@ -0,0 +1,92 @@
+package org.qpython.qpy.texteditor.androidlib.common;
+
+import android.app.Activity;
+import android.content.ActivityNotFoundException;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.texteditor.widget.crouton.Crouton;
+import org.qpython.qpy.texteditor.widget.crouton.Style;
+
+//import static com.thefinestartist.utils.content.ContextUtil.getPackageManager;
+//import static com.thefinestartist.utils.content.ContextUtil.startActivity;
+
+/**
+ *
+ */
+public class MiscUtils {
+
+    /**
+     * Start an email composer to send an email
+     *
+     * @param ctx    the current context
+     * @param object the title of the mail to compose
+     */
+    public static void sendEmail(Context ctx, CharSequence object) {
+        Intent email = new Intent(Intent.ACTION_SEND);
+        email.setType("text/plain");
+        email.putExtra(Intent.EXTRA_EMAIL, new String[]{ctx.getResources()
+                .getString(R.string.ui_mail)});
+        email.putExtra(Intent.EXTRA_SUBJECT, object);
+        ctx.startActivity(Intent.createChooser(email,
+                ctx.getString(R.string.ui_choose_mail)));
+    }
+
+    public static void sendEMailTo(Context ctx,String toAdd, String defaultText) {
+        Intent emailIntent = new Intent(Intent.ACTION_SEND);
+        emailIntent.setType("text/plain");
+//        emailIntent.setData(Uri.parse("mailto:"));
+        emailIntent.putExtra(Intent.EXTRA_EMAIL, toAdd);
+        emailIntent.putExtra(Intent.EXTRA_SUBJECT, defaultText);
+        if (emailIntent.resolveActivity(ctx.getPackageManager()) != null) {
+            ctx.startActivity(emailIntent);
+        }
+    }
+
+    /**
+     * Open the market on my apps
+     *
+     * @param activity the calling activity
+     */
+    public static void openMarket(Activity activity) {
+        String url;
+        Intent market = new Intent(Intent.ACTION_VIEW);
+        // market.setData(Uri.parse("market://search?q=pub:Xavier Gouchet"));
+        url = activity.getResources().getString(R.string.ui_market_url);
+        market.setData(Uri.parse(url));
+        try {
+            activity.startActivity(market);
+        } catch (ActivityNotFoundException e) {
+            Crouton.showText(activity, R.string.toast_no_market, Style.ALERT);
+        }
+    }
+
+    /**
+     * Open the market on this app
+     *
+     * @param activity   the calling activity
+     * @param appPackage the application package name
+     */
+    public static void openMarketApp(Activity activity, CharSequence appPackage) {
+        String url;
+        Intent market = new Intent(Intent.ACTION_VIEW);
+        url = activity.getResources().getString(R.string.ui_market_app_url,
+                appPackage);
+        market.setData(Uri.parse(url));
+        try {
+            activity.startActivity(market);
+        } catch (ActivityNotFoundException e) {
+            Crouton.showText(activity, R.string.toast_no_market, Style.ALERT);
+        }
+    }
+
+    public static void share(Context context,String text) {
+        Intent sendIntent = new Intent();
+        sendIntent.setAction(Intent.ACTION_SEND);
+        sendIntent.putExtra(Intent.EXTRA_TEXT, text);
+        sendIntent.setType("text/plain");
+        context.startActivity(sendIntent);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/common/UIUtils.java b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/common/UIUtils.java
new file mode 100644
index 00000000..c188acb9
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/common/UIUtils.java
@@ -0,0 +1,23 @@
+package org.qpython.qpy.texteditor.androidlib.common;
+
+import android.content.Context;
+
+/**
+ * 
+ */
+public class UIUtils {
+
+	/**
+	 * @param context
+	 *            the current application context
+	 * @param dp
+	 *            the dip value to convert
+	 * @return the px value corresponding to the given dip
+	 */
+	public static int getPxFromDp(Context context, int dp) {
+		float scale = context.getResources().getDisplayMetrics().density;
+
+		return ((int) ((dp * scale) + 0.5f));
+
+	}
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/comparator/ComparatorFilesAlpha.java b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/comparator/ComparatorFilesAlpha.java
new file mode 100644
index 00000000..bc5f954b
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/comparator/ComparatorFilesAlpha.java
@@ -0,0 +1,36 @@
+package org.qpython.qpy.texteditor.androidlib.comparator;
+
+import android.annotation.SuppressLint;
+import java.io.File;
+import java.util.Comparator;
+
+/**
+ * Compare files Alphabetically (w/ folders listed first)
+ * 
+ * @author x.gouchet
+ * 
+ */
+@SuppressLint("DefaultLocale")
+public class ComparatorFilesAlpha implements Comparator<File> {
+
+	/**
+	 * @see Comparator#compare(Object, Object)
+	 */
+	public int compare(File file1, File file2) {
+		int result;
+
+		// sort folders first
+		if ((file1.isDirectory()) && (!file2.isDirectory())) {
+			result = -1;
+		} else if ((!file1.isDirectory()) && (file2.isDirectory())) {
+			result = 1;
+		} else {
+			// here both are folders or both are files : sort alpha
+			result = file1.getName().toLowerCase()
+					.compareTo(file2.getName().toLowerCase());
+		}
+
+		return result;
+	}
+
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/comparator/ComparatorFilesDate.java b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/comparator/ComparatorFilesDate.java
new file mode 100644
index 00000000..29fcdf62
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/comparator/ComparatorFilesDate.java
@@ -0,0 +1,44 @@
+package org.qpython.qpy.texteditor.androidlib.comparator;
+
+import android.annotation.SuppressLint;
+import java.io.File;
+import java.util.Comparator;
+
+/**
+ * Compare files by date (w/ folders listed first)
+ * 
+ * @author x.gouchet
+ * 
+ */
+@SuppressLint("DefaultLocale")
+public class ComparatorFilesDate implements Comparator<File> {
+	/**
+	 * @see Comparator#compare(Object, Object)
+	 */
+	public int compare(File file1, File file2) {
+		int result;
+
+		// sort folders first
+		if ((file1.isDirectory()) && (!file2.isDirectory())) {
+			result = -1;
+		} else if ((!file1.isDirectory()) && (file2.isDirectory())) {
+			result = 1;
+		} else {
+
+			// both are files, or both are folders...
+			// get modif date
+			long modif1 = file1.lastModified();
+			long modif2 = file2.lastModified();
+
+			// same extension, we sort alphabetically
+			if (modif1 == modif2) {
+				result = file1.getName().toLowerCase()
+						.compareTo(file2.getName().toLowerCase());
+			} else {
+				result = (int) (modif1 - modif2);
+			}
+		}
+
+		return result;
+	}
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/comparator/ComparatorFilesSize.java b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/comparator/ComparatorFilesSize.java
new file mode 100644
index 00000000..fc128139
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/comparator/ComparatorFilesSize.java
@@ -0,0 +1,47 @@
+package org.qpython.qpy.texteditor.androidlib.comparator;
+
+import android.annotation.SuppressLint;
+import java.io.File;
+import java.util.Comparator;
+
+/**
+ * Compare files by size (w/ folders listed first)
+ * 
+ * @author x.gouchet
+ * 
+ */
+@SuppressLint("DefaultLocale")
+public class ComparatorFilesSize implements Comparator<File> {
+	/**
+	 * @see Comparator#compare(Object, Object)
+	 */
+	public int compare(File file1, File file2) {
+		int result;
+
+		// sort folders first
+		if ((file1.isDirectory()) && (!file2.isDirectory())) {
+			result = -1;
+		} else if ((!file1.isDirectory()) && (file2.isDirectory())) {
+			result = 1;
+		} else if ((file1.isDirectory()) && (file2.isDirectory())) {
+			// if both are folders
+			result = file1.getName().toLowerCase()
+					.compareTo(file2.getName().toLowerCase());
+		} else {
+
+			// both are files, we get the sizes
+			long size1 = file1.length();
+			long size2 = file2.length();
+
+			// same extension, we sort alphabetically
+			if (size1 == size2) {
+				result = file1.getName().toLowerCase()
+						.compareTo(file2.getName().toLowerCase());
+			} else {
+				result = (int) (size1 - size2);
+			}
+		}
+
+		return result;
+	}
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/comparator/ComparatorFilesType.java b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/comparator/ComparatorFilesType.java
new file mode 100644
index 00000000..db7278da
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/comparator/ComparatorFilesType.java
@@ -0,0 +1,48 @@
+package org.qpython.qpy.texteditor.androidlib.comparator;
+
+import android.annotation.SuppressLint;
+import java.io.File;
+import java.util.Comparator;
+
+/**
+ * Compare files by type (w/ folders listed first)
+ * 
+ * @author x.gouchet
+ * 
+ */
+@SuppressLint("DefaultLocale")
+public class ComparatorFilesType implements Comparator<File> {
+	/**
+	 * @see Comparator#compare(Object, Object)
+	 */
+	public int compare(File file1, File file2) {
+		int result;
+
+		// sort folders first
+		if ((file1.isDirectory()) && (!file2.isDirectory())) {
+			result = -1;
+		} else if ((!file1.isDirectory()) && (file2.isDirectory())) {
+			result = 1;
+		} else if ((file1.isDirectory()) && (file2.isDirectory())) {
+			// if both are folders
+			result = file1.getName().toLowerCase()
+					.compareTo(file2.getName().toLowerCase());
+		} else {
+			// both are files, we get the extension
+			String ext1 = file1.getName().substring(
+					file1.getName().lastIndexOf('.') + 1);
+			String ext2 = file2.getName().substring(
+					file2.getName().lastIndexOf('.') + 1);
+
+			// same extension, we sort alphabetically
+			if (ext1.equalsIgnoreCase(ext2)) {
+				result = file1.getName().toLowerCase()
+						.compareTo(file2.getName().toLowerCase());
+			} else {
+				result = ext1.toLowerCase().compareTo(ext2.toLowerCase());
+			}
+		}
+
+		return result;
+	}
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/data/FileUtils.java b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/data/FileUtils.java
new file mode 100644
index 00000000..58b343f4
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/data/FileUtils.java
@@ -0,0 +1,531 @@
+package org.qpython.qpy.texteditor.androidlib.data;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.channels.FileChannel;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.res.AssetManager;
+import android.os.Environment;
+import android.util.Log;
+import android.webkit.MimeTypeMap;
+
+@SuppressLint("DefaultLocale")
+public class FileUtils {
+	/** File of the external storage data */
+	public static final File STORAGE = Environment
+			.getExternalStorageDirectory();
+	/** Path to the external storage data */
+	public static final String STORAGE_PATH = STORAGE.getAbsolutePath();
+
+	/** default android Download folder */
+	public static final String DOWNLOAD_FOLDER = (STORAGE.getAbsolutePath()
+			+ File.separator + "Download");
+
+	/**
+	 * Copy all files in the given asset folder to the destination folder (must
+	 * be in the app's sandbox, unless the app has the write to external storage
+	 * permission)
+	 * 
+	 * @param ctx
+	 *            the current application context
+	 * @param destFolder
+	 *            the destination folder
+	 * @param assetFolder
+	 *            the source folder path (from the asset folder)
+	 */
+	public static void copyAssetsToAppData(Context ctx, File destFolder,
+			String assetFolder) {
+
+		String files[] = null;
+		InputStream assetStream;
+		File file;
+		String assetFile;
+
+		AssetManager assets = ctx.getAssets();
+
+		try {
+			files = assets.list(assetFolder);
+		} catch (IOException e) {
+			Log.w("AndroidLib", "Asset folder not found");
+		}
+
+		if (files != null) {
+			for (String fileName : files) {
+				file = new File(destFolder, fileName);
+
+				assetFile = assetFolder + File.separatorChar + fileName;
+				try {
+					file.getParentFile().mkdirs();
+					assetStream = assets.open(assetFile);
+					FileUtils.copyFile(assetStream, file);
+				} catch (IOException e) {
+					Log.w("AndroidLib", "unable to copy file " + fileName);
+				}
+			}
+		}
+	}
+
+	/**
+	 * 
+	 * @param file
+	 *            the file to test
+	 * @return if a file is a symbolic link
+	 */
+	public static boolean isSymLink(File file) {
+		boolean result;
+		result = false;
+
+		if ((file != null) && file.exists()) {
+			File canon, canonParent;
+			if (file.getParent() == null) {
+				canon = file;
+			} else {
+				try {
+					canonParent = file.getParentFile().getCanonicalFile();
+					canon = new File(canonParent, file.getName());
+				} catch (IOException e) {
+					canon = null;
+				}
+			}
+
+			try {
+				if (canon != null) {
+					result = !canon.getCanonicalFile().equals(
+							canon.getAbsoluteFile());
+				}
+			} catch (IOException e) {
+				result = false;
+			}
+		}
+
+		return result;
+	}
+
+	/**
+	 * 
+	 * @param file
+	 *            the symbolic link file
+	 * @return the target of the link
+	 */
+	public static File getSymLinkTarget(File file) {
+		File result;
+
+		result = file;
+
+		if ((file != null) && file.exists()) {
+			File canon, canonParent;
+			if (file.getParent() == null) {
+				canon = file;
+			} else {
+				try {
+					canonParent = file.getParentFile().getCanonicalFile();
+					canon = new File(canonParent, file.getName());
+				} catch (IOException e) {
+					canon = null;
+				}
+			}
+
+			try {
+				if (canon != null) {
+					result = canon.getCanonicalFile();
+				}
+			} catch (IOException e) {
+				result = file;
+			}
+		}
+
+		return result;
+	}
+
+	/**
+	 * 
+	 * @param file
+	 *            the file
+	 * @return the file extension (folders return an empty extension, whatever
+	 *         the name)
+	 */
+	public static String getFileExtension(File file) {
+		String ext, name;
+		int index;
+
+		ext = "";
+		if (!file.isDirectory()) {
+			name = file.getName();
+			index = name.lastIndexOf(".");
+			if (index != -1) {
+				ext = name.substring(index + 1).toLowerCase();
+			}
+		}
+		return ext;
+	}
+
+	/**
+	 * 
+	 * @param file
+	 *            the file
+	 * @return the file extension (folders return an empty extension, whatever
+	 *         the name)
+	 */
+	public static String getFileExtension(String filename) {
+		String ext;
+		int index;
+
+		ext = "";
+		if (filename != null) {
+			index = filename.lastIndexOf(".");
+			if (index != -1) {
+				ext = filename.substring(index + 1).toLowerCase();
+			}
+		}
+		return ext;
+	}
+
+	/**
+	 * 
+	 * @param file
+	 *            the file
+	 * @return the file prefix or the name if the file is a directory
+	 */
+	public static String getFilePrefix(File file) {
+		String prefix, name;
+		int index;
+
+		prefix = file.getName();
+		name = file.getName();
+		if (!file.isDirectory()) {
+			index = name.lastIndexOf(".");
+			if (index != -1) {
+				prefix = name.substring(0, index);
+			}
+		}
+		return prefix;
+	}
+
+	/**
+	 * @param file
+	 *            the file name
+	 * @return the Mime Type
+	 */
+	public static String getMimeType(File file) {
+
+		String type;
+		String ext;
+
+		ext = getFileExtension(file);
+		type = MimeTypeMap.getSingleton().getMimeTypeFromExtension(
+				ext.toLowerCase());
+		if (type == null) {
+			type = MimeTypeMapEnhanced.getMimeTypeFromExtension(ext
+					.toLowerCase());
+		}
+
+		if (type == null) {
+			type = "?/?";
+		}
+
+		return type;
+	}
+
+	/**
+	 * @param f
+	 *            a file
+	 * @return the canonical path of the file if possible, or the uncanonized
+	 *         path
+	 */
+	public static String getCanonizePath(File f) {
+		String path;
+		try {
+			path = f.getCanonicalPath();
+		} catch (IOException e) {
+			path = f.getPath();
+			Log.w("AndroidLib",
+					"Error while canonizing file path, using raw path instead : \""
+							+ path + "\"");
+		}
+		return path;
+	}
+
+	/**
+	 * Creates a new folder in the given parent folder
+	 * 
+	 * @param parent
+	 *            the parent file for the folder
+	 * @param name
+	 *            the name of the folder to create
+	 * @return if the folder was created
+	 */
+	public static boolean createFolder(File parent, String name) {
+		File folder;
+		boolean created;
+
+		created = false;
+		folder = new File(parent, name);
+		if (parent.canWrite() && folder.mkdirs()) {
+			created = true;
+		}
+
+		return created;
+	}
+
+	/**
+	 * Creates a new file in the given parent folder
+	 * 
+	 * @param parent
+	 *            the parent file for the folder
+	 * @param name
+	 *            the name of the file to create
+	 * @return if the file was created
+	 */
+	public static boolean createFile(File parent, String name) {
+		File file;
+		boolean created;
+
+		created = false;
+		file = new File(parent, name);
+		if (parent.canWrite()) {
+			try {
+				file.createNewFile();
+				created = true;
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}
+
+		return created;
+	}
+
+	/**
+	 * Delete the given file/folder
+	 * 
+	 * @param file
+	 *            the file/folder to delete
+	 * @return if the file/folder was deleted successfully
+	 */
+	public static boolean deleteItem(File file) {
+		boolean result;
+
+		if (!file.exists()) {
+			result = true;
+		} else if (!file.canWrite()) {
+			result = false;
+		} else {
+			result = file.delete();
+		}
+
+		return result;
+	}
+
+	/**
+	 * Delete the given folder with all its content
+	 * 
+	 * @param folder
+	 *            the folder to delete
+	 * @return if the folder was deleted successfully
+	 */
+	public static boolean deleteRecursiveFolder(File folder) {
+		boolean result;
+
+		if (folder == null) {
+			result = false;
+		} else {
+
+			File[] files = folder.listFiles();
+			// usually if the folder is a file or has no children
+			if (files == null) {
+				result = folder.delete();
+			} else {
+				boolean ok = true;
+				boolean fileOk;
+				for (File child : files) {
+					if (child.isDirectory()) {
+						fileOk = deleteRecursiveFolder(child);
+					} else {
+						fileOk = child.delete();
+					}
+
+					if (!fileOk) {
+						Log.w("", "Error deleting file " + child.getName());
+					}
+					ok = ok && fileOk;
+				}
+				if (ok) {
+					result = folder.delete();
+				} else {
+					result = false;
+				}
+			}
+		}
+
+		return result;
+	}
+
+	/**
+	 * Delete the file/folder at the given path
+	 * 
+	 * @param path
+	 *            the path of the file/folder to delete
+	 * @return if the file/folder was deleted successfully
+	 */
+	public static boolean deleteItem(String path) {
+		File file;
+		boolean result;
+
+		file = new File(path);
+
+		if (!file.exists()) {
+			result = true;
+		} else if (!file.canWrite()) {
+			result = false;
+		} else {
+			result = file.delete();
+		}
+
+		return result;
+	}
+
+	/**
+	 * 
+	 * @param src
+	 *            the source file
+	 * @param dst
+	 *            the destination file
+	 * @return if the copy was successfull
+	 */
+	public static boolean copyFile(File src, File dst) {
+
+		FileChannel inChannel = null;
+		FileChannel outChannel = null;
+
+		boolean complete = true;
+
+		try {
+			inChannel = new FileInputStream(src).getChannel();
+			outChannel = new FileOutputStream(dst).getChannel();
+		} catch (FileNotFoundException e) {
+			Log.w("AndroidLib", "File not found or no R/W permission", e);
+			complete = false;
+		}
+
+		try {
+			inChannel.transferTo(0, inChannel.size(), outChannel);
+		} catch (Exception e) {
+			Log.w("AndroidLib", "Error during copy", e);
+			complete = false;
+		}
+
+		try {
+			if (inChannel != null) {
+				inChannel.close();
+			}
+			if (outChannel != null) {
+				outChannel.close();
+			}
+		} catch (IOException e) {
+			Log.w("AndroidLib", "Error when closing files", e);
+			complete = false;
+		}
+
+		return complete;
+	}
+
+	/**
+	 * 
+	 * @param src
+	 *            the source input stream
+	 * @param dst
+	 *            the destination output
+	 * @return if the copy was successfull
+	 */
+	public static boolean copyFile(InputStream inputStream, File dst) {
+
+		FileOutputStream outputStream = null;
+		byte[] buf = new byte[1024];
+		int len;
+
+		boolean complete = true;
+
+		try {
+			outputStream = new FileOutputStream(dst);
+		} catch (FileNotFoundException e) {
+			Log.w("AndroidLib", "File not found or no R/W permission", e);
+			complete = false;
+		}
+
+		try {
+			while ((len = inputStream.read(buf)) > 0) {
+				outputStream.write(buf, 0, len);
+			}
+		} catch (Exception e) {
+			Log.w("AndroidLib", "Error during copy", e);
+			complete = false;
+		}
+
+		try {
+			if (inputStream != null) {
+				inputStream.close();
+			}
+			if (outputStream != null) {
+				outputStream.close();
+			}
+		} catch (IOException e) {
+			Log.w("AndroidLib", "Error when closing files", e);
+			complete = false;
+		}
+
+		return complete;
+	}
+
+	/**
+	 * Rename a file
+	 * 
+	 * @param file
+	 *            the file/folder to rename
+	 * @param newName
+	 *            the new name to the file
+	 * @return if the rename was succesfull
+	 */
+	public static boolean renameItem(File file, String newName) {
+		File newFile;
+		boolean result;
+
+		if ((!file.exists()) || (!file.canWrite())) {
+			result = false;
+		} else {
+			newFile = new File(file.getParentFile(), newName);
+			result = file.renameTo(newFile);
+		}
+
+		return result;
+	}
+
+	/**
+	 * Rename a file
+	 * 
+	 * @param oldPath
+	 *            the path of the file/folder to rename
+	 * @param newPath
+	 *            the new path to the file/folder
+	 * @return if the rename was succesfull
+	 */
+	public static boolean renameItem(String oldPath, String newPath) {
+		File file, newFile;
+		boolean result;
+
+		file = new File(oldPath);
+
+		if ((!file.exists()) || (!file.canWrite())) {
+			result = false;
+		} else {
+			newFile = new File(newPath);
+			result = file.renameTo(newFile);
+		}
+
+		return result;
+	}
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/data/MimeTypeMapEnhanced.java b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/data/MimeTypeMapEnhanced.java
new file mode 100644
index 00000000..38d1d7cb
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/data/MimeTypeMapEnhanced.java
@@ -0,0 +1,684 @@
+package org.qpython.qpy.texteditor.androidlib.data;
+
+import java.util.Hashtable;
+
+/**
+ * Enhanced myme types detection
+ */
+public class MimeTypeMapEnhanced {
+
+	/** map */
+	private static Hashtable<String, String> MAP;
+
+	/**
+	 * Constructor (private)
+	 */
+	private MimeTypeMapEnhanced() {
+	}
+
+	/**
+	 * @return the binding between file extension and Mime type
+	 */
+	private static Hashtable<String, String> getMap() {
+		if (MAP == null) {
+			MAP = new Hashtable<String, String>();
+			MAP.put("3dm", "x-world/x-3dmf");
+			MAP.put("3dmf", "x-world/x-3dmf");
+			MAP.put("7z", "application/x-compressed");
+			MAP.put("a", "application/octet-stream");
+			MAP.put("aab", "application/x-authorware-bin");
+			MAP.put("aam", "application/x-authorware-map");
+			MAP.put("aas", "application/x-authorware-seg");
+			MAP.put("abc", "text/vnd.abc");
+			MAP.put("acgi", "text/html");
+			MAP.put("afl", "video/animaflex");
+			MAP.put("ai", "application/postscript");
+			MAP.put("aif", "audio/aiff");
+			MAP.put("aif", "audio/x-aiff");
+			MAP.put("aifc", "audio/aiff");
+			MAP.put("aifc", "audio/x-aiff");
+			MAP.put("aiff", "audio/aiff");
+			MAP.put("aiff", "audio/x-aiff");
+			MAP.put("aim", "application/x-aim");
+			MAP.put("aip", "text/x-audiosoft-intra");
+			MAP.put("aks", "text/x-alkwarel-src");
+			MAP.put("ani", "application/x-navi-animation");
+			MAP.put("aos",
+					"application/x-nokia-9000-communicator-add-on-software");
+			MAP.put("aps", "application/mime");
+			MAP.put("arc", "application/octet-stream");
+			MAP.put("arj", "application/arj");
+			MAP.put("arj", "application/octet-stream");
+			MAP.put("art", "image/x-jg");
+			MAP.put("asf", "video/x-ms-asf");
+			MAP.put("asm", "text/x-asm");
+			MAP.put("asp", "text/asp");
+			MAP.put("asx", "application/x-mplayer2");
+			MAP.put("asx", "video/x-ms-asf");
+			MAP.put("asx", "video/x-ms-asf-plugin");
+			MAP.put("au", "audio/basic");
+			MAP.put("au", "audio/x-au");
+			MAP.put("avi", "application/x-troff-msvideo");
+			MAP.put("avi", "video/avi");
+			MAP.put("avi", "video/msvideo");
+			MAP.put("avi", "video/x-msvideo");
+			MAP.put("avs", "video/avs-video");
+			MAP.put("bcpio", "application/x-bcpio");
+			MAP.put("bin", "application/mac-binary");
+			MAP.put("bin", "application/macbinary");
+			MAP.put("bin", "application/octet-stream");
+			MAP.put("bin", "application/x-binary");
+			MAP.put("bin", "application/x-macbinary");
+			MAP.put("bm", "image/bmp");
+			MAP.put("bmp", "image/bmp");
+			MAP.put("bmp", "image/x-windows-bmp");
+			MAP.put("boo", "application/book");
+			MAP.put("book", "application/book");
+			MAP.put("boz", "application/x-bzip2");
+			MAP.put("bsh", "application/x-bsh");
+			MAP.put("bz", "application/x-bzip");
+			MAP.put("bz2", "application/x-bzip2");
+			MAP.put("c", "text/plain");
+			MAP.put("c", "text/x-c");
+			MAP.put("c++", "text/plain");
+			MAP.put("cat", "application/vnd.ms-pki.seccat");
+			MAP.put("cc", "text/plain");
+			MAP.put("cc", "text/x-c");
+			MAP.put("ccad", "application/clariscad");
+			MAP.put("cco", "application/x-cocoa");
+			MAP.put("cdf", "application/cdf");
+			MAP.put("cdf", "application/x-cdf");
+			MAP.put("cdf", "application/x-netcdf");
+			MAP.put("cer", "application/pkix-cert");
+			MAP.put("cer", "application/x-x509-ca-cert");
+			MAP.put("cha", "application/x-chat");
+			MAP.put("chat", "application/x-chat");
+			MAP.put("class", "application/java");
+			MAP.put("class", "application/java-byte-code");
+			MAP.put("class", "application/x-java-class");
+			MAP.put("com", "application/octet-stream");
+			MAP.put("com", "text/plain");
+			MAP.put("conf", "text/plain");
+			MAP.put("cpio", "application/x-cpio");
+			MAP.put("cpp", "text/x-c");
+			MAP.put("cpt", "application/mac-compactpro");
+			MAP.put("cpt", "application/x-compactpro");
+			MAP.put("cpt", "application/x-cpt");
+			MAP.put("crl", "application/pkcs-crl");
+			MAP.put("crl", "application/pkix-crl");
+			MAP.put("crt", "application/pkix-cert");
+			MAP.put("crt", "application/x-x509-ca-cert");
+			MAP.put("crt", "application/x-x509-user-cert");
+			MAP.put("csh", "application/x-csh");
+			MAP.put("csh", "text/x-script.csh");
+			MAP.put("css", "application/x-pointplus");
+			MAP.put("css", "text/css");
+			MAP.put("cxx", "text/plain");
+			MAP.put("dcr", "application/x-director");
+			MAP.put("db", "application/octet-stream");
+			MAP.put("deepv", "application/x-deepv");
+			MAP.put("def", "text/plain");
+			MAP.put("der", "application/x-x509-ca-cert");
+			MAP.put("dif", "video/x-dv");
+			MAP.put("dir", "application/x-director");
+			MAP.put("dl", "video/dl");
+			MAP.put("dl", "video/x-dl");
+			MAP.put("doc", "application/msword");
+			MAP.put("dot", "application/msword");
+			MAP.put("dp", "application/commonground");
+			MAP.put("drw", "application/drafting");
+			MAP.put("dtd", "application/xml-dtd");
+			MAP.put("dump", "application/octet-stream");
+			MAP.put("dv", "video/x-dv");
+			MAP.put("dvi", "application/x-dvi");
+			MAP.put("dwf", "drawing/x-dwf (old)");
+			MAP.put("dwf", "model/vnd.dwf");
+			MAP.put("dwg", "application/acad");
+			MAP.put("dwg", "image/vnd.dwg");
+			MAP.put("dwg", "image/x-dwg");
+			MAP.put("dxf", "application/dxf");
+			MAP.put("dxf", "image/vnd.dwg");
+			MAP.put("dxf", "image/x-dwg");
+			MAP.put("dxr", "application/x-director");
+			MAP.put("el", "text/x-script.elisp");
+			MAP.put("elc", "application/x-bytecode.elisp (compiled elisp)");
+			MAP.put("elc", "application/x-elc");
+			MAP.put("env", "application/x-envoy");
+			MAP.put("eps", "application/postscript");
+			MAP.put("es", "application/x-esrehber");
+			MAP.put("etx", "text/x-setext");
+			MAP.put("evy", "application/envoy");
+			MAP.put("evy", "application/x-envoy");
+			MAP.put("exe", "application/octet-stream");
+			MAP.put("f", "text/plain");
+			MAP.put("f", "text/x-fortran");
+			MAP.put("f77", "text/x-fortran");
+			MAP.put("f90", "text/plain");
+			MAP.put("f90", "text/x-fortran");
+			MAP.put("fdf", "application/vnd.fdf");
+			MAP.put("fif", "application/fractals");
+			MAP.put("fif", "image/fif");
+			MAP.put("fli", "video/fli");
+			MAP.put("fli", "video/x-fli");
+			MAP.put("flo", "image/florian");
+			MAP.put("flx", "text/vnd.fmi.flexstor");
+			MAP.put("fmf", "video/x-atomic3d-feature");
+			MAP.put("for", "text/plain");
+			MAP.put("for", "text/x-fortran");
+			MAP.put("fpx", "image/vnd.fpx");
+			MAP.put("fpx", "image/vnd.net-fpx");
+			MAP.put("frl", "application/freeloader");
+			MAP.put("funk", "audio/make");
+			MAP.put("g", "text/plain");
+			MAP.put("g3", "image/g3fax");
+			MAP.put("gif", "image/gif");
+			MAP.put("gl", "video/gl");
+			MAP.put("gl", "video/x-gl");
+			MAP.put("gsd", "audio/x-gsm");
+			MAP.put("gsm", "audio/x-gsm");
+			MAP.put("gsp", "application/x-gsp");
+			MAP.put("gss", "application/x-gss");
+			MAP.put("gtar", "application/x-gtar");
+			MAP.put("gz", "application/x-compressed");
+			MAP.put("gzip", "application/x-compressed");
+			MAP.put("h", "text/plain");
+			MAP.put("h", "text/x-h");
+			MAP.put("hdf", "application/x-hdf");
+			MAP.put("help", "application/x-helpfile");
+			MAP.put("hgl", "application/vnd.hp-hpgl");
+			MAP.put("hh", "text/plain");
+			MAP.put("hh", "text/x-h");
+			MAP.put("hlb", "text/x-script");
+			MAP.put("hlp", "application/hlp");
+			MAP.put("hlp", "application/x-helpfile");
+			MAP.put("hlp", "application/x-winhelp");
+			MAP.put("hpg", "application/vnd.hp-hpgl");
+			MAP.put("hpgl", "application/vnd.hp-hpgl");
+			MAP.put("hqx", "application/binhex");
+			MAP.put("hqx", "application/binhex4");
+			MAP.put("hqx", "application/mac-binhex");
+			MAP.put("hqx", "application/mac-binhex40");
+			MAP.put("hqx", "application/x-binhex40");
+			MAP.put("hqx", "application/x-mac-binhex40");
+			MAP.put("hta", "application/hta");
+			MAP.put("htc", "text/x-component");
+			MAP.put("htm", "text/html");
+			MAP.put("html", "text/html");
+			MAP.put("htmls", "text/html");
+			MAP.put("htt", "text/webviewhtml");
+			MAP.put("htx", "text/html");
+			MAP.put("ice", "x-conference/x-cooltalk");
+			MAP.put("ico", "image/x-icon");
+			MAP.put("idc", "text/plain");
+			MAP.put("ief", "image/ief");
+			MAP.put("iefs", "image/ief");
+			MAP.put("iges", "application/iges");
+			MAP.put("iges", "model/iges");
+			MAP.put("igs", "application/iges");
+			MAP.put("igs", "model/iges");
+			MAP.put("ima", "application/x-ima");
+			MAP.put("imap", "application/x-httpd-imap");
+			MAP.put("inf", "application/inf");
+			MAP.put("ins", "application/x-internett-signup");
+			MAP.put("ip", "application/x-ip2");
+			MAP.put("isu", "video/x-isvideo");
+			MAP.put("it", "audio/it");
+			MAP.put("iv", "application/x-inventor");
+			MAP.put("ivr", "i-world/i-vrml");
+			MAP.put("ivy", "application/x-livescreen");
+			MAP.put("jam", "audio/x-jam");
+			MAP.put("jar", "application/java-archive");
+			MAP.put("jav", "text/plain");
+			MAP.put("jav", "text/x-java-source");
+			MAP.put("java", "text/plain");
+			MAP.put("java", "text/x-java-source");
+			MAP.put("jcm", "application/x-java-commerce");
+			MAP.put("jfif", "image/jpeg");
+			MAP.put("jfif", "image/pjpeg");
+			MAP.put("jfif-tbnl", "image/jpeg");
+			MAP.put("jpe", "image/jpeg");
+			MAP.put("jpe", "image/pjpeg");
+			MAP.put("jpeg", "image/jpeg");
+			MAP.put("jpeg", "image/pjpeg");
+			MAP.put("jpg", "image/jpeg");
+			MAP.put("jpg", "image/pjpeg");
+			MAP.put("jps", "image/x-jps");
+			MAP.put("js", "application/x-javascript");
+			MAP.put("jut", "image/jutvision");
+			MAP.put("kar", "audio/midi");
+			MAP.put("kar", "music/x-karaoke");
+			MAP.put("ksh", "application/x-ksh");
+			MAP.put("ksh", "text/x-script.ksh");
+			MAP.put("la", "audio/nspaudio");
+			MAP.put("la", "audio/x-nspaudio");
+			MAP.put("lam", "audio/x-liveaudio");
+			MAP.put("latex", "application/x-latex");
+			MAP.put("lha", "application/lha");
+			MAP.put("lha", "application/octet-stream");
+			MAP.put("lha", "application/x-lha");
+			MAP.put("lhx", "application/octet-stream");
+			MAP.put("list", "text/plain");
+			MAP.put("lma", "audio/nspaudio");
+			MAP.put("lma", "audio/x-nspaudio");
+			MAP.put("log", "text/plain");
+			MAP.put("lsp", "application/x-lisp");
+			MAP.put("lsp", "text/x-script.lisp");
+			MAP.put("lst", "text/plain");
+			MAP.put("lsx", "text/x-la-asf");
+			MAP.put("ltx", "application/x-latex");
+			MAP.put("lzh", "application/octet-stream");
+			MAP.put("lzh", "application/x-lzh");
+			MAP.put("lzx", "application/lzx");
+			MAP.put("lzx", "application/octet-stream");
+			MAP.put("lzx", "application/x-lzx");
+			MAP.put("m", "text/plain");
+			MAP.put("m", "text/x-m");
+			MAP.put("m1v", "video/mpeg");
+			MAP.put("m2a", "audio/mpeg");
+			MAP.put("m2v", "video/mpeg");
+			MAP.put("m3u", "audio/x-mpegurl");
+			MAP.put("man", "application/x-troff-man");
+			MAP.put("map", "application/x-navimap");
+			MAP.put("mar", "text/plain");
+			MAP.put("mbd", "application/mbedlet");
+			MAP.put("mc$", "application/x-magic-cap-package-1.0");
+			MAP.put("mcd", "application/mcad");
+			MAP.put("mcd", "application/x-mathcad");
+			MAP.put("mcf", "image/vasa");
+			MAP.put("mcf", "text/mcf");
+			MAP.put("mcp", "application/netmc");
+			MAP.put("me", "application/x-troff-me");
+			MAP.put("mht", "message/rfc822");
+			MAP.put("mhtml", "message/rfc822");
+			MAP.put("mid", "application/x-midi");
+			MAP.put("mid", "audio/midi");
+			MAP.put("mid", "audio/x-mid");
+			MAP.put("mid", "audio/x-midi");
+			MAP.put("mid", "music/crescendo");
+			MAP.put("mid", "x-music/x-midi");
+			MAP.put("midi", "application/x-midi");
+			MAP.put("midi", "audio/midi");
+			MAP.put("midi", "audio/x-mid");
+			MAP.put("midi", "audio/x-midi");
+			MAP.put("midi", "music/crescendo");
+			MAP.put("midi", "x-music/x-midi");
+			MAP.put("mif", "application/x-frame");
+			MAP.put("mif", "application/x-mif");
+			MAP.put("mime", "message/rfc822");
+			MAP.put("mime", "www/mime");
+			MAP.put("mjf", "audio/x-vnd.audioexplosion.mjuicemediafile");
+			MAP.put("mjpg", "video/x-motion-jpeg");
+			MAP.put("mm", "application/base64");
+			MAP.put("mm", "application/x-meme");
+			MAP.put("mme", "application/base64");
+			MAP.put("mod", "audio/mod");
+			MAP.put("mod", "audio/x-mod");
+			MAP.put("moov", "video/quicktime");
+			MAP.put("mov", "video/quicktime");
+			MAP.put("movie", "video/x-sgi-movie");
+			MAP.put("mp2", "audio/mpeg");
+			MAP.put("mp2", "audio/x-mpeg");
+			MAP.put("mp2", "video/mpeg");
+			MAP.put("mp2", "video/x-mpeg");
+			MAP.put("mp2", "video/x-mpeq2a");
+			MAP.put("mp3", "audio/mpeg3");
+			MAP.put("mp3", "audio/x-mpeg-3");
+			MAP.put("mp3", "video/mpeg");
+			MAP.put("mp3", "video/x-mpeg");
+			MAP.put("mpa", "audio/mpeg");
+			MAP.put("mpa", "video/mpeg");
+			MAP.put("mpc", "application/x-project");
+			MAP.put("mpe", "video/mpeg");
+			MAP.put("mpeg", "video/mpeg");
+			MAP.put("mpg", "audio/mpeg");
+			MAP.put("mpg", "video/mpeg");
+			MAP.put("mpga", "audio/mpeg");
+			MAP.put("mpp", "application/vnd.ms-project");
+			MAP.put("mpt", "application/x-project");
+			MAP.put("mpv", "application/x-project");
+			MAP.put("mpx", "application/x-project");
+			MAP.put("mrc", "application/marc");
+			MAP.put("ms", "application/x-troff-ms");
+			MAP.put("mv", "video/x-sgi-movie");
+			MAP.put("my", "audio/make");
+			MAP.put("mzz", "application/x-vnd.audioexplosion.mzz");
+			MAP.put("nap", "image/naplps");
+			MAP.put("naplps", "image/naplps");
+			MAP.put("nc", "application/x-netcdf");
+			MAP.put("ncm", "application/vnd.nokia.configuration-message");
+			MAP.put("nif", "image/x-niff");
+			MAP.put("niff", "image/x-niff");
+			MAP.put("nix", "application/x-mix-transfer");
+			MAP.put("nsc", "application/x-conference");
+			MAP.put("nvd", "application/x-navidoc");
+			MAP.put("o", "application/octet-stream");
+			MAP.put("oda", "application/oda");
+			MAP.put("odb", "application/octet-stream");
+			MAP.put("omc", "application/x-omc");
+			MAP.put("omcd", "application/x-omcdatamaker");
+			MAP.put("omcr", "application/x-omcregerator");
+			MAP.put("p", "text/x-pascal");
+			MAP.put("p10", "application/pkcs10");
+			MAP.put("p10", "application/x-pkcs10");
+			MAP.put("p12", "application/pkcs-12");
+			MAP.put("p12", "application/x-pkcs12");
+			MAP.put("p7a", "application/x-pkcs7-signature");
+			MAP.put("p7c", "application/pkcs7-mime");
+			MAP.put("p7c", "application/x-pkcs7-mime");
+			MAP.put("p7m", "application/pkcs7-mime");
+			MAP.put("p7m", "application/x-pkcs7-mime");
+			MAP.put("p7r", "application/x-pkcs7-certreqresp");
+			MAP.put("p7s", "application/pkcs7-signature");
+			MAP.put("part", "application/pro_eng");
+			MAP.put("pas", "text/pascal");
+			MAP.put("pbm", "image/x-portable-bitmap");
+			MAP.put("pcl", "application/vnd.hp-pcl");
+			MAP.put("pcl", "application/x-pcl");
+			MAP.put("pct", "image/x-pict");
+			MAP.put("pcx", "image/x-pcx");
+			MAP.put("pdb", "application/octet-stream");
+			MAP.put("pdf", "application/pdf");
+			MAP.put("pfunk", "audio/make");
+			MAP.put("pfunk", "audio/make.my.funk");
+			MAP.put("pgm", "image/x-portable-graymap");
+			MAP.put("pgm", "image/x-portable-greymap");
+			MAP.put("pic", "image/pict");
+			MAP.put("pict", "image/pict");
+			MAP.put("pkg", "application/x-newton-compatible-pkg");
+			MAP.put("pko", "application/vnd.ms-pki.pko");
+			MAP.put("pl", "text/plain");
+			MAP.put("pl", "text/x-script.perl");
+			MAP.put("plist", "text/xml");
+			MAP.put("plx", "application/x-pixclscript");
+			MAP.put("pm", "image/x-xpixmap");
+			MAP.put("pm", "text/x-script.perl-module");
+			MAP.put("pm4", "application/x-pagemaker");
+			MAP.put("pm5", "application/x-pagemaker");
+			MAP.put("png", "image/png");
+			MAP.put("pnm", "application/x-portable-anymap");
+			MAP.put("pnm", "image/x-portable-anymap");
+			MAP.put("pot", "application/mspowerpoint");
+			MAP.put("pot", "application/vnd.ms-powerpoint");
+			MAP.put("pov", "model/x-pov");
+			MAP.put("ppa", "application/vnd.ms-powerpoint");
+			MAP.put("ppm", "image/x-portable-pixmap");
+			MAP.put("pps", "application/mspowerpoint");
+			MAP.put("pps", "application/vnd.ms-powerpoint");
+			MAP.put("ppt", "application/mspowerpoint");
+			MAP.put("ppt", "application/powerpoint");
+			MAP.put("ppt", "application/vnd.ms-powerpoint");
+			MAP.put("ppt", "application/x-mspowerpoint");
+			MAP.put("ppz", "application/mspowerpoint");
+			MAP.put("pre", "application/x-freelance");
+			MAP.put("prt", "application/pro_eng");
+			MAP.put("ps", "application/postscript");
+			MAP.put("psd", "application/octet-stream");
+			MAP.put("pvu", "paleovu/x-pv");
+			MAP.put("pwz", "application/vnd.ms-powerpoint");
+			MAP.put("py", "text/x-script.phyton");
+			MAP.put("pyc", "application/x-bytecode.python");
+			MAP.put("qcp", "audio/vnd.qcelp");
+			MAP.put("qd3", "x-world/x-3dmf");
+			MAP.put("qd3d", "x-world/x-3dmf");
+			MAP.put("qif", "image/x-quicktime");
+			MAP.put("qt", "video/quicktime");
+			MAP.put("qtc", "video/x-qtc");
+			MAP.put("qti", "image/x-quicktime");
+			MAP.put("qtif", "image/x-quicktime");
+			MAP.put("ra", "audio/x-pn-realaudio");
+			MAP.put("ra", "audio/x-pn-realaudio-plugin");
+			MAP.put("ra", "audio/x-realaudio");
+			MAP.put("ram", "audio/x-pn-realaudio");
+			MAP.put("ras", "application/x-cmu-raster");
+			MAP.put("ras", "image/cmu-raster");
+			MAP.put("ras", "image/x-cmu-raster");
+			MAP.put("rast", "image/cmu-raster");
+			MAP.put("rexx", "text/x-script.rexx");
+			MAP.put("rf", "image/vnd.rn-realflash");
+			MAP.put("rgb", "image/x-rgb");
+			MAP.put("rm", "application/vnd.rn-realmedia");
+			MAP.put("rm", "audio/x-pn-realaudio");
+			MAP.put("rmi", "audio/mid");
+			MAP.put("rmm", "audio/x-pn-realaudio");
+			MAP.put("rmp", "audio/x-pn-realaudio");
+			MAP.put("rmp", "audio/x-pn-realaudio-plugin");
+			MAP.put("rng", "application/ringing-tones");
+			MAP.put("rng", "application/vnd.nokia.ringing-tone");
+			MAP.put("rnx", "application/vnd.rn-realplayer");
+			MAP.put("roff", "application/x-troff");
+			MAP.put("rp", "image/vnd.rn-realpix");
+			MAP.put("rpm", "audio/x-pn-realaudio-plugin");
+			MAP.put("rt", "text/richtext");
+			MAP.put("rt", "text/vnd.rn-realtext");
+			MAP.put("rtf", "application/rtf");
+			MAP.put("rtf", "application/x-rtf");
+			MAP.put("rtf", "text/richtext");
+			MAP.put("rtx", "application/rtf");
+			MAP.put("rtx", "text/richtext");
+			MAP.put("rv", "video/vnd.rn-realvideo");
+			MAP.put("s", "text/x-asm");
+			MAP.put("s3m", "audio/s3m");
+			MAP.put("saveme", "application/octet-stream");
+			MAP.put("sbk", "application/x-tbook");
+			MAP.put("scm", "application/x-lotusscreencam");
+			MAP.put("scm", "text/x-script.guile");
+			MAP.put("scm", "text/x-script.scheme");
+			MAP.put("scm", "video/x-scm");
+			MAP.put("sdml", "text/plain");
+			MAP.put("sdp", "application/sdp");
+			MAP.put("sdp", "application/x-sdp");
+			MAP.put("sdr", "application/sounder");
+			MAP.put("sea", "application/sea");
+			MAP.put("sea", "application/x-sea");
+			MAP.put("set", "application/set");
+			MAP.put("sgm", "text/sgml");
+			MAP.put("sgm", "text/x-sgml");
+			MAP.put("sgml", "text/sgml");
+			MAP.put("sgml", "text/x-sgml");
+			MAP.put("sh", "application/x-bsh");
+			MAP.put("sh", "application/x-sh");
+			MAP.put("sh", "application/x-shar");
+			MAP.put("sh", "text/x-script.sh");
+			MAP.put("shar", "application/x-bsh");
+			MAP.put("shar", "application/x-shar");
+			MAP.put("shtml", "text/html");
+			MAP.put("shtml", "text/x-server-parsed-html");
+			MAP.put("sid", "audio/x-psid");
+			MAP.put("sit", "application/x-sit");
+			MAP.put("sit", "application/x-stuffit");
+			MAP.put("skd", "application/x-koan");
+			MAP.put("skm", "application/x-koan");
+			MAP.put("skp", "application/x-koan");
+			MAP.put("skt", "application/x-koan");
+			MAP.put("sl", "application/x-seelogo");
+			MAP.put("smi", "application/smil");
+			MAP.put("smil", "application/smil");
+			MAP.put("snd", "audio/basic");
+			MAP.put("snd", "audio/x-adpcm");
+			MAP.put("sol", "application/solids");
+			MAP.put("spc", "application/x-pkcs7-certificates");
+			MAP.put("spc", "text/x-speech");
+			MAP.put("spl", "application/futuresplash");
+			MAP.put("spr", "application/x-sprite");
+			MAP.put("sprite", "application/x-sprite");
+			MAP.put("src", "application/x-wais-source");
+			MAP.put("ssi", "text/x-server-parsed-html");
+			MAP.put("ssm", "application/streamingmedia");
+			MAP.put("sst", "application/vnd.ms-pki.certstore");
+			MAP.put("step", "application/step");
+			MAP.put("stl", "application/sla");
+			MAP.put("stl", "application/vnd.ms-pki.stl");
+			MAP.put("stl", "application/x-navistyle");
+			MAP.put("stp", "application/step");
+			MAP.put("sv4cpio", "application/x-sv4cpio");
+			MAP.put("sv4crc", "application/x-sv4crc");
+			MAP.put("svf", "image/vnd.dwg");
+			MAP.put("svf", "image/x-dwg");
+			MAP.put("svr", "application/x-world");
+			MAP.put("svr", "x-world/x-svr");
+			MAP.put("swf", "application/x-shockwave-flash");
+			MAP.put("t", "application/x-troff");
+			MAP.put("talk", "text/x-speech");
+			MAP.put("", "application/x-tar");
+			MAP.put("tbk", "application/toolbook");
+			MAP.put("tbk", "application/x-tbook");
+			MAP.put("tcl", "application/x-tcl");
+			MAP.put("tcl", "text/x-script.tcl");
+			MAP.put("tcsh", "text/x-script.tcsh");
+			MAP.put("tex", "application/x-tex");
+			MAP.put("texi", "application/x-texinfo");
+			MAP.put("texinfo", "application/x-texinfo");
+			MAP.put("text", "application/plain");
+			MAP.put("text", "text/plain");
+			MAP.put("tgz", "application/gnutar");
+			MAP.put("tgz", "application/x-compressed");
+			MAP.put("tif", "image/tiff");
+			MAP.put("tif", "image/x-tiff");
+			MAP.put("tiff", "image/tiff");
+			MAP.put("tiff", "image/x-tiff");
+			MAP.put("tr", "application/x-troff");
+			MAP.put("tsi", "audio/tsp-audio");
+			MAP.put("tsp", "application/dsptype");
+			MAP.put("tsp", "audio/tsplayer");
+			MAP.put("tsv", "text/tab-separated-values");
+			MAP.put("turbot", "image/florian");
+			MAP.put("txt", "text/plain");
+			MAP.put("uil", "text/x-uil");
+			MAP.put("uni", "text/uri-list");
+			MAP.put("unis", "text/uri-list");
+			MAP.put("unv", "application/i-deas");
+			MAP.put("uri", "text/uri-list");
+			MAP.put("uris", "text/uri-list");
+			MAP.put("ustar", "application/x-ustar");
+			MAP.put("ustar", "multipart/x-ustar");
+			MAP.put("uu", "application/octet-stream");
+			MAP.put("uu", "text/x-uuencode");
+			MAP.put("uue", "text/x-uuencode");
+			MAP.put("vcd", "application/x-cdlink");
+			MAP.put("vcs", "text/x-vcalendar");
+			MAP.put("vda", "application/vda");
+			MAP.put("vdo", "video/vdo");
+			MAP.put("vew", "application/groupwise");
+			MAP.put("viv", "video/vivo");
+			MAP.put("viv", "video/vnd.vivo");
+			MAP.put("vivo", "video/vivo");
+			MAP.put("vivo", "video/vnd.vivo");
+			MAP.put("vmd", "application/vocaltec-media-desc");
+			MAP.put("vmf", "application/vocaltec-media-file");
+			MAP.put("voc", "audio/voc");
+			MAP.put("voc", "audio/x-voc");
+			MAP.put("vos", "video/vosaic");
+			MAP.put("vox", "audio/voxware");
+			MAP.put("vqe", "audio/x-twinvq-plugin");
+			MAP.put("vqf", "audio/x-twinvq");
+			MAP.put("vql", "audio/x-twinvq-plugin");
+			MAP.put("vrml", "application/x-vrml");
+			MAP.put("vrml", "model/vrml");
+			MAP.put("vrml", "x-world/x-vrml");
+			MAP.put("vrt", "x-world/x-vrt");
+			MAP.put("vsd", "application/x-visio");
+			MAP.put("vst", "application/x-visio");
+			MAP.put("vsw", "application/x-visio");
+			MAP.put("w60", "application/wordperfect6.0");
+			MAP.put("w61", "application/wordperfect6.1");
+			MAP.put("w6w", "application/msword");
+			MAP.put("wav", "audio/wav");
+			MAP.put("wav", "audio/x-wav");
+			MAP.put("wb1", "application/x-qpro");
+			MAP.put("wbmp", "image/vnd.wap.wbmp");
+			MAP.put("web", "application/vnd.xara");
+			MAP.put("wiz", "application/msword");
+			MAP.put("wk1", "application/x-123");
+			MAP.put("wmf", "windows/metafile");
+			MAP.put("wml", "text/vnd.wap.wml");
+			MAP.put("wmlc", "application/vnd.wap.wmlc");
+			MAP.put("wmls", "text/vnd.wap.wmlscript");
+			MAP.put("wmlsc", "application/vnd.wap.wmlscriptc");
+			MAP.put("word", "application/msword");
+			MAP.put("wp", "application/wordperfect");
+			MAP.put("wp5", "application/wordperfect");
+			MAP.put("wp5", "application/wordperfect6.0");
+			MAP.put("wp6", "application/wordperfect");
+			MAP.put("wpd", "application/wordperfect");
+			MAP.put("wpd", "application/x-wpwin");
+			MAP.put("wq1", "application/x-lotus");
+			MAP.put("wri", "application/mswrite");
+			MAP.put("wri", "application/x-wri");
+			MAP.put("wrl", "application/x-world");
+			MAP.put("wrl", "model/vrml");
+			MAP.put("wrl", "x-world/x-vrml");
+			MAP.put("wrz", "model/vrml");
+			MAP.put("wrz", "x-world/x-vrml");
+			MAP.put("wsc", "text/scriplet");
+			MAP.put("wsrc", "application/x-wais-source");
+			MAP.put("wtk", "application/x-wintalk");
+			MAP.put("xbm", "image/x-xbitmap");
+			MAP.put("xbm", "image/x-xbm");
+			MAP.put("xbm", "image/xbm");
+			MAP.put("xdr", "video/x-amt-demorun");
+			MAP.put("xgz", "xgl/drawing");
+			MAP.put("xif", "image/vnd.xiff");
+			MAP.put("xl", "application/excel");
+			MAP.put("xla", "application/excel");
+			MAP.put("xla", "application/x-excel");
+			MAP.put("xla", "application/x-msexcel");
+			MAP.put("xlb", "application/excel");
+			MAP.put("xlb", "application/vnd.ms-excel");
+			MAP.put("xlb", "application/x-excel");
+			MAP.put("xlc", "application/excel");
+			MAP.put("xlc", "application/vnd.ms-excel");
+			MAP.put("xlc", "application/x-excel");
+			MAP.put("xld", "application/excel");
+			MAP.put("xld", "application/x-excel");
+			MAP.put("xlk", "application/excel");
+			MAP.put("xlk", "application/x-excel");
+			MAP.put("xll", "application/excel");
+			MAP.put("xll", "application/vnd.ms-excel");
+			MAP.put("xll", "application/x-excel");
+			MAP.put("xlm", "application/excel");
+			MAP.put("xlm", "application/vnd.ms-excel");
+			MAP.put("xlm", "application/x-excel");
+			MAP.put("xls", "application/excel");
+			MAP.put("xls", "application/vnd.ms-excel");
+			MAP.put("xls", "application/x-excel");
+			MAP.put("xls", "application/x-msexcel");
+			MAP.put("xlt", "application/excel");
+			MAP.put("xlt", "application/x-excel");
+			MAP.put("xlv", "application/excel");
+			MAP.put("xlv", "application/x-excel");
+			MAP.put("xlw", "application/excel");
+			MAP.put("xlw", "application/vnd.ms-excel");
+			MAP.put("xlw", "application/x-excel");
+			MAP.put("xlw", "application/x-msexcel");
+			MAP.put("xm", "audio/xm");
+			MAP.put("xml", "application/xml");
+			MAP.put("xml", "text/xml");
+			MAP.put("xsd", "application/xml");
+			MAP.put("xsd", "text/xml");
+			MAP.put("xmz", "xgl/movie");
+			MAP.put("xpix", "application/x-vnd.ls-xpix");
+			MAP.put("xpm", "image/x-xpixmap");
+			MAP.put("xpm", "image/xpm");
+			MAP.put("x-png", "image/png");
+			MAP.put("xsr", "video/x-amt-showrun");
+			MAP.put("xwd", "image/x-xwd");
+			MAP.put("xwd", "image/x-xwindowdump");
+			MAP.put("xyz", "chemical/x-pdb");
+			MAP.put("z", "application/x-compress");
+			MAP.put("z", "application/x-compressed");
+			MAP.put("zip", "application/x-compressed");
+			MAP.put("zoo", "application/octet-stream");
+			MAP.put("zsh", "text/x-script.zsh");
+		}
+		return MAP;
+	}
+
+	/**
+	 * @param ext
+	 *            the extension
+	 * @return the mime type
+	 */
+	public static String getMimeTypeFromExtension(String ext) {
+		return getMap().get(ext);
+	}
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/data/RootFileUtils.java b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/data/RootFileUtils.java
new file mode 100644
index 00000000..7b913a94
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/data/RootFileUtils.java
@@ -0,0 +1,50 @@
+package org.qpython.qpy.texteditor.androidlib.data;
+
+import java.io.BufferedReader;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.util.List;
+
+public class RootFileUtils {
+
+	public static List<File> listFiles(File folder) {
+
+		Process suProcess;
+		DataOutputStream os;
+		DataInputStream is;
+		StringBuffer text = new StringBuffer();
+		int c;
+
+		try {
+			suProcess = Runtime.getRuntime().exec("su");
+
+			os = new DataOutputStream(suProcess.getOutputStream());
+			is = new DataInputStream(suProcess.getInputStream());
+
+			os.writeBytes("ls " + FileUtils.getCanonizePath(folder) + "\n");
+			os.flush();
+
+			os.writeBytes("exit \n");
+			os.flush();
+
+			int suProcessRetVal = suProcess.waitFor();
+			byte buffer[] = new byte[1024];
+			Reader reader = new BufferedReader(new InputStreamReader(is));
+			do {
+				c = reader.read();
+				if (c != -1) {
+					text.append((char) c);
+				}
+			} while (c != -1);
+			reader.close();
+		} catch (Exception e) {
+
+		}
+
+		return null;
+
+	}
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/ui/Toaster.java b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/ui/Toaster.java
new file mode 100644
index 00000000..aa186286
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/ui/Toaster.java
@@ -0,0 +1,104 @@
+package org.qpython.qpy.texteditor.androidlib.ui;
+
+import android.app.Activity;
+import android.content.Context;
+import android.graphics.Color;
+import android.widget.TextView;
+import android.widget.Toast;
+
+@Deprecated
+public class Toaster {
+
+	protected static final int mError = Color.rgb(255, 128, 64);
+
+	/**
+	 * Show a toast message to the user, ensuring the toast is called from the
+	 * main thread
+	 *
+	 * @param activity
+	 *            The activity to use
+	 * @param resId
+	 *            the id of the string to display
+	 * @param error
+	 *            is the message an error (changes the text to red)
+	 */
+	@Deprecated
+	public static void showToastOnMainThread(final Activity activity,
+			final int resId, final boolean error) {
+		activity.runOnUiThread(new Runnable() {
+			public void run() {
+				showToast(activity, resId, error);
+			}
+		});
+	}
+
+	/**
+	 * Show a toast message to the user, ensuring the toast is called from the
+	 * main thread
+	 *
+	 * @param activity
+	 *            The activity to use
+	 * @param message
+	 *            the string to display
+	 * @param error
+	 *            is the message an error (changes the text to red)
+	 */
+	@Deprecated
+	public static void showToastOnMainThread(final Activity activity,
+			final CharSequence message, final boolean error) {
+		activity.runOnUiThread(new Runnable() {
+			public void run() {
+				showToast(activity, message, error);
+			}
+		});
+	}
+
+	/**
+	 * Show a toast message to the user
+	 *
+	 * @param ctx
+	 *            The context to use
+	 * @param resId
+	 *            the id of the string to display
+	 * @param error
+	 *            is the message an error (changes the text to red)
+	 */
+	@Deprecated
+	public static void showToast(Context ctx, int resId, boolean error) {
+		Toast toast;
+		TextView v;
+
+		toast = Toast.makeText(ctx, resId, Toast.LENGTH_SHORT);
+		if (error) {
+			v = (TextView) toast.getView().findViewById(android.R.id.message);
+			v.setTextColor(mError);
+			toast.setDuration(Toast.LENGTH_LONG);
+		}
+		toast.show();
+	}
+
+	/**
+	 * Show a toast message to the user
+	 *
+	 * @param ctx
+	 *            The context to use
+	 * @param message
+	 *            the string to display
+	 * @param error
+	 *            is the message an error (changes the text to red)
+	 */
+	@Deprecated
+	public static void showToast(Context ctx, CharSequence message,
+			boolean error) {
+		Toast toast;
+		TextView v;
+
+		toast = Toast.makeText(ctx, message, Toast.LENGTH_SHORT);
+		if (error) {
+			v = (TextView) toast.getView().findViewById(android.R.id.message);
+			v.setTextColor(mError);
+			toast.setDuration(Toast.LENGTH_LONG);
+		}
+		toast.show();
+	}
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/ui/activity/ActivityDecorator.java b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/ui/activity/ActivityDecorator.java
new file mode 100644
index 00000000..f28a051b
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/ui/activity/ActivityDecorator.java
@@ -0,0 +1,53 @@
+package org.qpython.qpy.texteditor.androidlib.ui.activity;
+
+import android.annotation.TargetApi;
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
+import android.view.Menu;
+import android.view.MenuItem;
+
+public class ActivityDecorator {
+
+	/**
+	 * Adds a Menu item either in the Option Menu (pre Honeycomb) or in the
+	 * action bar
+	 * 
+	 * @param menu
+	 *            the menu to fill
+	 * @param id
+	 *            the id of this item
+	 * @param title
+	 *            the title resource
+	 * @param icon
+	 *            the drawable (for pre honeycomb option menu)
+	 * @return the menu item
+	 */
+	public static MenuItem addMenuItem(Menu menu, int id, int title, int icon) {
+		MenuItem item;
+
+		item = menu.add(0, id, Menu.NONE, title);
+		if ((icon != -1) && (VERSION.SDK_INT < VERSION_CODES.HONEYCOMB)) {
+			item.setIcon(icon);
+		}
+		return item;
+	}
+
+	/**
+	 * Show the menu item as an action in the action bar
+	 * 
+	 * @param item
+	 *            the item to show
+	 * @param icon
+	 *            the item icon resource
+	 * 
+	 */
+	@TargetApi(11)
+	public static void showMenuItemAsAction(MenuItem item, int icon) {
+		if (VERSION.SDK_INT >= VERSION_CODES.HONEYCOMB) {
+			if (icon != -1) {
+				item.setIcon(icon);
+			}
+			item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+		}
+	}
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/ui/activity/BrowsingActivity.java b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/ui/activity/BrowsingActivity.java
new file mode 100644
index 00000000..c1058cc9
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/ui/activity/BrowsingActivity.java
@@ -0,0 +1,264 @@
+package org.qpython.qpy.texteditor.androidlib.ui.activity;
+
+import android.annotation.TargetApi;
+import android.app.Activity;
+import android.os.Build;
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.ListView;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.texteditor.androidlib.comparator.ComparatorFilesAlpha;
+import org.qpython.qpy.texteditor.androidlib.data.FileUtils;
+import org.qpython.qpy.texteditor.androidlib.ui.adapter.FileListAdapter;
+import org.qpython.qpy.texteditor.widget.crouton.Crouton;
+import org.qpython.qpy.texteditor.widget.crouton.Style;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * 
+ */
+public abstract class BrowsingActivity extends Activity implements
+		OnItemClickListener {
+
+	/** The list of files to display */
+	protected ArrayList<File> mList;
+	/** the dialog's list view */
+	protected ListView mFilesList;
+	/** The list adapter */
+	protected FileListAdapter mListAdapter;
+
+	/** the current folder */
+	protected File mCurrentFolder;
+
+	/** the current file sort */
+	protected Comparator<File> mComparator;
+
+	protected boolean mShowFoldersOnly = false;
+	protected boolean mShowHiddenFiles = true;
+	protected boolean mHideNonWriteableFiles = false;
+	protected List<String> mExtensionsWhiteList;
+	protected List<String> mExtensionsBlackList;
+
+	/**
+	 * @see android.app.Activity#onCreate(android.os.Bundle)
+	 */
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+
+		mExtensionsWhiteList = new ArrayList<>();
+		mExtensionsBlackList = new ArrayList<>();
+		mComparator = new ComparatorFilesAlpha();
+		mListAdapter = new FileListAdapter(this, new LinkedList<>(), null);
+	}
+
+	/**
+	 * @see android.app.Activity#onResume()
+	 */
+	protected void onResume() {
+		super.onResume();
+
+		// Setup the widget
+		mFilesList = findViewById(android.R.id.list);
+		mFilesList.setOnItemClickListener(this);
+
+		// set adapter
+		mFilesList.setAdapter(mListAdapter);
+
+		// initial folder
+		File folder;
+		if (mCurrentFolder != null) {
+			folder = mCurrentFolder;
+		} else if ((FileUtils.STORAGE.exists())
+				&& (FileUtils.STORAGE.canRead())) {
+			folder = FileUtils.STORAGE;
+		} else {
+			folder = new File("/");
+		}
+
+		fillFolderView(folder);
+	}
+
+	/**
+	 * @see android.widget.AdapterView.OnItemClickListener#onItemClick(android.widget.AdapterView,
+	 *      android.view.View, int, long)
+	 */
+	public void onItemClick(AdapterView<?> parent, View view, int position,
+			long id) {
+		File file, canon;
+
+		file = mList.get(position);
+		canon = new File(FileUtils.getCanonizePath(file));
+
+		// safe check : file exists
+		if (file.exists()) {
+			if (file.isDirectory()) {
+				if (onFolderClick(file)) {
+					fillFolderView(canon);
+				}
+			} else {
+				onFileClick(canon);
+			}
+		}
+	}
+
+	/**
+	 * @param folder
+	 *            the folder being clicked
+	 * @return if the folder should be opened in the browsing list view
+	 */
+	protected abstract boolean onFolderClick(File folder);
+
+	/**
+	 * @param file
+	 *            the file being clicked (it is not a folder)
+	 */
+	protected abstract void onFileClick(File file);
+
+	/**
+	 * Folder view has been filled
+	 */
+	protected abstract void onFolderViewFilled();
+
+	/**
+	 * Fills the files list with the specified folder
+	 * 
+	 * @param file
+	 *            the file of the folder to display
+	 */
+	@TargetApi(Build.VERSION_CODES.HONEYCOMB)
+	protected void fillFolderView(File file) {
+		file = new File(FileUtils.getCanonizePath(file));
+
+		if (!file.exists()) {
+			Crouton.makeText(this, R.string.toast_folder_doesnt_exist,
+					Style.ALERT).show();
+			return;
+		}
+
+		if (!file.isDirectory()) {
+			Crouton.makeText(this, R.string.toast_folder_not_folder,
+					Style.ALERT).show();
+			return;
+		}
+
+		if (!file.canRead()) {
+			Crouton.makeText(this, R.string.toast_folder_cant_read, Style.ALERT)
+					.show();
+			return;
+		}
+
+		listFiles(file);
+
+		// create string list adapter
+		// mListAdapter = new FileListAdapter(this, mList, file);
+		mListAdapter.clear();
+		mListAdapter.setCurrentFolder(file);
+		mListAdapter.addAll(mList);
+		mFilesList.scrollTo(0, 0);
+
+		// update path
+		mCurrentFolder = file;
+		setTitle(file.getName());
+
+		onFolderViewFilled();
+	}
+
+	/**
+	 * List the files in the given folder and store them in the list of files to
+	 * display
+	 * 
+	 * @param folder
+	 *            the folder to analyze
+	 */
+	protected void listFiles(File folder) {
+		File file;
+
+		// get files list as array list
+		if ((folder == null) || (!folder.isDirectory())) {
+			mList = new ArrayList<>();
+			return;
+		}
+
+		mList = new ArrayList<>(Arrays.asList(folder.listFiles()));
+
+		// filter files
+		for (int i = (mList.size() - 1); i >= 0; i--) {
+			file = mList.get(i);
+
+			// remove
+			if (!(isFileVisible(file) && isFileTypeAllowed(file))) {
+				mList.remove(i);
+			}
+		}
+
+		// Sort list
+		if (mComparator != null) {
+			Collections.sort(mList, mComparator);
+		}
+
+		// Add parent folder
+		if (!folder.getPath().equals("/")) {
+			mList.add(0, folder.getParentFile());
+		}
+	}
+
+	protected boolean isFileVisible(File file) {
+
+		boolean visible = true;
+
+		// filter hidden files
+		if ((!mShowHiddenFiles) && (file.getName().startsWith("."))) {
+			visible = false;
+		}
+
+		// filter non folders
+		if (mShowFoldersOnly && (!file.isDirectory())) {
+			visible = false;
+		}
+
+		return visible;
+	}
+
+	/**
+	 * Filters files based on their extensions and white list / black list
+	 * 
+	 * @param file
+	 *            the file to test
+	 * @return if the file can be shown (either appear in white list or doesn't
+	 *         appear on blacklist)
+	 */
+	protected boolean isFileTypeAllowed(File file) {
+		boolean allow = true;
+		String ext;
+
+		if (file.isFile()) {
+			ext = FileUtils.getFileExtension(file);
+			if ((mExtensionsWhiteList != null)
+					&& (mExtensionsWhiteList.size() > 0)
+					&& (!mExtensionsWhiteList.contains(ext))) {
+				allow = false;
+			}
+
+			if ((mExtensionsBlackList != null)
+					&& (mExtensionsBlackList.size() > 0)
+					&& (mExtensionsBlackList.contains(ext))) {
+				allow = false;
+			}
+		}
+
+		return allow;
+	}
+
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/ui/adapter/FileListAdapter.java b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/ui/adapter/FileListAdapter.java
new file mode 100644
index 00000000..9c7de160
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/ui/adapter/FileListAdapter.java
@@ -0,0 +1,208 @@
+package org.qpython.qpy.texteditor.androidlib.ui.adapter;
+
+
+import android.content.Context;
+import android.graphics.Color;
+import android.graphics.Typeface;
+import android.graphics.drawable.Drawable;
+import android.text.TextUtils.TruncateAt;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.TextView;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.texteditor.androidlib.common.UIUtils;
+import org.qpython.qpy.texteditor.androidlib.data.FileUtils;
+
+import java.io.File;
+import java.util.List;
+
+
+/**
+ * A File List Adapter used to display folders and files
+ */
+public class FileListAdapter extends ArrayAdapter<File> {
+
+    private int               mLayout;
+    private boolean           mIconOnTop;
+    private File              mFolder;
+    private ThumbnailProvider mThumbnailProvider;
+    private List<File>        mSelection;
+
+    /**
+     * Constructor
+     *
+     * @param context The current context
+     * @param objects The objects to represent in the ListView.
+     * @param folder  the parent folder of the items presented, or null if the top
+     *                folder should not be displayed as up
+     */
+    public FileListAdapter(Context context, List<File> objects, File folder) {
+        this(context, objects, folder, R.layout.item_file);
+    }
+
+    /**
+     * Constructor
+     *
+     * @param context The current context
+     * @param objects The objects to represent in the ListView.
+     * @param folder  the parent folder of the items presented, or null if the top
+     *                folder should not be displayed as up
+     * @param layout  the layout to use
+     */
+    private FileListAdapter(Context context, List<File> objects, File folder,
+                            int layout) {
+        super(context, layout, objects);
+        mLayout = layout;
+        mFolder = folder;
+    }
+
+    private static int getIconForFile(File file) {
+        if (file.isDirectory()) {
+            return R.drawable.ic_editor_folder;
+        } else {
+            return R.drawable.ic_editor_file;
+        }
+    }
+
+    /**
+     * @see ArrayAdapter#getView(int, View, ViewGroup)
+     */
+    public View getView(int position, View convertView, ViewGroup parent) {
+        File file;
+        View v;
+        TextView textView;
+        String text;
+        int icon, style;
+
+        // recycle the view
+        v = convertView;
+        if (v == null) {
+            LayoutInflater vi = (LayoutInflater) getContext().getSystemService(
+                    Context.LAYOUT_INFLATER_SERVICE);
+            v = vi.inflate(R.layout.item_file, null);
+        }
+
+        // get the file infos
+        file = getItem(position);
+        style = Typeface.BOLD;
+        if (file != null) {
+            text = file.getName();
+
+//            if ((position == 0) && (mFolder != null)
+//                    && (file.equals(mFolder.getParentFile()))
+//                    && (!mFolder.getPath().equals("/"))) {
+//                icon = R.drawable.up;
+//                text = "";
+//            } else {
+            if (FileUtils.isSymLink(file)) {
+                File target = FileUtils.getSymLinkTarget(file);
+                if (target.equals(FileUtils.STORAGE)) {
+                    icon = R.drawable.prev;
+                } else if (target.isDirectory()) {
+                    icon = R.drawable.ic_editor_folder_little;
+                } else {
+                    icon = R.drawable.ic_editor_file_little;
+                }
+            } else {
+                if (position == 0) {
+                    icon = R.drawable.prev;
+                } else {
+                    icon = getIconForFile(file);
+                }
+            }
+//            }
+        } else {
+            text = "";
+            icon = R.drawable.ic_editor_file_little;
+        }
+
+        Drawable thumbnail = null;
+        Drawable selectedIcon = null;
+
+        // File Icon / Thumbnail
+        if (mThumbnailProvider != null) {
+            thumbnail = mThumbnailProvider.getThumbnailForFile(getContext(),
+                    file);
+        }
+        if (thumbnail == null) {
+            thumbnail = getContext().getResources().getDrawable(icon);
+        }
+
+        int size = UIUtils.getPxFromDp(getContext(), 38);
+
+        if (thumbnail != null) {
+            double ratio = ((double) thumbnail.getIntrinsicWidth())
+                    / ((double) thumbnail.getIntrinsicHeight());
+            if (ratio > 1) {
+                thumbnail.setBounds(0, 0, size, (int) (size / ratio));
+            } else {
+                thumbnail.setBounds(0, 0, (int) (size * ratio), size);
+            }
+        }
+
+        // Handle selection
+        int color = Color.LTGRAY;
+        if ((mSelection != null) && (mSelection.contains(file))) {
+            selectedIcon = getContext().getResources().getDrawable(
+                    R.drawable.ic_program_install);
+            selectedIcon.setBounds(0, 0, size, size);
+            style = Typeface.BOLD_ITALIC;
+            color = Color.rgb(0, 192, 0);
+        }
+
+        // Setup name and icon
+        textView = (TextView) v.findViewById(R.id.textFileName);
+        if (textView != null) {
+            textView.setText(text);
+
+            if (mIconOnTop) {
+                textView.setCompoundDrawables(null, thumbnail, null, null);
+                textView.setGravity(Gravity.CENTER);
+            } else {
+                textView.setCompoundDrawables(thumbnail, null, selectedIcon,
+                        null);
+                textView.setGravity(Gravity.CENTER_VERTICAL | Gravity.LEFT);
+            }
+
+            textView.setTypeface(Typeface.DEFAULT, style);
+
+            textView.setEllipsize(TruncateAt.MIDDLE);
+            textView.setSingleLine();
+            textView.setTextColor(color);
+        }
+
+        return v;
+    }
+
+    /**
+     * @param folder the current parent folder for displayed files
+     */
+    public void setCurrentFolder(File folder) {
+        mFolder = folder;
+    }
+
+    /**
+     * @param iconOnTop let the icon be above the file name
+     */
+    public void setIconOnTop(boolean iconOnTop) {
+        mIconOnTop = iconOnTop;
+    }
+
+    /**
+     * @param provider the {@link ThumbnailProvider} for this adapter
+     */
+    public void setThumbnailProvider(ThumbnailProvider provider) {
+        mThumbnailProvider = provider;
+    }
+
+    /**
+     * @param selection the list of selected files
+     */
+    public void setSelection(List<File> selection) {
+        mSelection = selection;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/ui/adapter/ThumbnailProvider.java b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/ui/adapter/ThumbnailProvider.java
new file mode 100644
index 00000000..7397dfc5
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/ui/adapter/ThumbnailProvider.java
@@ -0,0 +1,11 @@
+package org.qpython.qpy.texteditor.androidlib.ui.adapter;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+
+import java.io.File;
+
+public interface ThumbnailProvider {
+
+	public Drawable getThumbnailForFile(Context context, File file);
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/common/CommonEnums.java b/qpython/src/main/java/org/qpython/qpy/texteditor/common/CommonEnums.java
new file mode 100644
index 00000000..707c5c0d
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/common/CommonEnums.java
@@ -0,0 +1,14 @@
+package org.qpython.qpy.texteditor.common;
+
+/**
+ * Created by Hmei on 2017-05-11.
+ */
+
+public class CommonEnums {
+    public enum FileType {
+        FOLDER,
+        FILE,
+        PROJECT,
+        SCRIPT
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/common/ComparatorFilesAlpha.java b/qpython/src/main/java/org/qpython/qpy/texteditor/common/ComparatorFilesAlpha.java
new file mode 100644
index 00000000..be7f331a
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/common/ComparatorFilesAlpha.java
@@ -0,0 +1,30 @@
+package org.qpython.qpy.texteditor.common;
+
+import java.io.File;
+import java.util.Comparator;
+
+/**
+ * Compare files Alphabetically (w/ folders listed first)
+ * 
+ * @author x.gouchet
+ * 
+ */
+public class ComparatorFilesAlpha implements Comparator<File> {
+
+	/**
+	 * @see Comparator#compare(Object, Object)
+	 */
+	@Override
+	public int compare(File file1, File file2) {
+		// sort folders first
+		if ((file1.isDirectory()) && (!file2.isDirectory()))
+			return -1;
+		if ((!file1.isDirectory()) && (file2.isDirectory()))
+			return 1;
+
+		// here both are folders or both are files : sort alpha
+		return file1.getName().toLowerCase().compareTo(
+				file2.getName().toLowerCase());
+	}
+
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/common/Constants.java b/qpython/src/main/java/org/qpython/qpy/texteditor/common/Constants.java
new file mode 100644
index 00000000..19581089
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/common/Constants.java
@@ -0,0 +1,276 @@
+package org.qpython.qpy.texteditor.common;
+
+import java.io.File;
+
+import android.os.Environment;
+
+/**
+ * @author x.gouchet
+ */
+public interface Constants {
+
+    /**
+     * Tag for the log ( = {@value} )
+     */
+     String TAG = "TED";
+
+     String ACTION_WIDGET_OPEN = "org.qpython.qpy.texteditor.ACTION_TED_WIDGET_OPEN";
+
+    String ACTION_WIDGET_TEXT = "org.qpython.qpy.texteditor.ACTION_TED_WIDGET_TEXT";
+
+    /**
+     * Fonts folder
+     */
+     String FONT_FOLDER_NAME = "fonts";
+    /**
+     * Font file
+     */
+     String FONT_FILE_NAME   = "ted_font.ttf";
+
+    /**
+     * clears the current text ( = {@value} )
+     */
+     int MENU_ID_NEW         = 0;
+    /**
+     * Saves the file ( = {@value} )
+     */
+     int MENU_ID_SAVE        = 1;
+    /**
+     * Savesas a new file ( = {@value} )
+     */
+     int MENU_ID_SAVE_AS     = 2;
+    /**
+     * open an existing file
+     */
+     int MENU_ID_OPEN        = 3;
+    /**
+     * open an existing file ( = {@value} )
+     */
+     int MENU_ID_OPEN_RECENT = 4;
+    /**
+     * open the settings ( = {@value} )
+     */
+     int MENU_ID_SETTINGS    = 5;
+    /**
+     * open the about page ( = {@value} )
+     */
+     int MENU_ID_ABOUT       = 6;
+    /**
+     * Search a string in the file ( = {@value} )
+     */
+     int MENU_ID_SEARCH      = 7;
+    /**
+     * undo last change ( = {@value} )
+     */
+     int MENU_ID_UNDO        = 8;
+    /**
+     * redo last change ( = {@value} )
+     */
+     int MENU_ID_REDO        = 9;
+    /**
+     * Quit the app ( = {@value} )
+     */
+     int MENU_ID_QUIT        = 666;
+
+    /**
+     * File of the external storage data
+     */
+     File   STORAGE          = Environment
+            .getExternalStorageDirectory();
+    /**
+     * Path to the external storage data
+     */
+     String STORAGE_PATH     = STORAGE.getAbsolutePath();
+    /**
+     * name of the backup file
+     */
+     String BACKUP_FILE_NAME = "temp.bak";
+
+    String PREFERENCES_GIST                     = "show_gist";
+
+    /**
+     * name of the shared preferences for this app ( = {@value} )
+     */
+     String PREFERENCES_NAME                     = "org.qpython.qpy.texteditor";
+    /**
+     * Preference tag to retrieve the recent files ( = {@value} )
+     */
+     String PREFERENCE_RECENTS                   = "recent_files";
+    /**
+     * Preference tag to retrieve the recent files ( = {@value} )
+     */
+     String PREFERENCE_MAX_RECENTS               = "max_recent_files";
+     String PREFERENCE_MAX_LINES_NUM_WITH_SYNTAX = "max_lines_num_with_syntax";
+
+    /**
+     * Preference tag to retrieve the show PATTERN_LINE number ( = {@value} )
+     */
+     String PREFERENCE_SHOW_LINE_NUMBERS   = "show_line_numbers";
+    /**
+     * Preference tag to retrieve the wordwrap ( = {@value} )
+     */
+     String PREFERENCE_WORDWRAP            = "auto_break_lines";
+    /**
+     * Preference tag to retrieve the searchwrap ( = {@value} )
+     */
+     String PREFERENCE_SEARCHWRAP          = "search_wrap";
+    /**
+     * Preference tag to retrieve the setSearchState match case ( = {@value} )
+     */
+     String PREFERENCE_SEARCH_MATCH_CASE   = "search_match_case";
+    /**
+     * Preference tag to retrieve the Syntax Highlight ( = {@value} )
+     */
+     String PREFERENCE_HIGHLIGHT           = "highlight_syntax";
+    /**
+     * Preference tag to retrieve the Text Size ( = {@value} )
+     */
+     String PREFERENCE_TEXT_SIZE           = "text_size";
+    /**
+     * Preference tag to retrieve the End of lines pref ( = {@value} )
+     */
+     String PREFERENCE_END_OF_LINES        = "end_of_lines";
+    /**
+     * Preference tag to retrieve the Encoding pref ( = {@value} )
+     */
+     String PREFERENCE_ENCODING            = "encoding";
+    /**
+     * Preference tag to retrieve the Auto mode ( = {@value} )
+     */
+     String PREFERENCE_AUTO_SAVE           = "force_auto_save";
+    /**
+     * Preference tag to retrieve the Auto mode ( = {@value} )
+     */
+     String PREFERENCE_AUTO_SAVE_OVERWRITE = "auto_save_overwrite";
+    /**
+     * Preference tag to retrieve the Color Theme ( = {@value} )
+     */
+     String PREFERENCE_COLOR_THEME         = "color_theme";
+    /**
+     * Preference tag to retrieve the fling to scroll ( = {@value} )
+     */
+     String PREFERENCE_FLING_TO_SCROLL     = "fling_to_scroll";
+    /**
+     * Preference tag to retrieve if undo history is allowed ( = {@value} )
+     */
+     String PREFERENCE_ALLOW_UNDO          = "allow_undo";
+    /**
+     * Preference tag to retrieve the max undo stack ( = {@value} )
+     */
+     String PREFERENCE_MAX_UNDO_STACK      = "max_undo_stack";
+    /**
+     * Preference tag to retrieve the back button as undo ( = {@value} )
+     */
+     String PREFERENCE_BACK_BUTTON_AS_UNDO = "back_button_as_undo";
+    /**
+     * Preference tag to retrieve the use home page ( = {@value} )
+     */
+     String PREFERENCE_USE_HOME_PAGE       = "use_home_page";
+    /**
+     * Preference tag to retrieve the home page path ( = {@value} )
+     */
+     String PREFERENCE_HOME_PAGE_PATH      = "home_page_path";
+    /**
+     * Preference tag to select the font ( = {@value} )
+     */
+     String PREFERENCE_SELECT_FONT         = "select_font";
+    /**
+     * Preference tag to the text font ( = {@value} )
+     */
+     String PREFERENCE_FONT                = "text_font";
+
+    /**
+     * minimum text size
+     */
+     int TEXT_SIZE_MIN = 9;
+    /**
+     * maximum text size
+     */
+     int TEXT_SIZE_MAX = 40;
+
+    /**
+     * End of PATTERN_LINE setting for Linux files ( = {@value} )
+     */
+     int EOL_LINUX   = 0;
+    /**
+     * End of PATTERN_LINE setting for Windows files ( = {@value} )
+     */
+     int EOL_WINDOWS = 1;
+    /**
+     * End of PATTERN_LINE setting for Mac files ( = {@value} )
+     */
+     int EOL_MAC     = 2;
+
+    /**
+     * Encoding : 7 bit ASCII ( = {@value} )
+     */
+     String ENC_ASCII = "US-ASCII";
+    /**
+     * Encoding : ISO Latin Alphabet, aka ISO-LATIN-1 ( = {@value} )
+     */
+     String ENC_LATIN = "ISO-8859-1";
+    /**
+     * Encoding : 8 bit UCS Transformation Format ( = {@value} )
+     */
+     String ENC_UTF8  = "UTF-8";
+
+    /**
+     * color theme default : black on white ( = {@value} )
+     */
+     int COLOR_CLASSIC  = 0;
+    /**
+     * color theme negative : white on black ( = {@value} )
+     */
+     int COLOR_NEGATIVE = 1;
+    /**
+     * color theme matrix : green on dark green ( = {@value} )
+     */
+     int COLOR_MATRIX   = 2;
+    /**
+     * color theme sky : darkblue on skyblue ( = {@value} )
+     */
+     int COLOR_SKY      = 3;
+    /**
+     * color theme dracula : red on black ( = {@value} )
+     */
+     int COLOR_DRACULA  = 4;
+
+    /**
+     * Request code for Save As Activity
+     */
+     int REQUEST_SAVE_AS   = 107;
+    /**
+     * Request code for Open Activity
+     */
+     int REQUEST_OPEN      = 108;
+    /**
+     * Request code for Home Page Activity
+     */
+     int REQUEST_HOME_PAGE = 109;
+    /**
+     * Request code for Font Activity
+     */
+     int REQUEST_FONT      = 110;
+
+     int REQUEST_RECENT = 111;
+
+    /**
+     * extra when browsing for file
+     */
+     String EXTRA_REQUEST_CODE    = "request_code";
+    /**
+     * Extra to force read only from widget
+     */
+     String EXTRA_FORCE_READ_ONLY = "force_read_only";
+
+    /**
+     * an error result
+     */
+     int RESULT_ERROR = 1;
+
+    /**
+     * Editor(TedFragment.java)
+     */
+    int REQUEST_FILE    = 112;
+    int REQUEST_PROJECT = 113;
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/common/FontUtils.java b/qpython/src/main/java/org/qpython/qpy/texteditor/common/FontUtils.java
new file mode 100644
index 00000000..c37f13dd
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/common/FontUtils.java
@@ -0,0 +1,17 @@
+package org.qpython.qpy.texteditor.common;
+
+import java.io.File;
+
+import android.content.Context;
+
+public class FontUtils {
+
+	/**
+	 * @param ctx
+	 *            the current application context
+	 * @return the app folder for fonts
+	 */
+	public static File getAppFontFolder(Context ctx) {
+		return ctx.getDir(Constants.FONT_FOLDER_NAME, Context.MODE_PRIVATE);
+	}
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/common/RecentFiles.java b/qpython/src/main/java/org/qpython/qpy/texteditor/common/RecentFiles.java
new file mode 100644
index 00000000..0648b000
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/common/RecentFiles.java
@@ -0,0 +1,100 @@
+package org.qpython.qpy.texteditor.common;
+
+import android.content.SharedPreferences;
+import android.content.SharedPreferences.Editor;
+import android.util.Log;
+
+import org.qpython.qpy.BuildConfig;
+
+import java.io.File;
+import java.util.ArrayList;
+
+/**
+ * Storage for a recent files list
+ * 
+ * TODO code review
+ */
+public class RecentFiles implements Constants {
+
+	/** the list of paths in the recent list */
+	private static ArrayList<String> PATHS;
+
+	/**
+	 * loads the recent files from shared preferences
+	 *
+	 * @param saved
+	 *            the previously saved string
+	 */
+	public static void loadRecentFiles(String saved) {
+		PATHS = new ArrayList<>();
+		String[] paths = saved.split(File.pathSeparator);
+		for (String path : paths) {
+			if (path.length() > 0) {
+				PATHS.add(path);
+			}
+			if (PATHS.size() == Settings.MAX_RECENT_FILES) {
+				break;
+			}
+		}
+	}
+
+	/**
+	 * Saves the preferences when they have been edited
+	 *
+	 * @param prefs
+	 *            the preferences to save to
+	 */
+	public static void saveRecentList(SharedPreferences prefs) {
+		String str = "";
+		Editor editor;
+
+		for (String path : PATHS) {
+			str += path;
+			str += File.pathSeparator;
+		}
+
+		editor = prefs.edit();
+		editor.putString(PREFERENCE_RECENTS, str);
+		editor.commit();
+	}
+
+	/**
+	 * @return the list of most recent files
+	 */
+	public static ArrayList<String> getRecentFiles() {
+		return PATHS;
+	}
+
+	/**
+	 * Updates the recent list with a path. If the path is already in the list,
+	 * bring it back to top, else add it.
+	 *
+	 * @param path
+	 *            the path to insert
+	 */
+	public static void updateRecentList(String path) {
+		if (PATHS.contains(path)) {
+			PATHS.remove(path);
+		}
+
+		PATHS.add(0, path);
+		while (PATHS.size() > Settings.MAX_RECENT_FILES) {
+			PATHS.remove(Settings.MAX_RECENT_FILES);
+		}
+		if (BuildConfig.DEBUG) {
+			Log.d(TAG, "added path to recent files : " + path);
+		}
+	}
+
+	/**
+	 * Removes a path from the recent files list
+	 *
+	 * @param path
+	 *            the path to remove
+	 */
+	public static void removePath(String path) {
+		if (PATHS.contains(path)) {
+			PATHS.remove(path);
+		}
+	}
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/common/Settings.java b/qpython/src/main/java/org/qpython/qpy/texteditor/common/Settings.java
new file mode 100644
index 00000000..a58ac42d
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/common/Settings.java
@@ -0,0 +1,179 @@
+package org.qpython.qpy.texteditor.common;
+
+import java.io.File;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.SharedPreferences.Editor;
+import android.graphics.Typeface;
+
+public class Settings implements Constants {
+
+	/** Number of recent files to remember */
+	public static int MAX_RECENT_FILES = 10;
+	
+	public static int MAX_LINES_NUM_WITH_SYNTAX = 300;
+
+	/** Show the lines PATTERN_NUMBER */
+	public static boolean SHOW_LINE_NUMBERS = true;
+	/** automatic break PATTERN_LINE to fit one page */
+	public static boolean WORDWRAP = false;
+
+	public static boolean SHOW_GIST = true;
+
+	/** color setting */
+	public static int COLOR = COLOR_CLASSIC;
+
+	/** when setSearchState reaches the end of a file, setSearchState wrap */
+	public static boolean SEARCHWRAP = false;
+	/** only setSearchState for matchin case */
+	public static boolean SEARCHMATCHCASE = false;
+
+	/** Text size setting */
+	public static int TEXT_SIZE = 14;
+
+	/** Default end of PATTERN_LINE */
+	public static int DEFAULT_END_OF_LINE = EOL_LINUX;
+	/** End Of Line style */
+	public static int END_OF_LINE = EOL_LINUX;
+	/** Encoding */
+	public static String ENCODING = ENC_UTF8;
+
+	/** Let auto save on quit be triggered */
+	public static boolean FORCE_AUTO_SAVE = true;
+	public static boolean AUTO_SAVE_OVERWRITE = false;
+
+	/** enable fling to scroll */
+	public static boolean FLING_TO_SCROLL = false;
+
+	/** Use Undo instead of quit ? */
+	public static boolean UNDO = true;
+	/** Undo stack capacity */
+	public static int UNDO_MAX_STACK = 25;
+	/** Use back button as undo */
+	public static boolean BACK_BTN_AS_UNDO = false;
+
+	/** Use a Home Page */
+	public static boolean USE_HOME_PAGE = false;
+	/** Home Page Path */
+	public static String HOME_PAGE_PATH = "";
+
+	/**
+	 * @return the end of PATTERN_LINE characters according to the current settings
+	 */
+	public static String getEndOfLine() {
+		switch (END_OF_LINE) {
+		case EOL_MAC: // Mac OS
+			return "\r";
+		case EOL_WINDOWS: // Windows
+			return "\r\n";
+		case EOL_LINUX: // Linux / Android
+		default:
+			return "\n";
+		}
+	}
+
+	/**
+	 * Update the settings from the given {@link SharedPreferences}
+	 * 
+	 * @param settings
+	 *            the settings to read from
+	 */
+	public static void updateFromPreferences(SharedPreferences settings) {
+
+		MAX_RECENT_FILES = getStringPreferenceAsInteger(settings,
+				PREFERENCE_MAX_RECENTS, "10");
+		MAX_LINES_NUM_WITH_SYNTAX = getStringPreferenceAsInteger(settings,
+				PREFERENCE_MAX_LINES_NUM_WITH_SYNTAX, "300");
+
+		SHOW_LINE_NUMBERS = settings.getBoolean(PREFERENCE_SHOW_LINE_NUMBERS,
+				true);
+		SHOW_GIST = settings.getBoolean(PREFERENCES_GIST, true);
+		WORDWRAP = settings.getBoolean(PREFERENCE_WORDWRAP, false);
+		TEXT_SIZE = getStringPreferenceAsInteger(settings,
+				PREFERENCE_TEXT_SIZE, "14");
+		DEFAULT_END_OF_LINE = getStringPreferenceAsInteger(settings,
+				PREFERENCE_END_OF_LINES, ("" + EOL_LINUX));
+//		FORCE_AUTO_SAVE = settings.getBoolean(PREFERENCE_AUTO_SAVE, false);
+		FORCE_AUTO_SAVE = true;// 自动保存
+		AUTO_SAVE_OVERWRITE = settings.getBoolean(
+				PREFERENCE_AUTO_SAVE_OVERWRITE, false);
+		COLOR = getStringPreferenceAsInteger(settings, PREFERENCE_COLOR_THEME,
+				("" + COLOR_CLASSIC));
+		SEARCHWRAP = settings.getBoolean(PREFERENCE_SEARCHWRAP, false);
+		SEARCHMATCHCASE = settings.getBoolean(PREFERENCE_SEARCH_MATCH_CASE,
+				false);
+		ENCODING = settings.getString(PREFERENCE_ENCODING, ENC_UTF8);
+		FLING_TO_SCROLL = settings.getBoolean(PREFERENCE_FLING_TO_SCROLL, true);
+
+		BACK_BTN_AS_UNDO = settings.getBoolean(PREFERENCE_BACK_BUTTON_AS_UNDO,
+				false);
+		UNDO = settings.getBoolean(PREFERENCE_ALLOW_UNDO, true);
+		UNDO_MAX_STACK = getStringPreferenceAsInteger(settings,
+				PREFERENCE_MAX_UNDO_STACK, "25");
+
+		USE_HOME_PAGE = settings.getBoolean(PREFERENCE_USE_HOME_PAGE, false);
+		HOME_PAGE_PATH = settings.getString(PREFERENCE_HOME_PAGE_PATH, "");
+
+		RecentFiles.loadRecentFiles(settings.getString(PREFERENCE_RECENTS, ""));
+	}
+
+	/**
+	 * Reads a preference stored as a string and returns the numeric value
+	 * 
+	 * @param prefs
+	 *            the prefernce to read from
+	 * @param key
+	 *            the key
+	 * @param def
+	 *            the default value
+	 * @return the value as an int
+	 */
+	protected static int getStringPreferenceAsInteger(SharedPreferences prefs,
+			String key, String def) {
+		String strVal;
+		int intVal;
+
+		strVal = null;
+		try {
+			strVal = prefs.getString(key, def);
+		} catch (Exception e) {
+			strVal = def;
+		}
+
+		try {
+			intVal = Integer.parseInt(strVal);
+		} catch (NumberFormatException e) {
+			intVal = 0;
+		}
+
+		return intVal;
+	}
+
+	/**
+	 * Save the Home page settings
+	 * 
+	 * @param settings
+	 *            the settings to write to
+	 */
+	public static void saveHomePage(SharedPreferences settings) {
+		Editor editor = settings.edit();
+		editor.putString(PREFERENCE_HOME_PAGE_PATH, HOME_PAGE_PATH);
+		editor.commit();
+
+	}
+
+	public static File getFontFile(Context ctx) {
+		return new File(ctx.getDir(FONT_FOLDER_NAME, Context.MODE_PRIVATE),
+				FONT_FILE_NAME);
+	}
+
+	public static Typeface getTypeface(Context ctx) {
+		File fontFile = getFontFile(ctx);
+		Typeface res = Typeface.MONOSPACE;
+		if (fontFile.exists() && fontFile.canRead()) {
+			res = Typeface.createFromFile(getFontFile(ctx));
+		}
+		return res;
+	}
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/common/TedChangelog.java b/qpython/src/main/java/org/qpython/qpy/texteditor/common/TedChangelog.java
new file mode 100644
index 00000000..a8a07559
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/common/TedChangelog.java
@@ -0,0 +1,35 @@
+package org.qpython.qpy.texteditor.common;
+
+import org.qpython.qpy.R;
+
+public class TedChangelog extends org.qpython.qpy.texteditor.androidlib.common.ChangeLog {
+
+	/**
+	 * @see fr.xgouchet.androidlib.common.ChangeLog#getTitleResourceForVersion(int)
+	 */
+	@Override
+	public int getTitleResourceForVersion(int version) {
+		int res = 0;
+		switch (version) {
+		case 18:
+		default:
+			res = R.string.release18;
+		}
+		return res;
+	}
+
+	/**
+	 * @see fr.xgouchet.androidlib.common.ChangeLog#getChangeLogResourceForVersion(int)
+	 */
+	@Override
+	public int getChangeLogResourceForVersion(int version) {
+		int res = 0;
+		switch (version) {
+		case 18:
+		default:
+			res = R.string.release18_log;
+		}
+		return res;
+	}
+
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/common/TextFileUtils.java b/qpython/src/main/java/org/qpython/qpy/texteditor/common/TextFileUtils.java
new file mode 100644
index 00000000..5416ce8d
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/common/TextFileUtils.java
@@ -0,0 +1,168 @@
+package org.qpython.qpy.texteditor.common;
+
+import android.content.Context;
+import android.util.Log;
+
+import org.qpython.qpy.BuildConfig;
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+
+/**
+ * Misc file utilities
+ * 
+ * TODO code review
+ * 
+ */
+public class TextFileUtils implements Constants {
+
+	/**
+	 * @param path
+	 *            the absolute path to the file to save
+	 * @param text
+	 *            the text to write
+	 * @return if the file was saved successfully
+	 */
+	public static boolean writeTextFile(String path, String text) {
+		File file = new File(path);
+		OutputStreamWriter writer;
+		BufferedWriter out;
+		String eol_text = text;
+		try {
+			if (Settings.END_OF_LINE != EOL_LINUX) {
+				eol_text = eol_text.replaceAll("\n", Settings.getEndOfLine());
+			}
+			writer = new OutputStreamWriter(new FileOutputStream(file),
+					Settings.ENCODING);
+			out = new BufferedWriter(writer);
+			out.write(eol_text);
+			out.close();
+		} catch (OutOfMemoryError e) {
+			Log.w(TAG, "Out of memory error", e);
+			return false;
+		} catch (IOException e) {
+			Log.w(TAG, "Can't write to file " + path, e);
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * @param file
+	 *            the file to read
+	 * @return the content of the file as text
+	 */
+	public static String readTextFile(File file) {
+		InputStreamReader reader;
+		BufferedReader in;
+		StringBuffer text = new StringBuffer();
+		int c;
+		try {
+			reader = new InputStreamReader(new FileInputStream(file),
+					Settings.ENCODING);
+			in = new BufferedReader(reader);
+			do {
+				c = in.read();
+				if (c != -1) {
+					text.append((char) c);
+				}
+			} while (c != -1);
+			in.close();
+		} catch (IOException e) {
+			Log.w(TAG, "Can't read file " + file.getName(), e);
+			return null;
+		} catch (OutOfMemoryError e) {
+			Log.w(TAG, "File is to big to read", e);
+			return null;
+		}
+
+		// detect end of lines
+		String content = text.toString();
+		int windows = content.indexOf("\r\n");
+		int macos = content.indexOf("\r");
+
+		if (windows != -1) {
+			Settings.END_OF_LINE = EOL_WINDOWS;
+			content = content.replaceAll("\r\n", "\n");
+		} else {
+			if (macos != -1) {
+				Settings.END_OF_LINE = EOL_MAC;
+				content = content.replaceAll("\r", "\n");
+			} else {
+				Settings.END_OF_LINE = EOL_LINUX;
+			}
+		}
+
+		if (BuildConfig.DEBUG) {
+			Log.d(TAG, "Using End of Line : " + Settings.END_OF_LINE);
+		}
+		return content;
+	}
+
+	/**
+	 * @param context
+	 *            the current context
+	 * @param text
+	 *            the text to write
+	 * @return if the file was saved successfully
+	 */
+	public static boolean writeInternal(Context context, String text) {
+		FileOutputStream fos;
+		try {
+			fos = context
+					.openFileOutput(BACKUP_FILE_NAME, Context.MODE_PRIVATE);
+			fos.write(text.getBytes());
+			fos.close();
+			if (BuildConfig.DEBUG) {
+				Log.i(TAG, "Saved to file " + context.getFilesDir().getPath()
+						+ File.separator + BACKUP_FILE_NAME);
+			}
+		} catch (FileNotFoundException e) {
+			Log.w(TAG, "Couldn't write to internal storage ", e);
+			return false;
+		} catch (IOException e) {
+			Log.w(TAG, "Error occured while writing to internal storage ", e);
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * @param context
+	 *            the current context
+	 * @return the content of the file as text
+	 */
+	public static String readInternal(Context context) {
+		FileInputStream fis;
+		StringBuffer text = new StringBuffer();
+
+		try {
+			fis = context.openFileInput(BACKUP_FILE_NAME);
+			while (fis.available() > 0) {
+				text.append((char) fis.read());
+			}
+		} catch (FileNotFoundException e) {
+			Log.w(TAG, "No backup file available", e);
+			return null;
+		} catch (IOException e) {
+			Log.w(TAG, "Can't read backup file ", e);
+			return null;
+		}
+		return text.toString();
+	}
+
+	/**
+	 * @param context
+	 *            the current context
+	 */
+	public static void clearInternal(Context context) {
+		writeInternal(context, "");
+	}
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/common/WidgetPrefs.java b/qpython/src/main/java/org/qpython/qpy/texteditor/common/WidgetPrefs.java
new file mode 100644
index 00000000..26fe12b7
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/common/WidgetPrefs.java
@@ -0,0 +1,120 @@
+package org.qpython.qpy.texteditor.common;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.SharedPreferences.Editor;
+
+public class WidgetPrefs {
+
+	public final static String WIDGET_PREFERENCES = "fr.xgouchet.texteditor.widget";
+
+	public final static String WIDGET_TARGET_PATH = "target_path_";
+
+	public final static String WIDGET_READ_ONLY = "read_only_";
+
+	public final static String WIDGET_PRESENT_KEY = "widget_present_";
+
+	public String mTargetPath;
+	public boolean mReadOnly;
+
+	public WidgetPrefs() {
+		mTargetPath = "";
+	}
+
+	/**
+	 * Delete the data associated with a widget ID
+	 *
+	 * @param context
+	 *            the current context
+	 * @param widgetId
+	 *            the id to delete
+	 */
+	public static void delete(Context context, int widgetId) {
+		String key;
+		SharedPreferences prefs;
+		Editor edit;
+
+		prefs = context.getSharedPreferences(WIDGET_PREFERENCES,
+				Context.MODE_PRIVATE);
+		if (prefs != null) {
+			edit = prefs.edit();
+
+			if (edit != null) {
+				key = WIDGET_TARGET_PATH + String.valueOf(widgetId);
+				edit.remove(key);
+
+				key = WIDGET_READ_ONLY + String.valueOf(widgetId);
+				edit.remove(key);
+
+				key = WIDGET_PRESENT_KEY + String.valueOf(widgetId);
+				edit.remove(key);
+
+				edit.commit();
+			}
+		}
+	}
+
+	/**
+	 * Loads the widget prefs from the shared preferences
+	 *
+	 * @param context
+	 *            the current context
+	 * @param widgetId
+	 *            this widget id
+	 * @return if the widget is still present
+	 */
+	public boolean load(Context context, int widgetId) {
+		String key;
+		SharedPreferences prefs;
+
+		prefs = context.getSharedPreferences(WIDGET_PREFERENCES,
+				Context.MODE_PRIVATE);
+
+		if (prefs != null) {
+			key = WIDGET_TARGET_PATH + String.valueOf(widgetId);
+			mTargetPath = prefs.getString(key, "");
+
+			key = WIDGET_READ_ONLY + String.valueOf(widgetId);
+			mReadOnly = prefs.getBoolean(key, false);
+
+			key = WIDGET_PRESENT_KEY + String.valueOf(widgetId);
+			return prefs.getBoolean(key, false);
+		}
+
+		return false;
+	}
+
+	/**
+	 * Store this widget prefs in the shared preferences
+	 *
+	 * @param context
+	 *            the current context
+	 * @param widgetId
+	 *            this widget id
+	 */
+	public void store(Context context, int widgetId) {
+		String key;
+		SharedPreferences prefs;
+		Editor edit;
+
+		prefs = context.getSharedPreferences(WIDGET_PREFERENCES,
+				Context.MODE_PRIVATE);
+
+		if (prefs != null) {
+			edit = prefs.edit();
+
+			if (edit != null) {
+				key = WIDGET_TARGET_PATH + String.valueOf(widgetId);
+				edit.putString(key, mTargetPath);
+
+				key = WIDGET_READ_ONLY + String.valueOf(widgetId);
+				edit.putBoolean(key, mReadOnly);
+
+				key = WIDGET_PRESENT_KEY + String.valueOf(widgetId);
+				edit.putBoolean(key, true);
+
+				edit.commit();
+			}
+		}
+	}
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/newtexteditor/AfterTextChangeListener.java b/qpython/src/main/java/org/qpython/qpy/texteditor/newtexteditor/AfterTextChangeListener.java
new file mode 100755
index 00000000..e8066a30
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/newtexteditor/AfterTextChangeListener.java
@@ -0,0 +1,3 @@
+public interface AfterTextChangeListener {
+	public void afterTextChange();
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/newtexteditor/EditableWithLayout.java b/qpython/src/main/java/org/qpython/qpy/texteditor/newtexteditor/EditableWithLayout.java
new file mode 100755
index 00000000..538ca4d5
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/newtexteditor/EditableWithLayout.java
@@ -0,0 +1,931 @@
+package org.qpython.qpy.texteditor.newtexteditor;
+
+import java.lang.reflect.Array;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Stack;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Rect;
+import android.text.Editable;
+import android.text.InputFilter;
+import android.text.Selection;
+import android.text.TextPaint;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.text.style.ForegroundColorSpan;
+import android.util.Log;
+
+public class EditableWithLayout implements Editable,MyLayout {
+	protected static final String TAG="EditableWithLayout";
+	public static boolean mEnableHightLight=true;
+    List<LineBody> mLineBodies=new ArrayList<LineBody>();
+    List<SpanBody> mSpanBodies=new ArrayList<SpanBody>();
+	private int mLength=0;
+	private char []mText=new char[0];
+	private TextPaint mTextPaint ;
+	private TextPaint mSpanPaint ;
+	private TextWatcher mTextWatcher=null;
+    private int mSelectionStart=0;
+    private int mSelectionEnd=0;
+    private int mComposingStart=0;
+    private int mComposingEnd=0;
+    private Rect mRect=new Rect();
+    private Rect mRectLine=new Rect();
+    private float mLineHeight;
+    private float mTabWidth;
+    private ForegroundColorSpan mDefaultColorSpan;
+	private int mMaxSaveHistory;
+	private Stack<ReplaceBody> mUndoBodies = new Stack<ReplaceBody>();
+	private Stack<ReplaceBody> mRedoBodies = new Stack<ReplaceBody>();
+	public EditableWithLayout() {
+		setPaint(new TextPaint());
+		analysisLines();
+	}
+	
+	static void charsCopyStartToEnd(char []src,int where,char []dst,int start,int end){
+		for(;start<end;start++,where++){
+			dst[start]=src[where];
+		}
+	}
+	
+	static void charsCopyEndToStart(char []src,int where,char []dst,int start,int end){
+		int srcend=where+end-start;
+		for(;end>=start;end--,srcend--){
+			dst[end]=src[srcend];
+		}
+	}
+
+	@Override
+	public float getLineHeight() {
+		Log.i(TAG, "getLineHeight:"+mLineHeight);
+		return mLineHeight;
+	}
+
+	public void setLineHeight(float lineHeight){
+		Log.i(TAG, "setLineHeight:"+lineHeight);
+		mLineHeight=lineHeight;
+	}
+	
+	@Override
+	public int length() {
+		return mLength;
+	}
+	
+	private void resizeTo(int size){
+		if(mText.length>size)
+			return ;
+		char[] text=new char[size+4096];
+		System.arraycopy(mText, 0, text, 0, length());
+		mText=text;
+	}
+
+	@Override
+	public char charAt(int index) {
+		return mText[index];
+	}
+
+	@Override
+	public CharSequence subSequence(int start, int end) {
+		return String.copyValueOf(mText, start, end-start);
+	}
+	
+	@Override
+	public void getChars(int start, int end, char[] dest, int destoff) {
+        for (int i = start; i < end; i++)
+            dest[destoff++] = mText[i];
+	}
+
+	@Override
+	public void setSpan(Object what, int start, int end, int flags) {
+		if( what instanceof TextWatcher )
+		{
+			mTextWatcher=(TextWatcher) what;
+		}
+		else
+		if( what == Selection.SELECTION_START )
+		{
+			Log.i(TAG, "set SELECTION_START");
+			mSelectionStart=start;
+		}
+		else
+		if( what == Selection.SELECTION_END )
+		{
+			Log.i(TAG, "set SELECTION_END");
+			mSelectionEnd=start;
+		}
+		else
+		if( what instanceof ForegroundColorSpan ){
+		}
+		else
+		if( what == MyInputConnection.COMPOSING  )
+		{
+			Log.i(TAG, "set COMPOSING");
+			mComposingStart=start;
+			mComposingEnd=end;
+		}
+	}
+	
+	public void sendTextBeforeChanged(CharSequence s,int start,int count,int after){
+		if(mTextWatcher!=null)
+			mTextWatcher.beforeTextChanged(s, start, count, after);
+	}
+	
+	public void sendOnTextChanged(CharSequence s,int start,int before,int count){
+		for(int i=0;i<mSpanBodies.size();i++)
+		{
+			SpanBody spanBody=mSpanBodies.get(i);
+			if(spanBody.mEnd>start){
+				spanBody.mEnd+=count;
+			}
+			if(spanBody.mStart>start){
+				spanBody.mStart+=count;
+			}
+			if(spanBody.length()<=0)
+			{
+				mSpanBodies.remove(i);
+				i--;
+			}
+		}
+		if(mTextWatcher!=null)
+			mTextWatcher.onTextChanged(s, start, before, count);
+	}
+	
+	public void sendTextAfterChanged(){
+		if(mTextWatcher!=null)
+		{
+			mTextWatcher.afterTextChanged(this);
+		}
+	}
+
+	@Override
+	public void removeSpan(Object what) {
+	}
+	
+	@SuppressWarnings("unchecked")
+	@Override
+	public <T> T[] getSpans(int start, int end, Class<T> type) {
+
+		return (T[]) Array.newInstance(type, 0);
+	}
+	
+	private List<SpanBody> getColorSpanBodies(int start, int end){
+		LinkedList<SpanBody> bodies=new LinkedList<SpanBody>();
+		int startSpan=0;
+		int endSpan=mSpanBodies.size()-1;
+		int pos=0;
+		if(endSpan>=0)
+		while(true)
+		{
+			int center=(startSpan+endSpan)/2;
+			SpanBody centerBody=mSpanBodies.get(center);
+			int ret=centerBody.compileTo(start);
+			if(ret==0){
+				pos=center;
+				break;
+			}
+			if(center >= endSpan){
+				pos=center;
+				break;
+			}
+			if(ret>0)
+			{
+				startSpan=center+1;
+			}else{
+				endSpan=center-1;
+			}
+		}
+
+		int proStart=start;
+		for(;pos<mSpanBodies.size();pos++){
+			SpanBody body=mSpanBodies.get(pos);
+			if(body.mStart>=end)
+				break;
+			if(body.hasSub(start, end))
+			{
+				if(body.mStart>proStart){
+					bodies.add(new SpanBody(mDefaultColorSpan, proStart, body.mStart, 0));
+				}
+				int tend=body.mEnd<=end?body.mEnd:end;
+				int tstart=body.mStart>=start?body.mStart:start;
+				if(tend-tstart>0)
+					bodies.add(new SpanBody(body.mSpan, tstart, tend, 0));
+				proStart=tend;
+				if(proStart>=end)
+					break;
+			}
+		}
+		if(proStart<end)
+			bodies.add(new SpanBody(mDefaultColorSpan, proStart, end, 0));
+		/*
+		if(mSpanBodies!=null)
+		{
+			Iterator<SpanBody> iterator=mSpanBodies.iterator();
+			int proStart=start;
+			while(iterator.hasNext()){
+				SpanBody body=iterator.next();
+				if(body.hasSub(start, end))
+				{
+					if(body.mStart>proStart){
+						bodies.add(new SpanBody(mDefaultColorSpan, proStart, body.mStart, 0));
+					}
+					int tend=body.mEnd<=end?body.mEnd:end;
+					int tstart=body.mStart>=start?body.mStart:start;
+					if(tend-tstart>0)
+						bodies.add(new SpanBody(body.mSpan, tstart, tend, 0));
+					proStart=tend;
+					if(proStart>=end)
+						break;
+				}
+			}
+			if(proStart<end)
+				bodies.add(new SpanBody(mDefaultColorSpan, proStart, end, 0));
+
+		}
+		else{
+			bodies.add(new SpanBody(mDefaultColorSpan, start, end, 0));
+		}
+		*/
+		//LogUtil.i(TAG, "sumLoop:"+sumLoop);
+		return bodies;
+	}
+
+	@Override
+	public int getSpanStart(Object tag) {
+		if(tag == Selection.SELECTION_START)
+			return mSelectionStart;
+		if(tag == Selection.SELECTION_END)
+			return mSelectionEnd;
+		if(tag == MyInputConnection.COMPOSING )
+			return mComposingStart;
+		return 0;
+	}
+
+	@Override
+	public int getSpanEnd(Object tag) {
+		if(tag == Selection.SELECTION_END)
+			return mSelectionEnd;
+		if(tag == Selection.SELECTION_START)
+			return mSelectionStart;
+		if(tag == MyInputConnection.COMPOSING )
+			return mComposingEnd;
+		return 0;
+	}
+
+	@Override
+	public int getSpanFlags(Object tag) {
+		return 0;
+	}
+
+	@SuppressWarnings("rawtypes")
+	@Override
+	public int nextSpanTransition(int start, int limit, Class type) {
+		return 0;
+	}
+	
+	@Override
+	public Editable replace(int st, int en, CharSequence text, int start,int end) {
+		cleanRedo();
+		return replace(st,en,text,start,end,true);
+	}
+
+	public Editable replace(int st, int en, CharSequence text, int start,int end,boolean saveToUndo) {
+		int deleteLen=en-st;
+		int insertLen=end-start;
+		int addLen=insertLen-deleteLen;
+		resizeTo(length()+addLen);
+		if(deleteLen<0||insertLen<0)
+			return this;
+		if(deleteLen==0&&insertLen==0)
+			return this;
+		if(saveToUndo){
+			if(mMaxSaveHistory>0){
+				if(mUndoBodies.size()>mMaxSaveHistory)
+					mUndoBodies.remove(0);
+				ReplaceBody body=new ReplaceBody(st, en, subSequence(st, en),text, start, end, mSelectionStart, mSelectionEnd);
+				if(!mUndoBodies.isEmpty() && mUndoBodies.peek().addBody(body))
+				{
+				}
+				else
+					mUndoBodies.push(body);
+			}
+		}
+
+		sendOnTextChanged(this, st, length(), addLen);
+		sendTextBeforeChanged(this, st,addLen ,length()+addLen);
+
+		if(mSelectionStart==st && mSelectionEnd==en){
+			mSelectionStart=mSelectionEnd=en+addLen;
+		}
+		else
+		{
+			if(mSelectionStart>=st){
+				mSelectionStart+=addLen;
+				if(mSelectionStart<st)
+					mSelectionStart=st;
+			}
+			if(mSelectionEnd>=st){
+				mSelectionEnd+=addLen;
+				if(mSelectionEnd<st)
+					mSelectionEnd=st;
+			}
+		}
+
+		if(addLen>0)
+			charsCopyEndToStart(mText, en, mText, en+addLen, length()+addLen);
+		else
+		if(addLen<0)
+			charsCopyStartToEnd(mText, en, mText, en+addLen, length()+addLen);
+		if(insertLen>0)
+			TextUtils.getChars(text, start, end, mText, st);
+		mLength+=addLen;
+		if(mSelectionStart<0)
+			mSelectionStart=0;
+		if(mSelectionEnd<0)
+			mSelectionEnd=0;
+		if(mSelectionStart>mLength)
+			mSelectionStart=mLength;
+		if(mSelectionEnd>mLength)
+			mSelectionEnd=mLength;
+
+		analysisLines();
+		sendTextAfterChanged();
+		return this;
+	}
+
+	@Override
+	public Editable replace(int st, int en, CharSequence text) {
+		return replace(st, en, text, 0, text.length());
+	}
+
+	@Override
+	public Editable insert(int where, CharSequence text, int start, int end) {
+		int len = end-start;
+		if(where<0 || where>length() || len<=0)
+			return this;
+		return replace(where,where, text, start, end);
+	}
+
+	@Override
+	public Editable insert(int where, CharSequence text) {
+		return insert(where,text,0,text.length());
+	}
+	
+	@Override
+	public Editable delete(int st, int en) {
+		return replace(st, en, null, 0, 0);
+	}
+
+	@Override
+	public Editable append(CharSequence text) {
+		return null;
+	}
+
+	@Override
+	public Editable append(CharSequence text, int start, int end) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public Editable append(char text) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void clear() {
+		sendOnTextChanged(this, 0, length(), length());
+		sendTextBeforeChanged(this, 0, length(), 0);
+		mLength=0;
+		sendTextAfterChanged();
+	}
+
+	@Override
+	public void clearSpans() {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public InputFilter[] getFilters() {
+		return null;
+	}
+
+	@Override
+	public void setFilters(InputFilter[] filters) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public int getLineForOffset(int offset) {
+		if(mLineBodies.isEmpty())
+			return 0;
+		int startLine=0;
+		int endLine=getLineCount()-1;
+		if(mLineBodies instanceof ArrayList )
+		{
+			while(true){
+				int centerLine=(startLine+endLine)/2;
+				LineBody bodyCenter=mLineBodies.get(centerLine);
+				int ret=bodyCenter.compileTo(offset);
+				if(ret==0)
+					return centerLine;
+				if(centerLine>=endLine)
+					break;
+				if(ret<0)
+					endLine=centerLine-1;
+				else
+					startLine=centerLine+1;
+			}
+		}
+		else
+		{
+			for(int i=0;i<mLineBodies.size();i++)
+			{
+				LineBody body=mLineBodies.get(i);
+				if(body.in(offset))
+					return i;
+			}
+		}
+		return endLine;
+	}
+
+	@Override
+	public float getPrimaryHorizontal(int start) {
+		int line=getLineForOffset(start);
+		LineBody body= mLineBodies.get(line);
+		Paint paint=getPaint();
+		float horizontal=0f;
+		for(int offset=body.mStart;offset<start;offset++){
+			float tx=0;
+			if(mText[offset]=='\t')
+				tx=mTabWidth - (horizontal % mTabWidth);
+			else
+				tx=paint.measureText(mText, offset, 1);
+			horizontal+=tx;
+		}
+		/*
+		try {
+			//horizontal=getPaint().measureText(this, body.mStart, start);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}*/
+		return horizontal;
+	}
+
+	@Override
+	public void getLineBounds(int line, Rect rect) {
+		rect.left=0;
+		rect.right=Integer.MAX_VALUE/2;
+		float top=line*mLineHeight;
+		rect.top=(int) top;
+		rect.bottom=(int) (top+mLineHeight);
+	}
+
+	@Override
+	public int getLineForVertical(int top) {
+		int line=(int) (top/mLineHeight);
+		if(line<0)
+			line=0;
+		if(line>=getLineCount())
+			line=getLineCount()-1;
+		return line;
+	}
+
+	public void draw(Canvas canvas) {
+		long timeStart = System.currentTimeMillis();
+		canvas.getClipBounds(mRect);
+		int lastLine=getLineCount()-1;
+		int startLine=getLineForVertical(mRect.top);
+		int endLine=getLineForVertical(mRect.bottom);
+		float descent=mTextPaint.getFontMetrics().descent;
+		for(int i=startLine;i<=endLine;i++)
+		{
+			getLineBounds(i, mRectLine);
+			LineBody body=mLineBodies.get(i);
+			int proTab=body.mStart;
+			int nextTab;
+			float startX=0;
+			float lineY=mRectLine.bottom-descent;
+			int start;
+			int count;
+			while(true){
+				nextTab=getNextTab(proTab);
+				if(nextTab==-1)
+					break;
+				if( proTab!=nextTab ){
+					start=proTab;
+					count=nextTab-proTab;
+					List<SpanBody> bodies=getColorSpanBodies(start, start+count);
+					Iterator<SpanBody> iterator=bodies.iterator();
+					while(iterator.hasNext()){
+						SpanBody spanBody=iterator.next();
+						mSpanPaint.setColor( ((ForegroundColorSpan)spanBody.mSpan).getForegroundColor() );
+						float tstartX=startX+measureText(mText, spanBody.mStart, spanBody.length());
+						if(tstartX>mRect.left)
+							canvas.drawText(mText, spanBody.mStart, spanBody.length(), startX, lineY, mSpanPaint);
+						startX=tstartX;
+						if(startX>mRect.right)
+							break;
+					}
+					if(startX>mRect.right)
+						break;
+				}
+				startX+=mTabWidth-(startX % mTabWidth);
+				proTab=nextTab+1;
+			}
+
+			start=proTab;
+			if(lastLine==i)
+				count=body.mEnd-proTab;
+			else
+				count=body.mEnd-proTab-1;
+
+			if(count>0)
+			{
+				List<SpanBody> bodies=getColorSpanBodies(start, start+count);
+				Iterator<SpanBody> iterator=bodies.iterator();
+				while(iterator.hasNext()){
+					SpanBody spanBody=iterator.next();
+					mSpanPaint.setColor( ((ForegroundColorSpan)spanBody.mSpan).getForegroundColor() );
+					float tstartX=startX+measureText(mText, spanBody.mStart, spanBody.length());
+					if(tstartX>mRect.left)
+						canvas.drawText(mText, spanBody.mStart, spanBody.length(), startX, lineY, mSpanPaint);
+					startX=tstartX;
+					if(startX>mRect.right)
+						break;
+				}
+			}
+
+		}
+		long timeEnd = System.currentTimeMillis();
+	}
+	
+	/*
+	Bitmap mCacheBitmap=null;
+	Bitmap mCacheBitmapBk=null;
+	Rect mPerRect=new Rect();
+	Rect mNowRect=new Rect();
+	@Override
+	public void draw(Canvas canvas)
+	{
+		canvas.getClipBounds(mNowRect);
+		if( mCacheBitmap==null || mPerRect.width()!=mNowRect.width() || mPerRect.height()!=mNowRect.height() )
+		{//size change 
+			mPerRect.set(0, 0, 0, 0);
+			try {
+				mCacheBitmap=null;
+				mCacheBitmapBk=null;
+				mCacheBitmap=Bitmap.createBitmap(mNowRect.width(), mNowRect.height(), Config.ARGB_4444);
+				mCacheBitmapBk=Bitmap.createBitmap(mNowRect.width(), mNowRect.height(), Config.ARGB_4444);
+			} catch (Exception e) {
+				mCacheBitmap=null;
+				mCacheBitmapBk=null;
+			} catch (Error e) {
+				mCacheBitmap=null;
+				mCacheBitmapBk=null;
+			}
+		}
+		if(mCacheBitmap!=null)
+		{
+			Bitmap tempBitmap=mCacheBitmap;
+			mCacheBitmap=mCacheBitmapBk;
+			mCacheBitmapBk=tempBitmap;
+			
+			Canvas canvas2=new Canvas(mCacheBitmap);
+			canvas2.drawColor(Color.TRANSPARENT, Mode.CLEAR);
+			if(mPerRect.width()>0||mPerRect.height()>0)
+			{
+				int dx=mPerRect.left-mNowRect.left;
+				int dy=mPerRect.top-mNowRect.top;
+				canvas2.drawBitmap(mCacheBitmapBk, dx, dy, mSpanPaint);
+				canvas2.translate(-mNowRect.left, -mNowRect.top);
+				if(dy>0)
+				{
+					canvas2.save();
+					canvas2.clipRect(mNowRect.left, mNowRect.top, mNowRect.right, mPerRect.top);
+					drawReal(canvas2);
+					canvas2.restore();
+				}
+				else
+				if(dy<0)
+				{
+					canvas2.save();
+					canvas2.clipRect(mNowRect.left, mPerRect.bottom, mNowRect.right, mNowRect.bottom);
+					drawReal(canvas2);
+					canvas2.restore();
+				}
+				else  //if(dy==0)
+				{
+					LogUtil.i(TAG, "if(dy==0)");
+					if(dx>0)
+					{
+						canvas2.clipRect(mNowRect.left, mNowRect.top, mPerRect.left, mNowRect.bottom );
+						drawReal(canvas2);
+					}
+					else
+					if(dx<0)
+					{
+						canvas2.clipRect(mPerRect.right, mNowRect.top,mNowRect.right, mNowRect.bottom );
+						drawReal(canvas2);
+					}
+				}
+			}
+			else
+			{
+				canvas2.translate(-mNowRect.left, -mNowRect.top);
+				drawReal(canvas2);
+			}
+			canvas.drawBitmap(mCacheBitmap, mNowRect.left, mNowRect.top, mSpanPaint);
+			mPerRect.set(mNowRect);
+		}
+		else
+			drawReal(canvas);
+	}
+	*/
+	
+	@SuppressWarnings("unused")
+	private void drawTest(Canvas canvas)
+	{
+		float startY=0;
+		for(int y=0;y<40;y++)
+		{
+			float startX=0;
+			for(int x=0;x<18;x++)
+			{
+				String text=""+x;
+				mSpanPaint.setColor(Color.rgb(255, 0, 0));
+				canvas.drawText(text, startX, startY, mSpanPaint);
+				startX+=mSpanPaint.measureText(text);
+
+				text=",";
+				mSpanPaint.setColor(Color.rgb(0, 0, 0));
+				canvas.drawText(text, startX, startY, mSpanPaint);
+				startX+=mSpanPaint.measureText(text);
+
+			}
+			startY+=mSpanPaint.getTextSize();
+		}
+	}
+	
+	public float measureText(char []text,int index,int count)
+	{
+		return mSpanPaint.measureText(text,index,count);
+	}
+	
+	private int getNextTab(int offset){
+		int len=length();
+		while(offset<len ){
+			if(mText[offset]=='\n')
+				return -1;
+			if(mText[offset]=='\t')
+				return offset;
+			offset++;
+		}
+		return -1;
+	}
+
+	private void analysisLines(){
+		mLineBodies.clear();
+		int start=0;
+		for(int i=0;i<mLength;i++){
+			if(mText[i]=='\n'){
+				mLineBodies.add(new LineBody(start, i+1));
+				start=i+1;
+			}
+		}
+		mLineBodies.add(new LineBody(start, mLength));
+	}
+	
+	@Override
+	public int getLineCount() {
+		return mLineBodies.size();
+	}
+	
+	@Override
+	public Paint getPaint() {
+		return mTextPaint;
+	}
+
+	public void setPaint(TextPaint paint){
+		mTextPaint=paint;
+		mLineHeight=paint.getTextSize();
+		mTabWidth=mTextPaint.measureText("0000");
+		mSpanPaint=new TextPaint(paint);
+		mDefaultColorSpan=new ForegroundColorSpan(mTextPaint.getColor());
+	}
+	
+	@Override
+	public int getOffsetForHorizontal(int line, float x) {
+		LineBody body=mLineBodies.get(line);
+		Paint paint = getPaint();
+		float sumx=0;
+		int pos=body.mStart;
+		if(x<=0)
+			return pos;
+		for(;pos<body.mEnd;pos++){
+			float tx=0;
+			if(mText[pos]=='\t')
+				tx=mTabWidth - (sumx % mTabWidth);
+			else
+				tx=paint.measureText(mText, pos, 1);
+			if(x<=sumx+tx/2)
+				return pos;
+			sumx+=tx;
+		}
+		int lineCount=getLineCount();
+		if(line==lineCount-1)
+			return body.mEnd;
+		return body.mEnd-1;
+	}
+
+	@Override
+	public int getHeight() {
+		return (int) (getLineCount()*mLineHeight);
+	}	
+
+	@Override
+	public String toString() {
+		return String.copyValueOf(mText, 0, length());
+	}
+	public void applyColorSpans(List<SpanBody> spans){
+		if(mEnableHightLight)
+			mSpanBodies=spans;
+	}
+
+	public void addColorSpan(SpanBody spanBody){
+		if(mEnableHightLight)
+			mSpanBodies.add(spanBody);
+	}
+	@Override
+	public int getLineOffset(int line) {
+		return mLineBodies.get(line).mStart;
+	}
+	
+	public void setMaxSaveHistory(int maxSaveHistory){
+		mMaxSaveHistory=maxSaveHistory;
+	}
+
+	public void cleanUndo(){
+		mUndoBodies.clear();
+	}
+	
+	public boolean canUndo(){
+		Log.i(TAG, "canUndo :"+!mUndoBodies.isEmpty());
+		return !mUndoBodies.isEmpty();
+	}
+	
+	public boolean undo(){
+		if(!canUndo())
+			return false;
+		ReplaceBody body=mUndoBodies.pop();
+		ReplaceBody replaceBody=body.getUndoBody();
+		if(mMaxSaveHistory>0){
+			if(mRedoBodies.size()>mMaxSaveHistory)
+				mRedoBodies.remove(0);
+			mRedoBodies.push(body);
+		}
+		replace(replaceBody.mSt, replaceBody.mEn, replaceBody.mText, replaceBody.mStart, replaceBody.mEnd, false);
+		if(replaceBody.mText==null || replaceBody.mText.length()==0 || replaceBody.mEnd-replaceBody.mStart==0 )
+		{
+			mSelectionStart=replaceBody.mSt;
+			mSelectionEnd=mSelectionStart;
+		}
+		else
+		{
+			mSelectionStart=replaceBody.mSt;
+			mSelectionEnd=replaceBody.mSt+replaceBody.mEnd-replaceBody.mStart;
+		}
+		return true;
+	}
+	
+	public void cleanRedo(){
+		mRedoBodies.clear();
+	}
+	
+	public boolean canRedo(){
+		Log.i(TAG, "canRedo :"+!mRedoBodies.isEmpty());
+		return !mRedoBodies.isEmpty();
+		
+	}
+	
+	public boolean redo(){
+		if(!canRedo())
+			return false;
+		ReplaceBody body=mRedoBodies.pop();
+		ReplaceBody replaceBody=body.getRedoBody();
+		if(mMaxSaveHistory>0){
+			if(mUndoBodies.size()>mMaxSaveHistory)
+				mUndoBodies.remove(0);
+			mUndoBodies.push(body);
+		}
+		replace(replaceBody.mSt, replaceBody.mEn, replaceBody.mText, replaceBody.mStart, replaceBody.mEnd, false);
+		if(replaceBody.mText==null || replaceBody.mText.length()==0 || replaceBody.mEnd-replaceBody.mStart==0 )
+		{
+			mSelectionStart=replaceBody.mSt;
+			mSelectionEnd=mSelectionStart;
+		}
+		else
+		{
+			mSelectionStart=replaceBody.mSt;
+			mSelectionEnd=replaceBody.mSt+replaceBody.mEnd-replaceBody.mStart;
+		}
+		return true;
+	}
+	
+}
+
+
+class LineBody{
+	int mStart;
+	int mEnd;
+	public LineBody(int start,int end) {
+		mStart=start;
+		mEnd=end;
+	}
+	public boolean in(int pos){
+		if(pos>=mStart && pos<mEnd)
+			return true;
+		return false;
+	}
+	public int compileTo(int pos){
+		if(pos<mStart)
+			return -1;
+		if(pos>=mEnd)
+			return 1;
+		return 0;
+	}
+	public int length()
+	{
+		return mEnd-mStart-1;
+	}	
+}
+
+
+
+class ReplaceBody{
+	int mSt;
+	int mEn;
+	CharSequence mSubtext;
+	CharSequence mText;
+	int mStart;
+	int mEnd;
+	int mSelectionStart;
+	int mSelectionEnd;
+	public ReplaceBody(int st, int en,CharSequence subtext, CharSequence text, int start,int end,int selectionStart,int selectionEnd) {
+		mSt=st;
+		mEn=en;
+		mSubtext=subtext;
+		mText=text;
+		mStart=start;
+		mEnd=end;
+		mSelectionStart=selectionStart;
+		mSelectionEnd=selectionEnd;
+	}
+	
+	public ReplaceBody getUndoBody(){
+		return new ReplaceBody(mSt, mSt+mEnd-mStart, mText,mSubtext, 0, mSubtext.length(), mSelectionStart, mSelectionEnd);
+	}
+	
+	public ReplaceBody getRedoBody(){
+		return this;
+	}
+	
+	public boolean isDelete(){
+		if(mEn-mSt>0&&mStart==0&&mEnd==0)
+			return true;
+		return false;
+	}
+	
+	public boolean isInsert(){
+		if(mSt==mEn && mText!=null && mText.length()!=0 &&mEnd-mStart>0)
+			return true;
+		Log.i("isInsert", "false");
+		return false;
+	}
+	
+	public boolean addBody(ReplaceBody body){
+		if( isDelete() && body.isDelete() && mSt==body.mEn )
+		{
+			this.mSt=body.mSt;
+			this.mSubtext=body.mSubtext.toString()+this.mSubtext;
+			this.mSelectionStart=body.mSelectionStart;
+			return true;
+		}
+		Log.i("addBody", "addBody");
+		if( isInsert() && body.isInsert() && mSt+mText.length()==body.mSt) 
+		{
+			Log.i("addBody", "�ϲ�����IJ��� ");
+			this.mText=this.mText+body.mText.subSequence(body.mStart, body.mEnd).toString();
+			this.mEnd+=body.mEnd-body.mStart;
+			this.mSelectionEnd = body.mSelectionEnd;
+			return true;
+		}
+		return false;
+	}
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/newtexteditor/MyEditText.java b/qpython/src/main/java/org/qpython/qpy/texteditor/newtexteditor/MyEditText.java
new file mode 100755
index 00000000..f7b97e85
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/newtexteditor/MyEditText.java
@@ -0,0 +1,961 @@
+package org.qpython.qpy.texteditor.newtexteditor;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Rect;
+import android.graphics.Typeface;
+import android.text.ClipboardManager;
+import android.text.Editable;
+import android.text.Selection;
+import android.text.TextPaint;
+import android.text.TextWatcher;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.GestureDetector;
+import android.view.GestureDetector.OnGestureListener;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.view.ScaleGestureDetector;
+import android.view.ScaleGestureDetector.OnScaleGestureListener;
+import android.view.View;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputConnection;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.Scroller;
+
+public class MyEditText extends View implements OnGestureListener,TextWatcher, OnScaleGestureListener {
+	protected static final String TAG="MyEditText";
+	
+	public static float mFontScale = 1.0f;
+	public static float mLineScale = 1.0f;
+	public static int mBackGroundColor = Color.TRANSPARENT;
+	public static int mBaseFontColor = Color.BLACK;
+	protected MyInputConnection mBaseInputConnection;
+	protected int mDownState=0;
+	MyLayout mLayout;
+	Paint mCursorPaint=new Paint();
+	Paint mSelectionPaint=new Paint();
+	Paint mSelectionBackgroundPaint=new Paint();
+	TextPaint mTextPaint=new TextPaint();
+	TextPaint mLineNumberPaint=new TextPaint();
+	int i=0;
+	private GestureDetector mGestureDetector;
+	private ScaleGestureDetector mScaleGestureDetector;
+	private Scroller mScroller;
+	private ScrollBar mScrollBar;
+	private float mSelectBarRadius = 1;
+	private Rect mBoundsOfCursor=new Rect();
+	private Rect mBounds=new Rect();
+
+	
+	public MyEditText(Context context) {
+		super(context);
+		init();
+	}
+
+	public MyEditText(Context context, AttributeSet attrs) {
+		super(context, attrs);
+		init();
+	}
+	
+	public void insertText(CharSequence charSequence){
+		mBaseInputConnection.commitText(charSequence, getCursor());
+	}
+	
+	public void setTextSize(float size){
+		mTextPaint.setTextSize(size*mFontScale);
+		mTextPaint.setTypeface(Typeface.MONOSPACE);
+		mLineNumberPaint=new TextPaint(mTextPaint);
+		mLineNumberPaint.setColor(Color.GRAY);
+		mLineNumberPaint.setTypeface(Typeface.MONOSPACE);
+		getLayout().setPaint(mTextPaint);
+		getLayout().setLineHeight(size*mFontScale*1.2f*mLineScale);
+	}
+	
+	public Editable getText(){
+		return mBaseInputConnection.getEditable();
+	}
+	
+	public void setText(CharSequence charSequence){
+		if(mBaseInputConnection==null)
+			mBaseInputConnection=new MyInputConnection(this)
+		{
+		    public boolean clearMetaKeyStates(int states) {
+		    	mDownState=0;
+		    	return super.clearMetaKeyStates(states);
+		    }
+
+			@Override
+		    public boolean performContextMenuAction(int id) {
+				MyEditText.this.performContextMenuAction(id);
+		        return super.performContextMenuAction(id);
+		    }
+
+			@Override
+			public boolean setSelection(int start, int end) {
+
+				if(start==end){
+					post(new Runnable() {
+						@Override
+						public void run() {
+							bringPosToVisible(getCursor());
+						}
+					});
+				}
+				else
+				if(isMoveSelectionStart()){
+					postDelayed(new Runnable() {
+						@Override
+						public void run() {
+							bringPosToVisible(getSelectionStart());
+						}
+					},100);
+				}else
+				if(isMoveSelectionEnd()){
+					postDelayed(new Runnable() {
+						@Override
+						public void run() {
+							bringPosToVisible(getSelectionEnd());
+						}
+					},100);
+				}else{
+					postDelayed(new Runnable() {
+						@Override
+						public void run() {
+							bringPosToVisible(getSelectionEnd());
+						}
+					},100);
+				}
+				return super.setSelection(start, end);
+			}
+		};
+
+		mBaseInputConnection.getEditable().clear();
+		if(charSequence!=null){
+			mBaseInputConnection.getEditable().insert(0, charSequence);
+		}
+		else{
+		}
+
+		if(getCursor()>mBaseInputConnection.getEditable().length())
+			setCursor(mBaseInputConnection.getEditable().length());
+
+		cleanRedo();
+		cleanUndo();
+		makeLayout();
+	}
+	
+	public MyLayout getLayout(){
+		if(mBaseInputConnection==null)
+			return null;
+		return mBaseInputConnection.getLayout();
+	}
+
+	private void init()
+	{
+		setWillNotCacheDrawing(true);
+		setText("");
+		mTextPaint.setColor(mBaseFontColor);
+		setBackgroundColor(mBackGroundColor);
+
+		mScroller=new Scroller(getContext());
+		mGestureDetector=new GestureDetector(getContext(), this);
+		mScaleGestureDetector=new ScaleGestureDetector(getContext(), this);
+		mScrollBar=new ScrollBar();
+		float density=getContext().getResources().getDisplayMetrics().density;
+		mScrollBar.setSize(getHeight(),density*4);
+		float size=density*12f;
+		setTextSize(size);
+		mSelectionBackgroundPaint.setColor(Color.argb(0x60, 0x80, 0xf8, 0x80));
+		mSelectionPaint.setColor(Color.argb(0xff, 0x80, 0x88, 0xff));
+		mLineNumberPaint.setTypeface(Typeface.MONOSPACE);
+		float strokeWidth=getContext().getResources().getDisplayMetrics().density;
+		mSelectBarRadius=strokeWidth*18;
+		if(strokeWidth<1)
+			strokeWidth=1;
+		mCursorPaint.setStrokeWidth(strokeWidth);
+		setScrollContainer(true);
+		this.post(new Runnable(){
+			int colors[]={
+					Color.BLACK,Color.argb(0x80, 0xF0, 0x80, 0x80),
+					};
+			int num=0;
+			@Override
+			public void run() {
+				if(num>=colors.length)
+					num=0;
+				mCursorPaint.setColor(colors[num]);
+				MyEditText.this.postDelayed(this, 360);
+				postInvalidate();
+				num++;
+			}
+		});
+		setScrollbarFadingEnabled(true);
+	}
+
+	@Override
+	public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
+		outAttrs.imeOptions=EditorInfo.IME_FLAG_NO_ENTER_ACTION | EditorInfo.IME_ACTION_DONE | EditorInfo.IME_FLAG_NO_EXTRACT_UI;
+		outAttrs.inputType=EditorInfo.TYPE_CLASS_TEXT ;//1310738;
+		return mBaseInputConnection;
+	}
+
+	@Override
+	protected void onSizeChanged(int w, int h, int oldw, int oldh) {
+		post(new Runnable() {
+			@Override
+			public void run() {
+				setCursor(getCursor());
+				bringPosToVisible(getCursor());
+			}
+		});
+		float density=getContext().getResources().getDisplayMetrics().density;
+		mScrollBar.setSize(getHeight(),density*4);
+		//mEdgeEffectLeft.setSize(getHeight(),getWidth());
+		super.onSizeChanged(w, h, oldw, oldh);
+	}
+
+	@Override
+	public boolean onTouchEvent(MotionEvent event) {
+		if(event.getAction()==MotionEvent.ACTION_DOWN)
+		{
+			mScroller.abortAnimation();
+		}
+		mGestureDetector.onTouchEvent(event);
+		mScaleGestureDetector.onTouchEvent(event);
+		return true;
+	}
+	
+	@Override
+	protected void onDraw(Canvas canvas) {
+		if(mLayout!=null)
+		{
+			int selectLineStart=0;
+			int selectLineEnd=0;
+			float selectStartX=0;
+			float selectEndX=0;
+			if(isSelection())
+			{
+				int start=getSelectionStart();
+				int end=getSelectionEnd();
+				selectLineStart=mLayout.getLineForOffset(start);
+				selectLineEnd=mLayout.getLineForOffset(end);
+				selectStartX=mLayout.getPrimaryHorizontal(start);
+				selectEndX=mLayout.getPrimaryHorizontal(end);
+			}
+
+			int cursor=getCursor();
+			float x=mLayout.getPrimaryHorizontal(cursor);
+			int line=mLayout.getLineForOffset(cursor);
+			mLayout.getLineBounds(line, mBoundsOfCursor);
+			canvas.drawLine(x, mBoundsOfCursor.top, x, mBoundsOfCursor.bottom, mCursorPaint);
+
+			canvas.getClipBounds(mBounds);
+			int lineStart=mLayout.getLineForVertical(mBounds.top);
+			int lineEnd=mLayout.getLineForVertical(mBounds.bottom);
+			float descent=mLayout.getPaint().getFontMetrics().descent;
+			for(int i=lineStart;i<=lineEnd;i++){
+
+				mLayout.getLineBounds(i, mBounds);
+				if(mBounds.left>=0)
+				{
+					String value=String.valueOf(i+1);
+					canvas.drawText(value, mBounds.left-mLineNumberPaint.measureText(value+"0"), mBounds.bottom - descent , mLineNumberPaint);
+				}
+				if(isSelection())
+				{
+					if(i>selectLineStart && i<selectLineEnd){
+						canvas.drawRect(mBounds, mSelectionBackgroundPaint);
+					}
+					else
+					if(i==selectLineStart )
+					{
+						if(i==selectLineEnd){
+							canvas.drawRect(selectStartX, mBounds.top, selectEndX, mBounds.bottom, mSelectionBackgroundPaint);
+						}
+						else{
+							canvas.drawRect(selectStartX, mBounds.top, mBounds.right, mBounds.bottom, mSelectionBackgroundPaint);
+						}
+					}
+					else
+					if(i==selectLineEnd )
+					{
+						canvas.drawRect(0, mBounds.top, selectEndX, mBounds.bottom, mSelectionBackgroundPaint);
+					}
+				}
+			}
+
+			try {
+				mLayout.draw(canvas);
+			} catch (OutOfMemoryError e) {
+				e.printStackTrace();
+			}
+
+			if(isSelection()){
+				int r=(int) mSelectBarRadius;
+				canvas.drawCircle(x, mBoundsOfCursor.bottom + r, r, mSelectionPaint);
+
+				cursor=getSelectionStart();
+				x=mLayout.getPrimaryHorizontal(cursor);
+				line=mLayout.getLineForOffset(cursor);
+				mLayout.getLineBounds(line, mBoundsOfCursor);
+				canvas.drawLine(x, mBoundsOfCursor.top, x, mBoundsOfCursor.bottom, mCursorPaint);
+
+				canvas.drawCircle(x, mBoundsOfCursor.bottom + r, r, mSelectionPaint);
+			}
+		}
+		canvas.save();
+		canvas.rotate(90);
+		canvas.translate( getScrollY(),-(getScrollX()+getWidth()) );
+		mScrollBar.draw(canvas);
+		canvas.save();
+		/*
+		canvas.restore();
+		canvas.save();
+		canvas.translate(getScrollX(), getScrollY());
+		mEdgeEffectTop.draw(canvas);
+		canvas.restore();
+		canvas.save();
+		canvas.rotate(180);
+		canvas.translate( -(getScrollX()+getWidth()), -(getScrollY()+getHeight()) );
+		mEdgeEffectBottom.draw(canvas);
+		canvas.restore();
+		canvas.rotate(-90);
+		canvas.translate( -(getScrollY()+getHeight()) ,getScrollX() );
+		//mEdgeEffectLeft.draw(canvas);
+		canvas.restore();
+		canvas.save();
+		*/
+	}
+
+	protected void makeLayout(){
+		if(getText()!=null)
+		{
+			mLayout=mBaseInputConnection.getLayout();
+			//mLayout=new StaticLayout(mEditable, mTextPaint, Integer.MAX_VALUE,Layout.Alignment.ALIGN_NORMAL,1f,0f,false);
+			//mLayout=new DynamicLayout(getText(),mTextPaint,Integer.MAX_VALUE,Layout.Alignment.ALIGN_NORMAL,1f,0f,false);
+		}
+	}
+	
+	public TextPaint getPaint(){
+		return mTextPaint;
+	}
+
+	private float getWidthOfBit(int bit)
+	{
+		String str="";
+		for(int i=0;i<bit;i++)
+		{
+			str+='0';
+		}
+		return getPaint().measureText(str);
+	}
+
+	public int getBoundOfLeft(){
+		int left=(int) getWidthOfBit(1+getBitOfNum(getLineCount()));
+		return -(left);
+	}
+	
+	public int getBoundOfRight(){
+		if(mLayout==null)
+			return getWidth();
+		return Integer.MAX_VALUE/2;
+	}
+	
+	public int getBoundOfTop(){
+		return 0;
+	}
+	
+	public int getBoundOfBottom(){
+		if(mLayout==null)
+			return getHeight();
+		int h1=mLayout.getHeight();
+		int h2=getHeight();
+		return h1>h2?h1:h2;
+	}
+	
+	@Override
+	public void scrollTo(int x, int y) {
+		int left=getBoundOfLeft();
+		int right=getBoundOfRight();
+		int top=getBoundOfTop();
+		int bottom=getBoundOfBottom();
+		if(x<left)
+		{
+			x=left;
+		}
+		if(x>right)
+			x=right;
+		if(y<top)
+		{
+			y=top;
+		}
+		if(y>bottom)
+		{
+			y=bottom;
+		}
+		mScrollBar.setPosition(bottom-top+getHeight(), y-top, y-top+getHeight());
+		super.scrollTo(x, y);
+	}
+
+	private int getBitOfNum(int num)
+	{
+		if(num<10)
+			return 1;
+		if(num<100)
+			return 2;
+		if(num<1000)
+			return 3;
+		if(num<10000)
+			return 4;
+		if(num<100000)
+			return 5;
+		if(num<1000000)
+			return 6;
+		if(num<10000000)
+			return 7;
+		if(num<100000000)
+			return 8;
+		return 0;
+	}
+
+    public int getLineCount() {
+        return mLayout != null ? mLayout.getLineCount() : 0;
+    }
+
+    public boolean isSelection(){
+    	return getSelectionStart()!=getSelectionEnd();
+    }
+    
+    public int getSelectionStart(){
+    	return Selection.getSelectionStart(mBaseInputConnection.getEditable());
+    }
+    
+    public int getSelectionEnd(){
+    	return Selection.getSelectionEnd(mBaseInputConnection.getEditable());
+    }
+    
+    public int getCursor(){
+    	return getSelectionEnd();
+    }
+    
+    public void bringPosToVisible(int pos){
+    	if(mLayout!=null){
+    		if(pos>=0 && pos<=getText().length()){
+    			float x=mLayout.getPrimaryHorizontal(pos);
+    			int line=mLayout.getLineForOffset(pos);
+    			mLayout.getLineBounds(line, mBoundsOfCursor);
+    			int scrollX=getScrollX();
+    			int scrollY=getScrollY();
+    			if(mBoundsOfCursor.top<scrollY){
+    				scrollY=mBoundsOfCursor.top;
+    			}
+    			if(mBoundsOfCursor.bottom>scrollY+getHeight())
+    				scrollY=mBoundsOfCursor.bottom-getHeight();
+
+    			if(x<scrollX+mTextPaint.getTextSize())
+    				scrollX= (int)( x-mTextPaint.getTextSize());
+
+    			if(x>scrollX+getWidth()-mTextPaint.getTextSize())
+    				scrollX=(int) (x-getWidth()+mTextPaint.getTextSize());
+
+    			scrollTo(scrollX, scrollY);
+    			postInvalidate();
+    		}
+    	}
+    }
+    
+    public boolean setCursor(int cursor){
+    	return setSelection(cursor, cursor);
+    }
+	
+	public void showSoftKeyboard(){
+		setFocusableInTouchMode(true);
+		requestFocus();
+		InputMethodManager inputMethodManager=(InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+		inputMethodManager.showSoftInput(this,InputMethodManager.SHOW_FORCED);
+	}
+
+	public boolean isMoveSelectionStart(){
+		return mDownState==1;
+	}
+	
+	public boolean isMoveSelectionEnd(){
+		return mDownState==2;
+	}
+	
+	private boolean isMoveSelection(){
+		return mDownState!=0;
+	}
+	
+	@Override
+	public boolean onDown(MotionEvent e) {
+		mDownState=0;
+		if(isSelection())
+		{	
+			int cursor=getCursor();
+			float x=mLayout.getPrimaryHorizontal(cursor);
+			int line=mLayout.getLineForOffset(cursor);
+			mLayout.getLineBounds(line, mBoundsOfCursor); 
+			int r=(int) mSelectBarRadius;
+			int y=mBoundsOfCursor.bottom + r;
+			if( Math.sqrt( Math.pow(getScrollX()+e.getX()-x, 2f) + Math.pow(getScrollY()+e.getY()-y, 2f)  ) <= r){
+				mDownState=2;
+			}
+
+			cursor=getSelectionStart();
+			x=mLayout.getPrimaryHorizontal(cursor);
+			line=mLayout.getLineForOffset(cursor);
+			mLayout.getLineBounds(line, mBoundsOfCursor); 
+			r=(int) mSelectBarRadius;
+			y=mBoundsOfCursor.bottom + r;
+			if( Math.sqrt( Math.pow(getScrollX()+e.getX()-x, 2f) + Math.pow(getScrollY()+e.getY()-y, 2f)  ) <= r){
+				mDownState=1;
+			}
+		}
+		return true;
+	}
+
+	@Override
+	public void onShowPress(MotionEvent e) {
+	}
+
+	@Override
+	public boolean onSingleTapUp(MotionEvent e) {
+		if(mLayout!=null){
+			int line=mLayout.getLineForVertical(getScrollY()+(int) e.getY());
+			int offset=mLayout.getOffsetForHorizontal(line, getScrollX()+(int)e.getX());
+			setCursor(offset);
+		}
+		showSoftKeyboard();
+		return false;
+	}
+	@Override
+	public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX,
+			float distanceY) {
+		if(!isMoveSelection())
+		{
+			scrollBy((int)distanceX, (int )distanceY);
+			invalidate();  
+		}
+		else{
+			int line=mLayout.getLineForVertical(getScrollY()+(int) e2.getY()-(int)(1.5f*mLayout.getLineHeight()) );
+			int offset=mLayout.getOffsetForHorizontal(line, getScrollX()+(int)e2.getX());
+			int start=getSelectionStart();
+			int end=getSelectionEnd();
+			if(isMoveSelectionEnd()){
+				if(offset<=start)
+					offset=start+1;
+				if(offset<=getText().length())
+				{
+					setSelection(start, offset);
+					postInvalidate();
+				}
+			}else
+			if(isMoveSelectionStart()){
+				if(offset>=end)
+					offset=end-1;
+				if(offset>=0){
+					setSelection(offset, end);
+					postInvalidate();
+				}
+			}
+		}
+		return true;
+	}
+
+	@Override
+	public void onLongPress(MotionEvent e) {
+		if(isSelection()){
+			/*
+			PopupMenu popupMenu=new PopupMenu(getContext(), this );
+			Menu menu=popupMenu.getMenu();
+			menu.add(0, android.R.id.copy, 0, android.R.string.copy);
+			menu.add(0, android.R.id.cut, 0, android.R.string.cut);
+			menu.add(0, android.R.id.selectAll, 0, android.R.string.selectAll);
+			menu.add(0, android.R.id.paste, 0, android.R.string.paste);
+			popupMenu.setOnMenuItemClickListener(new OnMenuItemClickListener() {
+				public boolean onMenuItemClick(MenuItem arg0) {
+					int id=arg0.getItemId();
+					if(id==android.R.id.paste)
+						setCursor(getCursor());
+					return performContextMenuAction(id);
+				}
+			});
+			popupMenu.show();*/
+		}else
+		if(mLayout!=null){
+			int line=mLayout.getLineForVertical(getScrollY()+(int) e.getY());
+			int offset=mLayout.getOffsetForHorizontal(line, getScrollX()+(int)e.getX());
+			if(!selectAtPosition(offset)){
+				int start=offset-1;
+				if(start<0)
+					start=0;
+				setSelection(start, offset);
+			}
+		}
+	}
+
+	private boolean selectAtPosition(int position){
+		int start=position;
+		int end=position;
+		Editable editable=getText();
+		if(position<0 || position>=editable.length())
+			return false;
+		char ch=editable.charAt(position);
+		if( !(Character.isLetterOrDigit(ch) || ch=='_') )
+			return false;
+		for(start=position;start>0;start--){
+			char indexCh=editable.charAt(start);
+			if(!(Character.isLetterOrDigit(indexCh) || indexCh=='_') ){
+				start++;
+				break;
+			}
+		}
+		
+		for(end=position;end<editable.length()-1;end++){
+			char indexCh=editable.charAt(end);
+			if(!(Character.isLetterOrDigit(indexCh) || indexCh=='_') ){
+				break;
+			}
+		}
+		if(start>=end)
+			return false;
+		setSelection(start, end);
+		return true;
+	}
+	
+	@Override
+	public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX,
+			float velocityY) {
+		if(!isMoveSelection())
+		{
+			mScroller.fling(getScrollX(), getScrollY(), -(int)velocityX , -(int)velocityY, Integer.MIN_VALUE, Integer.MAX_VALUE, Integer.MIN_VALUE,  Integer.MAX_VALUE);
+    		postInvalidate();  
+		}
+		return true;
+	}
+	
+    @Override  
+    public void computeScroll() {  
+    	if (mScroller.computeScrollOffset()) 
+    	{
+    		scrollTo(mScroller.getCurrX(), mScroller.getCurrY());  
+    	}  
+    }
+    
+	public boolean setSelection(int start, int end) {
+		mScroller.abortAnimation();
+    	return mBaseInputConnection.setSelection(start, end);
+	}
+	
+	@Override
+	public boolean onKeyDown(int keyCode, KeyEvent event) {
+		switch(event.getKeyCode()){
+		case KeyEvent.KEYCODE_SHIFT_LEFT:
+			mDownState=1;
+			break;
+		case KeyEvent.KEYCODE_SHIFT_RIGHT:
+			mDownState=2;
+			break;
+		default:
+			return false;	
+		}
+		return true;
+	}
+	
+	@Override
+	public boolean onKeyUp(int keyCode, KeyEvent event) {
+		Editable editable=getText();
+		int start=Selection.getSelectionStart(editable);
+		int end=Selection.getSelectionEnd(editable);
+		if(event.getAction()==KeyEvent.ACTION_UP)
+		switch(event.getKeyCode()){
+		case KeyEvent.KEYCODE_DEL:
+			if(start>=end)
+				start=end-1;
+			if(start>=0)
+			editable.delete(start, end);
+			break;
+		case KeyEvent.KEYCODE_ENTER:
+			editable.replace(start, end, "\n");
+			setSelection(start+1, start+1);
+			break;
+		case KeyEvent.KEYCODE_DPAD_LEFT:
+			if(isMoveSelectionStart()){
+				start--;
+				if(start>=0)
+					setSelection(start, end);
+			}else if(isMoveSelectionEnd()){
+				end--;
+				if(end>start)
+					setSelection(start, end);
+			}else {
+				end--;
+				if(end>=0)
+					setSelection(end, end);
+			}
+			break;
+		case KeyEvent.KEYCODE_DPAD_RIGHT:
+			if(isMoveSelectionStart()){
+				start++;
+				if(start<end)
+					setSelection(start, end);
+			}else if(isMoveSelectionEnd()){
+				end++;
+				if(end<=editable.length())
+					setSelection(start, end);
+			}else {
+				end++;
+				if(end<=editable.length())
+					setSelection(end, end);
+			}
+			break;
+		case KeyEvent.KEYCODE_DPAD_UP :
+			if(isMoveSelectionStart()){
+				int line=mLayout.getLineForOffset(start);
+				float x=mLayout.getPrimaryHorizontal(start);
+				if(line>0)
+				{
+					int position=mLayout.getOffsetForHorizontal(line-1, x);
+					if(position>=0 && position < end)
+						setSelection(position, end);
+				}
+			}
+			else
+			{
+				int line=mLayout.getLineForOffset(end);
+				if(line>0){
+					float x=mLayout.getPrimaryHorizontal(end);
+					int position=mLayout.getOffsetForHorizontal(line-1, x);
+					if(isMoveSelectionEnd()){
+						if(position>start && position<=editable.length())
+							setSelection(start, position);
+					}
+					else{
+						setCursor(position);
+					}
+				}
+			}
+			break;
+		case KeyEvent.KEYCODE_DPAD_DOWN:
+			if(isMoveSelectionStart()){
+				int line=mLayout.getLineForOffset(start);
+				if(line<mLayout.getLineCount()-1){
+					float x=mLayout.getPrimaryHorizontal(start);
+					int position=mLayout.getOffsetForHorizontal(line+1, x);
+					if(position>=0 && position < end)
+						setSelection(position, end);
+				}
+			}else{
+				int line=mLayout.getLineForOffset(end);
+				if(line<mLayout.getLineCount()-1){
+					float x=mLayout.getPrimaryHorizontal(end);
+					int position=mLayout.getOffsetForHorizontal(line+1, x);
+					if(isMoveSelectionEnd()){
+						if(position>start && position<=editable.length())
+							setSelection(start, position);
+					}
+					else
+						setCursor(position);
+				}
+			}
+			break;
+		default:
+			return false;	
+		}
+		return true;
+	}
+
+	public boolean performContextMenuAction(int id) {
+		Editable editable=getText();
+		int start=Selection.getSelectionStart(editable);
+		int end=Selection.getSelectionEnd(editable);
+		switch (id) {
+		case android.R.id.selectAll:
+			setSelection(0, editable.length());
+			break;
+		case android.R.id.cut:
+			try {
+				ClipboardManager clipboardManager= (ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE);
+				clipboardManager.setText(editable.subSequence(start, end));
+				editable.delete(start, end);
+				setSelection(start, start);
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+			break;
+		case android.R.id.copy:
+			try {
+				ClipboardManager clipboardManager= (ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE);
+				clipboardManager.setText(editable.subSequence(start, end));
+				setSelection(end, end);
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+			break;
+		case android.R.id.paste:
+			try {
+				ClipboardManager clipboardManager= (ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE);
+				CharSequence charSequence=clipboardManager.getText();
+				editable.replace(start, end, charSequence);
+				int t=start+charSequence.length();
+				setSelection(t,t);
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+			break;
+		default:
+			return false;
+		}
+		return true;
+	}
+
+
+	@Override
+	public void beforeTextChanged(CharSequence s, int start, int count,int after) {
+	}
+
+
+	@Override
+	public void onTextChanged(CharSequence s, int start, int before, int count) {
+	}
+
+
+	@Override
+	public void afterTextChanged(Editable s) {
+		post(new Runnable() {
+			@Override
+			public void run() {
+				bringPosToVisible(getCursor());
+			}
+		});
+	}
+
+	public void closeInputMethod() {
+		Log.i(TAG, "closeInputMethod");
+		View editView=this;
+	    InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+	    boolean isOpen = imm.isActive();
+	    if (isOpen) {
+	        imm.hideSoftInputFromWindow(editView.getApplicationWindowToken(), 0 );
+	    }
+	}
+
+	public void setMaxSaveHistory(int maxSaveHistory){
+		if(getLayout() instanceof EditableWithLayout)
+		{
+			((EditableWithLayout)getLayout()).setMaxSaveHistory(maxSaveHistory);
+		}
+	}
+
+	public void cleanUndo(){
+		if(getLayout() instanceof EditableWithLayout)
+		{
+			((EditableWithLayout)getLayout()).cleanUndo();
+		}
+	}
+	
+	public boolean canUndo(){
+		if(getLayout() instanceof EditableWithLayout)
+		{
+			return ((EditableWithLayout)getLayout()).canUndo();
+		}
+		return false;
+	}
+	
+	public boolean undo(){
+		if(getLayout() instanceof EditableWithLayout)
+		{
+			return ((EditableWithLayout)getLayout()).undo();
+		}
+		return false;
+	}
+	
+	public void cleanRedo(){
+		if(getLayout() instanceof EditableWithLayout)
+		{
+			((EditableWithLayout)getLayout()).cleanRedo();
+		}
+	}
+	
+	public boolean canRedo(){
+		if(getLayout() instanceof EditableWithLayout)
+		{
+			return ((EditableWithLayout)getLayout()).canRedo();
+		}
+		return false;
+		
+	}
+	
+	public boolean redo(){
+		if(getLayout() instanceof EditableWithLayout)
+		{
+			return ((EditableWithLayout)getLayout()).redo();
+		}
+		return false;
+	}
+	
+	public boolean findString(String str){
+		int index=getText().toString().indexOf(str, getCursor());
+		if(index == -1)
+			return false;
+		return setSelection(index, index+str.length());
+	}
+	
+	public boolean replaceString(String str){
+		getText().replace(getSelectionStart(), getSelectionEnd(), str);
+		return true;
+	}
+	
+	public boolean replaceFindString(String find,String replace){
+		if(find.length() <= 0)
+			return false;
+		setCursor(getSelectionStart());
+		if(!findString(find))
+			return false;
+		replaceString(replace);
+		return true;
+	}
+	
+	public boolean replaceAll(String find,String replace){
+		int start=getSelectionStart();
+		int end = getSelectionEnd();
+		boolean finded=false;
+		setCursor(0);
+		while(replaceFindString(find,replace))
+		{
+			finded=true;
+		}
+		if(!finded)
+			setSelection(start, end);
+		return finded;
+	}
+
+
+	@Override
+	public boolean onScale(ScaleGestureDetector detector) {
+		float size=mTextPaint.getTextSize();
+		float scale=detector.getScaleFactor();
+		size*=scale;
+		if(size<8)
+			return true;
+		setTextSize(size);
+		scrollTo((int)(getScrollX()*scale),(int)( getScrollY()*scale) );
+		postInvalidate();
+		return true;
+	}
+
+
+	@Override
+	public boolean onScaleBegin(ScaleGestureDetector detector) {
+		return true;
+	}
+
+
+	@Override
+	public void onScaleEnd(ScaleGestureDetector detector) {
+	}
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/newtexteditor/MyInputConnection.java b/qpython/src/main/java/org/qpython/qpy/texteditor/newtexteditor/MyInputConnection.java
new file mode 100755
index 00000000..b338a91e
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/newtexteditor/MyInputConnection.java
@@ -0,0 +1,507 @@
+package org.qpython.qpy.texteditor.newtexteditor;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.SystemClock;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.text.Editable;
+import android.text.NoCopySpan;
+import android.text.Selection;
+import android.text.Spannable;
+import android.text.Spanned;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.text.method.MetaKeyKeyListener;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.inputmethod.CompletionInfo;
+import android.view.inputmethod.CorrectionInfo;
+import android.view.inputmethod.ExtractedText;
+import android.view.inputmethod.ExtractedTextRequest;
+import android.view.inputmethod.InputConnection;
+import android.view.inputmethod.InputContentInfo;
+import android.view.inputmethod.InputMethodManager;
+
+
+public class MyInputConnection implements InputConnection {
+    protected static final String  TAG                     = "MyInputConnection";
+    static final Object COMPOSING = new ComposingText();
+    public Editable mEditable = new EditableWithLayout();//new SpannableStringBuilder();
+    protected InputMethodManager mIMM;
+    int mBatchEditNum = 0;
+    private                boolean mIsFristCallGetEditable = true;
+    private   View               mView;
+    private Object[] mDefaultComposingSpans;
+
+    public MyInputConnection(View view) {
+        mView = view;
+        mIMM = (InputMethodManager) view.getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+    }
+
+    public static int getComposingSpanStart(Spannable text) {
+        //LogUtil.i(TAG, "getComposingSpanStart:"+text);
+        return text.getSpanStart(COMPOSING);
+    }
+
+    public static int getComposingSpanEnd(Spannable text) {
+        //LogUtil.i(TAG, "getComposingSpanEnd:"+text);
+        return text.getSpanEnd(COMPOSING);
+    }
+
+    public static final void removeComposingSpans(Spannable text) {
+        text.removeSpan(COMPOSING);
+        Object[] sps = text.getSpans(0, text.length(), Object.class);
+        if (sps != null) {
+            for (int i = sps.length - 1; i >= 0; i--) {
+                Object o = sps[i];
+                if ((text.getSpanFlags(o) & Spanned.SPAN_COMPOSING) != 0) {
+                    text.removeSpan(o);
+                }
+            }
+        }
+    }
+
+    public Editable getEditable() {
+        if (mIsFristCallGetEditable) {
+            mIsFristCallGetEditable = false;
+            if (mView instanceof TextWatcher)
+                mEditable.setSpan(mView, 0, mEditable.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE);
+        }
+        return mEditable;
+    }
+
+    public MyLayout getLayout() {
+        if (getEditable() instanceof MyLayout)
+            return (MyLayout) getEditable();
+        return null;//new DynamicLayout(getText(),mTextPaint,Integer.MAX_VALUE,Layout.Alignment.ALIGN_NORMAL,1f,0f,false);
+    }
+
+    @Override
+    public ExtractedText getExtractedText(ExtractedTextRequest request, int flags) {
+
+        //LogUtil.i(TAG, "getExtractedText"+" flags:"+request.flags+" hitMaxC"+request.hintMaxChars+
+        //		" hintMaxLines:"+request.hintMaxLines+" token"+request.token
+        //		+" describeContents:"+request.describeContents()
+        //		);
+        //return null;
+
+        if (mBatchEditNum != 0)
+            return null;
+        ExtractedText extractedText = new ExtractedText();
+        Editable editable = getEditable();
+        extractedText.startOffset = 0;
+        extractedText.selectionStart = Selection.getSelectionStart(editable);
+        extractedText.selectionEnd = Selection.getSelectionEnd(editable);
+        extractedText.partialEndOffset = -1;
+        extractedText.partialStartOffset = -1;
+
+        int retLen = editable.length();
+        int maxLength = 128 * 1024;
+        if (retLen > maxLength)
+            retLen = maxLength;
+        try {
+            extractedText.text = editable.subSequence(0, retLen);
+        } catch (OutOfMemoryError e) {
+            e.printStackTrace();
+        }
+        return extractedText;
+
+    }
+
+    @Override
+    public boolean beginBatchEdit() {
+        Log.i(TAG, "beginBatchEdit");
+        mBatchEditNum++;
+        return true;
+    }
+
+    @Override
+    public boolean endBatchEdit() {
+        Log.i(TAG, "endBatchEdit");
+        mBatchEditNum--;
+        return true;
+    }
+
+    @Override
+    public boolean commitCompletion(CompletionInfo text) {
+        Log.i(TAG, "commitCompletion:" + text);
+        return true;
+    }
+
+    @Override
+    public boolean commitCorrection(CorrectionInfo correctionInfo) {
+        return false;
+    }
+
+    @Override
+    public boolean performPrivateCommand(String action, Bundle data) {
+        Log.i(TAG, "performPrivateCommand:" + action + " " + data);
+        return true;
+    }
+
+    public boolean requestCursorUpdates(int cursorUpdateMode) {
+        Log.i(TAG, "requestCursorUpdates:" + cursorUpdateMode);
+        return true;
+    }
+
+    @Override
+    public Handler getHandler() {
+        return null;
+    }
+
+    @Override
+    public void closeConnection() {
+
+    }
+
+    @Override
+    public boolean commitContent(@NonNull InputContentInfo inputContentInfo, int flags, @Nullable Bundle opts) {
+        return false;
+    }
+
+    @Override
+    public CharSequence getTextBeforeCursor(int length, int flags) {
+        Log.i(TAG, "getTextBeforeCursor:" + length);
+        final Editable content = getEditable();
+        if (content == null) return null;
+
+        int a = Selection.getSelectionStart(content);
+        int b = Selection.getSelectionEnd(content);
+
+        if (a > b) {
+            int tmp = a;
+            a = b;
+            b = tmp;
+        }
+
+        if (a <= 0) {
+            return "";
+        }
+
+        if (length > a) {
+            length = a;
+        }
+
+        if ((flags & GET_TEXT_WITH_STYLES) != 0) {
+            return content.subSequence(a - length, a);
+        }
+        return TextUtils.substring(content, a - length, a);
+    }
+
+    @Override
+    public CharSequence getTextAfterCursor(int length, int flags) {
+        Log.i(TAG, "getTextAfterCursor:" + length);
+        final Editable content = getEditable();
+        if (content == null) return null;
+
+        int a = Selection.getSelectionStart(content);
+        int b = Selection.getSelectionEnd(content);
+
+        if (a > b) {
+            int tmp = a;
+            a = b;
+            b = tmp;
+        }
+        if (b < 0) {
+            b = 0;
+        }
+
+        if (b + length > content.length()) {
+            length = content.length() - b;
+        }
+
+
+        if ((flags & GET_TEXT_WITH_STYLES) != 0) {
+            return content.subSequence(b, b + length);
+        }
+        return TextUtils.substring(content, b, b + length);
+    }
+
+    public CharSequence getSelectedText(int flags) {
+        Log.i(TAG, "getSelectedText:" + flags);
+        final Editable content = getEditable();
+        if (content == null) return null;
+
+        int a = Selection.getSelectionStart(content);
+        int b = Selection.getSelectionEnd(content);
+
+        if (a > b) {
+            int tmp = a;
+            a = b;
+            b = tmp;
+        }
+
+        if (a == b) return null;
+
+        if ((flags & GET_TEXT_WITH_STYLES) != 0) {
+            return content.subSequence(a, b);
+        }
+        return TextUtils.substring(content, a, b);
+    }
+
+    @Override
+    public int getCursorCapsMode(int reqModes) {
+        Log.i(TAG, "getCursorCapsMode:" + reqModes);
+        return 0;
+        /*
+        if (mDummyMode) return 0;
+
+        final Editable content = getEditable();
+        if (content == null) return 0;
+
+        int a = Selection.getSelectionStart(content);
+        int b = Selection.getSelectionEnd(content);
+
+        if (a > b) {
+            int tmp = a;
+            a = b;
+            b = tmp;
+        }
+
+        return TextUtils.getCapsMode(content, a, reqModes);
+        */
+    }
+
+    @Override
+    public boolean deleteSurroundingText(int beforeLength, int afterLength) {
+        Log.i(TAG, "deleteSurroundingText:" + beforeLength);
+        final Editable content = getEditable();
+        if (content == null) return false;
+
+        beginBatchEdit();
+
+        int a = Selection.getSelectionStart(content);
+        int b = Selection.getSelectionEnd(content);
+
+        if (a > b) {
+            int tmp = a;
+            a = b;
+            b = tmp;
+        }
+
+        int ca = getComposingSpanStart(content);
+        int cb = getComposingSpanEnd(content);
+        if (cb < ca) {
+            int tmp = ca;
+            ca = cb;
+            cb = tmp;
+        }
+        if (ca != -1 && cb != -1) {
+            if (ca < a) a = ca;
+            if (cb > b) b = cb;
+        }
+
+        int deleted = 0;
+
+        if (beforeLength > 0) {
+            int start = a - beforeLength;
+            if (start < 0) start = 0;
+            content.delete(start, a);
+            deleted = a - start;
+        }
+
+        if (afterLength > 0) {
+            b = b - deleted;
+
+            int end = b + afterLength;
+            if (end > content.length()) end = content.length();
+
+            content.delete(b, end);
+        }
+
+        endBatchEdit();
+
+        return true;
+    }
+
+    @Override
+    public boolean deleteSurroundingTextInCodePoints(int beforeLength, int afterLength) {
+        return false;
+    }
+
+    @Override
+    public boolean setComposingText(CharSequence text, int newCursorPosition) {
+        Log.i(TAG, "setComposingText:" + text);
+        //replaceText(text, newCursorPosition, true);
+        return true;
+    }
+
+    public boolean setComposingRegion(int start, int end) {
+        Log.i(TAG, "setComposingRegion:" + start);
+        final Editable content = getEditable();
+        if (content != null) {
+            beginBatchEdit();
+            removeComposingSpans(content);
+            int a = start;
+            int b = end;
+            if (a > b) {
+                int tmp = a;
+                a = b;
+                b = tmp;
+            }
+            final int length = content.length();
+            if (a < 0) a = 0;
+            if (b < 0) b = 0;
+            if (a > length) a = length;
+            if (b > length) b = length;
+
+            if (mDefaultComposingSpans != null) {
+                for (int i = 0; i < mDefaultComposingSpans.length; ++i) {
+                    content.setSpan(mDefaultComposingSpans[i], a, b,
+                            Spanned.SPAN_EXCLUSIVE_EXCLUSIVE | Spanned.SPAN_COMPOSING);
+                }
+            }
+
+            content.setSpan(COMPOSING, a, b,
+                    Spanned.SPAN_EXCLUSIVE_EXCLUSIVE | Spanned.SPAN_COMPOSING);
+            endBatchEdit();
+        }
+        return true;
+    }
+
+    @Override
+    public boolean finishComposingText() {
+        Log.i(TAG, "finishComposingText:");
+        final Editable content = getEditable();
+        if (content != null) {
+            beginBatchEdit();
+            removeComposingSpans(content);
+            endBatchEdit();
+        }
+        return true;
+    }
+
+    @Override
+    public boolean commitText(CharSequence text, int newCursorPosition) {
+        Log.i(TAG, "commitText:" + text);
+        //replaceText(text, newCursorPosition, false);
+        Editable content = getEditable();
+        content.replace(Selection.getSelectionStart(content), Selection.getSelectionEnd(content), text);
+        //int cursor=Selection.getSelectionEnd(content);
+        //content.replace(cursor, cursor, text);
+        //Selection.setSelection(content, cursor+text.length());
+        return true;
+    }
+
+    @Override
+    public boolean setSelection(int start, int end) {
+        Log.i(TAG, "setSelection:" + start + end);
+        final Editable content = getEditable();
+        if (content == null) return false;
+        if (start == end && MetaKeyKeyListener.getMetaState(content, 0x800) != 0) {
+            Selection.extendSelection(content, start);
+        } else {
+            Selection.setSelection(content, start, end);
+        }
+        return true;
+    }
+
+    @Override
+    public boolean performEditorAction(int editorAction) {
+        //LogUtil.i(TAG, "performEditorAction:"+editorAction);
+        long eventTime = SystemClock.uptimeMillis();
+        sendKeyEvent(new KeyEvent(eventTime, eventTime,
+                KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_ENTER, 0, 0,
+                /*KeyCharacterMap.VIRTUAL_KEYBOARD*/-1, 0,
+                KeyEvent.FLAG_SOFT_KEYBOARD | KeyEvent.FLAG_KEEP_TOUCH_MODE
+                        | KeyEvent.FLAG_EDITOR_ACTION));
+        sendKeyEvent(new KeyEvent(SystemClock.uptimeMillis(), eventTime,
+                KeyEvent.ACTION_UP, KeyEvent.KEYCODE_ENTER, 0, 0,
+                /*KeyCharacterMap.VIRTUAL_KEYBOARD*/-1, 0,
+                KeyEvent.FLAG_SOFT_KEYBOARD | KeyEvent.FLAG_KEEP_TOUCH_MODE
+                        | KeyEvent.FLAG_EDITOR_ACTION));
+        return true;
+    }
+
+    @Override
+    public boolean performContextMenuAction(int id) {
+        Log.i(TAG, "performContextMenuAction:" + id);
+        return false;
+    }
+
+    @Override
+    public boolean sendKeyEvent(KeyEvent event) {
+        Log.i(TAG, "sendKeyEvent:" + event);
+        if (mView != null)
+            switch (event.getAction()) {
+                case KeyEvent.ACTION_DOWN:
+                    mView.onKeyDown(event.getKeyCode(), event);
+                    break;
+                case KeyEvent.ACTION_UP:
+                    mView.onKeyUp(event.getKeyCode(), event);
+                    break;
+            }
+        return false;
+    }
+
+    @Override
+    public boolean clearMetaKeyStates(int states) {
+        Log.i(TAG, "clearMetaKeyStates:" + states);
+        return false;
+    }
+
+    @Override
+    public boolean reportFullscreenMode(boolean enabled) {
+        Log.i(TAG, "reportFullscreenMode:" + enabled);
+        return false;
+    }
+
+    @SuppressWarnings("unused")
+    private void replaceText(CharSequence text, int newCursorPosition,
+                             boolean composing) {
+        final Editable content = getEditable();
+        if (content == null) {
+            return;
+        }
+
+        beginBatchEdit();
+
+        int a = getComposingSpanStart(content);
+        int b = getComposingSpanEnd(content);
+
+
+        if (b < a) {
+            int tmp = a;
+            a = b;
+            b = tmp;
+        }
+
+        if (a != -1 && b != -1) {
+            removeComposingSpans(content);
+        } else {
+            a = Selection.getSelectionStart(content);
+            b = Selection.getSelectionEnd(content);
+            if (a < 0) a = 0;
+            if (b < 0) b = 0;
+            if (b < a) {
+                int tmp = a;
+                a = b;
+                b = tmp;
+            }
+        }
+
+        if (newCursorPosition > 0) {
+            newCursorPosition += b - 1;
+        } else {
+            newCursorPosition += a;
+        }
+        Log.i(TAG, "replaceText:" + newCursorPosition);
+        if (newCursorPosition < 0) newCursorPosition = 0;
+        if (newCursorPosition > content.length())
+            newCursorPosition = content.length();
+        content.setSpan(COMPOSING, a, b, 0);
+        Selection.setSelection(content, newCursorPosition);
+
+        Log.i(TAG, "replaceText:" + newCursorPosition);
+        content.replace(a, b, text);
+
+        endBatchEdit();
+    }
+
+}
+
+class ComposingText implements NoCopySpan {
+}
\ No newline at end of file
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/newtexteditor/MyLayout.java b/qpython/src/main/java/org/qpython/qpy/texteditor/newtexteditor/MyLayout.java
new file mode 100755
index 00000000..9793031f
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/newtexteditor/MyLayout.java
@@ -0,0 +1,34 @@
+package org.qpython.qpy.texteditor.newtexteditor;
+
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.Rect;
+import android.text.TextPaint;
+
+public interface MyLayout {
+	public float getLineHeight();
+
+	public void setLineHeight(float lineHeight);
+	
+	public int getLineForOffset(int start);
+
+	public int getLineOffset(int line);
+	
+	public float getPrimaryHorizontal(int start);
+
+	public void getLineBounds(int line, Rect mBoundsOfCursor);
+
+	public int getLineForVertical(int top);
+
+	public void draw(Canvas canvas);
+
+	public int getLineCount();
+
+	public Paint getPaint();
+
+	public void setPaint(TextPaint paint);
+
+	public int getOffsetForHorizontal(int line, float x);
+
+	public int getHeight();
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/newtexteditor/ScrollBar.java b/qpython/src/main/java/org/qpython/qpy/texteditor/newtexteditor/ScrollBar.java
new file mode 100755
index 00000000..e1f773fe
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/newtexteditor/ScrollBar.java
@@ -0,0 +1,44 @@
+package org.qpython.qpy.texteditor.newtexteditor;
+
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+
+public class ScrollBar {
+	final static float MINI_SCALE=0.1f;
+	float mAll=100;
+	float mStart=8;
+	float mEnd=9;
+	float mWidth;
+	float mHeight;
+	Paint mPaint=new Paint();
+	public ScrollBar() {
+		mPaint.setColor(Color.GRAY);
+	}
+	
+	public void draw(Canvas canvas){
+		float x=mWidth*(mStart/mAll);
+		float y=mWidth*(mEnd/mAll);
+		canvas.drawRect(x, 0, y, mHeight, mPaint);
+	}
+	
+	public void setSize(float width,float height)
+	{
+		mWidth=width;
+		mHeight=height;
+	}
+	
+	public void setPosition(float all,float start,float end){
+		mAll=all;
+		if(mAll<=0)
+			mAll=1;
+		mStart=start;
+		mEnd=end;
+		float scale=(mEnd-mStart)/mAll;
+		if(scale<MINI_SCALE)
+		{
+			mStart-=mAll*(MINI_SCALE-scale)/2;
+			mEnd+=mAll*(MINI_SCALE-scale)/2;
+		}
+	}
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/newtexteditor/SpanBody.java b/qpython/src/main/java/org/qpython/qpy/texteditor/newtexteditor/SpanBody.java
new file mode 100755
index 00000000..9a1f9c6f
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/newtexteditor/SpanBody.java
@@ -0,0 +1,47 @@
+package org.qpython.qpy.texteditor.newtexteditor;
+
+public class SpanBody{
+	Object mSpan;
+	int mStart;
+	int mEnd;
+	int mFlag;
+	public SpanBody(Object span,int start,int end,int flag) {
+		mSpan=span;
+		mStart=start;
+		mEnd=end;
+		mFlag=flag;
+	}
+	public boolean hasSub(int start,int end){
+		if(start<mStart)
+		{
+			if(end>mStart)
+				return true;
+		}
+		else
+		if(start>=mEnd){
+			return false;
+		}
+		else{
+			return true;
+		}
+		return false;
+	}
+	
+	public boolean in(int pos){
+		if(pos>=mStart && pos<mEnd)
+			return true;
+		return false;
+	}
+	
+	public int compileTo(int pos){
+		if(pos<mStart)
+			return -1;
+		if(pos>=mEnd)
+			return 1;
+		return 0;
+	}
+	public int length()
+	{
+		return mEnd-mStart;
+	}
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/ui/adapter/FolderAdapter.java b/qpython/src/main/java/org/qpython/qpy/texteditor/ui/adapter/FolderAdapter.java
new file mode 100644
index 00000000..e2b7fb8f
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/ui/adapter/FolderAdapter.java
@@ -0,0 +1,102 @@
+package org.qpython.qpy.texteditor.ui.adapter;
+
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+import android.view.ViewGroup;
+
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ItemFolderBinding;
+import org.qpython.qpy.texteditor.ui.adapter.bean.FolderBean;
+
+import java.util.List;
+import java.util.Map;
+
+
+public class FolderAdapter extends RecyclerView.Adapter<MyViewHolder<ItemFolderBinding>> {
+    private List<FolderBean>     dataList;
+    private Map<String, Boolean> cloudMap;
+    private boolean              showPath;
+    private Click                clickListener;
+
+    public FolderAdapter(List<FolderBean> dataList, boolean showPath) {
+        this.dataList = dataList;
+        this.showPath = showPath;
+    }
+
+    public void setClickListener(Click clickListener) {
+        this.clickListener = clickListener;
+    }
+
+    @Override
+    public MyViewHolder<ItemFolderBinding> onCreateViewHolder(ViewGroup parent, int viewType) {
+        View view = View.inflate(parent.getContext(), R.layout.item_folder, null);
+        return new MyViewHolder<>(view);
+    }
+
+    @Override
+    public void onBindViewHolder(MyViewHolder<ItemFolderBinding> holder, final int position) {
+        ItemFolderBinding binding = holder.getBinding();
+        FolderBean item = dataList.get(position);
+        if (showPath) {
+            binding.tvPath.setVisibility(View.VISIBLE);
+            if (item.getPath().contains("/qpython")) {
+                binding.tvPath.setText(item.getPath().substring(item.getPath().indexOf("/qpython"), item.getPath().length()));
+            } else {
+                binding.tvPath.setText(item.getPath());
+            }
+        }
+        binding.tvFileName.setText(item.getName());
+        switch (item.getType()) {
+            case FILE:
+                binding.ivFileIcon.setImageResource(R.drawable.ic_editor_file);
+                break;
+            case FOLDER:
+                binding.ivFileIcon.setImageResource(R.drawable.ic_editor_folder);
+                break;
+        }
+        if (cloudMap != null) {
+            if (cloudMap.containsKey(item.getPath())) {
+                if (item.getFile().isDirectory()) {
+                    if (item.getFile().getParent().contains("projects"))
+                        binding.uploaded.setImageResource(R.drawable.ic_cloud_notdone);
+                } else {
+                    binding.uploaded.setImageResource(R.drawable.ic_cloud_done);
+                }
+                binding.uploaded.setVisibility(View.VISIBLE);
+            } else {
+                binding.uploaded.setVisibility(View.GONE);
+            }
+        }
+        binding.llFolderItem.setOnClickListener(v -> clickListener.onItemClick(position));
+        binding.llFolderItem.setOnLongClickListener(v -> {
+            clickListener.onLongClick(position);
+            return true;
+        });
+        binding.uploading.setVisibility(item.isUploading() ? View.VISIBLE : View.GONE);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+
+    @Override
+    public int getItemCount() {
+        return dataList == null ? 0 : dataList.size();
+    }
+
+    public void setCloudMap(Map<String, Boolean> cloudMap) {
+        this.cloudMap = cloudMap;
+    }
+
+    public void setUploadFile(int position) {
+        cloudMap.put(dataList.get(position).getPath(), true);
+    }
+
+    public interface Click {
+        void onItemClick(int position);
+
+        void onLongClick(int position);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/ui/adapter/FontListAdapter.java b/qpython/src/main/java/org/qpython/qpy/texteditor/ui/adapter/FontListAdapter.java
new file mode 100644
index 00000000..f016f65a
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/ui/adapter/FontListAdapter.java
@@ -0,0 +1,57 @@
+package org.qpython.qpy.texteditor.ui.adapter;
+
+import android.content.Context;
+import android.graphics.Typeface;
+import android.util.Log;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.texteditor.androidlib.data.FileUtils;
+import org.qpython.qpy.texteditor.androidlib.ui.adapter.FileListAdapter;
+
+import java.io.File;
+import java.util.List;
+
+public class FontListAdapter extends FileListAdapter {
+
+	/**
+	 * Constructor
+	 * 
+	 * @param context
+	 *            The current context
+	 * @param objects
+	 *            The objects to represent in the ListView.
+	 * @param folder
+	 *            the parent folder of the items presented, or null if the top
+	 *            folder should not be displayed as up
+	 */
+	public FontListAdapter(Context context, List<File> objects) {
+		super(context, objects, null);
+	}
+
+	/**
+	 * @see fr.xgouchet.androidlib.ui.adapter.FileListAdapter#getView(int,
+	 *      android.view.View, android.view.ViewGroup)
+	 */
+	@Override
+	public View getView(int position, View convertView, ViewGroup parent) {
+		View v = super.getView(position, convertView, parent);
+
+		File f = getItem(position);
+
+		if (FileUtils.getFileExtension(f).equalsIgnoreCase("ttf")) {
+			TextView t = (TextView) v.findViewById(R.id.textFileName);
+			Typeface font = Typeface.DEFAULT;
+			try {
+				font = Typeface.createFromFile(f);
+				t.setTypeface(font);
+			} catch (RuntimeException e) {
+				Log.w("TED", "Unable to create a font from " + f.getName());
+			}
+		}
+
+		return v;
+	}
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/ui/adapter/MyViewHolder.java b/qpython/src/main/java/org/qpython/qpy/texteditor/ui/adapter/MyViewHolder.java
new file mode 100644
index 00000000..42294f22
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/ui/adapter/MyViewHolder.java
@@ -0,0 +1,25 @@
+package org.qpython.qpy.texteditor.ui.adapter;
+
+import android.databinding.DataBindingUtil;
+import android.databinding.ViewDataBinding;
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+import android.view.ViewGroup;
+
+
+public class MyViewHolder<B extends ViewDataBinding> extends RecyclerView.ViewHolder {
+    private B binding;
+
+    public MyViewHolder(View itemView) {
+        super(itemView);
+        binding = DataBindingUtil.bind(itemView);
+    }
+
+    public B getBinding() {
+        return binding;
+    }
+
+    public void setBinding(B binding) {
+        this.binding = binding;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/ui/adapter/PathListAdapter.java b/qpython/src/main/java/org/qpython/qpy/texteditor/ui/adapter/PathListAdapter.java
new file mode 100644
index 00000000..94b80514
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/ui/adapter/PathListAdapter.java
@@ -0,0 +1,156 @@
+package org.qpython.qpy.texteditor.ui.adapter;
+
+import android.content.Context;
+import android.databinding.DataBindingUtil;
+import android.databinding.ViewDataBinding;
+import android.graphics.Color;
+import android.os.Handler;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ItemFolderBinding;
+import org.qpython.qpy.texteditor.ui.adapter.bean.FolderBean;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * A File List Adapter
+ *
+ * @author Hmei
+ */
+public class PathListAdapter extends RecyclerView.Adapter<PathListAdapter.MyViewHolder> {
+    private static final int PENDING_REMOVAL_TIMEOUT = 3000; // 3sec
+    HashMap<FolderBean, Runnable> pendingRunnables = new HashMap<>(); // map of items to pending runnables, so we can cancel a removal if need be
+    private List<FolderBean> dataList;
+    private List<FolderBean> itemsPendingRemoval;
+    private Context          context;
+    private boolean showPath;
+    private Callback callback;
+    private Handler handler = new Handler(); // hanlder for running delayed runnables
+
+
+    public PathListAdapter(List<FolderBean> dataList, Context context, boolean showPath, Callback callback) {
+        this.dataList = dataList;
+        this.context = context;
+        this.showPath = showPath;
+        this.callback = callback;
+        this.itemsPendingRemoval = new ArrayList<>();
+    }
+
+    @Override
+    public MyViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        ItemFolderBinding binding = DataBindingUtil.inflate(LayoutInflater.from(context), R.layout.item_folder, parent, false);
+        MyViewHolder holder = new MyViewHolder(binding.getRoot());
+        holder.setBinding(binding);
+        return holder;
+    }
+
+    @Override
+    public void onBindViewHolder(MyViewHolder holder, final int position) {
+        final FolderBean item = dataList.get(position);
+        ItemFolderBinding binding = holder.getBinding();
+        if (itemsPendingRemoval.contains(item)) {
+            // undo state
+            holder.itemView.setBackgroundColor(Color.parseColor("#FFD14136"));
+            binding.ivFileIcon.setVisibility(View.GONE);
+            binding.tvFileName.setVisibility(View.GONE);
+//            binding.btnUndo.setVisibility(View.VISIBLE);
+//            binding.btnUndo.setOnClickListener(v -> {
+//                Runnable pendingRemovalRunnable = pendingRunnables.get(item);
+//                pendingRunnables.remove(item);
+//                if (pendingRemovalRunnable != null)
+//                    handler.removeCallbacks(pendingRemovalRunnable);
+//                itemsPendingRemoval.remove(item);
+//                // this will rebind the row in "normal" state
+//                notifyItemChanged(dataList.indexOf(item));
+//            });
+        } else {
+//            binding.btnUndo.setVisibility(View.GONE);
+            binding.tvFileName.setText(item.getName());
+            if (showPath) {
+                binding.tvPath.setVisibility(View.VISIBLE);
+                binding.tvPath.setText(item.getPath().substring(item.getPath().indexOf("/qpython"), item.getPath().length()));
+            }
+            switch (item.getType()) {
+                case FILE:
+                    binding.ivFileIcon.setImageResource(R.drawable.ic_editor_file);
+                    break;
+                case FOLDER:
+                    binding.ivFileIcon.setImageResource(R.drawable.ic_editor_folder);
+                    break;
+            }
+
+            binding.llFolderItem.setOnClickListener(v -> callback.click(position));
+        }
+    }
+
+    @Override
+    public int getItemCount() {
+        return dataList == null ? 0 : (dataList.size() == 0 ? 0 : dataList.size());
+    }
+
+    public void pendingRemoval(int position) {
+        final FolderBean item = dataList.get(position);
+        if (!itemsPendingRemoval.contains(item)) {
+            itemsPendingRemoval.add(item);
+            // this will redraw row in "undo" state
+            notifyItemChanged(position);
+            // let's create, store and post a runnable to remove the item
+            Runnable pendingRemovalRunnable = new Runnable() {
+                @Override
+                public void run() {
+                    remove(dataList.indexOf(item));
+                }
+            };
+            handler.postDelayed(pendingRemovalRunnable, PENDING_REMOVAL_TIMEOUT);
+            pendingRunnables.put(item, pendingRemovalRunnable);
+        }
+    }
+
+    public void remove(int position) {
+        FolderBean item = dataList.get(position);
+        if (itemsPendingRemoval.contains(item)) {
+            itemsPendingRemoval.remove(item);
+        }
+        if (dataList.contains(item)) {
+            dataList.remove(position);
+            notifyItemRemoved(position);
+        }
+    }
+
+    public boolean isPendingRemoval(int position) {
+        FolderBean item = dataList.get(position);
+        return itemsPendingRemoval.contains(item);
+    }
+
+
+    public interface Callback {
+        void click(int position);
+    }
+
+    static class MyViewHolder extends RecyclerView.ViewHolder {
+        private ItemFolderBinding binding;
+
+        MyViewHolder(View itemView) {
+            super(itemView);
+        }
+
+        public ItemFolderBinding getBinding() {
+            return binding;
+        }
+
+        public void setBinding(ItemFolderBinding binding) {
+            this.binding = binding;
+        }
+    }
+
+}
+
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/ui/adapter/bean/FolderBean.java b/qpython/src/main/java/org/qpython/qpy/texteditor/ui/adapter/bean/FolderBean.java
new file mode 100644
index 00000000..8b828664
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/ui/adapter/bean/FolderBean.java
@@ -0,0 +1,89 @@
+package org.qpython.qpy.texteditor.ui.adapter.bean;
+
+import org.qpython.qpy.texteditor.common.CommonEnums.FileType;
+
+import java.io.File;
+
+/**
+ * To store path list's item data
+ * Created by Hmei on 2017-05-11.
+ */
+
+public class FolderBean {
+    private File     file;
+    private FileType type;
+    private String   name;
+    private String   path;
+    private boolean  isUploading;
+
+    public FolderBean(File file) {
+        this.file = file;
+        type = file.isDirectory() ? FileType.FOLDER : FileType.FILE;
+        name = file.getName();
+        path = file.getAbsolutePath();
+    }
+
+    public FileType getFolder() {
+        return path.contains("/projects") ? FileType.PROJECT : FileType.SCRIPT;
+    }
+
+    public String getProjectPath() {
+        if (getFolder().equals(FileType.PROJECT)) {
+            String[] nodes = path.split("/");
+            StringBuilder sb = new StringBuilder();
+            boolean isProjNode = false;
+            for (String node : nodes) {
+                if (!isProjNode) {
+                    sb.append(node).append("/");
+                    isProjNode = node.startsWith("projects");
+                } else {
+                    sb.append(node);
+                    return sb.toString();
+                }
+            }
+            return "";
+        } else {
+            return "";
+        }
+    }
+
+    public FileType getType() {
+        return type;
+    }
+
+    public void setType(FileType type) {
+        this.type = type;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    public void setPath(String path) {
+        this.path = path;
+    }
+
+    public File getFile() {
+        return file;
+    }
+
+    public void setFile(File file) {
+        this.file = file;
+    }
+
+    public boolean isUploading() {
+        return isUploading;
+    }
+
+    public void setUploading(boolean uploading) {
+        isUploading = uploading;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/ui/adapter/bean/PopupItemBean.java b/qpython/src/main/java/org/qpython/qpy/texteditor/ui/adapter/bean/PopupItemBean.java
new file mode 100644
index 00000000..d4c79f8e
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/ui/adapter/bean/PopupItemBean.java
@@ -0,0 +1,47 @@
+package org.qpython.qpy.texteditor.ui.adapter.bean;
+
+import android.view.View;
+import android.widget.TextView;
+
+/**
+ * A bean class that describe popup item
+ * Created by Hmei on 2017-05-31.
+ */
+
+public class PopupItemBean {
+    private boolean isDisable = false;
+    private String title1, title2;
+    private View.OnClickListener clickListener;
+
+    public PopupItemBean(String title, View.OnClickListener clickListener) {
+        this.title1 = title;
+        this.clickListener = clickListener;
+    }
+
+
+    public View.OnClickListener getClickListener() {
+        return v -> {
+            clickListener.onClick(v);
+            if (title2 != null) {
+                TextView tv = (TextView) v;
+                isDisable = !isDisable;
+                if (isDisable) {
+                    tv.setText(title2);
+                } else {
+                    tv.setText(title1);
+                }
+            }
+
+        };
+    }
+
+    @Override
+    public String toString() {
+        return isDisable ? title2 : title1;
+    }
+
+    public PopupItemBean setTitle2(String title2) {
+        this.title2 = title2;
+        return this;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/ui/view/AdvancedEditText.java b/qpython/src/main/java/org/qpython/qpy/texteditor/ui/view/AdvancedEditText.java
new file mode 100644
index 00000000..80e2a883
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/ui/view/AdvancedEditText.java
@@ -0,0 +1,760 @@
+package org.qpython.qpy.texteditor.ui.view;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Point;
+import android.graphics.Rect;
+import android.graphics.Typeface;
+import android.os.Handler;
+import android.text.Editable;
+import android.text.InputFilter;
+import android.text.InputType;
+import android.text.SpannableStringBuilder;
+import android.text.Spanned;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.text.style.BackgroundColorSpan;
+import android.text.style.ForegroundColorSpan;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.GestureDetector;
+import android.view.GestureDetector.OnGestureListener;
+import android.view.MotionEvent;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.Scroller;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.texteditor.common.Constants;
+import org.qpython.qpy.texteditor.common.Settings;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static org.qpython.qpy.utils.CodePattern.COLOR_BUILTIN;
+import static org.qpython.qpy.utils.CodePattern.COLOR_COMMENT;
+import static org.qpython.qpy.utils.CodePattern.COLOR_ERROR;
+import static org.qpython.qpy.utils.CodePattern.COLOR_KEYWORD;
+import static org.qpython.qpy.utils.CodePattern.COLOR_QUOTE;
+import static org.qpython.qpy.utils.CodePattern.PATTERN_LINE;
+import static org.qpython.qpy.utils.CodePattern.PATTERN_LUA_BUILD_IN;
+import static org.qpython.qpy.utils.CodePattern.PATTERN_LUA_KEYWORD;
+import static org.qpython.qpy.utils.CodePattern.PATTERN_PY_BUILD_IN;
+import static org.qpython.qpy.utils.CodePattern.PATTERN_PY_COMMENT;
+import static org.qpython.qpy.utils.CodePattern.PATTERN_PY_KEYWORD;
+
+/**
+ * TODO create a syntax highlighter
+ */
+public class AdvancedEditText extends android.support.v7.widget.AppCompatEditText implements Constants, OnGestureListener {
+//		OnKeyListener{
+
+
+    private static final Pattern               luaComments           = Pattern.compile(
+            "--.*\n");
+    private static final Pattern               trailingWhiteSpace    = Pattern.compile(
+            "[\\t ]+$",
+            Pattern.MULTILINE);
+    private static final Pattern               quotes                = Pattern.compile(
+            "\"([^[\"\\n]])+\"|" +
+                    "\'([^[\'\\n]])+\'"
+    );
+    private final        Handler               updateHandler         = new Handler();
+    public               OnTextChangedListener onTextChangedListener = null;
+    public               int                   updateDelay           = 1000;
+    public               int                   errorLine             = 0;
+    public               boolean               dirty                 = false;
+    /**
+     * The PATTERN_LINE PATTERN_NUMBER paint
+     */
+    protected Paint mPaintNumbers;
+    /**
+     * The PATTERN_LINE PATTERN_NUMBER paint
+     */
+    protected Paint mPaintHighlight;
+    /**
+     * the offset value in dp
+     */
+    protected int mPaddingDP = 6;
+    /**
+     * the padding scaled
+     */
+    protected int      mPadding;
+    /**
+     * the scale for desnity pixels
+     */
+    protected float    mScale;
+    /**
+     * the scroller instance
+     */
+    protected Scroller mTedScroller;
+
+
+    /////////
+    /**
+     * the velocity tracker
+     */
+    protected GestureDetector mGestureDetector;
+    /**
+     * the Max size of the view
+     */
+    protected Point           mMaxSize;
+    /**
+     * the highlighted PATTERN_LINE index
+     */
+    protected int             mHighlightedLine;
+    protected int             mHighlightStart;
+    protected Rect            mDrawingRect, mLineBounds;
+    String  fileType = "";
+    Boolean isWatch  = true;
+    private       boolean  modified       = true;
+    private final Runnable updateRunnable =
+            () -> {
+                Editable e = getText();
+
+                if (onTextChangedListener != null)
+                    onTextChangedListener.onTextChanged(e.toString());
+
+                highlightWithoutChange(e);
+            };
+
+    /**
+     * @param context the current context
+     * @param attrs   some attributes
+     * @category ObjectLifecycle
+     */
+    public AdvancedEditText(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        setInputType(InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS | InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_MULTI_LINE);
+
+        mPaintNumbers = new Paint();
+        mPaintNumbers.setTypeface(Typeface.MONOSPACE);
+        mPaintNumbers.setAntiAlias(true);
+
+        mPaintHighlight = new Paint();
+
+        mScale = context.getResources().getDisplayMetrics().density;
+        mPadding = (int) (mPaddingDP * mScale);
+
+        mHighlightedLine = mHighlightStart = -1;
+
+        mDrawingRect = new Rect();
+        mLineBounds = new Rect();
+
+        mGestureDetector = new GestureDetector(getContext(), this);
+
+        updateFromSettings("");
+
+    }
+
+    /**
+     * @category View
+     * @see android.widget.TextView#computeScroll()
+     */
+    @Override
+    public void computeScroll() {
+
+        if (mTedScroller != null) {
+            if (mTedScroller.computeScrollOffset()) {
+                scrollTo(mTedScroller.getCurrX(), mTedScroller.getCurrY());
+            }
+        } else {
+            super.computeScroll();
+        }
+    }
+
+    /**
+     * @category View
+     * @see EditText#onDraw(Canvas)
+     */
+    @Override
+    public void onDraw(Canvas canvas) {
+        int count, padding, lineX, baseline;
+
+        // padding
+        padding = mPadding;
+        count = getLineCount();
+        if (Settings.SHOW_LINE_NUMBERS) {
+            padding = (int) (Math.floor(Math.log10(count)) + 1);
+            padding = (int) ((padding * mPaintNumbers.getTextSize()) + mPadding + (Settings.TEXT_SIZE
+                    * mScale * 0.5));
+            setPadding(padding, mPadding, mPadding, mPadding);
+        } else {
+            setPadding(mPadding, mPadding, mPadding, mPadding);
+        }
+
+        // get the drawing boundaries
+        getDrawingRect(mDrawingRect);
+
+        // display current PATTERN_LINE
+        computeLineHighlight();
+
+        // draw PATTERN_LINE PATTERN_NUMBER
+        count = getLineCount();
+        lineX = (int) (mDrawingRect.left + padding - (Settings.TEXT_SIZE
+                * mScale * 0.5));
+
+        for (int i = 0; i < count; i++) {
+            baseline = getLineBounds(i, mLineBounds);
+            if ((mMaxSize != null) && (mMaxSize.x < mLineBounds.right)) {
+                mMaxSize.x = mLineBounds.right;
+            }
+
+            if ((mLineBounds.bottom < mDrawingRect.top)
+                    || (mLineBounds.top > mDrawingRect.bottom)) {
+                continue;
+            }
+
+            if ((i == mHighlightedLine) && (!Settings.WORDWRAP)) {
+                canvas.drawRect(mLineBounds, mPaintHighlight);
+            }
+
+            if (Settings.SHOW_LINE_NUMBERS) {
+                canvas.drawText("" + (i + 1), mDrawingRect.left + mPadding,
+                        baseline, mPaintNumbers);
+            }
+            if (Settings.SHOW_LINE_NUMBERS) {
+                canvas.drawLine(lineX, mDrawingRect.top, lineX,
+                        mDrawingRect.bottom, mPaintNumbers);
+            }
+        }
+
+        if (mMaxSize != null) {
+            mMaxSize.y = mLineBounds.bottom;
+            mMaxSize.x = Math.max(mMaxSize.x + mPadding - mDrawingRect.width(),
+                    0);
+            mMaxSize.y = Math.max(
+                    mMaxSize.y + mPadding - mDrawingRect.height(), 0);
+        }
+        super.onDraw(canvas);
+    }
+
+//	/**
+//	 * @see android.view.View.OnKeyListener#onKey(android.view.View, int,
+//	 *      android.view.KeyEvent)
+//	 */
+//	@Override
+//	public boolean onKey(View v, int keyCode, KeyEvent event) {
+//		return false;
+//	}
+
+    /**
+     * @category GestureDetection
+     * @see android.widget.TextView#onTouchEvent(android.view.MotionEvent)
+     */
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+
+        super.onTouchEvent(event);
+        if (mGestureDetector != null) {
+            return mGestureDetector.onTouchEvent(event);
+        }
+
+        return true;
+    }
+
+    /**
+     * @category GestureDetection
+     * @see android.view.GestureDetector.OnGestureListener#onDown(android.view.MotionEvent)
+     */
+    @Override
+    public boolean onDown(MotionEvent e) {
+        return true;
+    }
+
+    /**
+     * @category GestureDetection
+     * @see android.view.GestureDetector.OnGestureListener#onSingleTapUp(android.view.MotionEvent)
+     */
+    @Override
+    public boolean onSingleTapUp(MotionEvent e) {
+        if (isEnabled()) {
+            ((InputMethodManager) getContext().getSystemService(
+                    Context.INPUT_METHOD_SERVICE)).showSoftInput(this,
+                    InputMethodManager.SHOW_IMPLICIT);
+        }
+        return true;
+    }
+
+    /**
+     * @category GestureDetection
+     * @see android.view.GestureDetector.OnGestureListener#onShowPress(android.view.MotionEvent)
+     */
+    @Override
+    public void onShowPress(MotionEvent e) {
+    }
+
+    /**
+     * @see android.view.GestureDetector.OnGestureListener#onLongPress(android.view.MotionEvent)
+     */
+    @Override
+    public void onLongPress(MotionEvent e) {
+
+    }
+
+    /**
+     * @see android.view.GestureDetector.OnGestureListener#onScroll(android.view.MotionEvent,
+     * android.view.MotionEvent, float, float)
+     */
+    @Override
+    public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX,
+                            float distanceY) {
+        // mTedScroller.setFriction(0);
+        return true;
+    }
+
+    /**
+     * @see android.view.GestureDetector.OnGestureListener#onFling(android.view.MotionEvent,
+     * android.view.MotionEvent, float, float)
+     */
+    @Override
+    public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX,
+                           float velocityY) {
+        if (!Settings.FLING_TO_SCROLL) {
+            return true;
+        }
+
+        if (mTedScroller != null) {
+            mTedScroller.fling(getScrollX(), getScrollY(), -(int) velocityX,
+                    -(int) velocityY, 0, mMaxSize.x, 0, mMaxSize.y);
+        }
+        return true;
+    }
+
+    /**
+     * Update view settings from the app preferences
+     *
+     * @category Custom
+     */
+    public void updateFromSettings(String fileType) {
+        Log.d(TAG, "updateFromSettings:" + fileType);
+
+        this.fileType = TextUtils.isEmpty(fileType) ? this.fileType : fileType;
+
+        if (isInEditMode()) {
+            return;
+        }
+
+        setTypeface(Settings.getTypeface(getContext()));
+
+        // wordwrap
+        setHorizontallyScrolling(!Settings.WORDWRAP);
+
+        // color Theme
+        switch (Settings.COLOR) {
+            case COLOR_NEGATIVE:
+                setBackgroundResource(R.drawable.textfield_black);
+                setTextColor(Color.WHITE);
+                mPaintHighlight.setColor(Color.WHITE);
+                mPaintNumbers.setColor(Color.GRAY);
+                break;
+            case COLOR_MATRIX:
+                setBackgroundResource(R.drawable.textfield_matrix);
+                setTextColor(Color.GREEN);
+                mPaintHighlight.setColor(Color.GREEN);
+                mPaintNumbers.setColor(Color.rgb(0, 128, 0));
+                break;
+            case COLOR_SKY:
+                setBackgroundResource(R.drawable.textfield_sky);
+                setTextColor(Color.rgb(0, 0, 64));
+                mPaintHighlight.setColor(Color.rgb(0, 0, 64));
+                mPaintNumbers.setColor(Color.rgb(0, 128, 255));
+                break;
+            case COLOR_DRACULA:
+                setBackgroundResource(R.drawable.textfield_dracula);
+                setTextColor(Color.RED);
+                mPaintHighlight.setColor(Color.RED);
+                mPaintNumbers.setColor(Color.rgb(192, 0, 0));
+                break;
+            case COLOR_CLASSIC:
+            default:
+                setBackgroundResource(R.drawable.textfield_white);
+                setTextColor(Color.BLACK);
+                mPaintHighlight.setColor(Color.BLACK);
+                mPaintNumbers.setColor(Color.GRAY);
+                break;
+        }
+        mPaintHighlight.setAlpha(48);
+
+        // text size
+        setTextSize(Settings.TEXT_SIZE);
+        mPaintNumbers.setTextSize(Settings.TEXT_SIZE * mScale * 0.85f);
+
+        // refresh view
+        postInvalidate();
+        refreshDrawableState();
+
+        // use Fling when scrolling settings ?
+        if (Settings.FLING_TO_SCROLL) {
+            mTedScroller = new Scroller(getContext());
+            mMaxSize = new Point();
+        } else {
+            mTedScroller = null;
+            mMaxSize = null;
+        }
+
+
+        if (true
+            /*
+                (this.fileType.equals("py") || this.fileType.equals("lua")) &&
+                        this.getLineCount() < Settings.MAX_LINES_NUM_WITH_SYNTAX*/) {
+            isWatch = true;
+            init();
+            refresh();
+        } else {
+            isWatch = false;
+            cancelUpdate();
+            unHightlight();
+        }
+        //}
+    }
+
+    /**
+     * Compute the PATTERN_LINE to highlight based on selection
+     */
+    protected void computeLineHighlight() {
+        int i, line, selStart;
+        String text;
+
+        if (!isEnabled()) {
+            mHighlightedLine = -1;
+            return;
+        }
+
+        selStart = getSelectionStart();
+        if (mHighlightStart != selStart) {
+            text = getText().toString();
+
+            line = i = 0;
+            while (i < selStart) {
+                i = text.indexOf("\n", i);
+                if (i < 0) {
+                    break;
+                }
+                if (i < selStart) {
+                    ++line;
+                }
+                ++i;
+            }
+
+            mHighlightedLine = line;
+        }
+    }
+
+    private Pattern getKw() {
+        if (fileType.equals("py")) {
+            return PATTERN_PY_KEYWORD;
+        } else if (fileType.equals("lua")) {
+            return PATTERN_LUA_KEYWORD;
+        } else {
+            return Pattern.compile(
+                    "\\b()\\b");
+        }
+    }
+
+    private Pattern getBuiltins() {
+        if (fileType.equals("py")) {
+            return PATTERN_PY_BUILD_IN;
+        } else if (fileType.equals("lua")) {
+            return PATTERN_LUA_BUILD_IN;
+
+        } else {
+            return Pattern.compile(
+                    "\\b()\\b");
+        }
+    }
+
+    private Pattern getComments() {
+        if (fileType.equals("py")) {
+            return PATTERN_PY_COMMENT;
+        } else if (fileType.equals("lua")) {
+            return luaComments;
+        } else {
+            return Pattern.compile(
+                    "");
+
+        }
+    }
+
+    public void setTextHighlighted(CharSequence text) {
+        cancelUpdate();
+
+        errorLine = 0;
+        dirty = false;
+
+        modified = false;
+        setText(highlight(new SpannableStringBuilder(text)));
+        modified = true;
+
+        if (onTextChangedListener != null)
+            onTextChangedListener.onTextChanged(text.toString());
+    }
+
+    public String getCleanText() {
+        return trailingWhiteSpace
+                .matcher(getText())
+                .replaceAll("");
+    }
+
+    public void refresh() {
+        highlightWithoutChange(getText());
+    }
+
+    public void unHightlight() {
+        unHightWithoutChange(getText());
+    }
+
+    private void init() {
+        setHorizontallyScrolling(true);
+
+        setFilters(new InputFilter[]{
+                (source, start, end, dest, dstart, dend) -> {
+                    //LogUtil.d(TAG, "end:"+end+"-start:"+start+"-dstart:"+dstart+"-dend:"+dend+"-"+modified+"-dlen:"+dest.length()+"-slen:"+source.length());
+                    if (modified &&
+                            end - start == 1 &&
+                            start < source.length() &&
+                            dstart <= dest.length()) {
+                        char c = source.charAt(start);
+
+                        //LogUtil.d(TAG, "c:"+c);
+                        if (c == '\n')
+                            return autoIndent(
+                                    source,
+                                    start,
+                                    end,
+                                    dest,
+                                    dstart,
+                                    dend);
+                    }
+
+                    return source;
+                }});
+
+        addTextChangedListener(
+                new TextWatcher() {
+                    @Override
+                    public void onTextChanged(
+                            CharSequence s,
+                            int start,
+                            int before,
+                            int count) {
+                    }
+
+                    @Override
+                    public void beforeTextChanged(
+                            CharSequence s,
+                            int start,
+                            int count,
+                            int after) {
+                    }
+
+                    @Override
+                    public void afterTextChanged(Editable e) {
+                        if (isWatch) {
+                            cancelUpdate();
+
+                            if (!modified)
+                                return;
+
+                            dirty = true;
+                            updateHandler.postDelayed(
+                                    updateRunnable,
+                                    updateDelay);
+                        }
+                    }
+                });
+    }
+
+    private void cancelUpdate() {
+        updateHandler.removeCallbacks(updateRunnable);
+    }
+
+    private void highlightWithoutChange(Editable e) {
+        modified = false;
+        highlight(e);
+        modified = true;
+    }
+
+    public void unHightWithoutChange(Editable e) {
+        Log.d(TAG, "unHightWithoutChange");
+        modified = false;
+        clearSpans(e);
+        modified = true;
+
+    }
+
+    private Editable highlight(Editable e) {
+        try {
+            // don't use e.clearSpans() because it will remove
+            // too much
+            clearSpans(e);
+
+            if (e.length() == 0)
+                return e;
+
+            if (errorLine > 0) {
+                Matcher m = PATTERN_LINE.matcher(e);
+
+                for (int n = errorLine;
+                     n-- > 0 && m.find(); )
+                    ;
+
+                e.setSpan(
+                        new BackgroundColorSpan(COLOR_ERROR),
+                        m.start(),
+                        m.end(),
+                        Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+            }
+
+			/*for( Matcher m = PATTERN_NUMBER.matcher( e );
+                m.find(); )
+				e.setSpan(
+					new ForegroundColorSpan( COLOR_NUMBER ),
+					m.start(),
+					m.end(),
+					Spanned.SPAN_EXCLUSIVE_EXCLUSIVE );*/
+
+            for (Matcher m = getKw().matcher(e);
+                 m.find(); )
+                e.setSpan(
+                        new ForegroundColorSpan(COLOR_KEYWORD),
+                        m.start(),
+                        m.end(),
+                        Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+
+            for (Matcher m = getBuiltins().matcher(e);
+                 m.find(); )
+                e.setSpan(
+                        new ForegroundColorSpan(COLOR_BUILTIN),
+                        m.start(),
+                        m.end(),
+                        Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+
+            for (Matcher m = getComments().matcher(e);
+                 m.find(); )
+                e.setSpan(
+                        new ForegroundColorSpan(COLOR_COMMENT),
+                        m.start(),
+                        m.end(),
+                        Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+
+            for (Matcher m = quotes.matcher(e);
+                 m.find(); )
+                e.setSpan(
+                        new ForegroundColorSpan(COLOR_QUOTE),
+                        m.start(),
+                        m.end(),
+                        Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+        } catch (Exception ex) {
+        }
+
+        return e;
+    }
+
+    private void clearSpans(Editable e) {
+        // remove foreground color spans
+        {
+            ForegroundColorSpan spans[] = e.getSpans(
+                    0,
+                    e.length(),
+                    ForegroundColorSpan.class);
+
+            for (int n = spans.length; n-- > 0; )
+                e.removeSpan(spans[n]);
+        }
+
+        // remove background color spans
+        {
+            BackgroundColorSpan spans[] = e.getSpans(
+                    0,
+                    e.length(),
+                    BackgroundColorSpan.class);
+
+            for (int n = spans.length; n-- > 0; )
+                e.removeSpan(spans[n]);
+        }
+    }
+
+    private CharSequence autoIndent(CharSequence source, int start, int end, Spanned dest, int dstart, int dend) {
+        String indent = "";
+        int istart = dstart - 1;
+        int iend = -1;
+
+        //LogUtil.d(TAG, "dstart:"+dstart+"-istart:"+istart);
+
+        if (istart > 0) {
+
+            if (dest.charAt(istart) == ':') indent += "    ";
+        }
+
+        // find start of this PATTERN_LINE
+        boolean dataBefore = false;
+        int pt = 0;
+
+        for (; istart > -1; --istart) {
+            char c = dest.charAt(istart);
+
+            if (c == '\n')
+                break;
+
+            if (c != ' ' && c != '\t') {
+                if (!dataBefore) {
+                    // indent always after those characters
+                    if (c == '{' ||
+                            c == '+' ||
+                            c == '-' ||
+                            c == '*' ||
+                            c == '/' ||
+                            c == '%' ||
+                            c == '^' ||
+                            c == '=')
+                        --pt;
+
+                    dataBefore = true;
+                }
+
+                // parenthesis counter
+                if (c == '(')
+                    --pt;
+                else if (c == ')')
+                    ++pt;
+            }
+        }
+
+        // copy indent of this PATTERN_LINE into the next
+        if (istart > -1) {
+
+            char charAtCursor = dest.charAt(istart);
+
+            for (iend = ++istart; iend < dend; ++iend) {
+                char c = dest.charAt(iend);
+
+                // auto expand comments
+                if (charAtCursor != '\n' &&
+                        c == '/' &&
+                        iend + 1 < dend &&
+                        dest.charAt(iend) == c) {
+                    iend += 2;
+                    break;
+                }
+
+                if (c != ' ' && c != '\t')
+                    break;
+            }
+
+            indent += dest.subSequence(istart, iend);
+        }
+
+        // add new indent
+        if (pt < 0)
+            indent += "\t";
+
+        // append white space of previous PATTERN_LINE and new indent
+        return source + indent;
+    }
+
+    public interface OnTextChangedListener {
+        public void onTextChanged(String text);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/ui/view/EditorPopUp.java b/qpython/src/main/java/org/qpython/qpy/texteditor/ui/view/EditorPopUp.java
new file mode 100644
index 00000000..ae2b75d7
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/ui/view/EditorPopUp.java
@@ -0,0 +1,56 @@
+package org.qpython.qpy.texteditor.ui.view;
+
+import android.content.Context;
+import android.graphics.drawable.BitmapDrawable;
+import android.os.Build;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.FrameLayout;
+import android.widget.ListView;
+import android.widget.PopupWindow;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.texteditor.ui.adapter.bean.PopupItemBean;
+
+import java.util.List;
+
+public class EditorPopUp {
+    private PopupWindow popupWindow;
+
+    public EditorPopUp(Context context, final List<PopupItemBean> itemBeanList) {
+        FrameLayout root = (FrameLayout) LayoutInflater.from(context).inflate(R.layout.popup_add_editor, null);
+        ListView listView = root.findViewById(R.id.list_view);
+
+        ArrayAdapter<PopupItemBean> adapter = new ArrayAdapter<>(context, R.layout.item_pop_up, itemBeanList);
+        listView.setAdapter(adapter);
+        listView.setOnItemClickListener((parent, view, position, id) -> {
+            itemBeanList.get(position).getClickListener().onClick(view);
+            adapter.notifyDataSetChanged();
+            popupWindow.dismiss();
+        });
+
+        popupWindow = new PopupWindow(root, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+        popupWindow.setBackgroundDrawable(new BitmapDrawable());
+        popupWindow.setFocusable(true);
+        popupWindow.setOutsideTouchable(true);
+    }
+
+    public void show(View view, int gravity, int x, int y) {
+        popupWindow.showAtLocation(view, gravity, x, y);
+    }
+
+    public void show(View view) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            popupWindow.showAsDropDown(view, 0, 0, Gravity.END);
+        } else {
+            popupWindow.showAtLocation(view, Gravity.TOP | Gravity.END, 0, view.getHeight());
+        }
+    }
+
+    public void dismiss() {
+        popupWindow.dismiss();
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/ui/view/EnterDialog.java b/qpython/src/main/java/org/qpython/qpy/texteditor/ui/view/EnterDialog.java
new file mode 100644
index 00000000..07db3b2c
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/ui/view/EnterDialog.java
@@ -0,0 +1,95 @@
+package org.qpython.qpy.texteditor.ui.view;
+
+import android.support.v7.app.AlertDialog;
+import android.app.Dialog;
+import android.content.Context;
+import android.databinding.DataBindingUtil;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.DialogEnterBinding;
+
+/**
+ * A Dialog Contain EditText
+ * Created by Hmei on 2017-05-18.
+ */
+
+public class EnterDialog {
+    private DialogEnterBinding binding;
+
+    private AlertDialog dialog;
+
+    public EnterDialog(Context context) {
+        binding = DataBindingUtil.inflate(LayoutInflater.from(context), R.layout.dialog_enter, null, false);
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(context, R.style.MyDialog);
+        builder.setView(binding.getRoot());
+        dialog = builder.create();
+
+        Window window = dialog.getWindow();
+        if (window != null) {
+            window.setGravity(Gravity.CENTER);
+            window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+            window.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+            window.setSoftInputMode(
+                    WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
+        }
+
+        binding.tvNegative.setOnClickListener(v -> dialog.dismiss());
+    }
+
+    public EnterDialog setTitle(String title) {
+        binding.tvTitle.setText(title);
+        return this;
+    }
+
+    public EnterDialog setText(String text) {
+        binding.etEnter.setText(text);
+        binding.etEnter.setSelection(text.length());
+        return this;
+    }
+
+    public EnterDialog setExt(String ext) {
+        binding.etEnter.setText(ext);
+        return this;
+    }
+
+    public EnterDialog setHint(String hint) {
+        binding.etEnter.setHint(hint);
+        return this;
+    }
+
+    public EnterDialog setConfirmListener(final ClickListener listener) {
+        binding.tvPositive.setOnClickListener(v -> {
+            if (listener.OnClickListener(binding.etEnter.getText().toString())) {
+                dialog.dismiss();
+            }
+        });
+        return this;
+    }
+
+    public EnterDialog setEnterType(int type) {
+        binding.etEnter.setInputType(type);
+        return this;
+    }
+
+    public void show() {
+        dialog.show();
+    }
+
+    public interface ClickListener {
+        /**
+         * @param name Project/script name
+         * @return true if the dialog should be dismissed
+         */
+        boolean OnClickListener(String name);
+    }
+
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/ui/view/MyEditTextPreference.java b/qpython/src/main/java/org/qpython/qpy/texteditor/ui/view/MyEditTextPreference.java
new file mode 100644
index 00000000..6d017c6e
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/ui/view/MyEditTextPreference.java
@@ -0,0 +1,32 @@
+package org.qpython.qpy.texteditor.ui.view;
+
+import android.support.v7.app.AlertDialog;
+import android.content.Context;
+import android.os.Bundle;
+import android.preference.EditTextPreference;
+import android.util.AttributeSet;
+import android.view.View;
+
+/**
+ * Created by Hmei on 2017-06-14.
+ */
+
+public class MyEditTextPreference extends EditTextPreference {
+    public MyEditTextPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public MyEditTextPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public MyEditTextPreference(Context context) {
+        super(context);
+    }
+
+    @Override
+    protected void showDialog(Bundle state) {
+
+        super.showDialog(state);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/ui/view/MyItemDecoration.java b/qpython/src/main/java/org/qpython/qpy/texteditor/ui/view/MyItemDecoration.java
new file mode 100644
index 00000000..70746e7d
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/ui/view/MyItemDecoration.java
@@ -0,0 +1,89 @@
+package org.qpython.qpy.texteditor.ui.view;
+
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+
+/**
+ *
+ * Created by Hmei on 2017-05-23.
+ */
+
+public class MyItemDecoration extends RecyclerView.ItemDecoration {
+    // we want to cache this and not allocate anything repeatedly in the onDraw method
+    private Drawable background;
+    private boolean  initiated;
+
+    private void init() {
+        background = new ColorDrawable(Color.parseColor("#FFD14136"));
+        initiated = true;
+    }
+
+    @Override
+    public void onDraw(Canvas c, RecyclerView parent, RecyclerView.State state) {
+
+        if (!initiated) {
+            init();
+        }
+
+        // only if animation is in progress
+        if (parent.getItemAnimator().isRunning()) {
+
+            // some items might be animating down and some items might be animating up to close the gap left by the removed item
+            // this is not exclusive, both movement can be happening at the same time
+            // to reproduce this leave just enough items so the first one and the last one would be just a little off screen
+            // then remove one from the middle
+
+            // find first child with translationY > 0
+            // and last one with translationY < 0
+            // we're after a rect that is not covered in recycler-view views at this point in time
+            View lastViewComingDown = null;
+            View firstViewComingUp = null;
+
+            // this is fixed
+            int left = 0;
+            int right = parent.getWidth();
+
+            // this we need to find out
+            int top = 0;
+            int bottom = 0;
+
+            // find relevant translating views
+            int childCount = parent.getLayoutManager().getChildCount();
+            for (int i = 0; i < childCount; i++) {
+                View child = parent.getLayoutManager().getChildAt(i);
+                if (child.getTranslationY() < 0) {
+                    // view is coming down
+                    lastViewComingDown = child;
+                } else if (child.getTranslationY() > 0) {
+                    // view is coming up
+                    if (firstViewComingUp == null) {
+                        firstViewComingUp = child;
+                    }
+                }
+            }
+
+            if (lastViewComingDown != null && firstViewComingUp != null) {
+                // views are coming down AND going up to fill the void
+                top = lastViewComingDown.getBottom() + (int) lastViewComingDown.getTranslationY();
+                bottom = firstViewComingUp.getTop() + (int) firstViewComingUp.getTranslationY();
+            } else if (lastViewComingDown != null) {
+                // views are going down to fill the void
+                top = lastViewComingDown.getBottom() + (int) lastViewComingDown.getTranslationY();
+                bottom = lastViewComingDown.getBottom();
+            } else if (firstViewComingUp != null) {
+                // views are coming up to fill the void
+                top = firstViewComingUp.getTop();
+                bottom = firstViewComingUp.getTop() + (int) firstViewComingUp.getTranslationY();
+            }
+
+            background.setBounds(left, top, right, bottom);
+            background.draw(c);
+
+        }
+        super.onDraw(c, parent, state);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/ui/view/MyTouchHelperCallback.java b/qpython/src/main/java/org/qpython/qpy/texteditor/ui/view/MyTouchHelperCallback.java
new file mode 100644
index 00000000..30a8e03b
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/ui/view/MyTouchHelperCallback.java
@@ -0,0 +1,101 @@
+package org.qpython.qpy.texteditor.ui.view;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.support.v4.content.ContextCompat;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.helper.ItemTouchHelper;
+import android.view.View;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.texteditor.ui.adapter.PathListAdapter;
+
+import static android.support.v7.widget.helper.ItemTouchHelper.ACTION_STATE_IDLE;
+
+/**
+ * To
+ * Created by Hmei on 2017-05-23.
+ */
+
+public class MyTouchHelperCallback extends ItemTouchHelper.SimpleCallback {
+
+    // we want to cache these and not allocate anything repeatedly in the onChildDraw method
+    private Drawable        background;
+    private Drawable        xMark;
+    private int             xMarkMargin;
+    private boolean         initiated;
+    private Context         context;
+    private PathListAdapter adapter;
+    public MyTouchHelperCallback(int dragDirs, int swipeDirs, PathListAdapter adapter,Context context) {
+        super(dragDirs, swipeDirs);
+        this.adapter = adapter;
+        this.context = context;
+    }
+
+    private void init() {
+        background = new ColorDrawable(Color.RED);
+        xMark = ContextCompat.getDrawable(context, R.drawable.ic_clear_24dp);
+        xMark.setColorFilter(Color.WHITE, PorterDuff.Mode.SRC_ATOP);
+        xMarkMargin = (int) context.getResources().getDimension(R.dimen.default_margin);
+        initiated = true;
+    }
+
+    @Override
+    public int getSwipeDirs(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
+        int position = viewHolder.getAdapterPosition();
+        if (adapter.isPendingRemoval(position)) {
+            return ACTION_STATE_IDLE;
+        }
+        return super.getSwipeDirs(recyclerView, viewHolder);
+    }
+
+    @Override
+    public void onSwiped(RecyclerView.ViewHolder viewHolder, int swipeDir) {
+        int swipedPosition = viewHolder.getAdapterPosition();
+        adapter.pendingRemoval(swipedPosition);
+    }
+
+    @Override
+    public void onChildDraw(Canvas c, RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, float dX, float dY, int actionState, boolean isCurrentlyActive) {
+        View itemView = viewHolder.itemView;
+
+        // not sure why, but this method get's called for viewholder that are already swiped away
+        if (viewHolder.getAdapterPosition() == -1) {
+            // not interested in those
+            return;
+        }
+
+        if (!initiated) {
+            init();
+        }
+
+        // draw red background
+        background.setBounds(itemView.getRight() + (int) dX, itemView.getTop(), itemView.getRight(), itemView.getBottom());
+        background.draw(c);
+
+        // draw x mark
+        int itemHeight = itemView.getBottom() - itemView.getTop();
+        int intrinsicWidth = xMark.getIntrinsicWidth();
+        int intrinsicHeight = xMark.getIntrinsicWidth();
+
+        int xMarkLeft = itemView.getRight() - xMarkMargin - intrinsicWidth;
+        int xMarkRight = itemView.getRight() - xMarkMargin;
+        int xMarkTop = itemView.getTop() + (itemHeight - intrinsicHeight) / 2;
+        int xMarkBottom = xMarkTop + intrinsicHeight;
+        xMark.setBounds(xMarkLeft, xMarkTop, xMarkRight, xMarkBottom);
+
+        xMark.draw(c);
+
+        super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive);
+    }
+
+
+    @Override
+    public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, RecyclerView.ViewHolder target) {
+        return false;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/ui/view/TopSearchDialog.java b/qpython/src/main/java/org/qpython/qpy/texteditor/ui/view/TopSearchDialog.java
new file mode 100644
index 00000000..d95bd53c
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/ui/view/TopSearchDialog.java
@@ -0,0 +1,82 @@
+//package org.qpython.qpy.texteditor.ui.view;
+//
+//import android.app.Dialog;
+//import android.content.Context;
+//import android.databinding.DataBindingUtil;
+//import android.graphics.Color;
+//import android.graphics.drawable.ColorDrawable;
+//import android.text.TextWatcher;
+//import android.view.Gravity;
+//import android.view.LayoutInflater;
+//import android.view.View;
+//import android.view.ViewGroup;
+//import android.view.Window;
+//
+//import org.qpython.qpy.texteditor.R;
+//import org.qpython.qpy.texteditor.databinding.DialogSearchTopBinding;
+//
+///**
+// * Top search dialog
+// * Created by Hmei on 2017-05-10.
+// */
+//
+//public class TopSearchDialog {
+//
+//    private static Dialog searchDialog;
+//    private Callback callback;
+//    private DialogSearchTopBinding binding;
+//
+//    public TopSearchDialog(Context context) {
+//        searchDialog = new Dialog(context);
+//        binding = DataBindingUtil.inflate(LayoutInflater.from(context), R.layout.dialog_search_top, null, false);
+//        initWindow();
+//        initListener();
+//    }
+//
+//    private void initWindow() {
+//        Window window = searchDialog.getWindow();
+//        window.setGravity( Gravity.TOP);
+//        window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+//        window.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+//    }
+//
+//    private void initListener() {
+//        binding.ibClear.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View view) {
+//                binding.textSearch.setText("");
+//            }
+//        });
+//        binding.ibClose.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View view) {
+//                dismiss();
+//            }
+//        });
+//    }
+//
+//    public TopSearchDialog addTextChangeListener(TextWatcher textWatcher) {
+//        binding.textSearch.addTextChangedListener(textWatcher);
+//        return this;
+//    }
+//
+//    public TopSearchDialog addCallback(Callback callback) {
+//        this.callback = callback;
+//        return this;
+//    }
+//
+//    public void show() {
+//        searchDialog.show();
+//    }
+//
+//    public void dismiss() {
+//        searchDialog.dismiss();
+//        if (callback != null) {
+//            callback.dismiss();
+//        }
+//    }
+//
+//    interface Callback{
+//        void dismiss();
+//    }
+//}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/undo/TextChange.java b/qpython/src/main/java/org/qpython/qpy/texteditor/undo/TextChange.java
new file mode 100644
index 00000000..16756bda
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/undo/TextChange.java
@@ -0,0 +1,83 @@
+package org.qpython.qpy.texteditor.undo;
+
+
+import android.text.Editable;
+
+import org.qpython.qpy.texteditor.common.Constants;
+
+public interface TextChange extends Constants {
+
+	/**
+	 * Undo this change
+	 * 
+	 * @param text
+	 *            the editable object on which the undo is done
+	 * @return the caret position after the undo
+	 */
+	int undo(Editable text);
+
+	/**
+	 * Redo the undo
+	 * @param text the editable object on which the undo is done
+	 * @return the caret position after the undo
+	 */
+	int redo(Editable text);
+
+	/**
+	 * Method is deprecated, you should use the canMergeXXX methods instead
+	 * 
+	 * @return the caret position after this change
+	 */
+	@Deprecated
+	int getCaret();
+
+	/**
+	 * Method is deprecated, you should use the canMergeXXX methods instead
+	 * 
+	 * @param sequence
+	 *            the sequence being appended to this {@link TextChange}
+	 */
+	@Deprecated
+	void append(CharSequence sequence);
+
+	/**
+	 * A change to the text {@linkplain s} will be made, where the
+	 * {@linkplain count} characters starting at {@linkplain start} will be
+	 * replaced by {@linkplain after} characters
+	 * 
+	 * If possible, this change is merged in this {@link TextChange}
+	 * 
+	 * @param s
+	 *            the sequence being changed
+	 * @param start
+	 *            the start index
+	 * @param count
+	 *            the number of characters that will change
+	 * @param after
+	 *            the number of characters that will replace the old ones
+	 * @return if the change can be merged with this {@link TextChange}
+	 */
+	boolean canMergeChangeBefore(CharSequence s, int start, int count,
+								 int after);
+
+	/**
+	 * A change to the text {@linkplain s} has been made, where the
+	 * {@linkplain count} characters starting at {@linkplain start} have
+	 * replaced the substring of length {@linkplain before}
+	 * 
+	 * If possible, this change is merged in this {@link TextChange}
+	 * 
+	 * @param s
+	 *            the sequence being changed
+	 * @param start
+	 *            the start index
+	 * @param before
+	 *            the number of character that were replaced
+	 * @param count
+	 *            the number of characters that will change
+	 * @return if the change can be merged with this {@link TextChange}
+	 */
+	boolean canMergeChangeAfter(CharSequence s, int start, int before,
+								int count);
+
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/undo/TextChangeDelete.java b/qpython/src/main/java/org/qpython/qpy/texteditor/undo/TextChangeDelete.java
new file mode 100644
index 00000000..80de2ea8
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/undo/TextChangeDelete.java
@@ -0,0 +1,77 @@
+package org.qpython.qpy.texteditor.undo;
+
+import android.text.Editable;
+import android.util.Log;
+
+import org.qpython.qpy.BuildConfig;
+
+public class TextChangeDelete implements TextChange {
+
+    private StringBuffer mSequence;
+    private int          mStart;
+
+    /**
+     * @param seq   the sequence being deleted
+     * @param start the start index
+     */
+    TextChangeDelete(CharSequence seq, int start) {
+        mSequence = new StringBuffer();
+        mSequence.append(seq);
+        mStart = start;
+    }
+
+    @Override
+    public int undo(Editable s) {
+        s.insert(mStart, mSequence);
+        return mStart + mSequence.length();
+    }
+
+    @Override
+    public int redo(Editable text) {
+        text.replace(mStart, mStart + mSequence.length(), "");
+        return mStart;
+    }
+
+    @Override
+    public int getCaret() {
+        if (mSequence.toString().contains(" "))
+            return -1;
+        if (mSequence.toString().contains("\n"))
+            return -1;
+        return mStart;
+    }
+
+    @Override
+    public void append(CharSequence seq) {
+        mSequence.insert(0, seq);
+        if (BuildConfig.DEBUG)
+            Log.d(TAG, mSequence.toString());
+        mStart -= seq.length();
+    }
+
+    @Override
+    public boolean canMergeChangeBefore(CharSequence s, int start, int count, int after) {
+        CharSequence sub;
+        if (mSequence.toString().contains(" "))
+            return false;
+        if (mSequence.toString().contains("\n"))
+            return false;
+        if ((count != 1) || (start + count != mStart))
+            return false;
+
+        sub = s.subSequence(start, start + count);
+        append(sub);
+        return true;
+    }
+
+    @Override
+    public boolean canMergeChangeAfter(CharSequence s, int start, int before, int count) {
+        return false;
+    }
+
+    @Override
+    public String toString() {
+        return "-\"" + mSequence.toString().replaceAll("\n", "~") + "\" @" + mStart;
+    }
+
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/undo/TextChangeInsert.java b/qpython/src/main/java/org/qpython/qpy/texteditor/undo/TextChangeInsert.java
new file mode 100644
index 00000000..7c6becdd
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/undo/TextChangeInsert.java
@@ -0,0 +1,110 @@
+package org.qpython.qpy.texteditor.undo;
+
+import android.text.Editable;
+import android.util.Log;
+
+import org.qpython.qpy.BuildConfig;
+
+public class TextChangeInsert implements TextChange {
+
+	private StringBuffer mSequence;
+	private int          mStart;
+
+	TextChangeInsert(CharSequence seq, int start) {
+		mSequence = new StringBuffer();
+		mSequence.append(seq);
+		mStart = start;
+	}
+
+	@Override
+	public int getCaret() {
+		if (mSequence.toString().contains(" "))
+			return -1;
+		if (mSequence.toString().contains("\n"))
+			return -1;
+		return mStart + mSequence.length();
+	}
+
+	@Override
+	public void append(CharSequence seq) {
+		mSequence.append(seq);
+	}
+
+	@Override
+	public boolean canMergeChangeBefore(CharSequence s, int start, int count, int after) {
+
+		CharSequence sub;
+		boolean append, replace;
+
+		if (mSequence.toString().contains(" "))
+			return false;
+		if (mSequence.toString().contains("\n"))
+			return false;
+
+		sub = s.subSequence(start, start + count);
+		append = (start == mStart + mSequence.length());
+		replace = (start == mStart) && (after >= mSequence.length())
+				&& (sub.toString().startsWith(mSequence.toString()));
+
+		if (append) {
+			// mSequence.append(sub);
+			return true;
+		}
+
+		if (replace) {
+			// mSequence = new StringBuffer();
+			// mSequence.append(sub);
+			return true;
+		}
+		return false;
+	}
+
+	@Override
+	public boolean canMergeChangeAfter(CharSequence s, int start, int before, int count) {
+		CharSequence sub;
+		boolean append, replace;
+
+		if (mSequence.toString().contains(" "))
+			return false;
+		if (mSequence.toString().contains("\n"))
+			return false;
+
+		sub = s.subSequence(start, start + count);
+		append = (start == mStart + mSequence.length());
+		replace = (start == mStart) && (count >= mSequence.length())
+				&& (sub.toString().startsWith(mSequence.toString()));
+
+		if (append) {
+			mSequence.append(sub);
+			return true;
+		}
+
+		if (replace) {
+			mSequence = new StringBuffer();
+			mSequence.append(sub);
+			return true;
+		}
+
+		return false;
+	}
+
+	@Override
+	public int undo(Editable s) {
+		if (BuildConfig.DEBUG)
+			Log.i(TAG, "Undo Insert : deleting " + mStart + " to " + (mStart + mSequence.length()));
+		s.replace(mStart, mStart + mSequence.length(), "");
+		return mStart;
+	}
+
+	@Override
+	public int redo(Editable text) {
+		text.insert(mStart, mSequence);
+		return mStart + mSequence.length();
+	}
+
+	@Override
+	public String toString() {
+		return "+\"" + mSequence.toString().replaceAll("\n", "~") + "\" @" + mStart;
+	}
+
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/undo/TextChangeWatcher.java b/qpython/src/main/java/org/qpython/qpy/texteditor/undo/TextChangeWatcher.java
new file mode 100644
index 00000000..33e40ce4
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/undo/TextChangeWatcher.java
@@ -0,0 +1,183 @@
+package org.qpython.qpy.texteditor.undo;
+
+import android.text.Editable;
+import android.util.Log;
+
+import org.qpython.qpy.BuildConfig;
+import org.qpython.qpy.texteditor.common.Constants;
+import org.qpython.qpy.texteditor.common.Settings;
+
+import java.util.Stack;
+
+public class TextChangeWatcher implements Constants {
+
+    private final Stack<TextChange> history;
+    private final Stack<TextChange> future;
+    private boolean isRedo = false;
+
+    private TextChange mCurrentChange;
+
+    /**
+     *
+     */
+    public TextChangeWatcher() {
+        history = new Stack<>();
+        future = new Stack<>();
+    }
+
+    /**
+     * Undo the last operation
+     *
+     * @param text the text to undo on
+     * @return the caret position
+     */
+    public int undo(Editable text) {
+        pushCurrentChange();
+
+        if (history.size() == 0) {
+            if (BuildConfig.DEBUG)
+                Log.i(TAG, "Nothing to undo");
+            return -1;
+        }
+
+        TextChange change = history.pop();
+        future.push(change);
+        if (change != null)
+            return change.undo(text);
+        else if (BuildConfig.DEBUG)
+            Log.w(TAG, "Null change ?!");
+
+        return -1;
+    }
+
+    public int redo(Editable text) {
+        isRedo = true;
+        if (future.size() == 0) return -1;
+
+        TextChange change = future.pop();
+        if (change != null) {
+            return change.redo(text);
+        } else {
+            return -1;
+        }
+    }
+
+    /**
+     * A change to the text {@param s} will be made, where the
+     * {@param count} characters starting at {@param start} will be
+     * replaced by {@param after} characters
+     *
+     * @param s     the sequence being changed
+     * @param start the start index
+     * @param count the number of characters that will change
+     * @param after the number of characters that will replace the old ones
+     */
+    public void beforeChange(CharSequence s, int start, int count, int after) {
+        if ((mCurrentChange != null)
+                && (mCurrentChange.canMergeChangeBefore(s, start, count, after))) {
+        } else {
+            if (count == 0) {
+                // no existing character changed
+                // ignore, will be processed after
+            } else if (after == 0) {
+                // existing character replaced by none => delete
+                processDelete(s, start, count);
+            } else {
+                // n chars replaced by m other chars => replace
+                // replace is a delete AND an insert...
+                processDelete(s, start, count);
+            }
+        }
+    }
+
+    /**
+     * A change to the text {@param s} has been made, where the
+     * {@param count} characters starting at {@param start} have
+     * replaced the substring of length {@param before}
+     *
+     * @param s      the sequence being changed
+     * @param start  the start index
+     * @param before the number of character that were replaced
+     * @param count  the number of characters that will change
+     */
+    public void afterChange(CharSequence s, int start, int before, int count) {
+        if ((mCurrentChange != null)
+                && (mCurrentChange.canMergeChangeAfter(s, start, before, count))) {
+
+        } else {
+            if (before == 0) {
+                // 0 charactes replaced by count => insert
+                processInsert(s, start, count);
+            } else if (count == 0) {
+                // existing character replaced by none => delete, already done
+                // before
+            } else {
+                // n chars replaced by m other chars => replace
+                // replace is a delete AND an insert...
+                processInsert(s, start, count);
+            }
+        }
+        if (!isRedo) {
+            future.clear();
+        } else {
+            isRedo = false;
+        }
+        // printStack();
+    }
+
+    /**
+     * @param s     the sequence being modified
+     * @param start the first character index
+     * @param count the number of inserted text
+     */
+    public void processInsert(CharSequence s, int start, int count) {
+        CharSequence sub = s.subSequence(start, start + count);
+
+        if (mCurrentChange != null)
+            pushCurrentChange();
+
+        mCurrentChange = new TextChangeInsert(sub, start);
+    }
+
+    /**
+     * @param s     the sequence being modified
+     * @param start the first character index
+     * @param count the number of inserted text
+     */
+    public void processDelete(CharSequence s, int start, int count) {
+        CharSequence sub = s.subSequence(start, start + count);
+
+        if (mCurrentChange != null)
+            pushCurrentChange();
+
+        mCurrentChange = new TextChangeDelete(sub, start);
+    }
+
+    /**
+     * Pushes the current change on top of the stack
+     */
+    protected void pushCurrentChange() {
+        if (mCurrentChange == null)
+            return;
+
+        history.push(mCurrentChange);
+        while (history.size() > Settings.UNDO_MAX_STACK) {
+            history.remove(0);
+        }
+        mCurrentChange = null;
+    }
+
+    /**
+     * Prints the current stack
+     */
+    public void printStack() {
+        if (!BuildConfig.DEBUG)
+            return;
+        Log.i(TAG, "STACK");
+        for (TextChange change : history) {
+            Log.d(TAG, change.toString());
+        }
+        Log.d(TAG, "Current change : " + mCurrentChange.toString());
+    }
+
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/widget/crouton/AnimationsBuilder.java b/qpython/src/main/java/org/qpython/qpy/texteditor/widget/crouton/AnimationsBuilder.java
new file mode 100644
index 00000000..1ec27c23
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/widget/crouton/AnimationsBuilder.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2012 Benjamin Weiss
+ * Copyright 2012 Neofonie Mobile GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.qpython.qpy.texteditor.widget.crouton;
+
+import android.view.animation.Animation;
+import android.view.animation.TranslateAnimation;
+
+final class AnimationsBuilder {
+
+  private static Animation slideInDownAnimation, slideOutUpAnimation;
+
+  private AnimationsBuilder() {
+  }
+
+  public static Animation buildSlideInDownAnimation() {
+    if (slideInDownAnimation == null) {
+      slideInDownAnimation = new TranslateAnimation(SlideInDownAnimationParameters.FROM_X_DELTA, SlideInDownAnimationParameters.TO_X_DELTA,
+          SlideInDownAnimationParameters.FROM_Y_DELTA, SlideInDownAnimationParameters.TO_Y_DELTA);
+      slideInDownAnimation.setDuration(SlideInDownAnimationParameters.DURATION);
+    }
+
+    return slideInDownAnimation;
+  }
+
+  public static Animation buildSlideOutUpAnimation() {
+    if (slideOutUpAnimation == null) {
+      slideOutUpAnimation = new TranslateAnimation(SlideOutUpAnimationParameters.FROM_X_DELTA, SlideOutUpAnimationParameters.TO_X_DELTA,
+          SlideOutUpAnimationParameters.FROM_Y_DELTA, SlideOutUpAnimationParameters.TO_Y_DELTA);
+      slideOutUpAnimation.setDuration(SlideOutUpAnimationParameters.DURATION);
+    }
+    return slideOutUpAnimation;
+  }
+
+  private static final class SlideInDownAnimationParameters {
+    public static final float FROM_X_DELTA = 0;
+    public static final float TO_X_DELTA = 0;
+    public static final float FROM_Y_DELTA = -50;
+    public static final float TO_Y_DELTA = 0;
+    public static final long DURATION = 400;
+
+    private SlideInDownAnimationParameters() {
+    }
+  }
+
+  private static final class SlideOutUpAnimationParameters {
+    public static final float FROM_X_DELTA = 0;
+    public static final float TO_X_DELTA = 0;
+    public static final float FROM_Y_DELTA = 0;
+    public static final float TO_Y_DELTA = -50;
+    public static final long DURATION = 400;
+
+    private SlideOutUpAnimationParameters() {
+    }
+  }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/widget/crouton/Crouton.java b/qpython/src/main/java/org/qpython/qpy/texteditor/widget/crouton/Crouton.java
new file mode 100644
index 00000000..8b4754e0
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/widget/crouton/Crouton.java
@@ -0,0 +1,456 @@
+/*
+ * Copyright 2012 Benjamin Weiss
+ * Copyright 2012 Neofonie Mobile GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.qpython.qpy.texteditor.widget.crouton;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Shader;
+import android.graphics.Typeface;
+import android.graphics.drawable.BitmapDrawable;
+import android.util.TypedValue;
+import android.view.View;
+import android.view.animation.Animation;
+import android.view.animation.AnimationUtils;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+import android.widget.Toast;
+
+/*
+ * Based on an article by Cyril Mottier (http://android.cyrilmottier.com/?p=773) <br>
+ */
+
+/**
+ * Displays information in a non-invasive context related manner. Like
+ * {@link Toast}, but better.
+ * <p/>
+ * Call {@link Manager#clearCroutonsForActivity(Activity)} within your
+ * Activitie's onDestroy method to avoid {@link Context} leaks.
+ * 
+ */
+public final class Crouton {
+	private static final int IMAGE_ID = 0x100;
+	private static final int TEXT_ID = 0x101;
+	private final CharSequence text;
+	private final Style style;
+	private final View customView;
+
+	private Activity activity;
+	private FrameLayout croutonView;
+	private Animation inAnimation;
+	private Animation outAnimation;
+
+	/**
+	 * Creates the {@link Crouton}.
+	 *
+	 * @param activity
+	 *            The {@link Activity} that the {@link Crouton} should be
+	 *            attached to.
+	 * @param text
+	 *            The text you want to display.
+	 * @param style
+	 *            The style that this {@link Crouton} should be created with.
+	 */
+	private Crouton(Activity activity, CharSequence text, Style style) {
+		if ((activity == null) || (text == null) || (style == null)) {
+			throw new IllegalArgumentException(
+					"Null parameters are not accepted");
+		}
+
+		this.activity = activity;
+		this.text = text;
+		this.style = style;
+		this.customView = null;
+	}
+
+	/**
+	 * Creates the {@link Crouton}.
+	 *
+	 * @param activity
+	 *            The {@link Activity} that the {@link Crouton} should be
+	 *            attached to.
+	 * @param customView
+	 *            The custom {@link View} to display
+	 */
+	private Crouton(Activity activity, View customView) {
+		if ((activity == null) || (customView == null)) {
+			throw new IllegalArgumentException(
+					"Null parameters are not accepted");
+		}
+
+		this.activity = activity;
+		this.customView = customView;
+		this.style = new Style.Builder().build();
+		this.text = null;
+	}
+
+	/**
+	 * Creates a {@link Crouton} with provided text and style for a given
+	 * activity.
+	 *
+	 * @param activity
+	 *            The {@link Activity} that the {@link Crouton} should be
+	 *            attached to.
+	 * @param text
+	 *            The text you want to display.
+	 * @param style
+	 *            The style that this {@link Crouton} should be created with.
+	 * @return The created {@link Crouton}.
+	 */
+	public static Crouton makeText(Activity activity, CharSequence text,
+			Style style) {
+		return new Crouton(activity, text, style);
+	}
+
+	/**
+	 * Creates a {@link Crouton} with provided text-resource and style for a
+	 * given activity.
+	 *
+	 * @param activity
+	 *            The {@link Activity} that the {@link Crouton} should be
+	 *            attached to.
+	 * @param textResourceId
+	 *            The resource id of the text you want to display.
+	 * @param style
+	 *            The style that this {@link Crouton} should be created with.
+	 * @return The created {@link Crouton}.
+	 */
+	public static Crouton makeText(Activity activity, int textResourceId,
+			Style style) {
+		return makeText(activity, activity.getString(textResourceId), style);
+	}
+
+	/**
+	 * Creates a {@link Crouton} with provided text-resource and style for a
+	 * given activity.
+	 *
+	 * @param activity
+	 *            The {@link Activity} that the {@link Crouton} should be
+	 *            attached to.
+	 * @param customView
+	 *            The custom {@link View} to display
+	 * @return The created {@link Crouton}.
+	 */
+	public static Crouton make(Activity activity, View customView) {
+		return new Crouton(activity, customView);
+	}
+
+	/**
+	 * Creates a {@link Crouton} with provided text and style for a given
+	 * activity and displays it directly.
+	 *
+	 * @param activity
+	 *            The {@link android.app.Activity} that the {@link Crouton}
+	 *            should be attached to.
+	 * @param text
+	 *            The text you want to display.
+	 * @param style
+	 *            The style that this {@link Crouton} should be created with.
+	 *
+	 */
+	public static void showText(Activity activity, CharSequence text,
+			Style style) {
+		makeText(activity, text, style).show();
+	}
+
+	/**
+	 * Creates a {@link Crouton} with provided text and style for a given
+	 * activity and displays it directly.
+	 *
+	 * @param activity
+	 *            The {@link android.app.Activity} that the {@link Crouton}
+	 *            should be attached to.
+	 * @param customView
+	 *            The custom {@link View} to display
+	 *
+	 */
+	public static void show(Activity activity, View customView) {
+		make(activity, customView).show();
+	}
+
+	/**
+	 * Creates a {@link Crouton} with provided text-resource and style for a
+	 * given activity and displays it directly.
+	 *
+	 * @param activity
+	 *            The {@link Activity} that the {@link Crouton} should be
+	 *            attached to.
+	 * @param textResourceId
+	 *            The resource id of the text you want to display.
+	 * @param style
+	 *            The style that this {@link Crouton} should be created with.
+	 *
+	 */
+	public static void showText(Activity activity, int textResourceId,
+			Style style) {
+		showText(activity, activity.getString(textResourceId), style);
+	}
+
+	/**
+	 * Cancels all queued {@link Crouton}s. If there is a {@link Crouton}
+	 * displayed currently, it will be the last one displayed.
+	 */
+	public static void cancelAllCroutons() {
+		Manager.getInstance().clearCroutonQueue();
+	}
+
+	/**
+	 * Clears (and removes from {@link Activity}'s content view, if necessary)
+	 * all croutons for the provided activity
+	 *
+	 * @param activity
+	 *            - The {@link} Activity to clear the croutons for
+	 */
+	public static void clearCroutonsForActivity(Activity activity) {
+		Manager.getInstance().clearCroutonsForActivity(activity);
+	}
+
+	/**
+	 * Cancels a {@link Crouton} immediately.
+	 */
+	public void cancel() {
+		Manager manager = Manager.getInstance();
+		manager.removeCroutonImmediately(this);
+	}
+
+	/**
+	 * Displays the {@link Crouton}. If there's another {@link Crouton} visible
+	 * at the time, this {@link Crouton} will be displayed afterwards.
+	 */
+	public void show() {
+		Manager.getInstance().add(this);
+	}
+
+	/**
+	 * @return <code>true</code> if the {@link Crouton} is being displayed, else
+	 *         <code>false</code>.
+	 */
+	boolean isShowing() {
+		return (activity != null) && (croutonView != null)
+				&& (croutonView.getParent() != null);
+	}
+
+	/**
+	 * Removes the activity reference this {@link Crouton} is holding
+	 */
+	void detachActivity() {
+		activity = null;
+	}
+
+	/**
+	 * @return the style
+	 */
+	Style getStyle() {
+		return style;
+	}
+
+	/**
+	 * @return the activity
+	 */
+	Activity getActivity() {
+		return activity;
+	}
+
+	/**
+	 * @return the text
+	 */
+	CharSequence getText() {
+		return text;
+	}
+
+	/**
+	 * @return the view
+	 */
+	View getView() {
+		// return the custom view if one exists
+		if (this.customView != null) {
+			return this.customView;
+		}
+
+		// if already setup return the view
+		if (this.croutonView == null) {
+			initializeCroutonView();
+		}
+
+		return croutonView;
+	}
+
+	@SuppressWarnings("deprecation")
+	private void initializeCroutonView() {
+		Resources resources = this.activity.getResources();
+
+		// create outer frame
+		this.croutonView = new FrameLayout(this.activity);
+
+		int height = this.style.heightInPixels;
+
+		// if a height dimension has been set, this will overwrite any height in
+		// pixels
+		if (this.style.heightDimensionResId > 0) {
+			height = resources
+					.getDimensionPixelSize(this.style.heightDimensionResId);
+		}
+		this.croutonView.setLayoutParams(new FrameLayout.LayoutParams(
+				FrameLayout.LayoutParams.MATCH_PARENT, height));
+
+		// set background
+		if (this.style.backgroundColorValue != -1) {
+			this.croutonView
+					.setBackgroundColor(this.style.backgroundColorValue);
+		} else {
+			this.croutonView.setBackgroundColor(resources
+					.getColor(this.style.backgroundColorResourceId));
+		}
+
+		// set the background drawable if set. This will override the background
+		// color.
+		if (this.style.backgroundDrawableResourceId != 0) {
+			Bitmap background = BitmapFactory.decodeResource(resources,
+					this.style.backgroundDrawableResourceId);
+			BitmapDrawable drawable = new BitmapDrawable(resources, background);
+			if (this.style.isTileEnabled) {
+				drawable.setTileModeXY(Shader.TileMode.REPEAT,
+						Shader.TileMode.REPEAT);
+			}
+			this.croutonView.setBackgroundDrawable(drawable);
+		}
+
+		// create content view
+		RelativeLayout contentView = new RelativeLayout(this.activity);
+		contentView.setLayoutParams(new RelativeLayout.LayoutParams(
+				RelativeLayout.LayoutParams.MATCH_PARENT,
+				RelativeLayout.LayoutParams.WRAP_CONTENT));
+
+		// set padding
+		int padding = this.style.paddingInPixels;
+
+		// if a padding dimension has been set, this will overwrite any padding
+		// in pixels
+		if (this.style.paddingDimensionResId > 0) {
+			padding = resources
+					.getDimensionPixelSize(this.style.paddingDimensionResId);
+		}
+		contentView.setPadding(padding, padding, padding, padding);
+
+		// only setup image if one is requested
+		ImageView image = null;
+		if ((this.style.imageDrawable != null) || (this.style.imageResId != 0)) {
+			image = new ImageView(this.activity);
+			image.setId(IMAGE_ID);
+			image.setAdjustViewBounds(true);
+			image.setScaleType(this.style.imageScaleType);
+
+			// set the image drawable if not null
+			if (this.style.imageDrawable != null) {
+				image.setImageDrawable(this.style.imageDrawable);
+			}
+
+			// set the image resource if not 0. This will overwrite the drawable
+			// if both are set
+			if (this.style.imageResId != 0) {
+				image.setImageResource(this.style.imageResId);
+			}
+
+			RelativeLayout.LayoutParams imageParams = new RelativeLayout.LayoutParams(
+					RelativeLayout.LayoutParams.WRAP_CONTENT,
+					RelativeLayout.LayoutParams.WRAP_CONTENT);
+			imageParams.addRule(RelativeLayout.ALIGN_PARENT_LEFT,
+					RelativeLayout.TRUE);
+			imageParams.addRule(RelativeLayout.CENTER_VERTICAL,
+					RelativeLayout.TRUE);
+			contentView.addView(image, imageParams);
+		}
+
+		TextView text = new TextView(this.activity);
+		text.setId(TEXT_ID);
+		text.setText(this.text);
+		text.setTypeface(Typeface.DEFAULT);
+		text.setGravity(this.style.gravity);
+
+		// set the text color if set
+		if (this.style.textColorResourceId != 0) {
+			text.setTextColor(resources
+					.getColor(this.style.textColorResourceId));
+		}
+
+		// Set the text size. If the user has set a text size and text
+		// appearance, the text size in the text appearance
+		// will override this.
+		if (this.style.textSize != 0) {
+			text.setTextSize(TypedValue.COMPLEX_UNIT_SP, this.style.textSize);
+		}
+
+		// Setup the shadow if requested
+		if (this.style.textShadowColorResId != 0) {
+			int textShadowColor = resources
+					.getColor(this.style.textShadowColorResId);
+			float textShadowRadius = this.style.textShadowRadius;
+			float textShadowDx = this.style.textShadowDx;
+			float textShadowDy = this.style.textShadowDy;
+			text.setShadowLayer(textShadowRadius, textShadowDx, textShadowDy,
+					textShadowColor);
+		}
+
+		// Set the text appearance
+		if (this.style.textAppearanceResId != 0) {
+			text.setTextAppearance(this.activity,
+					this.style.textAppearanceResId);
+		}
+
+		RelativeLayout.LayoutParams textParams = new RelativeLayout.LayoutParams(
+				RelativeLayout.LayoutParams.MATCH_PARENT,
+				RelativeLayout.LayoutParams.WRAP_CONTENT);
+		if (image != null) {
+			textParams.addRule(RelativeLayout.RIGHT_OF, image.getId());
+		}
+		contentView.addView(text, textParams);
+		this.croutonView.addView(contentView);
+	}
+
+	public Animation getInAnimation() {
+		if ((this.inAnimation == null) && (this.activity != null)) {
+			if (getStyle().inAnimationResId > 0) {
+				this.inAnimation = AnimationUtils.loadAnimation(getActivity(),
+						getStyle().inAnimationResId);
+			} else {
+				this.inAnimation = AnimationsBuilder
+						.buildSlideInDownAnimation();
+			}
+		}
+
+		return inAnimation;
+	}
+
+	public Animation getOutAnimation() {
+		if ((this.outAnimation == null) && (this.activity != null)) {
+			if (getStyle().outAnimationResId > 0) {
+				this.outAnimation = AnimationUtils.loadAnimation(getActivity(),
+						getStyle().outAnimationResId);
+			} else {
+				this.outAnimation = AnimationsBuilder
+						.buildSlideOutUpAnimation();
+			}
+		}
+
+		return outAnimation;
+	}
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/widget/crouton/Manager.java b/qpython/src/main/java/org/qpython/qpy/texteditor/widget/crouton/Manager.java
new file mode 100644
index 00000000..5dfe66c0
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/widget/crouton/Manager.java
@@ -0,0 +1,306 @@
+/*
+ * Copyright 2012 Benjamin Weiss
+ * Copyright 2012 Neofonie Mobile GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.qpython.qpy.texteditor.widget.crouton;
+
+import java.util.Iterator;
+import java.util.Queue;
+import java.util.concurrent.LinkedBlockingQueue;
+
+import android.app.Activity;
+import android.os.Handler;
+import android.os.Message;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewParent;
+
+/**
+ * Manages the lifecycle of {@link Crouton}s.
+ */
+final class Manager extends Handler {
+
+  private static Manager INSTANCE;
+  private Queue<Crouton> croutonQueue;
+
+  private Manager() {
+    croutonQueue = new LinkedBlockingQueue<Crouton>();
+  }
+
+  /**
+   * @return The currently used instance of the {@link Manager}.
+   */
+  static synchronized Manager getInstance() {
+    if (INSTANCE == null) {
+      INSTANCE = new Manager();
+    }
+
+    return INSTANCE;
+  }
+
+  /**
+   * Inserts a {@link Crouton} to be displayed.
+   *
+   * @param crouton
+   *          The {@link Crouton} to be displayed.
+   */
+  void add(Crouton crouton) {
+    croutonQueue.add(crouton);
+    displayCrouton();
+  }
+
+  /**
+   * Displays the next {@link Crouton} within the queue.
+   */
+  private void displayCrouton() {
+    if (croutonQueue.isEmpty()) {
+      return;
+    }
+
+    // First peek whether the Crouton has an activity.
+    final Crouton currentCrouton = croutonQueue.peek();
+
+    // If the activity is null we poll the Crouton off the queue.
+    if (currentCrouton.getActivity() == null) {
+      croutonQueue.poll();
+    }
+
+    if (!currentCrouton.isShowing()) {
+      // Display the Crouton
+      sendMessage(currentCrouton, Messages.ADD_CROUTON_TO_VIEW);
+    } else {
+      sendMessageDelayed(currentCrouton, Messages.DISPLAY_CROUTON, calculateCroutonDuration(currentCrouton));
+    }
+  }
+
+  private long calculateCroutonDuration(Crouton crouton) {
+    long croutonDuration = 0;
+    croutonDuration += crouton.getStyle().durationInMilliseconds;
+    croutonDuration += crouton.getInAnimation().getDuration();
+    croutonDuration += crouton.getOutAnimation().getDuration();
+    return croutonDuration;
+  }
+
+  /**
+   * Sends a {@link Crouton} within a {@link Message}.
+   *
+   * @param crouton
+   *          The {@link Crouton} that should be sent.
+   * @param messageId
+   *          The {@link Message} id.
+   */
+  private void sendMessage(Crouton crouton, final int messageId) {
+    final Message message = obtainMessage(messageId);
+    message.obj = crouton;
+    sendMessage(message);
+  }
+
+  /**
+   * Sends a {@link Crouton} within a delayed {@link Message}.
+   *
+   * @param crouton
+   *          The {@link Crouton} that should be sent.
+   * @param messageId
+   *          The {@link Message} id.
+   * @param delay
+   *          The delay in milliseconds.
+   */
+  private void sendMessageDelayed(Crouton crouton, final int messageId, final long delay) {
+    Message message = obtainMessage(messageId);
+    message.obj = crouton;
+    sendMessageDelayed(message, delay);
+  }
+
+  /*
+   * (non-Javadoc)
+   *
+   * @see android.os.Handler#handleMessage(android.os.Message)
+   */
+  @Override
+  public void handleMessage(Message message) {
+    final Crouton crouton = (Crouton) message.obj;
+
+    switch (message.what) {
+      case Messages.DISPLAY_CROUTON : {
+        displayCrouton();
+        break;
+      }
+
+      case Messages.ADD_CROUTON_TO_VIEW : {
+        addCroutonToView(crouton);
+        break;
+      }
+
+      case Messages.REMOVE_CROUTON : {
+        removeCrouton(crouton);
+        break;
+      }
+
+      default : {
+        super.handleMessage(message);
+        break;
+      }
+    }
+  }
+
+  /**
+   * Adds a {@link Crouton} to the {@link ViewParent} of it's {@link Activity}.
+   *
+   * @param crouton
+   *          The {@link Crouton} that should be added.
+   */
+  private void addCroutonToView(Crouton crouton) {
+    // don't add if it is already showing
+    if (crouton.isShowing()) {
+      return;
+    }
+
+    View croutonView = crouton.getView();
+    if (croutonView.getParent() == null) {
+      ViewGroup.LayoutParams params = croutonView.getLayoutParams();
+      if (params == null) {
+        params = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+      }
+      crouton.getActivity().addContentView(croutonView, params);
+    }
+    croutonView.startAnimation(crouton.getInAnimation());
+    sendMessageDelayed(crouton, Messages.REMOVE_CROUTON, crouton.getStyle().durationInMilliseconds + +crouton.getInAnimation().getDuration());
+  }
+
+  /**
+   * Removes the {@link Crouton}'s view after it's display
+   * durationInMilliseconds.
+   *
+   * @param crouton
+   *          The {@link Crouton} added to a {@link ViewGroup} and should be
+   *          removed.
+   */
+  private void removeCrouton(Crouton crouton) {
+    View croutonView = crouton.getView();
+    ViewGroup croutonParentView = (ViewGroup) croutonView.getParent();
+
+    if (croutonParentView != null) {
+      croutonView.startAnimation(crouton.getOutAnimation());
+
+      // Remove the Crouton from the queue.
+      Crouton removed = croutonQueue.poll();
+
+      // Remove the crouton from the view's parent.
+      croutonParentView.removeView(croutonView);
+      if (removed != null) {
+        removed.detachActivity();
+      }
+
+      // Send a message to display the next crouton but delay it by the out
+      // animation duration to make sure it finishes
+      sendMessageDelayed(crouton, Messages.DISPLAY_CROUTON, crouton.getOutAnimation().getDuration());
+    }
+  }
+
+  /**
+   * Removes a {@link Crouton} immediately, even when it's currently being
+   * displayed.
+   *
+   * @param crouton
+   *          The {@link Crouton} that should be removed.
+   */
+  void removeCroutonImmediately(Crouton crouton) {
+    if (croutonQueue != null) {
+      final Iterator<Crouton> croutonIterator = croutonQueue.iterator();
+      while (croutonIterator.hasNext()) {
+        final Crouton c = croutonIterator.next();
+        if (c.equals(crouton) && (c.getActivity() != null)) {
+          // remove the crouton from the content view
+          if (crouton.isShowing()) {
+            ((ViewGroup) c.getView().getParent()).removeView(c.getView());
+          }
+
+          // remove any messages pending for the crouton
+          removeAllMessagesForCrouton(c);
+
+          // remove the crouton from the queue
+          croutonIterator.remove();
+
+          // we have found our crouton so just break
+          break;
+        }
+      }
+    }
+  }
+
+  /**
+   * Removes all {@link Crouton}s from the queue.
+   */
+  void clearCroutonQueue() {
+    removeAllMessages();
+
+    if (croutonQueue != null) {
+      // remove any views that may already have been added to the activity's
+      // content view
+      for (Crouton crouton : croutonQueue) {
+        if (crouton.isShowing()) {
+          ((ViewGroup) crouton.getView().getParent()).removeView(crouton.getView());
+        }
+      }
+      croutonQueue.clear();
+    }
+  }
+
+  /**
+   * Removes all {@link Crouton}s for the provided activity. This will remove
+   * crouton from {@link Activity}s content view immediately.
+   */
+  void clearCroutonsForActivity(Activity activity) {
+    if (croutonQueue != null) {
+      Iterator<Crouton> croutonIterator = croutonQueue.iterator();
+      while (croutonIterator.hasNext()) {
+        Crouton crouton = croutonIterator.next();
+        if ((crouton.getActivity() != null) && crouton.getActivity().equals(activity)) {
+          // remove the crouton from the content view
+          if (crouton.isShowing()) {
+            ((ViewGroup) crouton.getView().getParent()).removeView(crouton.getView());
+          }
+
+          removeAllMessagesForCrouton(crouton);
+
+          // remove the crouton from the queue
+          croutonIterator.remove();
+        }
+      }
+    }
+  }
+
+  private void removeAllMessages() {
+    removeMessages(Messages.ADD_CROUTON_TO_VIEW);
+    removeMessages(Messages.DISPLAY_CROUTON);
+    removeMessages(Messages.REMOVE_CROUTON);
+  }
+
+  private void removeAllMessagesForCrouton(Crouton crouton) {
+    removeMessages(Messages.ADD_CROUTON_TO_VIEW, crouton);
+    removeMessages(Messages.DISPLAY_CROUTON, crouton);
+    removeMessages(Messages.REMOVE_CROUTON, crouton);
+
+  }
+
+  private static final class Messages {
+    public static final int DISPLAY_CROUTON = 0xc2007;
+    public static final int ADD_CROUTON_TO_VIEW = 0xc20074dd;
+    public static final int REMOVE_CROUTON = 0xc2007de1;
+    private Messages() { /* noop */
+    }
+  }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/widget/crouton/Style.java b/qpython/src/main/java/org/qpython/qpy/texteditor/widget/crouton/Style.java
new file mode 100644
index 00000000..aa9d8a0e
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/widget/crouton/Style.java
@@ -0,0 +1,487 @@
+/*
+ * Copyright 2012 Benjamin Weiss
+ * Copyright 2012 Neofonie Mobile GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.qpython.qpy.texteditor.widget.crouton;
+
+import android.graphics.drawable.Drawable;
+import android.view.Gravity;
+import android.view.ViewGroup;
+import android.view.ViewGroup.LayoutParams;
+import android.widget.ImageView;
+
+/**
+ * The style for a {@link Crouton}.
+ */
+
+public class Style {
+	public static final Style ALERT;
+	public static final Style CONFIRM;
+	public static final Style INFO;
+
+	public static final int holoRedLight = 0xffeccd00;
+	public static final int holoGreenLight = 0xff4bac07;
+	public static final int holoBlueLight = 0xffeccd00;
+
+	static {
+		ALERT = new Builder().setDuration(3500)
+				.setBackgroundColorValue(holoRedLight)
+				.setHeight(LayoutParams.WRAP_CONTENT).build();
+		CONFIRM = new Builder().setDuration(2000)
+				.setBackgroundColorValue(holoBlueLight)
+				.setHeight(LayoutParams.WRAP_CONTENT).build();
+		INFO = new Builder().setDuration(2000)
+				.setBackgroundColorValue(holoGreenLight)
+				.setHeight(LayoutParams.WRAP_CONTENT).build();
+	}
+
+	/**
+	 * The durationInMilliseconds the {@link Crouton} will be displayed in
+	 * milliseconds.
+	 */
+	final int durationInMilliseconds;
+
+	/**
+	 * The resource id of the backgroundResourceId.
+	 * <p/>
+	 * 0 for no backgroundResourceId.
+	 */
+	final int backgroundColorResourceId;
+
+	/**
+	 * The resource id of the backgroundDrawableResourceId.
+	 * <p/>
+	 * 0 for no backgroundDrawableResourceId.
+	 */
+	final int backgroundDrawableResourceId;
+
+	/**
+	 * The backgroundColorResourceValue's e.g. 0xffff4444;
+	 * <p/>
+	 * -1 for no value.
+	 */
+	final int backgroundColorValue;
+
+	/**
+	 * Whether we should isTileEnabled the backgroundResourceId or not.
+	 */
+	final boolean isTileEnabled;
+
+	/**
+	 * The text colorResourceId's resource id.
+	 * <p/>
+	 * 0 sets the text colorResourceId to the system theme default.
+	 */
+	final int textColorResourceId;
+
+	/**
+	 * The height of the {@link Crouton} in pixels.
+	 */
+	final int heightInPixels;
+
+	/**
+	 * Resource ID for the height of the {@link Crouton}.
+	 */
+	final int heightDimensionResId;
+
+	/**
+	 * The text's gravity as provided by {@link Gravity}.
+	 */
+	final int gravity;
+
+	/**
+	 * An additional image to display in the {@link Crouton}.
+	 */
+	final Drawable imageDrawable;
+
+	/**
+	 * An additional image to display in the {@link Crouton}.
+	 */
+	final int imageResId;
+
+	/**
+	 * The {@link ImageView.ScaleType} for the image to display in the
+	 * {@link Crouton}.
+	 */
+	final ImageView.ScaleType imageScaleType;
+
+	/**
+	 * The text size in sp
+	 * <p/>
+	 * 0 sets the text size to the system theme default
+	 */
+	final int textSize;
+
+	/**
+	 * The text shadow color's resource id
+	 */
+	final int textShadowColorResId;
+
+	/**
+	 * The text shadow radius
+	 */
+	final float textShadowRadius;
+
+	/**
+	 * The text shadow vertical offset
+	 */
+	final float textShadowDy;
+
+	/**
+	 * The text shadow horizontal offset
+	 */
+	final float textShadowDx;
+
+	/**
+	 * The text appearance resource id for the text.
+	 */
+	final int textAppearanceResId;
+
+	/**
+	 * The resource id for the in animation
+	 */
+	final int inAnimationResId;
+
+	/**
+	 * The resource id for the out animation
+	 */
+	final int outAnimationResId;
+
+	/**
+	 * The padding for the crouton view content in pixels
+	 */
+	final int paddingInPixels;
+
+	/**
+	 * The resource id for the padding for the view content
+	 */
+	final int paddingDimensionResId;
+
+	private Style(final Builder builder) {
+		this.durationInMilliseconds = builder.durationInMilliseconds;
+		this.backgroundColorResourceId = builder.backgroundColorResourceId;
+		this.backgroundDrawableResourceId = builder.backgroundDrawableResourceId;
+		this.isTileEnabled = builder.isTileEnabled;
+		this.textColorResourceId = builder.textColorResourceId;
+		this.heightInPixels = builder.heightInPixels;
+		this.heightDimensionResId = builder.heightDimensionResId;
+		this.gravity = builder.gravity;
+		this.imageDrawable = builder.imageDrawable;
+		this.textSize = builder.textSize;
+		this.textShadowColorResId = builder.textShadowColorResId;
+		this.textShadowRadius = builder.textShadowRadius;
+		this.textShadowDx = builder.textShadowDx;
+		this.textShadowDy = builder.textShadowDy;
+		this.textAppearanceResId = builder.textAppearanceResId;
+		this.inAnimationResId = builder.inAnimationResId;
+		this.outAnimationResId = builder.outAnimationResId;
+		this.imageResId = builder.imageResId;
+		this.imageScaleType = builder.imageScaleType;
+		this.paddingInPixels = builder.paddingInPixels;
+		this.paddingDimensionResId = builder.paddingDimensionResId;
+		this.backgroundColorValue = builder.backgroundColorValue;
+	}
+
+	/**
+	 * Builder for the {@link Style} object.
+	 */
+	public static class Builder {
+		private int durationInMilliseconds;
+		private int backgroundColorValue;
+		private int backgroundColorResourceId;
+		private int backgroundDrawableResourceId;
+		private boolean isTileEnabled;
+		private int textColorResourceId;
+		private int heightInPixels;
+		private int heightDimensionResId;
+		private int gravity;
+		private Drawable imageDrawable;
+		private int textSize;
+		private int textShadowColorResId;
+		private float textShadowRadius;
+		private float textShadowDx;
+		private float textShadowDy;
+		private int textAppearanceResId;
+		private int inAnimationResId;
+		private int outAnimationResId;
+		private int imageResId;
+		private ImageView.ScaleType imageScaleType;
+		private int paddingInPixels;
+		private int paddingDimensionResId;
+
+		public Builder() {
+			durationInMilliseconds = 2000;
+			heightInPixels = ViewGroup.LayoutParams.WRAP_CONTENT;
+			paddingInPixels = 40;
+			backgroundColorResourceId = android.R.color.holo_blue_light;
+			backgroundDrawableResourceId = 0;
+			backgroundColorValue = -1;
+			isTileEnabled = false;
+			textColorResourceId = android.R.color.white;
+			heightInPixels = ViewGroup.LayoutParams.WRAP_CONTENT;
+			gravity = Gravity.CENTER;
+			imageDrawable = null;
+			inAnimationResId = 0;
+			outAnimationResId = 0;
+			imageResId = 0;
+			textSize = 14;
+			imageScaleType = ImageView.ScaleType.FIT_XY;
+		}
+
+		/**
+		 * Set the durationInMilliseconds option of the {@link Crouton}.
+		 * 
+		 * @param duration
+		 *            The durationInMilliseconds the crouton will be displayed
+		 *            {@link Crouton} in milliseconds.
+		 * @return the {@link Builder}.
+		 */
+		public Builder setDuration(int duration) {
+			this.durationInMilliseconds = duration;
+
+			return this;
+		}
+
+		/**
+		 * Set the backgroundColorResourceId option of the {@link Crouton}.
+		 * 
+		 * @param backgroundColorResourceId
+		 *            The backgroundColorResourceId's resource id.
+		 * @return the {@link Builder}.
+		 */
+		public Builder setBackgroundColor(int backgroundColorResourceId) {
+			this.backgroundColorResourceId = backgroundColorResourceId;
+
+			return this;
+		}
+
+		/**
+		 * Set the backgroundColorResourceValue option of the {@link Crouton}.
+		 * 
+		 * @param backgroundColorResourceValue
+		 *            The backgroundColorResourceValue's e.g. 0xffff4444;
+		 * @return the {@link Builder}.
+		 */
+		public Builder setBackgroundColorValue(int backgroundColorValue) {
+			this.backgroundColorValue = backgroundColorValue;
+			return this;
+		}
+
+		/**
+		 * Set the backgroundDrawableResourceId option for the {@link Crouton}.
+		 * 
+		 * @param backgroundDrawableResourceId
+		 *            Resource ID of a backgroundDrawableResourceId image
+		 *            drawable.
+		 * @return the {@link Builder}.
+		 */
+		public Builder setBackgroundDrawable(int backgroundDrawableResourceId) {
+			this.backgroundDrawableResourceId = backgroundDrawableResourceId;
+
+			return this;
+		}
+
+		/**
+		 * Set the heightInPixels option for the {@link Crouton}.
+		 * 
+		 * @param height
+		 *            The height of the {@link Crouton} in pixel. Can also be
+		 *            {@link LayoutParams#MATCH_PARENT} or
+		 *            {@link LayoutParams#WRAP_CONTENT}.
+		 * @return the {@link Builder}.
+		 */
+		public Builder setHeight(int height) {
+			this.heightInPixels = height;
+
+			return this;
+		}
+
+		/**
+		 * Set the resource id for the height option for the {@link Crouton}.
+		 * 
+		 * @param heightDimensionResId
+		 *            Resource ID of a dimension for the height of the
+		 *            {@link Crouton} .
+		 * @return the {@link Builder}.
+		 */
+		public Builder setHeightDimensionResId(int heightDimensionResId) {
+			this.heightDimensionResId = heightDimensionResId;
+
+			return this;
+		}
+
+		/**
+		 * Set the isTileEnabled option for the {@link Crouton}.
+		 * 
+		 * @param isTileEnabled
+		 *            <code>true</code> if you want the backgroundResourceId to
+		 *            be tiled, else <code>false</code>.
+		 * @return the {@link Builder}.
+		 */
+		public Builder setTileEnabled(boolean isTileEnabled) {
+			this.isTileEnabled = isTileEnabled;
+
+			return this;
+		}
+
+		/**
+		 * Set the textColorResourceId option for the {@link Crouton}.
+		 * 
+		 * @param textColor
+		 *            The resource id of the text colorResourceId.
+		 * @return the {@link Builder}.
+		 */
+		public Builder setTextColor(int textColor) {
+			this.textColorResourceId = textColor;
+
+			return this;
+		}
+
+		/**
+		 * Set the gravity option for the {@link Crouton}.
+		 * 
+		 * @param gravity
+		 *            The text's gravity as provided by {@link Gravity}.
+		 * @return the {@link Builder}.
+		 */
+		public Builder setGravity(int gravity) {
+			this.gravity = gravity;
+
+			return this;
+		}
+
+		/**
+		 * Set the image option for the {@link Crouton}.
+		 * 
+		 * @param imageDrawable
+		 *            An additional image to display in the {@link Crouton}.
+		 * @return the {@link Builder}.
+		 */
+		public Builder setImageDrawable(Drawable imageDrawable) {
+			this.imageDrawable = imageDrawable;
+
+			return this;
+		}
+
+		/**
+		 * Set the image resource option for the {@link Crouton}.
+		 * 
+		 * @param imageResId
+		 *            An additional image to display in the {@link Crouton}.
+		 * @return the {@link Builder}.
+		 */
+		public Builder setImageResource(int imageResId) {
+			this.imageResId = imageResId;
+
+			return this;
+		}
+
+		/**
+		 * The text size in sp
+		 */
+		public Builder setTextSize(int textSize) {
+			this.textSize = textSize;
+			return this;
+		}
+
+		/**
+		 * The text shadow color's resource id
+		 */
+		public Builder setTextShadowColor(int textShadowColorResId) {
+			this.textShadowColorResId = textShadowColorResId;
+			return this;
+		}
+
+		/**
+		 * The text shadow radius
+		 */
+		public Builder setTextShadowRadius(float textShadowRadius) {
+			this.textShadowRadius = textShadowRadius;
+			return this;
+		}
+
+		/**
+		 * The text shadow horizontal offset
+		 */
+		public Builder setTextShadowDx(float textShadowDx) {
+			this.textShadowDx = textShadowDx;
+			return this;
+		}
+
+		/**
+		 * The text shadow vertical offset
+		 */
+		public Builder setTextShadowDy(float textShadowDy) {
+			this.textShadowDy = textShadowDy;
+			return this;
+		}
+
+		/**
+		 * The text appearance resource id for the text.
+		 */
+		public Builder setTextAppearance(int textAppearanceResId) {
+			this.textAppearanceResId = textAppearanceResId;
+			return this;
+		}
+
+		/**
+		 * The resource id for the in animation
+		 */
+		public Builder setInAnimation(int inAnimationResId) {
+			this.inAnimationResId = inAnimationResId;
+			return this;
+		}
+
+		/**
+		 * The resource id for the out animation
+		 */
+		public Builder setOutAnimation(int outAnimationResId) {
+			this.outAnimationResId = outAnimationResId;
+			return this;
+		}
+
+		/**
+		 * The {@link ImageView.ScaleType} for the image
+		 */
+		public Builder setImageScaleType(ImageView.ScaleType imageScaleType) {
+			this.imageScaleType = imageScaleType;
+			return this;
+		}
+
+		/**
+		 * The padding for the crouton view's content in pixels
+		 */
+		public Builder setPaddingInPixels(int padding) {
+			this.paddingInPixels = padding;
+			return this;
+		}
+
+		/**
+		 * The resource id for the padding for the crouton view's content
+		 */
+		public Builder setPaddingDimensionResId(int paddingResId) {
+			this.paddingDimensionResId = paddingResId;
+			return this;
+		}
+
+		/**
+		 * @return a configured {@link Style} object.
+		 */
+		public Style build() {
+			return new Style(this);
+		}
+	}
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/utils/CodePattern.java b/qpython/src/main/java/org/qpython/qpy/utils/CodePattern.java
new file mode 100644
index 00000000..78d274cd
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/utils/CodePattern.java
@@ -0,0 +1,112 @@
+package org.qpython.qpy.utils;
+
+import android.text.SpannableString;
+import android.text.Spanned;
+import android.text.style.ForegroundColorSpan;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Created by Hmei
+ * 2018/4/19.
+ */
+
+public class CodePattern {
+    public static final int COLOR_ERROR   = 0x80ff0000;
+    public static final int COLOR_NUMBER  = 0xff7ba212;
+    public static final int COLOR_KEYWORD = 0xff7ba212;
+    public static final int COLOR_BUILTIN = 0xffd79e39;
+    public static final int COLOR_COMMENT = 0xff808080;
+    public static final int COLOR_QUOTE   = 0xff399ed7;
+    
+    public static final Pattern PATTERN_LINE       = Pattern.compile(
+            ".*\\n");
+    public static final Pattern PATTERN_NUMBER     = Pattern.compile(
+            "\\b(\\d*[.]?\\d+)\\b");
+    public static final Pattern PATTERN_PY_KEYWORD   = Pattern.compile(
+            "\\b(break|continue|del|" +
+                    "except|exec|finally|" +
+                    "pass|print|raise|" +
+                    "return|try|with|" +
+                    "global|assert|" +
+                    "lambda|yield|" +
+                    "def|class|self|" +
+                    "for|while|" +
+                    "if|elif|else|" +
+                    "and|in|is|not|or|" +
+                    "import|from|as)\\b");
+    public static final Pattern PATTERN_LUA_KEYWORD  = Pattern.compile(
+            "\\b(and|break|do|" +
+                    "else|elseif|end|" +
+                    "for|function|" +
+                    "goto|if|in|" +
+                    "local|" +
+                    "not|or|" +
+                    "repeat|return|then|" +
+                    "until|" +
+                    "while)\\b");
+    public static final Pattern PATTERN_LUA_BUILD_IN = Pattern.compile(
+            "\\b(print|false|true|nil)\\b");
+    public static final Pattern PATTERN_PY_BUILD_IN = Pattern.compile(
+            "\\b(True|False|bool|enumerate|set|frozenset|help|" +
+                    "reversed|sorted|sum|" +
+                    "Ellipsis|None|NotImplemented|__import__|abs|" +
+                    "apply|buffer|callable|chr|classmethod|cmp|" +
+                    "coerce|compile|complex|delattr|dict|dir|divmod|" +
+                    "eval|execfile|file|filter|float|getattr|globals|" +
+                    "hasattr|hash|hex|id|input|int|intern|isinstance|" +
+                    "issubclass|iter|len|list|locals|long|map|max|" +
+                    "min|object|oct|open|ord|pow|property|range|" +
+                    "raw_input|reduce|reload|repr|round|setattr|" +
+                    "slice|staticmethod|str|super|tuple|type|unichr|" +
+                    "unicode|vars|xrange|zip|" +
+                    "ArithmeticError|AssertionError|AttributeError|" +
+                    "DeprecationWarning|EOFError|EnvironmentError|" +
+                    "Exception|FloatingPointError|IOError|" +
+                    "ImportError|IndentationError|IndexError|" +
+                    "KeyError|KeyboardInterrupt|LookupError|" +
+                    "MemoryError|NameError|NotImplementedError|" +
+                    "OSError|OverflowError|OverflowWarning|" +
+                    "ReferenceError|RuntimeError|RuntimeWarning|" +
+                    "StandardError|StopIteration|SyntaxError|" +
+                    "SyntaxWarning|SystemError|SystemExit|TabError|" +
+                    "TypeError|UnboundLocalError|UnicodeError|" +
+                    "UnicodeEncodeError|UnicodeDecodeError|" +
+                    "UnicodeTranslateError|" +
+                    "UserWarning|ValueError|Warning|WindowsError|" +
+                    "ZeroDivisionError)\\b");
+    public static final Pattern PATTERN_PY_COMMENT  = Pattern.compile(
+            "/\\*(?:.|[\\n\\r])*?\\*/|" +
+                    "#.*\n|" +
+                    "\"\"\"(?:.|[\\n\\r])*?\"\"\"|" +
+                    "\'\'\'(?:.|[\\n\\r])*?\'\'\'");
+
+    public static SpannableString formatPyCode(String code) {
+        SpannableString sStr = new SpannableString(code);
+        for (Matcher m = PATTERN_PY_KEYWORD.matcher(sStr); m.find(); ) {
+            sStr.setSpan(
+                    new ForegroundColorSpan(COLOR_KEYWORD),
+                    m.start(),
+                    m.end(),
+                    Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+        }
+
+        for (Matcher m = PATTERN_PY_BUILD_IN.matcher(sStr); m.find(); ) {
+            sStr.setSpan(
+                    new ForegroundColorSpan(COLOR_BUILTIN),
+                    m.start(),
+                    m.end(),
+                    Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+        }
+
+        for (Matcher m = PATTERN_PY_COMMENT.matcher(sStr); m.find(); ) {
+            sStr.setSpan(
+                    new ForegroundColorSpan(COLOR_COMMENT),
+                    m.start(),
+                    m.end(),
+                    Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+        }
+        return sStr;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/utils/DateTimeUtil.java b/qpython/src/main/java/org/qpython/qpy/utils/DateTimeUtil.java
new file mode 100644
index 00000000..0c3b6c78
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/utils/DateTimeUtil.java
@@ -0,0 +1,51 @@
+package org.qpython.qpy.utils;
+
+import android.annotation.SuppressLint;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.TimeZone;
+
+/**
+ * 文 件 名: DateTimeUtil
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2017/12/28 10:15
+ * 邮   箱: qq798435167@gmail.com
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class DateTimeUtil {
+
+    public static String format(Date remoteDate) {
+        Date date = remoteDate;
+        String result = null;
+        long creatTime = date.getTime();
+        long currentTime = System.currentTimeMillis();
+        //间隔时间秒
+        long detalTimeS = (currentTime - creatTime) / 1000;
+        long detalTimeM = detalTimeS / 60;
+        long detalTimeH = detalTimeM / 60;
+        long detalTimeDay = detalTimeH / 24;
+        if (detalTimeS < 60) {
+            result = "just moment";
+        } else if (detalTimeS >= 60 && detalTimeM < 60) {
+            result = detalTimeM + " minutes ago";
+        } else if (detalTimeM >= 60 && detalTimeH <= 10) {
+            result = detalTimeH + " hours ago";
+        } else if (detalTimeH > 10) {
+            result = dateFormat("M-d HH:mm", date);
+        } else if (detalTimeDay >= 1 && detalTimeDay < 365) {
+            result = dateFormat("M-d", date);
+        } else {
+            result = dateFormat("yyyy-M-d", date);
+        }
+        return result;
+    }
+
+    @SuppressLint("SimpleDateFormat")
+    public static String dateFormat(String reg, Date date) {
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat(reg);
+        return simpleDateFormat.format(date);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/utils/FileUtils.java b/qpython/src/main/java/org/qpython/qpy/utils/FileUtils.java
new file mode 100644
index 00000000..d5d1b718
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/utils/FileUtils.java
@@ -0,0 +1,158 @@
+package org.qpython.qpy.utils;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.widget.Toast;
+
+import org.qpython.qpy.R;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+public class FileUtils {
+    public static boolean copyToFile(InputStream inputStream, File destFile) {
+        try {
+            if (destFile.exists()) {
+                destFile.delete();
+            }
+            OutputStream out = new FileOutputStream(destFile);
+            try {
+                byte[] buffer = new byte[4096];
+                int bytesRead;
+                while ((bytesRead = inputStream.read(buffer)) >= 0) {
+                    out.write(buffer, 0, bytesRead);
+                }
+            } finally {
+                out.close();
+            }
+            return true;
+        } catch (IOException e) {
+            return false;
+        }
+    }
+
+    public static boolean copyFile(File srcFile, File destFile) {
+        boolean result = false;
+        try {
+            InputStream in = new FileInputStream(srcFile);
+            try {
+                result = copyToFile(in, destFile);
+            } finally {
+                in.close();
+            }
+        } catch (IOException e) {
+            result = false;
+        }
+        return result;
+    }
+
+    /**
+     * 调用系统应用打开文件
+     */
+    public static void openFile(Context context, File file) {
+        Intent intent = new Intent();
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        //设置intent的Action属性
+        intent.setAction(Intent.ACTION_VIEW);
+        //获取文件file的MIME类型
+        String type = getMIMEType(file);
+        //设置intent的data和Type属性。
+        intent.setDataAndType(Uri.fromFile(file), type);
+        //跳转
+        try {
+            context.startActivity(intent);
+        } catch (Exception e) {
+            e.printStackTrace();
+            Toast.makeText(context, R.string.cant_open, Toast.LENGTH_SHORT).show();
+        }
+    }
+
+    /***根据文件后缀回去MIME类型****/
+
+    private static String getMIMEType(File file) {
+        String type = "*/*";
+        String fName = file.getName();
+        //获取后缀名前的分隔符"."在fName中的位置。
+        int dotIndex = fName.lastIndexOf(".");
+        if (dotIndex < 0) {
+            return type;
+        }
+        String end = fName.substring(dotIndex, fName.length()).toLowerCase();
+        if (end == "") return type;
+        //在MIME和文件类型的匹配表中找到对应的MIME类型。
+        for (int i = 0; i < MIME_MapTable.length; i++) {
+            if (end.equals(MIME_MapTable[i][0]))
+                type = MIME_MapTable[i][1];
+        }
+        return type;
+    }
+
+    private static final String[][] MIME_MapTable = {
+            // {后缀名，MIME类型}
+            {".3gp", "video/3gpp"},
+            {".apk", "application/vnd.android.package-archive"},
+            {".asf", "video/x-ms-asf"},
+            {".avi", "video/x-msvideo"},
+            {".bin", "application/octet-stream"},
+            {".bmp", "image/bmp"},
+            {".c", "text/plain"},
+            {".class", "application/octet-stream"},
+            {".conf", "text/plain"},
+            {".cpp", "text/plain"},
+            {".doc", "application/msword"},
+            {".docx",
+                    "application/vnd.openxmlformats-officedocument.wordprocessingml.document"},
+            {".xls", "application/vnd.ms-excel"},
+            {".xlsx",
+                    "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"},
+            {".exe", "application/octet-stream"},
+            {".gif", "image/gif"},
+            {".gtar", "application/x-gtar"},
+            {".gz", "application/x-gzip"},
+            {".h", "text/plain"},
+            {".htm", "text/html"},
+            {".html", "text/html"},
+            {".jar", "application/java-archive"},
+            {".java", "text/plain"},
+            {".jpeg", "image/jpeg"},
+            {".jpg", "image/jpeg"},
+            {".js", "application/x-javascript"},
+            {".log", "text/plain"},
+            {".m3u", "audio/x-mpegurl"},
+            {".m4a", "audio/mp4a-latm"},
+            {".m4b", "audio/mp4a-latm"},
+            {".m4p", "audio/mp4a-latm"},
+            {".m4u", "video/vnd.mpegurl"},
+            {".m4v", "video/x-m4v"},
+            {".mov", "video/quicktime"},
+            {".mp2", "audio/x-mpeg"},
+            {".mp3", "audio/x-mpeg"},
+            {".mp4", "video/mp4"},
+            {".mpc", "application/vnd.mpohun.certificate"},
+            {".mpe", "video/mpeg"},
+            {".mpeg", "video/mpeg"},
+            {".mpg", "video/mpeg"},
+            {".mpg4", "video/mp4"},
+            {".mpga", "audio/mpeg"},
+            {".msg", "application/vnd.ms-outlook"},
+            {".ogg", "audio/ogg"},
+            {".pdf", "application/pdf"},
+            {".png", "image/png"},
+            {".pps", "application/vnd.ms-powerpoint"},
+            {".ppt", "application/vnd.ms-powerpoint"},
+            {".pptx", "application/vnd.openxmlformats-officedocument.presentationml.presentation"},
+            {".prop", "text/plain"}, {".rc", "text/plain"},
+            {".rmvb", "audio/x-pn-realaudio"}, {".rtf", "application/rtf"},
+            {".sh", "text/plain"}, {".tar", "application/x-tar"},
+            {".tgz", "application/x-compressed"}, {".txt", "text/plain"},
+            {".wav", "audio/x-wav"}, {".wma", "audio/x-ms-wma"},
+            {".wmv", "audio/x-ms-wmv"},
+            {".wps", "application/vnd.ms-works"}, {".xml", "text/plain"},
+            {".z", "application/x-compress"},
+            {".zip", "application/x-zip-compressed"}, {"", "*/*"}};
+}
\ No newline at end of file
diff --git a/qpython/src/main/java/org/qpython/qpy/utils/NoteBookAction.java b/qpython/src/main/java/org/qpython/qpy/utils/NoteBookAction.java
new file mode 100644
index 00000000..3eb4d2cb
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/utils/NoteBookAction.java
@@ -0,0 +1,67 @@
+package org.qpython.qpy.utils;
+
+/**
+ * 文 件 名: NoteBookAction
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/2/8 11:27
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class NoteBookAction {
+    //运行全部cell
+    public static final String PLAY_ALL_CELL = "$('li#run_all_cells').click()";
+    //清空当前输出
+    public static final String CLEAR_CURRENT_OUTPUT = "$('li#clear_current_output').click()";
+
+    //从底部添加一个cell
+    public static final String ADD_CELL_BELOW = "$('li#insert_cell_below').click()";
+
+    //切换cell为code类型
+    public static final String SWITCH_CODE_TYPE = "$('select#cell_type').val('code').change()";
+
+    //切换cell为markdown类型
+    public static final String SWITCH_MARKDOWN_TYPE = "$('select#cell_type').val('markdown').change()";
+
+    //删除一个cell
+    public static final String DELETE_CELL = "$('li#delete_cell').click()";
+
+    //取消删除cell
+    public static final String UNDELETE_CELL = "$('li#undelete_cell').click()";
+
+    //保存文档
+    public static final String SAVE_NOTEBOOK = "$('button[data-jupyter-action=\"jupyter-notebook:save-notebook\"]')[0].click()";
+
+    //undo
+    public static final String CELL_UNDO = "";
+
+    //redo
+    public static final String CELL_REDO = "";
+
+    //运行当前cell并选择下一个cell
+    public static final String PLAY_CURRENT_CELL = "$('button[data-jupyter-action=\"jupyter-notebook:run-cell-and-select-next\"]')[0].click()";
+
+    //运行全部cell
+    public static final String RUN_ALL = "";
+
+    //清空输出 & 重启kernel
+    public static final String CLEAR_ALL_OUTPUT = "$('li#clear_all_output').click()";
+
+    //shutdown
+    public static final String SHUTDOWN_KERNEL = "$('li#shutdown_kernel').click()";
+
+    //移动cell到下一个cell
+    public static final String MOVE_CELL_DOWN = "$('button[data-jupyter-action=\"jupyter-notebook:move-cell-down\"]')[0].click()";
+
+    //移动cell到上一个cell
+    public static final String MOVE_CELL_UP = "$('button[data-jupyter-action=\"jupyter-notebook:move-cell-up\"]')[0].click()";
+
+    //剪切
+    public static final String CELL_CUT = "";
+
+    //复制
+    public static final String CELL_COPY = "";
+
+    //粘贴
+    public static final String CELL_PASTE = "";
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/utils/NotebookUtil.java b/qpython/src/main/java/org/qpython/qpy/utils/NotebookUtil.java
new file mode 100644
index 00000000..1717f9e5
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/utils/NotebookUtil.java
@@ -0,0 +1,309 @@
+package org.qpython.qpy.utils;
+
+import android.app.Activity;
+import android.content.Context;
+import android.os.Handler;
+import android.os.Looper;
+import android.util.Log;
+
+import com.loopj.android.http.AsyncHttpResponseHandler;
+import com.quseit.base.QBaseApp;
+import com.quseit.util.NAction;
+import com.quseit.util.NStorage;
+import com.quseit.util.NUtil;
+
+import org.apache.http.Header;
+import org.qpython.qpy.R;
+import org.qpython.qpy.console.ScriptExec;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpysdk.QPyConstants;
+import org.qpython.qpysdk.QPySDK;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import okhttp3.Call;
+import okhttp3.Callback;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+
+/**
+ * 文 件 名: NotebookCheckUtil
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/2/8 09:35
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class NotebookUtil {
+
+    private static final String TAG = "NotebookUtil";
+    public static final String RELEASE_PATH = QPyConstants.ABSOLUTE_PATH + "/.notebook";
+    public static final String NB_SERVER = "http://127.0.0.1:13000";
+    public static final String KILL_SERVER = NB_SERVER + "/__exit";
+    public static final String NOTEBOOK_SERVER = NB_SERVER + "/notebooks/";
+
+    public static final String NOTEBOOK_DIR = QPyConstants.ABSOLUTE_PATH+"/";
+    public static final String ext = ".ipynb";
+    public static final String Untitled = "Untitled";
+
+    public static boolean isNotebookEnable(Context context) {
+        boolean isNLI = isNotebookLibInstall(context);
+        Log.d("NotebookUtil", "isNotebookEnable:" + "-" + isNLI);
+        return isNLI;
+    }
+
+
+
+    /**
+     * 检查notebook库是否安装
+     */
+    public static boolean isNotebookLibInstall(Context context) {
+        boolean common = new File(context.getFilesDir().getAbsolutePath() + "/lib/notebook.zip").exists();
+        if (NAction.isQPy3(context)) {
+            return common & new File(context.getFilesDir().getAbsoluteFile()+"/bin/jupyter").exists();
+        } else {
+            return common & new File(context.getFilesDir().getAbsoluteFile()+"/bin/jupyter2").exists();
+        }
+    }
+
+    /**
+     * 释放相关资源
+     */
+    public static boolean extraData(Context context) {
+        //如果解压成功则lib目录下回出现libzmq.so文件
+        if (new File(context.getFilesDir().getAbsolutePath() + "/lib", "notebook.zip").exists()) {
+            //对bin目录下的文件修改执行权限
+            File bind = new File(context.getFilesDir().getAbsolutePath() + "/bin");
+            if (bind.listFiles() != null) {
+                for (File bin : bind.listFiles()) {
+                    try {
+                        org.qpython.qpysdk.utils.FileUtils.chmod(bin, 0755);
+                    } catch (Exception e1) {
+                        e1.printStackTrace();
+                    }
+                }
+            }
+            if (context.getPackageName().equals("com.hipipal.qpyplus")) {  // old version
+                // Rename correct files to
+                String[] list = {"jupyter-chq", "jupyter2-chq", "jupyter-notebook-chq", "jupyter2-notebook-chq"};
+                for (int i=0;i<list.length;i++) {
+                    String f = list[i];
+                    String t = f.replace("-chq","");
+
+                    File ff = new File(context.getFilesDir().getAbsolutePath() + "/bin", f);
+                    File tf = new File(context.getFilesDir().getAbsolutePath() + "/bin", t);
+                    if (ff.exists()) {
+                        ff.renameTo(tf);
+
+                    }
+                }
+            }
+
+        } else {
+            return false;
+        }
+        return true;
+    }
+
+
+
+    /**
+     * 创建一个的notebook
+     */
+    @SuppressWarnings("ResultOfMethodCallIgnored")
+    public static String createNotebook(Context context, String fileName) {
+        InputStream is = null;
+        FileOutputStream fileOutputStream = null;
+        File file = new File(NOTEBOOK_DIR + "notebooks/", fileName + ext);
+        try {
+            if (!file.exists()) {
+                file.getParentFile().mkdirs();
+                file.createNewFile();
+            }
+            fileOutputStream = new FileOutputStream(file);
+            is = context.getAssets().open(Untitled + ext);
+
+            int lenght = is.available();
+            byte[] buffer = new byte[lenght];
+            is.read(buffer);
+            fileOutputStream.write(buffer);
+            fileOutputStream.flush();
+            return file.getAbsolutePath();
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        } finally {
+            try {
+                if (is != null)
+                    is.close();
+                if (fileOutputStream != null)
+                    fileOutputStream.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    /**
+     * 关闭后台服务
+     */
+    public static void killServer() {
+        QBaseApp.getInstance().getAsyncHttpClient().get(KILL_SERVER, new AsyncHttpResponseHandler() {
+            @Override
+            public void onSuccess(int i, Header[] headers, byte[] bytes) {
+
+            }
+
+            @Override
+            public void onFailure(int i, Header[] headers, byte[] bytes, Throwable throwable) {
+
+            }
+        });
+    }
+
+    /**
+     * 下载文件
+     */
+    public static void downloadFile(String url, DownloadCallback callback) {
+        Log.d("NotebookUtil", "downloadFile:" + url);
+        final Handler handler = new Handler(Looper.getMainLooper());
+        OkHttpClient client = App.getOkHttpClient();
+        Request request = new Request.Builder().url(url).build();
+        client.newCall(request).enqueue(new Callback() {
+            @Override
+            public void onFailure(Call call, IOException e) {
+                e.printStackTrace();
+                handler.post(() -> {
+                    callback.onFail(e.getMessage());
+                });
+            }
+
+            @Override
+            public void onResponse(Call call, Response response) throws IOException {
+                InputStream is = null;
+                FileOutputStream fos = null;
+                byte[] buff = new byte[2048];
+                int len = -1;
+                try {
+                    String filePath = getTempFilePath(url);
+                    Log.d("NotebookUtil", "onResponse:downloadFile:" + filePath);
+                    if (filePath == null) {
+                        handler.post(() -> {
+                            callback.onFail("Failed to download " + url);
+                        });
+                        return;
+                    }
+                    fos = new FileOutputStream(filePath);
+                    is = response.body().byteStream();
+                    while ((len = is.read(buff)) != -1) {
+                        fos.write(buff, 0, len);
+                    }
+                    fos.flush();
+                    handler.post(() -> {
+                        callback.onSuccess(filePath);
+                    });
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    handler.post(() -> {
+                        callback.onFail(e.getMessage());
+                    });
+                } finally {
+                    if (is != null) {
+                        is.close();
+                    }
+                    if (fos != null) {
+                        fos.close();
+                    }
+                }
+            }
+        });
+
+    }
+
+    private static String getTempFilePath(String url) {
+        //LogUtil.d("NotebookUtil", "getTempFilePath:"+url);
+        File dir = new File(QPyConstants.ABSOLUTE_PATH, "notebooks");
+        if (!dir.exists()) {
+            dir.mkdirs();
+        }
+        String fileName = NUtil.getFileFromUrl(url);
+        File file = new File(dir, fileName);
+        Log.d("NotebookUtil", "getTempFilePath:" + file);
+
+        try {
+            if (!file.exists()) {
+                file.createNewFile();
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+            return null;
+        }
+        return file.getAbsolutePath();
+    }
+
+    public interface DownloadCallback {
+        void onSuccess(String filePath);
+
+        void onFail(String msg);
+    }
+
+    public static void startNotebookService2(Context context) {
+        int notebookPid;
+        if (NAction.isQPy3(context)) {
+            notebookPid = ScriptExec.getInstance().playQScript(context, context.getFilesDir().getAbsolutePath() + "/bin/nb_man.py", null,false);
+
+        } else {
+            notebookPid = ScriptExec.getInstance().playQScript(context, context.getFilesDir().getAbsolutePath() + "/bin/nb2_man.py", null,false);
+        }
+        Log.d("NotebookUtil", "startNotebookService2:"+notebookPid);
+        NStorage.setSP(context, "notebook.pid", ""+notebookPid);
+    }
+
+    public static void startNotebookService(Context context) {
+        if (NAction.isQPy3(context)) {
+            ScriptExec.getInstance().playDScript(context, context.getFilesDir().getAbsolutePath() + "/bin/nb_man.py", null,false);
+        } else {
+            ScriptExec.getInstance().playDScript(context, context.getFilesDir().getAbsolutePath() + "/bin/nb2_man.py", null,false);
+        }
+    }
+
+    public static boolean isNBSrvSet(Context context) {
+        boolean isset = getNBPid2(context) != -1;
+        Log.d(TAG, "isNBSrvSet:"+(isset?"yes":"no"));
+        return isset;
+    }
+
+    public static void killNBSrv(Context context) {
+        int pid = getNBPid2(context);
+
+        Log.d(TAG, "killNBSrv:"+pid);
+
+        if (pid!=-1) {
+            android.os.Process.killProcess(pid);
+        }
+        NStorage.setSP(context, "notebook.pid", "");
+
+    }
+
+    public static int getNBPid2(Context context) {
+        String _pid = NStorage.getSP(context, "notebook.pid");
+        if (!_pid.equals("")) {
+            return Integer.valueOf(_pid);
+        } else {
+            return -1;
+        }
+    }
+
+    public static String getNbResFk(Context context) {
+        return NAction.isQPy3(context)?QPyConstants.KEY_NOTEBOOK_RES: QPyConstants.KEY_NOTEBOOK2_RES;
+    }
+    public static String getNBLink(Context context) {
+        String nb_link = NAction.isQPy3(context)?"https://dl.qpy.io/notebook3.json":"https://dl.qpy.io/notebook2.json";
+        return nb_link+"?"+NAction.getUserUrl(context);
+    }
+
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/utils/OpenWebUtil.java b/qpython/src/main/java/org/qpython/qpy/utils/OpenWebUtil.java
new file mode 100644
index 00000000..4d9203fb
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/utils/OpenWebUtil.java
@@ -0,0 +1,24 @@
+package org.qpython.qpy.utils;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+
+/**
+ * 文 件 名: OpenWebUtil
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2017/12/29 12:18
+ * 邮   箱: qq798435167@gmail.com
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class OpenWebUtil {
+    public static void open(Context context,String url){
+        Intent intent = new Intent();
+        intent.setAction(Intent.ACTION_VIEW);
+        Uri content_url = Uri.parse(url);
+        intent.setData(content_url);
+        context.startActivity(Intent.createChooser(intent, "Please select your browser"));
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/utils/SolfKeybroadUtil.java b/qpython/src/main/java/org/qpython/qpy/utils/SolfKeybroadUtil.java
new file mode 100644
index 00000000..5e5ee738
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/utils/SolfKeybroadUtil.java
@@ -0,0 +1,25 @@
+package org.qpython.qpy.utils;
+
+import android.content.Context;
+import android.view.View;
+import android.view.inputmethod.InputMethodManager;
+
+/**
+ * 文 件 名: SolfKeybroadUtil
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2017/12/28 11:24
+ * 邮   箱: qq798435167@gmail.com
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class SolfKeybroadUtil {
+    public static void showSolfInput(View view , boolean show) {
+        InputMethodManager imm = (InputMethodManager) view.getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+        if (show) {
+            imm.showSoftInput(view, 0);
+        } else {
+            imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/utils/UpdateHelper.java b/qpython/src/main/java/org/qpython/qpy/utils/UpdateHelper.java
new file mode 100644
index 00000000..8b221d3b
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/utils/UpdateHelper.java
@@ -0,0 +1,383 @@
+package org.qpython.qpy.utils;
+
+import android.support.v7.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Environment;
+import android.util.Log;
+import android.widget.Toast;
+
+import com.google.gson.Gson;
+
+import com.loopj.android.http.AsyncHttpClient;
+import com.loopj.android.http.JsonHttpResponseHandler;
+import com.loopj.android.http.RequestParams;
+import com.quseit.base.QBaseApp;
+import com.quseit.config.BASE_CONF;
+import com.quseit.common.db.AppLog;
+import com.quseit.common.db.CacheLog;
+import com.quseit.common.db.UserLog;
+import com.quseit.util.DateTimeHelper;
+import com.quseit.util.FileHelper;
+import com.quseit.util.NAction;
+import com.quseit.util.NUtil;
+import com.quseit.util.VeDate;
+
+import org.apache.http.Header;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.qpython.qpy.R;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.server.model.SettingModel;
+import org.qpython.qpysdk.QPyConstants;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+
+public class UpdateHelper {
+
+    private static final String TAG = "UpdateHelper";
+
+    private static void checkConfUpdate(final Context context) {
+        if (NUtil.netCheckin(context.getApplicationContext())) {
+            // clear db cache
+            CacheLog cDB = new CacheLog(context);
+            cDB.cleanCache();
+
+            RequestParams myParam = new RequestParams();
+            String types = "11,12,13";
+            String limit = BASE_CONF.LOG_LIMIT;
+            UserLog userLog = new UserLog(context.getApplicationContext());
+            String xlogs = "";
+            try {
+                xlogs = userLog.getLogs(types, 0, limit, "ASC");
+            } catch (OutOfMemoryError e) {
+                Log.d(TAG, "err when getLogs:" + e.getMessage());
+                xlogs = "";
+                userLog.deleteAllStat_0_Log();
+            }
+            final String logs = xlogs;
+            myParam.put("time", DateTimeHelper.getDateMin());
+            myParam.put("logs", logs);
+
+			/* 手机客户信息 */
+            String collectInfos = BASE_CONF.COLLECT_INFO;
+
+            Field[] fields = Build.class.getDeclaredFields();
+            for (Field field : fields) {
+                try {
+                    field.setAccessible(true);
+                    String k = field.getName();
+                    if (k != null) {
+                        k = k.toLowerCase().trim();
+                    }
+                    if (collectInfos.contains("#" + k + "#")) {
+                        myParam.put(k, field.get(null).toString());
+                    }
+
+                } catch (Exception e) {
+                    Log.e(TAG, "Error occured when collect crash info", e);
+                }
+            }
+
+            if (BASE_CONF.DEBUG)
+                Log.d(TAG, "checkUpdate:" + logs);
+            String updateUrl = NAction.getUpdateHost(context.getApplicationContext());
+            if (updateUrl.equals("")) {
+                updateUrl = confGetUpdateURL(context, 1);
+            }
+            if (!BASE_CONF.DEBUG)
+                Log.d(TAG, "checkUpdate:" + updateUrl + "?" + NAction.getUserUrl(context.getApplicationContext()));
+
+            QBaseApp.getInstance().getAsyncHttpClient().post(context.getApplicationContext(), updateUrl + "?" + NAction.getUserUrl(context.getApplicationContext()),
+                    myParam, new JsonHttpResponseHandler() {
+                        @Override
+                        public void onSuccess(int statusCode, Header[] headers, JSONObject result) {
+                            if (result == null) {
+                                return;
+                            }
+                            if (BASE_CONF.DEBUG)
+                                Log.d(TAG, "checkUpdate-result:" + result.toString());
+                            UserLog log = new UserLog(context);
+                            log.deleteAllStat_0_Log();
+
+                            Gson gson = App.getGson();
+                            SettingModel settings = gson.fromJson(result.toString(), SettingModel.class);
+                            try {
+                                NAction.setExtConf(context, gson.toJson(settings.getQpy().getExt2()));
+                                NAction.setExtAdConf(context, gson.toJson(settings.getQpy().getExt_ad()));
+                                NAction.setUpdateCheckTime(context);
+                            } catch (NullPointerException e) {
+                                //Toast.makeText(context, R.string.get_setting_data_fail+"(e)"+e.getLocalizedMessage(), Toast.LENGTH_SHORT).show();
+                            }
+                        }
+                        @Override
+                        public void onFailure(int statusCode, Header[] headers, String responseString, Throwable throwable) {
+                            // waitingWindow.dismiss();
+                            Log.d(TAG, "Error in checkConfUpdate:" + throwable.getMessage());
+                        }
+                    });
+        }
+    }
+
+    private static String confGetUpdateURL(Context context, int flag) {
+        if (flag == 2) {
+            return QPyConstants.LOG_URL + context.getPackageName() + "/" + NUtil.getVersinoCode(context);
+        } else if (flag == 3) {
+            return QPyConstants.AD_URL + context.getPackageName() + "/" + NUtil.getVersinoCode(context) + "?"
+                    + NAction.getUserUrl(context.getApplicationContext());
+        } else if (flag == 5) {
+            return QPyConstants.IAP_LOG_URL + context.getPackageName() + "/" + NUtil.getVersinoCode(context) + "?"
+                    + NAction.getUserUrl(context.getApplicationContext());
+
+        } else {
+            return QPyConstants.UPDATE_URL + context.getPackageName() + "/" + NUtil.getVersinoCode(context);
+
+        }
+    }
+
+    public static void checkConfUpdate(Context context, String root) {
+        int now = VeDate.getStringDateHourAsInt();
+        int lastCheck = NAction.getUpdateCheckTime(context);
+        PackageInfo pInfo = null;
+        try {
+            pInfo = context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
+        } catch (PackageManager.NameNotFoundException e) {
+            e.printStackTrace();
+        }
+        if ((pInfo == null ? 0 : pInfo.versionCode) < BASE_CONF.UPDATE_VER) {
+            NAction.setUpdateHost(context, "");
+            checkConfUpdate(context.getApplicationContext());
+
+        } else {
+            if (!sendCrashLog(context.getApplicationContext())) {
+
+                int q = NAction.getUpdateQ(context.getApplicationContext());
+                if (q == 0) {
+                    q = BASE_CONF.UPDATEQ;
+                }
+
+                if ((now - lastCheck) >= q) { // 每q小时检查一次更新/清空一下不必要的cache
+                    checkUpdate(context, true);
+
+                    checkConfUpdate(context.getApplicationContext());
+
+                    // 清空图片目录的缓存
+                    String cacheDir = Environment.getExternalStorageDirectory() + "/" + root + "/" + BASE_CONF.DCACHE + "/";
+                    FileHelper.clearDir(cacheDir, 0, false);
+
+                }
+            }
+        }
+
+    }
+
+    private static boolean sendCrashLog(final Context context) {
+        if (NUtil.netCheckin(context.getApplicationContext())) {
+            Log.d(TAG, "notifyErr");
+
+            RequestParams myParam = new RequestParams();
+            //String updateUrl = NAction.getUpdateHost(context.getApplicationContext());
+            //if (updateUrl.equals("")) {
+            String   updateUrl = confGetUpdateURL(context, 2);
+            //}
+//            else {
+//                updateUrl = NAction.getExtP(context, "conf_send_log_host");
+//            }
+
+            String collectInfos = NAction.getExtP(context, "conf_get_log_cls");
+            if (collectInfos.equals("")) {
+                collectInfos = BASE_CONF.COLLECT_INFO;
+            }
+            Field[] fields = Build.class.getDeclaredFields();
+            for (Field field : fields) {
+                try {
+                    field.setAccessible(true);
+                    String k = field.getName();
+                    if (k != null) {
+                        k = k.toLowerCase().trim();
+                    }
+                    if (collectInfos.contains("#" + k + "#")) {
+                        myParam.put(k, field.get(null).toString());
+                    }
+                    // LogUtil.d(TAG, field.getName() + " : " + field.get(null));
+
+                } catch (Exception e) {
+                    Log.e(TAG, "an error occured when collect crash info", e);
+                }
+            }
+
+            AppLog appDB = new AppLog(context);
+            final ArrayList<String[]> logs = appDB.getLogs(0);
+            if (logs.size() != 0) {
+                JSONArray descArray = new JSONArray();
+                // LogUtil.d(TAG, "notifyErr:"+logs);
+                for (int i = 0; i < logs.size(); i++) {
+                    String[] items = logs.get(i);
+                    myParam.put("act", "report_err");
+                    descArray.put(items[5]);
+
+					/*
+                     * myParam.put("report_id", items[0]); myParam.put("report_title", items[1]);
+					 * myParam.put("report_ver", items[2]); myParam.put("report_time", items[3]);
+					 * myParam.put("report_stat", items[4]); myParam.put("report_desc", items[5]);
+					 * myParam.put("report_userno", items[6]); myParam.put("report_id", items[0]);
+					 * myParam.put("report_title", items[1]); myParam.put("report_ver", items[2]);
+					 * myParam.put("report_time", items[3]); myParam.put("report_stat", items[4]);
+					 * myParam.put("report_desc", items[5]); myParam.put("report_userno", items[6]);
+					 */
+
+                    appDB.deleteLog(Long.parseLong(items[0]));
+                }
+                myParam.put("report_desc", descArray.toString());
+
+                new AsyncHttpClient().post(context.getApplicationContext(), updateUrl + "?" + NAction.getUserUrl(context.getApplicationContext()),
+                        myParam, new JsonHttpResponseHandler() { });
+                return true;
+            } else {
+                // LogUtil.d(TAG, "notifyErr no need");
+                return false;
+            }
+        } else {
+            return false;
+        }
+    }
+
+    private static void checkUpdate(final Context context, final boolean isAuto) {
+        QBaseApp.getInstance().getAsyncHttpClient().post(context, BASE_CONF.UPDATER_URL, null, new JsonHttpResponseHandler() {
+            @Override
+            public void onSuccess(int statusCode, Header[] headers, JSONObject response) {
+                int ver = 0;
+                String downloadUrl = "";
+                String verName = "";
+                String desc = "";
+
+                int lastPluginVer = 0;
+                int currentPluginVer = 0;
+                String jsonPlugin = NAction.getExtPluginsConf(context);
+                try {
+                    JSONObject app = response.getJSONObject(BASE_CONF.APP_KEY);
+                    ver = app.getInt(BASE_CONF.VERSION_KEY);
+                    verName = app.getString(BASE_CONF.VERSION_NAME_KEY);
+                    downloadUrl = app.getString(BASE_CONF.DOWNLOAD_LINK_KEY);
+                    desc = app.getString(BASE_CONF.VERIOSN_DESC_KEY);
+                } catch (JSONException e) {
+                    e.printStackTrace();
+                }
+
+                try {
+                    if ("".equals(jsonPlugin)) {
+                        lastPluginVer = BASE_CONF.plugin_ver;
+                    } else {
+                        lastPluginVer = new JSONObject(jsonPlugin).getJSONObject(BASE_CONF.APP_KEY).getInt(BASE_CONF.VERSION_PLUGIN_KEY);
+                    }
+                    currentPluginVer = response.getJSONObject(BASE_CONF.APP_KEY).getInt(BASE_CONF.VERSION_PLUGIN_KEY);
+                } catch (JSONException e) {
+                    e.printStackTrace();
+                }
+                if (lastPluginVer < currentPluginVer || NUtil.getVersinoCode(context.getApplicationContext()) < ver) {
+                    //弹出提示更新
+                    AlertDialog.Builder alert = new AlertDialog.Builder(context);
+                    final String finalDownloadUrl = downloadUrl;
+                    final int finalVer = ver;
+                    final int finalLastPluginVer = lastPluginVer;
+                    final int finalCurrentPluginVer = currentPluginVer;
+                    alert.setTitle(com.quseit.android.R.string.up_soft_state_found)
+                            .setMessage(verName + "\n" + desc)
+                            .setPositiveButton(context.getString(com.quseit.android.R.string.up_soft), new DialogInterface.OnClickListener() {
+                                public void onClick(DialogInterface dialog, int which) {
+                                    if (NUtil.getVersinoCode(context.getApplicationContext()) < finalVer) {
+                                        //app更新
+                                        Intent intent = new Intent();
+                                        intent.setAction("android.intent.action.VIEW");
+                                        Uri content_url = Uri.parse(finalDownloadUrl);
+                                        intent.setData(content_url);
+                                        context.startActivity(intent);
+                                    }
+
+                                    if (finalLastPluginVer < finalCurrentPluginVer) {
+                                        //插件更新
+                                        JSONArray plugins = null;
+                                        try {
+                                            plugins = response.getJSONArray(BASE_CONF.PLUGIN_KEY);
+                                        } catch (JSONException e) {
+                                            e.printStackTrace();
+                                        }
+                                        for (int i = 0; i < plugins.length(); i++) {
+                                            JSONObject plugin = null;
+                                            try {
+                                                plugin = plugins.getJSONObject(i);
+                                            } catch (JSONException e) {
+                                                e.printStackTrace();
+                                            }
+                                            if (!(plugin == null)) {
+                                                try {
+                                                    final String dst = plugin.getString("dst");
+                                                    final String link = plugin.getString("link");
+                                                    new Thread(new Runnable() {
+                                                        @Override
+                                                        public void run() {
+                                                            boolean ret = FileHelper.getUrlAsFile(link, context.getApplicationContext().getFilesDir() + "/" + dst);
+                                                            if (ret) {
+//                                                                runOnUiThread(new Runnable() {
+//                                                                    @Override
+//                                                                    public void run() {
+//                                                                        Toast.makeText(context, "插件已更新，请重启app", Toast.LENGTH_SHORT).show();
+//                                                                    }
+//                                                                });
+                                                            } else {
+//                                                                runOnUiThread(new Runnable() {
+//                                                                    @Override
+//                                                                    public void run() {
+//                                                                        Toast.makeText(context, "插件更新失败", Toast.LENGTH_SHORT).show();
+//                                                                    }
+//                                                                });
+                                                            }
+                                                        }
+                                                    }).start();
+                                                } catch (JSONException e) {
+                                                    e.printStackTrace();
+                                                }
+                                            }
+                                        }
+                                        NAction.setExtPluginsConf(context, response.toString());
+                                    }
+                                }
+                            }).setNegativeButton(context.getString(com.quseit.android.R.string.promote_cancel), new DialogInterface.OnClickListener() {
+                        public void onClick(DialogInterface dialog, int which) {
+                            dialog.dismiss();
+                        }
+                    });
+                    alert.create().show();
+                } else {
+                    if (!isAuto) {
+//                        closeWaitWindow();
+//                        alertUpdateDialog2(verName);
+                    }
+
+                }
+            }
+        });
+
+    }
+
+    /*
+
+        key: 16 bit string
+        param: 64 bit string
+     */
+    public static void submitIAPLog(final Context context, String key, String param) {
+        RequestParams myParam = new RequestParams();
+        myParam.put("idt", key);
+        myParam.put("param", param);
+        new AsyncHttpClient().post(context, confGetUpdateURL(context, 5),
+                myParam, new JsonHttpResponseHandler() { }
+        );
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/utils/iap/IabBroadcastReceiver.java b/qpython/src/main/java/org/qpython/qpy/utils/iap/IabBroadcastReceiver.java
new file mode 100644
index 00000000..eea604d6
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/utils/iap/IabBroadcastReceiver.java
@@ -0,0 +1,59 @@
+/* Copyright (c) 2014 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.qpython.qpy.utils.iap;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+/**
+ * Receiver for the "com.android.vending.billing.PURCHASES_UPDATED" Action
+ * from the Play Store.
+ *
+ * <p>It is possible that an in-app item may be acquired without the
+ * application calling getBuyIntent(), for example if the item can be
+ * redeemed from inside the Play Store using a promotional code. If this
+ * application isn't running at the time, then when it is started a call
+ * to getPurchases() will be sufficient notification. However, if the
+ * application is already running in the background when the item is acquired,
+ * a message to this BroadcastReceiver will indicate that the an item
+ * has been acquired.</p>
+ */
+public class IabBroadcastReceiver extends BroadcastReceiver {
+    /**
+     * The Intent action that this Receiver should filter for.
+     */
+    public static final String ACTION = "com.android.vending.billing.PURCHASES_UPDATED";
+    private final IabBroadcastListener mListener;
+
+    public IabBroadcastReceiver(IabBroadcastListener listener) {
+        mListener = listener;
+    }
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        if (mListener != null) {
+            mListener.receivedBroadcast();
+        }
+    }
+
+    /**
+     * Listener interface for received broadcast messages.
+     */
+    public interface IabBroadcastListener {
+        void receivedBroadcast();
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/utils/iap/IabException.java b/qpython/src/main/java/org/qpython/qpy/utils/iap/IabException.java
new file mode 100644
index 00000000..ec66b0a6
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/utils/iap/IabException.java
@@ -0,0 +1,43 @@
+/* Copyright (c) 2012 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.qpython.qpy.utils.iap;
+
+/**
+ * Exception thrown when something went wrong with in-app billing.
+ * An IabException has an associated IabResult (an error).
+ * To get the IAB result that caused this exception to be thrown,
+ * call {@link #getResult()}.
+ */
+public class IabException extends Exception {
+    IabResult mResult;
+
+    public IabException(IabResult r) {
+        this(r, null);
+    }
+    public IabException(int response, String message) {
+        this(new IabResult(response, message));
+    }
+    public IabException(IabResult r, Exception cause) {
+        super(r.getMessage(), cause);
+        mResult = r;
+    }
+    public IabException(int response, String message, Exception cause) {
+        this(new IabResult(response, message), cause);
+    }
+
+    /** Returns the IAB result (error) that this exception signals. */
+    public IabResult getResult() { return mResult; }
+}
\ No newline at end of file
diff --git a/qpython/src/main/java/org/qpython/qpy/utils/iap/IabHelper.java b/qpython/src/main/java/org/qpython/qpy/utils/iap/IabHelper.java
new file mode 100755
index 00000000..cc0c3334
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/utils/iap/IabHelper.java
@@ -0,0 +1,1095 @@
+/* Copyright (c) 2012 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.qpython.qpy.utils.iap;
+
+import android.app.Activity;
+import android.app.PendingIntent;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentSender.SendIntentException;
+import android.content.ServiceConnection;
+import android.content.pm.ResolveInfo;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.IBinder;
+import android.os.RemoteException;
+import android.text.TextUtils;
+import android.util.Log;
+
+
+import com.android.vending.billing.IInAppBillingService;
+
+import org.json.JSONException;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * Provides convenience methods for in-app billing. You can create one instance of this
+ * class for your application and use it to process in-app billing operations.
+ * It provides synchronous (blocking) and asynchronous (non-blocking) methods for
+ * many common in-app billing operations, as well as automatic signature
+ * verification.
+ *
+ * After instantiating, you must perform setup in order to start using the object.
+ * To perform setup, call the {@link #startSetup} method and provide a listener;
+ * that listener will be notified when setup is complete, after which (and not before)
+ * you may call other methods.
+ *
+ * After setup is complete, you will typically want to request an inventory of owned
+ * items and subscriptions. See {@link #queryInventory}, {@link #queryInventoryAsync}
+ * and related methods.
+ *
+ * When you are done with this object, don't forget to call {@link #dispose}
+ * to ensure proper cleanup. This object holds a binding to the in-app billing
+ * service, which will leak unless you dispose of it correctly. If you created
+ * the object on an Activity's onCreate method, then the recommended
+ * place to dispose of it is the Activity's onDestroy method. It is invalid to
+ * dispose the object while an asynchronous operation is in progress. You can
+ * call {@link #disposeWhenFinished()} to ensure that any in-progress operation
+ * completes before the object is disposed.
+ *
+ * A note about threading: When using this object from a background thread, you may
+ * call the blocking versions of methods; when using from a UI thread, call
+ * only the asynchronous versions and handle the results via callbacks.
+ * Also, notice that you can only call one asynchronous operation at a time;
+ * attempting to start a second asynchronous operation while the first one
+ * has not yet completed will result in an exception being thrown.
+ *
+ */
+public class IabHelper {
+    // Billing response codes
+    public static final int BILLING_RESPONSE_RESULT_OK = 0;
+    public static final int BILLING_RESPONSE_RESULT_USER_CANCELED = 1;
+    public static final int BILLING_RESPONSE_RESULT_SERVICE_UNAVAILABLE = 2;
+    public static final int BILLING_RESPONSE_RESULT_BILLING_UNAVAILABLE = 3;
+    public static final int BILLING_RESPONSE_RESULT_ITEM_UNAVAILABLE = 4;
+    public static final int BILLING_RESPONSE_RESULT_DEVELOPER_ERROR = 5;
+    public static final int BILLING_RESPONSE_RESULT_ERROR = 6;
+    public static final int BILLING_RESPONSE_RESULT_ITEM_ALREADY_OWNED = 7;
+    public static final int BILLING_RESPONSE_RESULT_ITEM_NOT_OWNED = 8;
+    // IAB Helper error codes
+    public static final int IABHELPER_ERROR_BASE = -1000;
+    public static final int IABHELPER_REMOTE_EXCEPTION = -1001;
+    public static final int IABHELPER_BAD_RESPONSE = -1002;
+    public static final int IABHELPER_VERIFICATION_FAILED = -1003;
+    public static final int IABHELPER_SEND_INTENT_FAILED = -1004;
+    public static final int IABHELPER_USER_CANCELLED = -1005;
+    public static final int IABHELPER_UNKNOWN_PURCHASE_RESPONSE = -1006;
+    public static final int IABHELPER_MISSING_TOKEN = -1007;
+    public static final int IABHELPER_UNKNOWN_ERROR = -1008;
+    public static final int IABHELPER_SUBSCRIPTIONS_NOT_AVAILABLE = -1009;
+    public static final int IABHELPER_INVALID_CONSUMPTION = -1010;
+    public static final int IABHELPER_SUBSCRIPTION_UPDATE_NOT_AVAILABLE = -1011;
+    // Keys for the responses from InAppBillingService
+    public static final String RESPONSE_CODE = "RESPONSE_CODE";
+    public static final String RESPONSE_GET_SKU_DETAILS_LIST = "DETAILS_LIST";
+    public static final String RESPONSE_BUY_INTENT = "BUY_INTENT";
+    public static final String RESPONSE_INAPP_PURCHASE_DATA = "INAPP_PURCHASE_DATA";
+    public static final String RESPONSE_INAPP_SIGNATURE = "INAPP_DATA_SIGNATURE";
+    public static final String RESPONSE_INAPP_ITEM_LIST = "INAPP_PURCHASE_ITEM_LIST";
+    public static final String RESPONSE_INAPP_PURCHASE_DATA_LIST = "INAPP_PURCHASE_DATA_LIST";
+    public static final String RESPONSE_INAPP_SIGNATURE_LIST = "INAPP_DATA_SIGNATURE_LIST";
+    public static final String INAPP_CONTINUATION_TOKEN = "INAPP_CONTINUATION_TOKEN";
+    // Item types
+    public static final String ITEM_TYPE_INAPP = "inapp";
+    public static final String ITEM_TYPE_SUBS = "subs";
+    // some fields on the getSkuDetails response bundle
+    public static final String GET_SKU_DETAILS_ITEM_LIST = "ITEM_ID_LIST";
+    public static final String GET_SKU_DETAILS_ITEM_TYPE_LIST = "ITEM_TYPE_LIST";
+    // Ensure atomic access to mAsyncInProgress and mDisposeAfterAsync.
+    private final Object mAsyncInProgressLock = new Object();
+    // Is debug logging enabled?
+    boolean mDebugLog = false;
+    String mDebugTag = "IabHelper";
+    // Is setup done?
+    boolean mSetupDone = false;
+    // Has this object been disposed of? (If so, we should ignore callbacks, etc)
+    boolean mDisposed = false;
+    // Do we need to dispose this object after an in-progress asynchronous operation?
+    boolean mDisposeAfterAsync = false;
+    // Are subscriptions supported?
+    boolean mSubscriptionsSupported = false;
+    // Is subscription update supported?
+    boolean mSubscriptionUpdateSupported = false;
+    // Is an asynchronous operation in progress?
+    // (only one at a time can be in progress)
+    boolean mAsyncInProgress = false;
+    // (for logging/debugging)
+    // if mAsyncInProgress == true, what asynchronous operation is in progress?
+    String mAsyncOperation = "";
+    // Context we were passed during initialization
+    Context mContext;
+    // Connection to the service
+    IInAppBillingService mService;
+    ServiceConnection    mServiceConn;
+    // The request code used to launch purchase flow
+    int mRequestCode;
+    // The item type of the current purchase flow
+    String mPurchasingItemType;
+    // Public key for verifying signature, in base64 encoding
+    String mSignatureBase64 = null;
+    // The listener registered on launchPurchaseFlow, which we have to call back when
+    // the purchase finishes
+    OnIabPurchaseFinishedListener mPurchaseListener;
+
+    /**
+     * Creates an instance. After creation, it will not yet be ready to use. You must perform
+     * setup by calling {@link #startSetup} and wait for setup to complete. This constructor does not
+     * block and is safe to call from a UI thread.
+     *
+     * @param ctx Your application or Activity context. Needed to bind to the in-app billing service.
+     * @param base64PublicKey Your application's public key, encoded in base64.
+     *     This is used for verification of purchase signatures. You can find your app's base64-encoded
+     *     public key in your application's page on Google Play Developer Console. Note that this
+     *     is NOT your "developer public key".
+     */
+    public IabHelper(Context ctx, String base64PublicKey) {
+        mContext = ctx.getApplicationContext();
+        mSignatureBase64 = base64PublicKey;
+        logDebug("IAB helper created.");
+    }
+
+    /**
+     * Returns a human-readable description for the given response code.
+     *
+     * @param code The response code
+     * @return A human-readable string explaining the result code.
+     *     It also includes the result code numerically.
+     */
+    public static String getResponseDesc(int code) {
+        String[] iab_msgs = ("0:OK/1:User Canceled/2:Unknown/" +
+                "3:Billing Unavailable/4:Item unavailable/" +
+                "5:Developer Error/6:Error/7:Item Already Owned/" +
+                "8:Item not owned").split("/");
+        String[] iabhelper_msgs = ("0:OK/-1001:Remote exception during initialization/" +
+                                   "-1002:Bad response received/" +
+                                   "-1003:Purchase signature verification failed/" +
+                                   "-1004:Send intent failed/" +
+                                   "-1005:User cancelled/" +
+                                   "-1006:Unknown purchase response/" +
+                                   "-1007:Missing token/" +
+                                   "-1008:Unknown error/" +
+                                   "-1009:Subscriptions not available/" +
+                                   "-1010:Invalid consumption attempt").split("/");
+
+        if (code <= IABHELPER_ERROR_BASE) {
+            int index = IABHELPER_ERROR_BASE - code;
+            if (index >= 0 && index < iabhelper_msgs.length) return iabhelper_msgs[index];
+            else return String.valueOf(code) + ":Unknown IAB Helper Error";
+        }
+        else if (code < 0 || code >= iab_msgs.length)
+            return String.valueOf(code) + ":Unknown";
+        else
+            return iab_msgs[code];
+    }
+
+    /**
+     * Enables or disable debug logging through LogCat.
+     */
+    public void enableDebugLogging(boolean enable, String tag) {
+        checkNotDisposed();
+        mDebugLog = enable;
+        mDebugTag = tag;
+    }
+
+    public void enableDebugLogging(boolean enable) {
+        checkNotDisposed();
+        mDebugLog = enable;
+    }
+
+    /**
+     * Starts the setup process. This will start up the setup process asynchronously.
+     * You will be notified through the listener when the setup process is complete.
+     * This method is safe to call from a UI thread.
+     *
+     * @param listener The listener to notify when the setup process is complete.
+     */
+    public void startSetup(final OnIabSetupFinishedListener listener) {
+        // If already set up, can't do it again.
+        checkNotDisposed();
+        if (mSetupDone) throw new IllegalStateException("IAB helper is already set up.");
+
+        // Connection to IAB service
+        logDebug("Starting in-app billing setup.");
+        mServiceConn = new ServiceConnection() {
+            @Override
+            public void onServiceDisconnected(ComponentName name) {
+                logDebug("Billing service disconnected.");
+                mService = null;
+            }
+
+            @Override
+            public void onServiceConnected(ComponentName name, IBinder service) {
+                if (mDisposed) return;
+                logDebug("Billing service connected.");
+                mService = IInAppBillingService.Stub.asInterface(service);
+                String packageName = mContext.getPackageName();
+                try {
+                    logDebug("Checking for in-app billing 3 support.");
+
+                    // check for in-app billing v3 support
+                    int response = mService.isBillingSupported(3, packageName, ITEM_TYPE_INAPP);
+                    if (response != BILLING_RESPONSE_RESULT_OK) {
+                        if (listener != null) listener.onIabSetupFinished(new IabResult(response,
+                                "Error checking for billing v3 support."));
+
+                        // if in-app purchases aren't supported, neither are subscriptions
+                        mSubscriptionsSupported = false;
+                        mSubscriptionUpdateSupported = false;
+                        return;
+                    } else {
+                        logDebug("In-app billing version 3 supported for " + packageName);
+                    }
+
+                    // Check for v5 subscriptions support. This is needed for
+                    // getBuyIntentToReplaceSku which allows for subscription update
+                    response = mService.isBillingSupported(5, packageName, ITEM_TYPE_SUBS);
+                    if (response == BILLING_RESPONSE_RESULT_OK) {
+                        logDebug("Subscription re-signup AVAILABLE.");
+                        mSubscriptionUpdateSupported = true;
+                    } else {
+                        logDebug("Subscription re-signup not available.");
+                        mSubscriptionUpdateSupported = false;
+                    }
+
+                    if (mSubscriptionUpdateSupported) {
+                        mSubscriptionsSupported = true;
+                    } else {
+                        // check for v3 subscriptions support
+                        response = mService.isBillingSupported(3, packageName, ITEM_TYPE_SUBS);
+                        if (response == BILLING_RESPONSE_RESULT_OK) {
+                            logDebug("Subscriptions AVAILABLE.");
+                            mSubscriptionsSupported = true;
+                        } else {
+                            logDebug("Subscriptions NOT AVAILABLE. Response: " + response);
+                            mSubscriptionsSupported = false;
+                            mSubscriptionUpdateSupported = false;
+                        }
+                    }
+
+                    mSetupDone = true;
+                }
+                catch (RemoteException e) {
+                    if (listener != null) {
+                        listener.onIabSetupFinished(new IabResult(IABHELPER_REMOTE_EXCEPTION,
+                                "RemoteException while setting up in-app billing."));
+                    }
+                    e.printStackTrace();
+                    return;
+                }
+
+                if (listener != null) {
+                    listener.onIabSetupFinished(new IabResult(BILLING_RESPONSE_RESULT_OK, "Setup successful."));
+                }
+            }
+        };
+
+        Intent serviceIntent = new Intent("com.android.vending.billing.InAppBillingService.BIND");
+        serviceIntent.setPackage("com.android.vending");
+        List<ResolveInfo> intentServices = mContext.getPackageManager().queryIntentServices(serviceIntent, 0);
+        if (intentServices != null && !intentServices.isEmpty()) {
+            // service available to handle that Intent
+            mContext.bindService(serviceIntent, mServiceConn, Context.BIND_AUTO_CREATE);
+        }
+        else {
+            // no service available to handle that Intent
+            if (listener != null) {
+                listener.onIabSetupFinished(
+                        new IabResult(BILLING_RESPONSE_RESULT_BILLING_UNAVAILABLE,
+                                "Billing service unavailable on device."));
+            }
+        }
+    }
+
+    /**
+     * Dispose of object, releasing resources. It's very important to call this
+     * method when you are done with this object. It will release any resources
+     * used by it such as service connections. Naturally, once the object is
+     * disposed of, it can't be used again.
+     */
+    public void dispose() throws IabAsyncInProgressException {
+        synchronized (mAsyncInProgressLock) {
+            if (mAsyncInProgress) {
+                throw new IabAsyncInProgressException("Can't dispose because an async operation " +
+                    "(" + mAsyncOperation + ") is in progress.");
+            }
+        }
+        logDebug("Disposing.");
+        mSetupDone = false;
+        if (mServiceConn != null) {
+            logDebug("Unbinding from service.");
+            if (mContext != null) mContext.unbindService(mServiceConn);
+        }
+        mDisposed = true;
+        mContext = null;
+        mServiceConn = null;
+        mService = null;
+        mPurchaseListener = null;
+    }
+
+    /**
+     * Disposes of object, releasing resources. If there is an in-progress async operation, this
+     * method will queue the dispose to occur after the operation has finished.
+     */
+    public void disposeWhenFinished() {
+        synchronized (mAsyncInProgressLock) {
+            if (mAsyncInProgress) {
+                logDebug("Will dispose after async operation finishes.");
+                mDisposeAfterAsync = true;
+            } else {
+                try {
+                    dispose();
+                } catch (IabAsyncInProgressException e) {
+                    // Should never be thrown, because we call dispose() only after checking that
+                    // there's not already an async operation in progress.
+                }
+            }
+        }
+    }
+
+    private void checkNotDisposed() {
+        if (mDisposed) throw new IllegalStateException("IabHelper was disposed of, so it cannot be used.");
+    }
+
+    /** Returns whether subscriptions are supported. */
+    public boolean subscriptionsSupported() {
+        checkNotDisposed();
+        return mSubscriptionsSupported;
+    }
+
+    public void launchPurchaseFlow(Activity act, String sku, int requestCode, OnIabPurchaseFinishedListener listener)
+        throws IabAsyncInProgressException {
+        launchPurchaseFlow(act, sku, requestCode, listener, "");
+    }
+
+    public void launchPurchaseFlow(Activity act, String sku, int requestCode,
+            OnIabPurchaseFinishedListener listener, String extraData)
+        throws IabAsyncInProgressException {
+        launchPurchaseFlow(act, sku, ITEM_TYPE_INAPP, null, requestCode, listener, extraData);
+    }
+
+    public void launchSubscriptionPurchaseFlow(Activity act, String sku, int requestCode,
+            OnIabPurchaseFinishedListener listener) throws IabAsyncInProgressException {
+        launchSubscriptionPurchaseFlow(act, sku, requestCode, listener, "");
+    }
+
+    public void launchSubscriptionPurchaseFlow(Activity act, String sku, int requestCode,
+            OnIabPurchaseFinishedListener listener, String extraData)
+        throws IabAsyncInProgressException {
+        launchPurchaseFlow(act, sku, ITEM_TYPE_SUBS, null, requestCode, listener, extraData);
+    }
+
+    /**
+     * Initiate the UI flow for an in-app purchase. Call this method to initiate an in-app purchase,
+     * which will involve bringing up the Google Play screen. The calling activity will be paused
+     * while the user interacts with Google Play, and the result will be delivered via the
+     * activity's {@link Activity#onActivityResult} method, at which point you must call
+     * this object's {@link #handleActivityResult} method to continue the purchase flow. This method
+     * MUST be called from the UI thread of the Activity.
+     *
+     * @param act The calling activity.
+     * @param sku The sku of the item to purchase.
+     * @param itemType indicates if it's a product or a subscription (ITEM_TYPE_INAPP or
+     *      ITEM_TYPE_SUBS)
+     * @param oldSkus A list of SKUs which the new SKU is replacing or null if there are none
+     * @param requestCode A request code (to differentiate from other responses -- as in
+     *      {@link Activity#startActivityForResult}).
+     * @param listener The listener to notify when the purchase process finishes
+     * @param extraData Extra data (developer payload), which will be returned with the purchase
+     *      data when the purchase completes. This extra data will be permanently bound to that
+     *      purchase and will always be returned when the purchase is queried.
+     */
+    public void launchPurchaseFlow(Activity act, String sku, String itemType, List<String> oldSkus,
+            int requestCode, OnIabPurchaseFinishedListener listener, String extraData)
+        throws IabAsyncInProgressException {
+        checkNotDisposed();
+        checkSetupDone("launchPurchaseFlow");
+        flagStartAsync("launchPurchaseFlow");
+        IabResult result;
+
+        if (itemType.equals(ITEM_TYPE_SUBS) && !mSubscriptionsSupported) {
+            IabResult r = new IabResult(IABHELPER_SUBSCRIPTIONS_NOT_AVAILABLE,
+                    "Subscriptions are not available.");
+            flagEndAsync();
+            if (listener != null) listener.onIabPurchaseFinished(r, null);
+            return;
+        }
+
+        try {
+            logDebug("Constructing buy intent for " + sku + ", item type: " + itemType);
+            Bundle buyIntentBundle;
+            if (oldSkus == null || oldSkus.isEmpty()) {
+                // Purchasing a new item or subscription re-signup
+                buyIntentBundle = mService.getBuyIntent(3, mContext.getPackageName(), sku, itemType,
+                        extraData);
+            } else {
+                // Subscription upgrade/downgrade
+                if (!mSubscriptionUpdateSupported) {
+                    IabResult r = new IabResult(IABHELPER_SUBSCRIPTION_UPDATE_NOT_AVAILABLE,
+                            "Subscription updates are not available.");
+                    flagEndAsync();
+                    if (listener != null) listener.onIabPurchaseFinished(r, null);
+                    return;
+                }
+                buyIntentBundle = mService.getBuyIntentToReplaceSkus(5, mContext.getPackageName(),
+                        oldSkus, sku, itemType, extraData);
+            }
+            int response = getResponseCodeFromBundle(buyIntentBundle);
+            if (response != BILLING_RESPONSE_RESULT_OK) {
+                logError("Unable to buy item, Error response: " + getResponseDesc(response));
+                flagEndAsync();
+                result = new IabResult(response, "Unable to buy item");
+                if (listener != null) listener.onIabPurchaseFinished(result, null);
+                return;
+            }
+
+            PendingIntent pendingIntent = buyIntentBundle.getParcelable(RESPONSE_BUY_INTENT);
+            logDebug("Launching buy intent for " + sku + ". Request code: " + requestCode);
+            mRequestCode = requestCode;
+            mPurchaseListener = listener;
+            mPurchasingItemType = itemType;
+            act.startIntentSenderForResult(pendingIntent.getIntentSender(),
+                    requestCode, new Intent(),
+                    Integer.valueOf(0), Integer.valueOf(0),
+                    Integer.valueOf(0));
+        }
+        catch (SendIntentException e) {
+            logError("SendIntentException while launching purchase flow for sku " + sku);
+            e.printStackTrace();
+            flagEndAsync();
+
+            result = new IabResult(IABHELPER_SEND_INTENT_FAILED, "Failed to send intent.");
+            if (listener != null) listener.onIabPurchaseFinished(result, null);
+        }
+        catch (RemoteException e) {
+            logError("RemoteException while launching purchase flow for sku " + sku);
+            e.printStackTrace();
+            flagEndAsync();
+
+            result = new IabResult(IABHELPER_REMOTE_EXCEPTION, "Remote exception while starting purchase flow");
+            if (listener != null) listener.onIabPurchaseFinished(result, null);
+        }
+    }
+
+    /**
+     * Handles an activity result that's part of the purchase flow in in-app billing. If you
+     * are calling {@link #launchPurchaseFlow}, then you must call this method from your
+     * Activity's {@link Activity@onActivityResult} method. This method
+     * MUST be called from the UI thread of the Activity.
+     *
+     * @param requestCode The requestCode as you received it.
+     * @param resultCode The resultCode as you received it.
+     * @param data The data (Intent) as you received it.
+     * @return Returns true if the result was related to a purchase flow and was handled;
+     *     false if the result was not related to a purchase, in which case you should
+     *     handle it normally.
+     */
+    public boolean handleActivityResult(int requestCode, int resultCode, Intent data) {
+        IabResult result;
+        if (requestCode != mRequestCode) return false;
+
+        checkNotDisposed();
+        checkSetupDone("handleActivityResult");
+
+        // end of async purchase operation that started on launchPurchaseFlow
+        flagEndAsync();
+
+        if (data == null) {
+            logError("Null data in IAB activity result.");
+            result = new IabResult(IABHELPER_BAD_RESPONSE, "Null data in IAB result");
+            if (mPurchaseListener != null) mPurchaseListener.onIabPurchaseFinished(result, null);
+            return true;
+        }
+
+        int responseCode = getResponseCodeFromIntent(data);
+        String purchaseData = data.getStringExtra(RESPONSE_INAPP_PURCHASE_DATA);
+        String dataSignature = data.getStringExtra(RESPONSE_INAPP_SIGNATURE);
+
+        if (resultCode == Activity.RESULT_OK && responseCode == BILLING_RESPONSE_RESULT_OK) {
+            logDebug("Successful resultcode from purchase activity.");
+            logDebug("Purchase data: " + purchaseData);
+            logDebug("Data signature: " + dataSignature);
+            logDebug("Extras: " + data.getExtras());
+            logDebug("Expected item type: " + mPurchasingItemType);
+
+            if (purchaseData == null || dataSignature == null) {
+                logError("BUG: either purchaseData or dataSignature is null.");
+                logDebug("Extras: " + data.getExtras().toString());
+                result = new IabResult(IABHELPER_UNKNOWN_ERROR, "IAB returned null purchaseData or dataSignature");
+                if (mPurchaseListener != null) mPurchaseListener.onIabPurchaseFinished(result, null);
+                return true;
+            }
+
+            Purchase purchase = null;
+            try {
+                purchase = new Purchase(mPurchasingItemType, purchaseData, dataSignature);
+                String sku = purchase.getSku();
+
+                // Verify signature
+                if (!Security.verifyPurchase(mSignatureBase64, purchaseData, dataSignature)) {
+                    logError("Purchase signature verification FAILED for sku " + sku);
+                    result = new IabResult(IABHELPER_VERIFICATION_FAILED, "Signature verification failed for sku " + sku);
+                    if (mPurchaseListener != null) mPurchaseListener.onIabPurchaseFinished(result, purchase);
+                    return true;
+                }
+                logDebug("Purchase signature successfully verified.");
+            }
+            catch (JSONException e) {
+                logError("Failed to parse purchase data.");
+                e.printStackTrace();
+                result = new IabResult(IABHELPER_BAD_RESPONSE, "Failed to parse purchase data.");
+                if (mPurchaseListener != null) mPurchaseListener.onIabPurchaseFinished(result, null);
+                return true;
+            }
+
+            if (mPurchaseListener != null) {
+                mPurchaseListener.onIabPurchaseFinished(new IabResult(BILLING_RESPONSE_RESULT_OK, "Success"), purchase);
+            }
+        }
+        else if (resultCode == Activity.RESULT_OK) {
+            // result code was OK, but in-app billing response was not OK.
+            logDebug("Result code was OK but in-app billing response was not OK: " + getResponseDesc(responseCode));
+            if (mPurchaseListener != null) {
+                result = new IabResult(responseCode, "Problem purchashing item.");
+                mPurchaseListener.onIabPurchaseFinished(result, null);
+            }
+        }
+        else if (resultCode == Activity.RESULT_CANCELED) {
+            logDebug("Purchase canceled - Response: " + getResponseDesc(responseCode));
+            result = new IabResult(IABHELPER_USER_CANCELLED, "User canceled.");
+            if (mPurchaseListener != null) mPurchaseListener.onIabPurchaseFinished(result, null);
+        }
+        else {
+            logError("Purchase failed. Result code: " + Integer.toString(resultCode)
+                    + ". Response: " + getResponseDesc(responseCode));
+            result = new IabResult(IABHELPER_UNKNOWN_PURCHASE_RESPONSE, "Unknown purchase response.");
+            if (mPurchaseListener != null) mPurchaseListener.onIabPurchaseFinished(result, null);
+        }
+        return true;
+    }
+
+    public Inventory queryInventory() throws IabException {
+        return queryInventory(false, null, null);
+    }
+
+    /**
+     * Queries the inventory. This will query all owned items from the server, as well as
+     * information on additional skus, if specified. This method may block or take long to execute.
+     * Do not call from a UI thread. For that, use the non-blocking version {@link #queryInventoryAsync}.
+     *
+     * @param querySkuDetails if true, SKU details (price, description, etc) will be queried as well
+     *     as purchase information.
+     * @param moreItemSkus additional PRODUCT skus to query information on, regardless of ownership.
+     *     Ignored if null or if querySkuDetails is false.
+     * @param moreSubsSkus additional SUBSCRIPTIONS skus to query information on, regardless of ownership.
+     *     Ignored if null or if querySkuDetails is false.
+     * @throws IabException if a problem occurs while refreshing the inventory.
+     */
+    public Inventory queryInventory(boolean querySkuDetails, List<String> moreItemSkus,
+            List<String> moreSubsSkus) throws IabException {
+        checkNotDisposed();
+        checkSetupDone("queryInventory");
+        try {
+            Inventory inv = new Inventory();
+            int r = queryPurchases(inv, ITEM_TYPE_INAPP);
+            if (r != BILLING_RESPONSE_RESULT_OK) {
+                throw new IabException(r, "Error refreshing inventory (querying owned items).");
+            }
+
+            if (querySkuDetails) {
+                r = querySkuDetails(ITEM_TYPE_INAPP, inv, moreItemSkus);
+                if (r != BILLING_RESPONSE_RESULT_OK) {
+                    throw new IabException(r, "Error refreshing inventory (querying prices of items).");
+                }
+            }
+
+            // if subscriptions are supported, then also query for subscriptions
+            if (mSubscriptionsSupported) {
+                r = queryPurchases(inv, ITEM_TYPE_SUBS);
+                if (r != BILLING_RESPONSE_RESULT_OK) {
+                    throw new IabException(r, "Error refreshing inventory (querying owned subscriptions).");
+                }
+
+                if (querySkuDetails) {
+                    r = querySkuDetails(ITEM_TYPE_SUBS, inv, moreSubsSkus);
+                    if (r != BILLING_RESPONSE_RESULT_OK) {
+                        throw new IabException(r, "Error refreshing inventory (querying prices of subscriptions).");
+                    }
+                }
+            }
+
+            return inv;
+        }
+        catch (RemoteException e) {
+            throw new IabException(IABHELPER_REMOTE_EXCEPTION, "Remote exception while refreshing inventory.", e);
+        }
+        catch (JSONException e) {
+            throw new IabException(IABHELPER_BAD_RESPONSE, "Error parsing JSON response while refreshing inventory.", e);
+        }
+    }
+
+    /**
+     * Asynchronous wrapper for inventory query. This will perform an inventory
+     * query as described in {@link #queryInventory}, but will do so asynchronously
+     * and call back the specified listener upon completion. This method is safe to
+     * call from a UI thread.
+     *
+     * @param querySkuDetails as in {@link #queryInventory}
+     * @param moreItemSkus as in {@link #queryInventory}
+     * @param moreSubsSkus as in {@link #queryInventory}
+     * @param listener The listener to notify when the refresh operation completes.
+     */
+    public void queryInventoryAsync(final boolean querySkuDetails, final List<String> moreItemSkus,
+            final List<String> moreSubsSkus, final QueryInventoryFinishedListener listener)
+        throws IabAsyncInProgressException {
+        final Handler handler = new Handler();
+        checkNotDisposed();
+        checkSetupDone("queryInventory");
+        flagStartAsync("refresh inventory");
+        (new Thread(new Runnable() {
+            public void run() {
+                IabResult result = new IabResult(BILLING_RESPONSE_RESULT_OK, "Inventory refresh successful.");
+                Inventory inv = null;
+                try {
+                    inv = queryInventory(querySkuDetails, moreItemSkus, moreSubsSkus);
+                }
+                catch (IabException ex) {
+                    result = ex.getResult();
+                }
+
+                flagEndAsync();
+
+                final IabResult result_f = result;
+                final Inventory inv_f = inv;
+                if (!mDisposed && listener != null) {
+                    handler.post(new Runnable() {
+                        public void run() {
+                            listener.onQueryInventoryFinished(result_f, inv_f);
+                        }
+                    });
+                }
+            }
+        })).start();
+    }
+
+    public void queryInventoryAsync(QueryInventoryFinishedListener listener)
+        throws IabAsyncInProgressException{
+        queryInventoryAsync(false, null, null, listener);
+    }
+
+    /**
+     * Consumes a given in-app product. Consuming can only be done on an item
+     * that's owned, and as a result of consumption, the user will no longer own it.
+     * This method may block or take long to return. Do not call from the UI thread.
+     * For that, see {@link #consumeAsync}.
+     *
+     * @param itemInfo The PurchaseInfo that represents the item to consume.
+     * @throws IabException if there is a problem during consumption.
+     */
+    void consume(Purchase itemInfo) throws IabException {
+        checkNotDisposed();
+        checkSetupDone("consume");
+
+        if (!itemInfo.mItemType.equals(ITEM_TYPE_INAPP)) {
+            throw new IabException(IABHELPER_INVALID_CONSUMPTION,
+                    "Items of type '" + itemInfo.mItemType + "' can't be consumed.");
+        }
+
+        try {
+            String token = itemInfo.getToken();
+            String sku = itemInfo.getSku();
+            if (token == null || token.equals("")) {
+                logError("Can't consume "+ sku + ". No token.");
+                throw new IabException(IABHELPER_MISSING_TOKEN, "PurchaseInfo is missing token for sku: "
+                        + sku + " " + itemInfo);
+            }
+
+            logDebug("Consuming sku: " + sku + ", token: " + token);
+            int response = mService.consumePurchase(3, mContext.getPackageName(), token);
+            if (response == BILLING_RESPONSE_RESULT_OK) {
+                logDebug("Successfully consumed sku: " + sku);
+            }
+            else {
+                logDebug("Error consuming consuming sku " + sku + ". " + getResponseDesc(response));
+                throw new IabException(response, "Error consuming sku " + sku);
+            }
+        }
+        catch (RemoteException e) {
+            throw new IabException(IABHELPER_REMOTE_EXCEPTION, "Remote exception while consuming. PurchaseInfo: " + itemInfo, e);
+        }
+    }
+
+    /**
+     * Asynchronous wrapper to item consumption. Works like {@link #consume}, but
+     * performs the consumption in the background and notifies completion through
+     * the provided listener. This method is safe to call from a UI thread.
+     *
+     * @param purchase The purchase to be consumed.
+     * @param listener The listener to notify when the consumption operation finishes.
+     */
+    public void consumeAsync(Purchase purchase, OnConsumeFinishedListener listener)
+        throws IabAsyncInProgressException {
+        checkNotDisposed();
+        checkSetupDone("consume");
+        List<Purchase> purchases = new ArrayList<Purchase>();
+        purchases.add(purchase);
+        consumeAsyncInternal(purchases, listener, null);
+    }
+
+    /**
+     * Same as {@link #consumeAsync}, but for multiple items at once.
+     * @param purchases The list of PurchaseInfo objects representing the purchases to consume.
+     * @param listener The listener to notify when the consumption operation finishes.
+     */
+    public void consumeAsync(List<Purchase> purchases, OnConsumeMultiFinishedListener listener)
+        throws IabAsyncInProgressException {
+        checkNotDisposed();
+        checkSetupDone("consume");
+        consumeAsyncInternal(purchases, null, listener);
+    }
+
+    // Checks that setup was done; if not, throws an exception.
+    void checkSetupDone(String operation) {
+        if (!mSetupDone) {
+            logError("Illegal state for operation (" + operation + "): IAB helper is not set up.");
+            throw new IllegalStateException("IAB helper is not set up. Can't perform operation: " + operation);
+        }
+    }
+
+    // Workaround to bug where sometimes response codes come as Long instead of Integer
+    int getResponseCodeFromBundle(Bundle b) {
+        Object o = b.get(RESPONSE_CODE);
+        if (o == null) {
+            logDebug("Bundle with null response code, assuming OK (known issue)");
+            return BILLING_RESPONSE_RESULT_OK;
+        }
+        else if (o instanceof Integer) return ((Integer)o).intValue();
+        else if (o instanceof Long) return (int)((Long)o).longValue();
+        else {
+            logError("Unexpected type for bundle response code.");
+            logError(o.getClass().getName());
+            throw new RuntimeException("Unexpected type for bundle response code: " + o.getClass().getName());
+        }
+    }
+
+    // Workaround to bug where sometimes response codes come as Long instead of Integer
+    int getResponseCodeFromIntent(Intent i) {
+        Object o = i.getExtras().get(RESPONSE_CODE);
+        if (o == null) {
+            logError("Intent with no response code, assuming OK (known issue)");
+            return BILLING_RESPONSE_RESULT_OK;
+        }
+        else if (o instanceof Integer) return ((Integer)o).intValue();
+        else if (o instanceof Long) return (int)((Long)o).longValue();
+        else {
+            logError("Unexpected type for intent response code.");
+            logError(o.getClass().getName());
+            throw new RuntimeException("Unexpected type for intent response code: " + o.getClass().getName());
+        }
+    }
+
+    void flagStartAsync(String operation) throws IabAsyncInProgressException {
+        synchronized (mAsyncInProgressLock) {
+            if (mAsyncInProgress) {
+                throw new IabAsyncInProgressException("Can't start async operation (" +
+                    operation + ") because another async operation (" + mAsyncOperation +
+                    ") is in progress.");
+            }
+            mAsyncOperation = operation;
+            mAsyncInProgress = true;
+            logDebug("Starting async operation: " + operation);
+        }
+    }
+
+    void flagEndAsync() {
+        synchronized (mAsyncInProgressLock) {
+            logDebug("Ending async operation: " + mAsyncOperation);
+            mAsyncOperation = "";
+            mAsyncInProgress = false;
+            if (mDisposeAfterAsync) {
+                try {
+                    dispose();
+                } catch (IabAsyncInProgressException e) {
+                    // Should not be thrown, because we reset mAsyncInProgress immediately before
+                    // calling dispose().
+                }
+            }
+        }
+    }
+
+    int queryPurchases(Inventory inv, String itemType) throws JSONException, RemoteException {
+        // Query purchases
+        logDebug("Querying owned items, item type: " + itemType);
+        logDebug("Package name: " + mContext.getPackageName());
+        boolean verificationFailed = false;
+        String continueToken = null;
+
+        do {
+            logDebug("Calling getPurchases with continuation token: " + continueToken);
+            Bundle ownedItems = mService.getPurchases(3, mContext.getPackageName(),
+                    itemType, continueToken);
+
+            int response = getResponseCodeFromBundle(ownedItems);
+            logDebug("Owned items response: " + String.valueOf(response));
+            if (response != BILLING_RESPONSE_RESULT_OK) {
+                logDebug("getPurchases() failed: " + getResponseDesc(response));
+                return response;
+            }
+            if (!ownedItems.containsKey(RESPONSE_INAPP_ITEM_LIST)
+                    || !ownedItems.containsKey(RESPONSE_INAPP_PURCHASE_DATA_LIST)
+                    || !ownedItems.containsKey(RESPONSE_INAPP_SIGNATURE_LIST)) {
+                logError("Bundle returned from getPurchases() doesn't contain required fields.");
+                return IABHELPER_BAD_RESPONSE;
+            }
+
+            ArrayList<String> ownedSkus = ownedItems.getStringArrayList(
+                    RESPONSE_INAPP_ITEM_LIST);
+            ArrayList<String> purchaseDataList = ownedItems.getStringArrayList(
+                    RESPONSE_INAPP_PURCHASE_DATA_LIST);
+            ArrayList<String> signatureList = ownedItems.getStringArrayList(
+                    RESPONSE_INAPP_SIGNATURE_LIST);
+
+            for (int i = 0; i < purchaseDataList.size(); ++i) {
+                String purchaseData = purchaseDataList.get(i);
+                String signature = signatureList.get(i);
+                String sku = ownedSkus.get(i);
+                if (Security.verifyPurchase(mSignatureBase64, purchaseData, signature)) {
+                    logDebug("Sku is owned: " + sku);
+                    Purchase purchase = new Purchase(itemType, purchaseData, signature);
+
+                    if (TextUtils.isEmpty(purchase.getToken())) {
+                        logWarn("BUG: empty/null token!");
+                        logDebug("Purchase data: " + purchaseData);
+                    }
+
+                    // Record ownership and token
+                    inv.addPurchase(purchase);
+                }
+                else {
+                    logWarn("Purchase signature verification **FAILED**. Not adding item.");
+                    logDebug("   Purchase data: " + purchaseData);
+                    logDebug("   Signature: " + signature);
+                    verificationFailed = true;
+                }
+            }
+
+            continueToken = ownedItems.getString(INAPP_CONTINUATION_TOKEN);
+            logDebug("Continuation token: " + continueToken);
+        } while (!TextUtils.isEmpty(continueToken));
+
+        return verificationFailed ? IABHELPER_VERIFICATION_FAILED : BILLING_RESPONSE_RESULT_OK;
+    }
+
+    int querySkuDetails(String itemType, Inventory inv, List<String> moreSkus)
+            throws RemoteException, JSONException {
+        logDebug("Querying SKU details.");
+        ArrayList<String> skuList = new ArrayList<String>();
+        skuList.addAll(inv.getAllOwnedSkus(itemType));
+        if (moreSkus != null) {
+            for (String sku : moreSkus) {
+                if (!skuList.contains(sku)) {
+                    skuList.add(sku);
+                }
+            }
+        }
+
+        if (skuList.size() == 0) {
+            logDebug("queryPrices: nothing to do because there are no SKUs.");
+            return BILLING_RESPONSE_RESULT_OK;
+        }
+
+        // Split the sku list in blocks of no more than 20 elements.
+        ArrayList<ArrayList<String>> packs = new ArrayList<ArrayList<String>>();
+        ArrayList<String> tempList;
+        int n = skuList.size() / 20;
+        int mod = skuList.size() % 20;
+        for (int i = 0; i < n; i++) {
+            tempList = new ArrayList<String>();
+            for (String s : skuList.subList(i * 20, i * 20 + 20)) {
+                tempList.add(s);
+            }
+            packs.add(tempList);
+        }
+        if (mod != 0) {
+            tempList = new ArrayList<String>();
+            for (String s : skuList.subList(n * 20, n * 20 + mod)) {
+                tempList.add(s);
+            }
+            packs.add(tempList);
+        }
+
+        for (ArrayList<String> skuPartList : packs) {
+            Bundle querySkus = new Bundle();
+            querySkus.putStringArrayList(GET_SKU_DETAILS_ITEM_LIST, skuPartList);
+            Bundle skuDetails = mService.getSkuDetails(3, mContext.getPackageName(),
+                    itemType, querySkus);
+
+            if (!skuDetails.containsKey(RESPONSE_GET_SKU_DETAILS_LIST)) {
+                int response = getResponseCodeFromBundle(skuDetails);
+                if (response != BILLING_RESPONSE_RESULT_OK) {
+                    logDebug("getSkuDetails() failed: " + getResponseDesc(response));
+                    return response;
+                } else {
+                    logError("getSkuDetails() returned a bundle with neither an error nor a detail list.");
+                    return IABHELPER_BAD_RESPONSE;
+                }
+            }
+
+            ArrayList<String> responseList = skuDetails.getStringArrayList(
+                    RESPONSE_GET_SKU_DETAILS_LIST);
+
+            for (String thisResponse : responseList) {
+                SkuDetails d = new SkuDetails(itemType, thisResponse);
+                logDebug("Got sku details: " + d);
+                inv.addSkuDetails(d);
+            }
+        }
+
+        return BILLING_RESPONSE_RESULT_OK;
+    }
+
+    void consumeAsyncInternal(final List<Purchase> purchases,
+                              final OnConsumeFinishedListener singleListener,
+                              final OnConsumeMultiFinishedListener multiListener)
+        throws IabAsyncInProgressException {
+        final Handler handler = new Handler();
+        flagStartAsync("consume");
+        (new Thread(new Runnable() {
+            public void run() {
+                final List<IabResult> results = new ArrayList<IabResult>();
+                for (Purchase purchase : purchases) {
+                    try {
+                        consume(purchase);
+                        results.add(new IabResult(BILLING_RESPONSE_RESULT_OK, "Successful consume of sku " + purchase.getSku()));
+                    }
+                    catch (IabException ex) {
+                        results.add(ex.getResult());
+                    }
+                }
+
+                flagEndAsync();
+                if (!mDisposed && singleListener != null) {
+                    handler.post(new Runnable() {
+                        public void run() {
+                            singleListener.onConsumeFinished(purchases.get(0), results.get(0));
+                        }
+                    });
+                }
+                if (!mDisposed && multiListener != null) {
+                    handler.post(new Runnable() {
+                        public void run() {
+                            multiListener.onConsumeMultiFinished(purchases, results);
+                        }
+                    });
+                }
+            }
+        })).start();
+    }
+
+    void logDebug(String msg) {
+        if (mDebugLog) Log.d(mDebugTag, msg);
+    }
+
+    void logError(String msg) {
+        Log.e(mDebugTag, "In-app billing error: " + msg);
+    }
+
+    void logWarn(String msg) {
+        Log.w(mDebugTag, "In-app billing warning: " + msg);
+    }
+
+    /**
+     * Callback for setup process. This listener's {@link #onIabSetupFinished} method is called
+     * when the setup process is complete.
+     */
+    public interface OnIabSetupFinishedListener {
+        /**
+         * Called to notify that setup is complete.
+         *
+         * @param result The result of the setup process.
+         */
+        void onIabSetupFinished(IabResult result);
+    }
+
+    /**
+     * Callback that notifies when a purchase is finished.
+     */
+    public interface OnIabPurchaseFinishedListener {
+        /**
+         * Called to notify that an in-app purchase finished. If the purchase was successful,
+         * then the sku parameter specifies which item was purchased. If the purchase failed,
+         * the sku and extraData parameters may or may not be null, depending on how far the purchase
+         * process went.
+         *
+         * @param result The result of the purchase.
+         * @param info The purchase information (null if purchase failed)
+         */
+        void onIabPurchaseFinished(IabResult result, Purchase info);
+    }
+
+    /**
+     * Listener that notifies when an inventory query operation completes.
+     */
+    public interface QueryInventoryFinishedListener {
+        /**
+         * Called to notify that an inventory query operation completed.
+         *
+         * @param result The result of the operation.
+         * @param inv The inventory.
+         */
+        void onQueryInventoryFinished(IabResult result, Inventory inv);
+    }
+
+    /**
+     * Callback that notifies when a consumption operation finishes.
+     */
+    public interface OnConsumeFinishedListener {
+        /**
+         * Called to notify that a consumption has finished.
+         *
+         * @param purchase The purchase that was (or was to be) consumed.
+         * @param result The result of the consumption operation.
+         */
+        void onConsumeFinished(Purchase purchase, IabResult result);
+    }
+
+    /**
+     * Callback that notifies when a multi-item consumption operation finishes.
+     */
+    public interface OnConsumeMultiFinishedListener {
+        /**
+         * Called to notify that a consumption of multiple items has finished.
+         *
+         * @param purchases The purchases that were (or were to be) consumed.
+         * @param results The results of each consumption operation, corresponding to each
+         *     sku.
+         */
+        void onConsumeMultiFinished(List<Purchase> purchases, List<IabResult> results);
+    }
+
+    /**
+     * Exception thrown when the requested operation cannot be started because an async operation
+     * is still in progress.
+     */
+    public static class IabAsyncInProgressException extends Exception {
+        public IabAsyncInProgressException(String message) {
+            super(message);
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/utils/iap/IabResult.java b/qpython/src/main/java/org/qpython/qpy/utils/iap/IabResult.java
new file mode 100644
index 00000000..3d149f20
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/utils/iap/IabResult.java
@@ -0,0 +1,45 @@
+/* Copyright (c) 2012 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.qpython.qpy.utils.iap;
+
+/**
+ * Represents the result of an in-app billing operation.
+ * A result is composed of a response code (an integer) and possibly a
+ * message (String). You can get those by calling
+ * {@link #getResponse} and {@link #getMessage()}, respectively. You
+ * can also inquire whether a result is a success or a failure by
+ * calling {@link #isSuccess()} and {@link #isFailure()}.
+ */
+public class IabResult {
+    int mResponse;
+    String mMessage;
+
+    public IabResult(int response, String message) {
+        mResponse = response;
+        if (message == null || message.trim().length() == 0) {
+            mMessage = IabHelper.getResponseDesc(response);
+        }
+        else {
+            mMessage = message + " (response: " + IabHelper.getResponseDesc(response) + ")";
+        }
+    }
+    public int getResponse() { return mResponse; }
+    public String getMessage() { return mMessage; }
+    public boolean isSuccess() { return mResponse == IabHelper.BILLING_RESPONSE_RESULT_OK; }
+    public boolean isFailure() { return !isSuccess(); }
+    public String toString() { return "IabResult: " + getMessage(); }
+}
+
diff --git a/qpython/src/main/java/org/qpython/qpy/utils/iap/Inventory.java b/qpython/src/main/java/org/qpython/qpy/utils/iap/Inventory.java
new file mode 100644
index 00000000..456b600f
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/utils/iap/Inventory.java
@@ -0,0 +1,91 @@
+/* Copyright (c) 2012 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.qpython.qpy.utils.iap;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Represents a block of information about in-app items.
+ * An Inventory is returned by such methods as {@link IabHelper#queryInventory}.
+ */
+public class Inventory {
+    Map<String,SkuDetails> mSkuMap = new HashMap<String,SkuDetails>();
+    Map<String,Purchase> mPurchaseMap = new HashMap<String,Purchase>();
+
+    Inventory() { }
+
+    /** Returns the listing details for an in-app product. */
+    public SkuDetails getSkuDetails(String sku) {
+        return mSkuMap.get(sku);
+    }
+
+    /** Returns purchase information for a given product, or null if there is no purchase. */
+    public Purchase getPurchase(String sku) {
+        return mPurchaseMap.get(sku);
+    }
+
+    /** Returns whether or not there exists a purchase of the given product. */
+    public boolean hasPurchase(String sku) {
+        return mPurchaseMap.containsKey(sku);
+    }
+
+    /** Return whether or not details about the given product are available. */
+    public boolean hasDetails(String sku) {
+        return mSkuMap.containsKey(sku);
+    }
+
+    /**
+     * Erase a purchase (locally) from the inventory, given its product ID. This just
+     * modifies the Inventory object locally and has no effect on the server! This is
+     * useful when you have an existing Inventory object which you know to be up to date,
+     * and you have just consumed an item successfully, which means that erasing its
+     * purchase data from the Inventory you already have is quicker than querying for
+     * a new Inventory.
+     */
+    public void erasePurchase(String sku) {
+        if (mPurchaseMap.containsKey(sku)) mPurchaseMap.remove(sku);
+    }
+
+    /** Returns a list of all owned product IDs. */
+    List<String> getAllOwnedSkus() {
+        return new ArrayList<String>(mPurchaseMap.keySet());
+    }
+
+    /** Returns a list of all owned product IDs of a given type */
+    List<String> getAllOwnedSkus(String itemType) {
+        List<String> result = new ArrayList<String>();
+        for (Purchase p : mPurchaseMap.values()) {
+            if (p.getItemType().equals(itemType)) result.add(p.getSku());
+        }
+        return result;
+    }
+
+    /** Returns a list of all purchases. */
+    List<Purchase> getAllPurchases() {
+        return new ArrayList<Purchase>(mPurchaseMap.values());
+    }
+
+    void addSkuDetails(SkuDetails d) {
+        mSkuMap.put(d.getSku(), d);
+    }
+
+    void addPurchase(Purchase p) {
+        mPurchaseMap.put(p.getSku(), p);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/utils/iap/Purchase.java b/qpython/src/main/java/org/qpython/qpy/utils/iap/Purchase.java
new file mode 100644
index 00000000..5eb9c822
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/utils/iap/Purchase.java
@@ -0,0 +1,66 @@
+/* Copyright (c) 2012 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.qpython.qpy.utils.iap;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+/**
+ * Represents an in-app billing purchase.
+ */
+public class Purchase {
+    String mItemType;  // ITEM_TYPE_INAPP or ITEM_TYPE_SUBS
+    String mOrderId;
+    String mPackageName;
+    String mSku;
+    long mPurchaseTime;
+    int mPurchaseState;
+    String mDeveloperPayload;
+    String mToken;
+    String mOriginalJson;
+    String mSignature;
+    boolean mIsAutoRenewing;
+
+    public Purchase(String itemType, String jsonPurchaseInfo, String signature) throws JSONException {
+        mItemType = itemType;
+        mOriginalJson = jsonPurchaseInfo;
+        JSONObject o = new JSONObject(mOriginalJson);
+        mOrderId = o.optString("orderId");
+        mPackageName = o.optString("packageName");
+        mSku = o.optString("productId");
+        mPurchaseTime = o.optLong("purchaseTime");
+        mPurchaseState = o.optInt("purchaseState");
+        mDeveloperPayload = o.optString("developerPayload");
+        mToken = o.optString("token", o.optString("purchaseToken"));
+        mIsAutoRenewing = o.optBoolean("autoRenewing");
+        mSignature = signature;
+    }
+
+    public String getItemType() { return mItemType; }
+    public String getOrderId() { return mOrderId; }
+    public String getPackageName() { return mPackageName; }
+    public String getSku() { return mSku; }
+    public long getPurchaseTime() { return mPurchaseTime; }
+    public int getPurchaseState() { return mPurchaseState; }
+    public String getDeveloperPayload() { return mDeveloperPayload; }
+    public String getToken() { return mToken; }
+    public String getOriginalJson() { return mOriginalJson; }
+    public String getSignature() { return mSignature; }
+    public boolean isAutoRenewing() { return mIsAutoRenewing; }
+
+    @Override
+    public String toString() { return "PurchaseInfo(type:" + mItemType + "):" + mOriginalJson; }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/utils/iap/Security.java b/qpython/src/main/java/org/qpython/qpy/utils/iap/Security.java
new file mode 100644
index 00000000..bff24e9c
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/utils/iap/Security.java
@@ -0,0 +1,121 @@
+/* Copyright (c) 2012 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.qpython.qpy.utils.iap;
+
+import android.text.TextUtils;
+import android.util.Base64;
+import android.util.Log;
+
+import java.security.InvalidKeyException;
+import java.security.KeyFactory;
+import java.security.NoSuchAlgorithmException;
+import java.security.PublicKey;
+import java.security.Signature;
+import java.security.SignatureException;
+import java.security.spec.InvalidKeySpecException;
+import java.security.spec.X509EncodedKeySpec;
+
+/**
+ * Security-related methods. For a secure implementation, all of this code
+ * should be implemented on a server that communicates with the
+ * application on the device. For the sake of simplicity and clarity of this
+ * example, this code is included here and is executed on the device. If you
+ * must verify the purchases on the phone, you should obfuscate this code to
+ * make it harder for an attacker to replace the code with stubs that treat all
+ * purchases as verified.
+ */
+public class Security {
+    private static final String TAG = "IABUtil/Security";
+
+    private static final String KEY_FACTORY_ALGORITHM = "RSA";
+    private static final String SIGNATURE_ALGORITHM = "SHA1withRSA";
+
+    /**
+     * Verifies that the data was signed with the given signature, and returns
+     * the verified purchase. The data is in JSON format and signed
+     * with a private key. The data also contains the {@link PurchaseState}
+     * and product ID of the purchase.
+     * @param base64PublicKey the base64-encoded public key to use for verifying.
+     * @param signedData the signed JSON string (signed, not encrypted)
+     * @param signature the signature for the data, signed with the private key
+     */
+    public static boolean verifyPurchase(String base64PublicKey, String signedData, String signature) {
+        if (TextUtils.isEmpty(signedData) || TextUtils.isEmpty(base64PublicKey) ||
+                TextUtils.isEmpty(signature)) {
+            Log.e(TAG, "Purchase verification failed: missing data.");
+            return false;
+        }
+
+        PublicKey key = Security.generatePublicKey(base64PublicKey);
+        return Security.verify(key, signedData, signature);
+    }
+
+    /**
+     * Generates a PublicKey instance from a string containing the
+     * Base64-encoded public key.
+     *
+     * @param encodedPublicKey Base64-encoded public key
+     * @throws IllegalArgumentException if encodedPublicKey is invalid
+     */
+    public static PublicKey generatePublicKey(String encodedPublicKey) {
+        try {
+            byte[] decodedKey = Base64.decode(encodedPublicKey, Base64.DEFAULT);
+            KeyFactory keyFactory = KeyFactory.getInstance(KEY_FACTORY_ALGORITHM);
+            return keyFactory.generatePublic(new X509EncodedKeySpec(decodedKey));
+        } catch (NoSuchAlgorithmException e) {
+            throw new RuntimeException(e);
+        } catch (InvalidKeySpecException e) {
+            Log.e(TAG, "Invalid key specification.");
+            throw new IllegalArgumentException(e);
+        }
+    }
+
+    /**
+     * Verifies that the signature from the server matches the computed
+     * signature on the data.  Returns true if the data is correctly signed.
+     *
+     * @param publicKey public key associated with the developer account
+     * @param signedData signed data from server
+     * @param signature server signature
+     * @return true if the data and signature match
+     */
+    public static boolean verify(PublicKey publicKey, String signedData, String signature) {
+        byte[] signatureBytes;
+        try {
+            signatureBytes = Base64.decode(signature, Base64.DEFAULT);
+        } catch (IllegalArgumentException e) {
+            Log.e(TAG, "Base64 decoding failed.");
+            return false;
+        }
+        try {
+            Signature sig = Signature.getInstance(SIGNATURE_ALGORITHM);
+            sig.initVerify(publicKey);
+            sig.update(signedData.getBytes());
+            if (!sig.verify(signatureBytes)) {
+                Log.e(TAG, "Signature verification failed.");
+                return false;
+            }
+            return true;
+        } catch (NoSuchAlgorithmException e) {
+            Log.e(TAG, "NoSuchAlgorithmException.");
+        } catch (InvalidKeyException e) {
+            Log.e(TAG, "Invalid key specification.");
+        } catch (SignatureException e) {
+            Log.e(TAG, "Signature exception.");
+        }
+        return false;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/utils/iap/SkuDetails.java b/qpython/src/main/java/org/qpython/qpy/utils/iap/SkuDetails.java
new file mode 100644
index 00000000..b48817e8
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/utils/iap/SkuDetails.java
@@ -0,0 +1,64 @@
+/* Copyright (c) 2012 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.qpython.qpy.utils.iap;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+/**
+ * Represents an in-app product's listing details.
+ */
+public class SkuDetails {
+    private final String mItemType;
+    private final String mSku;
+    private final String mType;
+    private final String mPrice;
+    private final long mPriceAmountMicros;
+    private final String mPriceCurrencyCode;
+    private final String mTitle;
+    private final String mDescription;
+    private final String mJson;
+
+    public SkuDetails(String jsonSkuDetails) throws JSONException {
+        this(IabHelper.ITEM_TYPE_INAPP, jsonSkuDetails);
+    }
+
+    public SkuDetails(String itemType, String jsonSkuDetails) throws JSONException {
+        mItemType = itemType;
+        mJson = jsonSkuDetails;
+        JSONObject o = new JSONObject(mJson);
+        mSku = o.optString("productId");
+        mType = o.optString("type");
+        mPrice = o.optString("price");
+        mPriceAmountMicros = o.optLong("price_amount_micros");
+        mPriceCurrencyCode = o.optString("price_currency_code");
+        mTitle = o.optString("title");
+        mDescription = o.optString("description");
+    }
+
+    public String getSku() { return mSku; }
+    public String getType() { return mType; }
+    public String getPrice() { return mPrice; }
+    public long getPriceAmountMicros() { return mPriceAmountMicros; }
+    public String getPriceCurrencyCode() { return mPriceCurrencyCode; }
+    public String getTitle() { return mTitle; }
+    public String getDescription() { return mDescription; }
+
+    @Override
+    public String toString() {
+        return "SkuDetails:" + mJson;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpylib/MPyApi.java b/qpython/src/main/java/org/qpython/qpylib/MPyApi.java
new file mode 100644
index 00000000..c814676e
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpylib/MPyApi.java
@@ -0,0 +1,288 @@
+package org.qpython.qpylib;
+
+//package org.qpython.qpylib;
+//
+
+import android.app.NotificationManager;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.ServiceConnection;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Environment;
+import android.os.Handler;
+import android.os.IBinder;
+import android.os.Message;
+import android.util.Log;
+import android.view.Window;
+
+import com.quseit.base.QBaseApp;
+
+import org.qpython.qpy.console.ScriptExec;
+
+import com.quseit.util.FileHelper;
+import com.quseit.util.NAction;
+import com.quseit.util.NUtil;
+
+import org.qpython.qpy.main.activity.BaseActivity;
+import org.qpython.qpysdk.QPyConstants;
+
+import java.io.File;
+
+public class MPyApi extends BaseActivity {
+    public static final    int    SleepFinish = 1;
+    protected static final String TAG         = "mpyapi";
+    protected String param;
+    protected String flag    = "";
+    protected int    runMode = 0;
+    Handler myHandler = new Handler() {
+        public void handleMessage(Message msg) {
+
+            if (msg.what == SleepFinish) {
+                finish();
+            }
+            super.handleMessage(msg);
+        }
+    };
+    private boolean           live       = false;
+    private String            logF       = QPyConstants.ABSOLUTE_LOG;
+    private Handler           handler    = new Handler() {
+        @Override
+        public void handleMessage(Message msg) {
+            Log.d(TAG, "process");
+            process();
+        }
+    };
+    @SuppressWarnings("unused")
+    private ServiceConnection connection = new ServiceConnection() {
+        @Override
+        public void onServiceConnected(ComponentName name, IBinder service) {
+            //if (!BASE_CONF.DEBUG)
+            Log.d(TAG, "onServiceConnected");
+            //binded = true;
+            handler.postDelayed(new Runnable() {
+
+                @Override
+                public void run() {
+                    handler.sendEmptyMessage(0);
+                }
+
+            }, 202);
+        }
+
+        @Override
+        public void onServiceDisconnected(ComponentName name) {
+            //if (!BASE_CONF.DEBUG)
+            Log.d(TAG, "onServiceDisconnected");
+            //binded = false;
+        }
+    };
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        requestWindowFeature(Window.FEATURE_NO_TITLE);
+
+        IntentFilter filter = new IntentFilter(".MPyApi");
+//        registerReceiver(mReceiver, filter);
+
+        if (!NUtil.isRunning(getApplicationContext(), "org.qpython.qsl4a.QPyScriptService")) {
+            Intent intent = new Intent();
+            intent.setClassName(this, "org.qpython.sl4alib.QPyScriptService");
+            startService(intent);
+        }
+
+        process();
+    }
+
+    private void process() {
+        Intent intent = this.getIntent();
+        String action = intent.getAction();
+        String xtype = intent.getType();
+
+        if (Intent.ACTION_SEND.equals(action) && xtype != null) {
+            if ("text/plain".equals(xtype)) {
+                handleSendText(intent);
+            } else if (xtype.startsWith("image/")) {
+                handleSendImage(intent);
+            }
+        } else if (Intent.ACTION_VIEW.equals(action)) {
+            handleSendUrl(intent);
+        } else {
+            Bundle bundle = intent.getExtras();
+            String param0 = intent.getStringExtra(QPyConstants.EXTRA_CONTENT_URL0);
+            if (param0 != null && param0.equals("shortcut")) {
+                String type = intent.getStringExtra(QPyConstants.EXTRA_CONTENT_URL1);
+                String path = intent.getStringExtra(QPyConstants.EXTRA_CONTENT_URL2);
+                if (type.equals("script")) {
+                    ScriptExec.getInstance().playScript(this,path, null, true);
+                } else if (type.equals("project")) {
+                    ScriptExec.getInstance().playProject(this,path, false);
+                }
+
+            } else if (bundle != null) {
+                String act = bundle.getString("act");
+                if (act != null) {
+                    if (act.equals("onPyApi")) {//
+                        String pycode = bundle.getString("pycode");
+                        String pyfile = bundle.getString("pyfile");
+                        param = bundle.getString("param");
+                        if (param != null && param.equals("fileapi")) {
+                            runMode = 2;
+                            ScriptExec.getInstance().playScript(this,pyfile, null, false);
+                        } else {
+                            // Compatibility Mode
+                            if (pycode.contains("#qpy:console\n") || NAction.isQPy3(getApplicationContext())) {
+                                runMode = 3;
+                            } else {
+                                runMode = 1;
+                            }
+                            String script = QPyConstants.ABSOLUTE_PATH + "/cache/last.py";
+                            FileHelper.putFileContents(this, script, pycode);
+                            ScriptExec.getInstance().playScript(this,script, null, false);
+                        }
+                    }
+                }
+            }
+        }
+        new SleepThread().start();
+    }
+
+    void handleSendUrl(Intent intent) {
+        Uri myURI = intent.getData();
+
+        if (myURI != null) {
+            String script = getApplicationContext().getFilesDir() + "/bin/share.py";
+            String param = myURI.toString();
+            ScriptExec.getInstance().playQScript(this,script, param, false);
+        }
+    }
+
+    void handleSendText(Intent intent) {
+        String sharedText = intent.getStringExtra(Intent.EXTRA_TEXT);
+        if (sharedText != null) {
+            //Toast.makeText(this,"sharedText:"+sharedText, Toast.LENGTH_SHORT).show();
+            //onMenu();
+            String script = getApplicationContext().getFilesDir() + "/bin/share.py";
+            String param = sharedText;
+            //new QPyTask().execute(script, param);
+            ScriptExec.getInstance().playQScript(this,script, param, false);
+
+            // Update UI to reflect text being shared
+        }
+    }
+
+    void handleSendImage(Intent intent) {
+        Uri imageUri = (Uri) intent.getParcelableExtra(Intent.EXTRA_STREAM);
+        if (imageUri != null) {
+            //onMenu();
+            ScriptExec.getInstance().playQScript(this, getApplicationContext().getFilesDir() + "/bin/share.py", imageUri.toString(), false);
+
+            // Update UI to reflect image being shared
+        }
+    }
+
+    @Override
+    public void onDestroy() {
+        Log.d(TAG, "onDestroy");
+        onAPIEnd();
+        super.onDestroy();
+    }
+
+    @Override
+    public void onResume() {
+        Log.d(TAG, "onResume");
+        //onAPIEnd();
+        onAPIEnd();
+        super.onResume();
+
+        Intent intent = this.getIntent();
+        String param0 = intent.getStringExtra(QPyConstants.EXTRA_CONTENT_URL0);
+        if (param0 != null && param0.equals("shortcut")) {
+
+            finish();
+
+        } else {
+//    		viewLog();
+            new SleepThread().start();
+
+
+        }
+        //flag = "end";
+    }
+
+    @SuppressWarnings("deprecation")
+    protected void onAPIEnd() {
+
+        if (!live) {
+            Intent rIntent = new Intent();
+            Bundle rBundle = new Bundle();
+
+            if (flag.equals("qedit")) {
+
+                if (param != null && !param.equals("")) {
+
+                } else {
+                    try {
+                        String root = QBaseApp.getInstance().getOrCreateRoot(QPyConstants.DFROM_RUN);
+                        File f = new File(root, ".last_tmp.py");
+                        param = f.getAbsolutePath().toString();
+                    } catch (Exception e) {
+                        e.printStackTrace();
+
+                    }
+                }
+
+            }
+
+            String result = FileHelper.getFileContents(logF);
+
+            rBundle.putString("result", result);
+            rBundle.putString("param", param);
+            rBundle.putString("flag", flag);
+            rBundle.putString("log", QPyConstants.ABSOLUTE_LOG);
+
+            rIntent.putExtras(rBundle);
+
+            //NotificationManager notificationManager = (NotificationManager)this.getSystemService(Context.NOTIFICATION_SERVICE);
+            //notificationManager.cancel(1000);
+            //LogUtil.d(TAG, "onAPIEnd:"+logF);
+
+            File logFile = new File(logF);
+
+            if (logFile.exists()) {
+                live = true;
+
+                NotificationManager notificationManager = (NotificationManager) this.getSystemService(Context.NOTIFICATION_SERVICE);
+
+                MPyApi.this.setResult(RESULT_OK, rIntent);
+                MPyApi.this.finish();
+
+            } else {
+                if (runMode == 3) { // console 模式
+                    MPyApi.this.setResult(RESULT_OK, rIntent);
+                    MPyApi.this.finish();
+                }
+
+            }
+        }
+    }
+
+    class SleepThread extends Thread implements Runnable {
+
+        @Override
+        public void run() {
+            try {
+                sleep(3000);
+            } catch (InterruptedException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            }
+            Message msg = new Message();
+            msg.what = SleepFinish;
+            MPyApi.this.myHandler.sendMessage(msg);
+        }
+    }
+}
\ No newline at end of file
diff --git a/qpython/src/main/java/org/qpython/qpylib/MPyService.java b/qpython/src/main/java/org/qpython/qpylib/MPyService.java
new file mode 100644
index 00000000..d0b6dc58
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpylib/MPyService.java
@@ -0,0 +1,128 @@
+package org.qpython.qpylib;
+
+import android.app.Service;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.IBinder;
+import android.support.annotation.Nullable;
+
+import com.quseit.util.FileHelper;
+import com.quseit.util.NAction;
+import com.quseit.util.NUtil;
+
+import org.qpython.qpy.console.ScriptExec;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpysdk.QPyConstants;
+
+public class MPyService extends Service {
+    protected static final String TAG = "mpyapi";
+    protected String param;
+    protected String flag    = "";
+    protected int    runMode = 0;
+
+    @Override
+    public void onCreate() {
+        if (!NUtil.isRunning(getApplicationContext(), "org.qpython.qsl4a.QPyScriptService")) {
+            Intent intent = new Intent();
+            intent.setClassName(this, "org.qpython.sl4alib.QPyScriptService");
+            startService(intent);
+        }
+    }
+
+
+    private void process(Intent intent) {
+        String action = intent.getAction();
+        String xtype = intent.getType();
+
+
+        if (Intent.ACTION_SEND.equals(action) && xtype != null) {
+            if ("text/plain".equals(xtype)) {
+                handleSendText(intent);
+            } else if (xtype.startsWith("image/")) {
+                handleSendImage(intent);
+            }
+        } else if (Intent.ACTION_VIEW.equals(action)) {
+            handleSendUrl(intent);
+        } else {
+
+            Bundle bundle = intent.getExtras();
+            String param0 = intent.getStringExtra(QPyConstants.EXTRA_CONTENT_URL0);
+            if (param0 != null && param0.equals("shortcut")) {
+
+                String type = intent.getStringExtra(QPyConstants.EXTRA_CONTENT_URL1);
+                String path = intent.getStringExtra(QPyConstants.EXTRA_CONTENT_URL2);
+                if (type.equals("script")) {
+                    ScriptExec.getInstance().playScript(MPyService.this, path, null, true);
+
+                } else if (type.equals("project")) {
+                    ScriptExec.getInstance().playProject(MPyService.this, path, false);
+                }
+
+            } else if (bundle != null) {
+                String act = bundle.getString("act");
+                if (act != null) {
+                    if (act.equals("onPyApi")) {//
+                        String pycode = bundle.getString("pycode");
+                        String pyfile = bundle.getString("pyfile");
+                        param = bundle.getString("param");
+
+                        if (param != null && param.equals("fileapi")) {
+                            runMode = 2;
+
+                            ScriptExec.getInstance().playScript(MPyService.this, pyfile, null, false);
+
+                        } else {
+                            // Compatibility Mode
+                            if (pycode != null && pycode.contains("#qpy:console\n") || NAction.isQPy3(getApplicationContext())) {
+                                runMode = 3;
+                            } else {
+                                runMode = 1;
+                            }
+                            String script = QPyConstants.ABSOLUTE_PATH + "/cache/last.py";
+                            FileHelper.putFileContents(this, script, pycode);
+                            ScriptExec.getInstance().playScript(MPyService.this, script, null, false);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    void handleSendUrl(Intent intent) {
+        Uri myURI = intent.getData();
+        if (myURI != null) {
+            String script = getApplicationContext().getFilesDir() + "/bin/share.py";
+            String param = myURI.toString();
+            ScriptExec.getInstance().playScript(MPyService.this, script, param, false);
+        }
+    }
+
+    void handleSendText(Intent intent) {
+        String sharedText = intent.getStringExtra(Intent.EXTRA_TEXT);
+        if (sharedText != null) {
+            String script = getApplicationContext().getFilesDir() + "/bin/share.py";
+            ScriptExec.getInstance().playScript(MPyService.this, script, sharedText, false);
+        }
+    }
+
+    void handleSendImage(Intent intent) {
+        Uri imageUri = intent.getParcelableExtra(Intent.EXTRA_STREAM);
+        if (imageUri != null) {
+            ScriptExec.getInstance().playQScript(MPyService.this, getApplicationContext().getFilesDir() + "/bin/share.py", imageUri.toString(), false);
+        }
+    }
+
+    @Nullable
+    @Override
+    public IBinder onBind(Intent intent) {
+        return null;
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        process(intent);
+        return super.onStartCommand(intent, flags, startId);
+    }
+
+}
\ No newline at end of file
diff --git a/qpython/src/main/res/anim/fade_in.xml b/qpython/src/main/res/anim/fade_in.xml
new file mode 100644
index 00000000..6243b9b6
--- /dev/null
+++ b/qpython/src/main/res/anim/fade_in.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<alpha xmlns:android="http://schemas.android.com/apk/res/android"
+       android:duration="300"
+       android:fromAlpha="0.0" android:interpolator="@android:anim/accelerate_interpolator"
+       android:toAlpha="1.0" />
\ No newline at end of file
diff --git a/qpython/src/main/res/anim/fade_out.xml b/qpython/src/main/res/anim/fade_out.xml
new file mode 100644
index 00000000..b3cebea4
--- /dev/null
+++ b/qpython/src/main/res/anim/fade_out.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<alpha xmlns:android="http://schemas.android.com/apk/res/android"
+       android:duration="300"
+       android:fillAfter="true" android:fromAlpha="1.0"
+       android:interpolator="@android:anim/accelerate_interpolator"
+       android:toAlpha="0.0" />
\ No newline at end of file
diff --git a/qpython/src/main/res/anim/slide_down.xml b/qpython/src/main/res/anim/slide_down.xml
new file mode 100644
index 00000000..cf513c7e
--- /dev/null
+++ b/qpython/src/main/res/anim/slide_down.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="@android:integer/config_mediumAnimTime"
+        android:fromYDelta="0%p"
+        android:interpolator="@android:anim/accelerate_interpolator"
+        android:toYDelta="100%p">
+    </translate>
+</set>
\ No newline at end of file
diff --git a/qpython/src/main/res/anim/slide_in_bottom.xml b/qpython/src/main/res/anim/slide_in_bottom.xml
new file mode 100644
index 00000000..32e3dcc7
--- /dev/null
+++ b/qpython/src/main/res/anim/slide_in_bottom.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:fromYDelta="100%p"
+        android:toYDelta="0.0"
+        android:duration="200"
+        />
+</set>
\ No newline at end of file
diff --git a/qpython/src/main/res/anim/slide_out_bottom.xml b/qpython/src/main/res/anim/slide_out_bottom.xml
new file mode 100644
index 00000000..072ab3d8
--- /dev/null
+++ b/qpython/src/main/res/anim/slide_out_bottom.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:fromYDelta="0.0"
+        android:toYDelta="100%p"
+        android:duration="200"
+        />
+</set>
\ No newline at end of file
diff --git a/qpython/src/main/res/anim/slide_up.xml b/qpython/src/main/res/anim/slide_up.xml
new file mode 100644
index 00000000..c8e8c99c
--- /dev/null
+++ b/qpython/src/main/res/anim/slide_up.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="@android:integer/config_mediumAnimTime"
+        android:fromYDelta="100%"
+        android:interpolator="@android:anim/accelerate_interpolator"
+        android:toXDelta="0">
+    </translate>
+</set>
\ No newline at end of file
diff --git a/qpython/src/main/res/drawable-hdpi/ic_launcher.png b/qpython/src/main/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 00000000..917e7d2c
Binary files /dev/null and b/qpython/src/main/res/drawable-hdpi/ic_launcher.png differ
diff --git a/qpython/src/main/res/drawable-mdpi/ic_launcher.png b/qpython/src/main/res/drawable-mdpi/ic_launcher.png
new file mode 100644
index 00000000..3e46b273
Binary files /dev/null and b/qpython/src/main/res/drawable-mdpi/ic_launcher.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/aipy.png b/qpython/src/main/res/drawable-xxhdpi/aipy.png
new file mode 100644
index 00000000..d2863734
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/aipy.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/aipy_light.png b/qpython/src/main/res/drawable-xxhdpi/aipy_light.png
new file mode 100644
index 00000000..7ca50a5a
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/aipy_light.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/arrow_up.png b/qpython/src/main/res/drawable-xxhdpi/arrow_up.png
new file mode 100644
index 00000000..9cd300be
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/arrow_up.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/arvr.png b/qpython/src/main/res/drawable-xxhdpi/arvr.png
new file mode 100644
index 00000000..13eccc2d
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/arvr.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/arvr_light.png b/qpython/src/main/res/drawable-xxhdpi/arvr_light.png
new file mode 100644
index 00000000..4f51596d
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/arvr_light.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/basics.png b/qpython/src/main/res/drawable-xxhdpi/basics.png
new file mode 100644
index 00000000..92b2e2d9
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/basics.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/basics_light.png b/qpython/src/main/res/drawable-xxhdpi/basics_light.png
new file mode 100644
index 00000000..6c11f8e8
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/basics_light.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/btn_close_window.png b/qpython/src/main/res/drawable-xxhdpi/btn_close_window.png
new file mode 100644
index 00000000..53f878be
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/btn_close_window.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/checked.png b/qpython/src/main/res/drawable-xxhdpi/checked.png
new file mode 100644
index 00000000..e3357173
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/checked.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/database.png b/qpython/src/main/res/drawable-xxhdpi/database.png
new file mode 100644
index 00000000..1aec6985
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/database.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/database_light.png b/qpython/src/main/res/drawable-xxhdpi/database_light.png
new file mode 100644
index 00000000..806b69a2
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/database_light.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/download.png b/qpython/src/main/res/drawable-xxhdpi/download.png
new file mode 100644
index 00000000..99ae4cdb
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/download.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/editor_qrcode.png b/qpython/src/main/res/drawable-xxhdpi/editor_qrcode.png
new file mode 100644
index 00000000..5526cfc0
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/editor_qrcode.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/empty.png b/qpython/src/main/res/drawable-xxhdpi/empty.png
new file mode 100644
index 00000000..052fe13e
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/empty.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/gist_editor.png b/qpython/src/main/res/drawable-xxhdpi/gist_editor.png
new file mode 100644
index 00000000..2aca5a8e
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/gist_editor.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/horizontal_separation_line.png b/qpython/src/main/res/drawable-xxhdpi/horizontal_separation_line.png
new file mode 100644
index 00000000..fd5a8725
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/horizontal_separation_line.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_about_mail.png b/qpython/src/main/res/drawable-xxhdpi/ic_about_mail.png
new file mode 100644
index 00000000..797945cf
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_about_mail.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_about_new.png b/qpython/src/main/res/drawable-xxhdpi/ic_about_new.png
new file mode 100644
index 00000000..4a3e2416
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_about_new.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_about_share.png b/qpython/src/main/res/drawable-xxhdpi/ic_about_share.png
new file mode 100644
index 00000000..49b377bf
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_about_share.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_add.png b/qpython/src/main/res/drawable-xxhdpi/ic_add.png
new file mode 100644
index 00000000..344ec159
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_add.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_arrow_back.png b/qpython/src/main/res/drawable-xxhdpi/ic_arrow_back.png
new file mode 100644
index 00000000..6fbf0602
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_arrow_back.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_arrow_back_white.png b/qpython/src/main/res/drawable-xxhdpi/ic_arrow_back_white.png
new file mode 100644
index 00000000..6fbf0602
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_arrow_back_white.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_arrow_drop_down_a.png b/qpython/src/main/res/drawable-xxhdpi/ic_arrow_drop_down_a.png
new file mode 100644
index 00000000..b2013a0a
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_arrow_drop_down_a.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_arrow_drop_down_b.png b/qpython/src/main/res/drawable-xxhdpi/ic_arrow_drop_down_b.png
new file mode 100644
index 00000000..50ce6e73
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_arrow_drop_down_b.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_back.png b/qpython/src/main/res/drawable-xxhdpi/ic_back.png
new file mode 100644
index 00000000..dc10e323
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_back.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_cloud_done.png b/qpython/src/main/res/drawable-xxhdpi/ic_cloud_done.png
new file mode 100644
index 00000000..3b7c08f6
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_cloud_done.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_cloud_download.png b/qpython/src/main/res/drawable-xxhdpi/ic_cloud_download.png
new file mode 100644
index 00000000..2528694d
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_cloud_download.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_cloud_list.png b/qpython/src/main/res/drawable-xxhdpi/ic_cloud_list.png
new file mode 100644
index 00000000..3ea67e1f
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_cloud_list.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_cloud_notdone.png b/qpython/src/main/res/drawable-xxhdpi/ic_cloud_notdone.png
new file mode 100644
index 00000000..1eb40fbf
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_cloud_notdone.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_cloud_upload.png b/qpython/src/main/res/drawable-xxhdpi/ic_cloud_upload.png
new file mode 100644
index 00000000..308aed61
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_cloud_upload.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_com_comment.png b/qpython/src/main/res/drawable-xxhdpi/ic_com_comment.png
new file mode 100644
index 00000000..387eb567
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_com_comment.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_com_copylink.png b/qpython/src/main/res/drawable-xxhdpi/ic_com_copylink.png
new file mode 100644
index 00000000..dec41ab3
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_com_copylink.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_com_delete.png b/qpython/src/main/res/drawable-xxhdpi/ic_com_delete.png
new file mode 100644
index 00000000..a47e919f
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_com_delete.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_com_facebook.png b/qpython/src/main/res/drawable-xxhdpi/ic_com_facebook.png
new file mode 100644
index 00000000..84bf3691
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_com_facebook.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_com_like.png b/qpython/src/main/res/drawable-xxhdpi/ic_com_like.png
new file mode 100644
index 00000000..1b572830
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_com_like.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_com_liked.png b/qpython/src/main/res/drawable-xxhdpi/ic_com_liked.png
new file mode 100644
index 00000000..2110fbed
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_com_liked.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_com_share.png b/qpython/src/main/res/drawable-xxhdpi/ic_com_share.png
new file mode 100644
index 00000000..0b6dca8e
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_com_share.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_com_sharecode.png b/qpython/src/main/res/drawable-xxhdpi/ic_com_sharecode.png
new file mode 100644
index 00000000..8f927d78
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_com_sharecode.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_com_twitter.png b/qpython/src/main/res/drawable-xxhdpi/ic_com_twitter.png
new file mode 100644
index 00000000..d2987757
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_com_twitter.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_cou_share.png b/qpython/src/main/res/drawable-xxhdpi/ic_cou_share.png
new file mode 100644
index 00000000..01560bf3
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_cou_share.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_course_clicks.png b/qpython/src/main/res/drawable-xxhdpi/ic_course_clicks.png
new file mode 100644
index 00000000..c1b25789
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_course_clicks.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_delete.png b/qpython/src/main/res/drawable-xxhdpi/ic_delete.png
new file mode 100644
index 00000000..c3104b55
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_delete.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editcode.png b/qpython/src/main/res/drawable-xxhdpi/ic_editcode.png
new file mode 100644
index 00000000..dc911d52
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editcode.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editcode_add.png b/qpython/src/main/res/drawable-xxhdpi/ic_editcode_add.png
new file mode 100644
index 00000000..1185fe6a
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editcode_add.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editor_arrow_down.png b/qpython/src/main/res/drawable-xxhdpi/ic_editor_arrow_down.png
new file mode 100644
index 00000000..dc0dda5f
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editor_arrow_down.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editor_arrow_left.png b/qpython/src/main/res/drawable-xxhdpi/ic_editor_arrow_left.png
new file mode 100644
index 00000000..37ca0d9e
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editor_arrow_left.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editor_arrow_right.png b/qpython/src/main/res/drawable-xxhdpi/ic_editor_arrow_right.png
new file mode 100644
index 00000000..7c134d79
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editor_arrow_right.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editor_arrow_up.png b/qpython/src/main/res/drawable-xxhdpi/ic_editor_arrow_up.png
new file mode 100644
index 00000000..8bb0d655
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editor_arrow_up.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editor_delete_name.png b/qpython/src/main/res/drawable-xxhdpi/ic_editor_delete_name.png
new file mode 100644
index 00000000..1d787e6e
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editor_delete_name.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editor_file.png b/qpython/src/main/res/drawable-xxhdpi/ic_editor_file.png
new file mode 100644
index 00000000..c567f4c3
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editor_file.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editor_file_little.png b/qpython/src/main/res/drawable-xxhdpi/ic_editor_file_little.png
new file mode 100644
index 00000000..7ef5f678
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editor_file_little.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editor_filetree_close.png b/qpython/src/main/res/drawable-xxhdpi/ic_editor_filetree_close.png
new file mode 100644
index 00000000..3a3bd293
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editor_filetree_close.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editor_folder.png b/qpython/src/main/res/drawable-xxhdpi/ic_editor_folder.png
new file mode 100644
index 00000000..f28e0f8d
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editor_folder.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editor_folder_little.png b/qpython/src/main/res/drawable-xxhdpi/ic_editor_folder_little.png
new file mode 100644
index 00000000..a600aa1a
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editor_folder_little.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editor_gist.png b/qpython/src/main/res/drawable-xxhdpi/ic_editor_gist.png
new file mode 100644
index 00000000..2399205b
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editor_gist.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editor_keyboard.png b/qpython/src/main/res/drawable-xxhdpi/ic_editor_keyboard.png
new file mode 100644
index 00000000..fac87e45
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editor_keyboard.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editor_keyboardlock.png b/qpython/src/main/res/drawable-xxhdpi/ic_editor_keyboardlock.png
new file mode 100644
index 00000000..f2e7dd20
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editor_keyboardlock.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editor_more_horiz.png b/qpython/src/main/res/drawable-xxhdpi/ic_editor_more_horiz.png
new file mode 100644
index 00000000..216edaa9
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editor_more_horiz.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editor_newfolder.png b/qpython/src/main/res/drawable-xxhdpi/ic_editor_newfolder.png
new file mode 100644
index 00000000..fc775036
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editor_newfolder.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editor_next.png b/qpython/src/main/res/drawable-xxhdpi/ic_editor_next.png
new file mode 100644
index 00000000..f5f6081c
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editor_next.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editor_open.png b/qpython/src/main/res/drawable-xxhdpi/ic_editor_open.png
new file mode 100644
index 00000000..899ebe1a
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editor_open.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editor_recent.png b/qpython/src/main/res/drawable-xxhdpi/ic_editor_recent.png
new file mode 100644
index 00000000..d3696ca1
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editor_recent.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editor_run.png b/qpython/src/main/res/drawable-xxhdpi/ic_editor_run.png
new file mode 100644
index 00000000..7f0de914
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editor_run.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editor_save.png b/qpython/src/main/res/drawable-xxhdpi/ic_editor_save.png
new file mode 100644
index 00000000..396d137e
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editor_save.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editor_saveas.png b/qpython/src/main/res/drawable-xxhdpi/ic_editor_saveas.png
new file mode 100644
index 00000000..91277e04
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editor_saveas.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editor_saveup.png b/qpython/src/main/res/drawable-xxhdpi/ic_editor_saveup.png
new file mode 100644
index 00000000..4d80e31c
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editor_saveup.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editor_search.png b/qpython/src/main/res/drawable-xxhdpi/ic_editor_search.png
new file mode 100644
index 00000000..dedbf806
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editor_search.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editor_sharecode.png b/qpython/src/main/res/drawable-xxhdpi/ic_editor_sharecode.png
new file mode 100644
index 00000000..e4b2993c
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editor_sharecode.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editor_snippet.png b/qpython/src/main/res/drawable-xxhdpi/ic_editor_snippet.png
new file mode 100644
index 00000000..e4b2993c
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editor_snippet.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editor_undo.png b/qpython/src/main/res/drawable-xxhdpi/ic_editor_undo.png
new file mode 100644
index 00000000..b0563a32
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editor_undo.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editor_unknown.png b/qpython/src/main/res/drawable-xxhdpi/ic_editor_unknown.png
new file mode 100644
index 00000000..8a1853a1
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editor_unknown.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editor_web.png b/qpython/src/main/res/drawable-xxhdpi/ic_editor_web.png
new file mode 100644
index 00000000..75d055b3
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editor_web.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_edittext.png b/qpython/src/main/res/drawable-xxhdpi/ic_edittext.png
new file mode 100644
index 00000000..02f574fa
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_edittext.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_edittext_add.png b/qpython/src/main/res/drawable-xxhdpi/ic_edittext_add.png
new file mode 100644
index 00000000..50b2a805
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_edittext_add.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_file_rename.png b/qpython/src/main/res/drawable-xxhdpi/ic_file_rename.png
new file mode 100644
index 00000000..c6875066
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_file_rename.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_folder_open.png b/qpython/src/main/res/drawable-xxhdpi/ic_folder_open.png
new file mode 100644
index 00000000..a14d8952
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_folder_open.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_gist.png b/qpython/src/main/res/drawable-xxhdpi/ic_gist.png
new file mode 100644
index 00000000..a1dcdee7
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_gist.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_go.png b/qpython/src/main/res/drawable-xxhdpi/ic_go.png
new file mode 100644
index 00000000..e70f0413
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_go.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_home_club.png b/qpython/src/main/res/drawable-xxhdpi/ic_home_club.png
new file mode 100644
index 00000000..677c135a
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_home_club.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_home_course.png b/qpython/src/main/res/drawable-xxhdpi/ic_home_course.png
new file mode 100644
index 00000000..ec1b26df
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_home_course.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_home_editor.png b/qpython/src/main/res/drawable-xxhdpi/ic_home_editor.png
new file mode 100644
index 00000000..5b0bb3f5
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_home_editor.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_home_file.png b/qpython/src/main/res/drawable-xxhdpi/ic_home_file.png
new file mode 100644
index 00000000..30e9cc42
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_home_file.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_home_gist.png b/qpython/src/main/res/drawable-xxhdpi/ic_home_gist.png
new file mode 100644
index 00000000..b0160188
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_home_gist.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_home_library.png b/qpython/src/main/res/drawable-xxhdpi/ic_home_library.png
new file mode 100644
index 00000000..a04e9b1a
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_home_library.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_home_more.png b/qpython/src/main/res/drawable-xxhdpi/ic_home_more.png
new file mode 100644
index 00000000..d7820c4e
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_home_more.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_home_program.png b/qpython/src/main/res/drawable-xxhdpi/ic_home_program.png
new file mode 100644
index 00000000..69171cd3
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_home_program.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_home_qpy_add.png b/qpython/src/main/res/drawable-xxhdpi/ic_home_qpy_add.png
new file mode 100644
index 00000000..d6997c9e
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_home_qpy_add.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_home_qpyapp.png b/qpython/src/main/res/drawable-xxhdpi/ic_home_qpyapp.png
new file mode 100644
index 00000000..c0a2e09a
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_home_qpyapp.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_home_scan.png b/qpython/src/main/res/drawable-xxhdpi/ic_home_scan.png
new file mode 100644
index 00000000..da238acc
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_home_scan.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_home_terminal.png b/qpython/src/main/res/drawable-xxhdpi/ic_home_terminal.png
new file mode 100644
index 00000000..7b8e04b1
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_home_terminal.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_ipynb.png b/qpython/src/main/res/drawable-xxhdpi/ic_ipynb.png
new file mode 100644
index 00000000..d9eeafa6
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_ipynb.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_keyboard_arrow_right_white.png b/qpython/src/main/res/drawable-xxhdpi/ic_keyboard_arrow_right_white.png
new file mode 100644
index 00000000..b14e8bb5
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_keyboard_arrow_right_white.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_keyboard_hide_black.png b/qpython/src/main/res/drawable-xxhdpi/ic_keyboard_hide_black.png
new file mode 100644
index 00000000..7d336eaa
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_keyboard_hide_black.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_launcher.png b/qpython/src/main/res/drawable-xxhdpi/ic_launcher.png
new file mode 100644
index 00000000..e25ce77f
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_launcher.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_library.png b/qpython/src/main/res/drawable-xxhdpi/ic_library.png
new file mode 100644
index 00000000..78597092
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_library.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_library_delete.png b/qpython/src/main/res/drawable-xxhdpi/ic_library_delete.png
new file mode 100644
index 00000000..3a3bd293
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_library_delete.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_library_detail.png b/qpython/src/main/res/drawable-xxhdpi/ic_library_detail.png
new file mode 100644
index 00000000..4e00c01f
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_library_detail.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_library_download.png b/qpython/src/main/res/drawable-xxhdpi/ic_library_download.png
new file mode 100644
index 00000000..62fc4a28
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_library_download.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_library_install.png b/qpython/src/main/res/drawable-xxhdpi/ic_library_install.png
new file mode 100644
index 00000000..00c6a3f9
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_library_install.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_library_reinstall.png b/qpython/src/main/res/drawable-xxhdpi/ic_library_reinstall.png
new file mode 100644
index 00000000..9012d4cc
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_library_reinstall.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_library_run.png b/qpython/src/main/res/drawable-xxhdpi/ic_library_run.png
new file mode 100644
index 00000000..adce51b6
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_library_run.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_library_upgrade.png b/qpython/src/main/res/drawable-xxhdpi/ic_library_upgrade.png
new file mode 100644
index 00000000..1505ffc5
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_library_upgrade.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_login.png b/qpython/src/main/res/drawable-xxhdpi/ic_login.png
new file mode 100644
index 00000000..a3834f3d
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_login.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_menu_preferences.png b/qpython/src/main/res/drawable-xxhdpi/ic_menu_preferences.png
new file mode 100644
index 00000000..5321f828
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_menu_preferences.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_menu_windows.png b/qpython/src/main/res/drawable-xxhdpi/ic_menu_windows.png
new file mode 100644
index 00000000..c33de2b0
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_menu_windows.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_more.png b/qpython/src/main/res/drawable-xxhdpi/ic_more.png
new file mode 100644
index 00000000..ad8711c4
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_more.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_notebook.png b/qpython/src/main/res/drawable-xxhdpi/ic_notebook.png
new file mode 100644
index 00000000..c6298d4a
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_notebook.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_open.png b/qpython/src/main/res/drawable-xxhdpi/ic_open.png
new file mode 100644
index 00000000..6b8ae463
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_open.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_play.png b/qpython/src/main/res/drawable-xxhdpi/ic_play.png
new file mode 100644
index 00000000..d8b95c84
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_play.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_program.png b/qpython/src/main/res/drawable-xxhdpi/ic_program.png
new file mode 100644
index 00000000..9d6daca3
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_program.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_program_install.png b/qpython/src/main/res/drawable-xxhdpi/ic_program_install.png
new file mode 100644
index 00000000..eed716f9
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_program_install.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_project_console.png b/qpython/src/main/res/drawable-xxhdpi/ic_project_console.png
new file mode 100644
index 00000000..d9450b08
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_project_console.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_project_kivy.png b/qpython/src/main/res/drawable-xxhdpi/ic_project_kivy.png
new file mode 100644
index 00000000..c361c2e9
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_project_kivy.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_project_kivy3.png b/qpython/src/main/res/drawable-xxhdpi/ic_project_kivy3.png
new file mode 100644
index 00000000..2c6e613d
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_project_kivy3.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_project_qapp.png b/qpython/src/main/res/drawable-xxhdpi/ic_project_qapp.png
new file mode 100644
index 00000000..d6b9f9d7
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_project_qapp.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_project_qapp3.png b/qpython/src/main/res/drawable-xxhdpi/ic_project_qapp3.png
new file mode 100644
index 00000000..0b57f976
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_project_qapp3.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_project_webapp.png b/qpython/src/main/res/drawable-xxhdpi/ic_project_webapp.png
new file mode 100644
index 00000000..291f57ee
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_project_webapp.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_project_webapp3.png b/qpython/src/main/res/drawable-xxhdpi/ic_project_webapp3.png
new file mode 100644
index 00000000..6841eeb0
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_project_webapp3.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_pyfile_kivy.png b/qpython/src/main/res/drawable-xxhdpi/ic_pyfile_kivy.png
new file mode 100644
index 00000000..52144a96
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_pyfile_kivy.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_pyfile_kivy3.png b/qpython/src/main/res/drawable-xxhdpi/ic_pyfile_kivy3.png
new file mode 100644
index 00000000..66c2739e
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_pyfile_kivy3.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_pyfile_qapp.png b/qpython/src/main/res/drawable-xxhdpi/ic_pyfile_qapp.png
new file mode 100644
index 00000000..ef2e33d7
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_pyfile_qapp.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_pyfile_qapp3.png b/qpython/src/main/res/drawable-xxhdpi/ic_pyfile_qapp3.png
new file mode 100644
index 00000000..fcc771ae
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_pyfile_qapp3.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_pyfile_webapp.png b/qpython/src/main/res/drawable-xxhdpi/ic_pyfile_webapp.png
new file mode 100644
index 00000000..4d5ff967
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_pyfile_webapp.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_pyfile_webapp3.png b/qpython/src/main/res/drawable-xxhdpi/ic_pyfile_webapp3.png
new file mode 100644
index 00000000..11f4e4da
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_pyfile_webapp3.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_qpypi_download.png b/qpython/src/main/res/drawable-xxhdpi/ic_qpypi_download.png
new file mode 100644
index 00000000..1cbfa0cd
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_qpypi_download.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_recent.png b/qpython/src/main/res/drawable-xxhdpi/ic_recent.png
new file mode 100644
index 00000000..756adb0e
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_recent.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_remove.png b/qpython/src/main/res/drawable-xxhdpi/ic_remove.png
new file mode 100644
index 00000000..cde36e1f
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_remove.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_richpush_actionbar_back.png b/qpython/src/main/res/drawable-xxhdpi/ic_richpush_actionbar_back.png
new file mode 100644
index 00000000..c9f4e4d6
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_richpush_actionbar_back.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_richpush_actionbar_divider.png b/qpython/src/main/res/drawable-xxhdpi/ic_richpush_actionbar_divider.png
new file mode 100644
index 00000000..f289651b
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_richpush_actionbar_divider.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_right.png b/qpython/src/main/res/drawable-xxhdpi/ic_right.png
new file mode 100644
index 00000000..e6495b29
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_right.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_save1.png b/qpython/src/main/res/drawable-xxhdpi/ic_save1.png
new file mode 100644
index 00000000..38e63c25
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_save1.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_save2.png b/qpython/src/main/res/drawable-xxhdpi/ic_save2.png
new file mode 100644
index 00000000..991e3ff7
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_save2.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_stepin.png b/qpython/src/main/res/drawable-xxhdpi/ic_stepin.png
new file mode 100644
index 00000000..a7685fd7
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_stepin.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_tab2.png b/qpython/src/main/res/drawable-xxhdpi/ic_tab2.png
new file mode 100644
index 00000000..c229624c
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_tab2.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_terminal.png b/qpython/src/main/res/drawable-xxhdpi/ic_terminal.png
new file mode 100644
index 00000000..f4c8867c
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_terminal.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_thumb_up.png b/qpython/src/main/res/drawable-xxhdpi/ic_thumb_up.png
new file mode 100644
index 00000000..bf9d1377
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_thumb_up.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_undo.png b/qpython/src/main/res/drawable-xxhdpi/ic_undo.png
new file mode 100644
index 00000000..d29d41e4
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_undo.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_undo_2.png b/qpython/src/main/res/drawable-xxhdpi/ic_undo_2.png
new file mode 100644
index 00000000..8c1b4512
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_undo_2.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_white_arrow_right.png b/qpython/src/main/res/drawable-xxhdpi/ic_white_arrow_right.png
new file mode 100644
index 00000000..c7b2bdf7
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_white_arrow_right.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/img_course.png b/qpython/src/main/res/drawable-xxhdpi/img_course.png
new file mode 100644
index 00000000..67ac3505
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/img_course.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/img_empty_net.png b/qpython/src/main/res/drawable-xxhdpi/img_empty_net.png
new file mode 100644
index 00000000..0aaf497c
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/img_empty_net.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/img_emptycourse.png b/qpython/src/main/res/drawable-xxhdpi/img_emptycourse.png
new file mode 100644
index 00000000..1e047c56
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/img_emptycourse.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/img_home_bg.png b/qpython/src/main/res/drawable-xxhdpi/img_home_bg.png
new file mode 100644
index 00000000..d462445f
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/img_home_bg.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/img_home_bg_land.png b/qpython/src/main/res/drawable-xxhdpi/img_home_bg_land.png
new file mode 100644
index 00000000..e032af8e
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/img_home_bg_land.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/img_home_logo.png b/qpython/src/main/res/drawable-xxhdpi/img_home_logo.png
new file mode 100644
index 00000000..da6fed3c
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/img_home_logo.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/img_home_logo_3.png b/qpython/src/main/res/drawable-xxhdpi/img_home_logo_3.png
new file mode 100644
index 00000000..02e01bf8
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/img_home_logo_3.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/img_homebar_bg.png b/qpython/src/main/res/drawable-xxhdpi/img_homebar_bg.png
new file mode 100644
index 00000000..a3130737
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/img_homebar_bg.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/img_me_bg.png b/qpython/src/main/res/drawable-xxhdpi/img_me_bg.png
new file mode 100644
index 00000000..4bc48955
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/img_me_bg.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/mohu.png b/qpython/src/main/res/drawable-xxhdpi/mohu.png
new file mode 100644
index 00000000..3b55f3d8
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/mohu.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/panel_bg.9.png b/qpython/src/main/res/drawable-xxhdpi/panel_bg.9.png
new file mode 100644
index 00000000..725a60df
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/panel_bg.9.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/prev.png b/qpython/src/main/res/drawable-xxhdpi/prev.png
new file mode 100644
index 00000000..34792177
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/prev.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/redo.png b/qpython/src/main/res/drawable-xxhdpi/redo.png
new file mode 100644
index 00000000..ec605c8a
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/redo.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/scan_image.png b/qpython/src/main/res/drawable-xxhdpi/scan_image.png
new file mode 100644
index 00000000..fec53c8f
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/scan_image.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/sorry.png b/qpython/src/main/res/drawable-xxhdpi/sorry.png
new file mode 100644
index 00000000..b5f7e4e1
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/sorry.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/terminal_mini_icon.png b/qpython/src/main/res/drawable-xxhdpi/terminal_mini_icon.png
new file mode 100644
index 00000000..e55a8fba
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/terminal_mini_icon.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/textfield_black.9.png b/qpython/src/main/res/drawable-xxhdpi/textfield_black.9.png
new file mode 100644
index 00000000..daaa087b
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/textfield_black.9.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/textfield_dracula.9.png b/qpython/src/main/res/drawable-xxhdpi/textfield_dracula.9.png
new file mode 100644
index 00000000..9d284d29
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/textfield_dracula.9.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/textfield_matrix.9.png b/qpython/src/main/res/drawable-xxhdpi/textfield_matrix.9.png
new file mode 100644
index 00000000..5edb5c44
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/textfield_matrix.9.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/textfield_sky.9.png b/qpython/src/main/res/drawable-xxhdpi/textfield_sky.9.png
new file mode 100644
index 00000000..878d1c61
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/textfield_sky.9.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/textfield_white.9.png b/qpython/src/main/res/drawable-xxhdpi/textfield_white.9.png
new file mode 100644
index 00000000..c8e5abab
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/textfield_white.9.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/transparent.png b/qpython/src/main/res/drawable-xxhdpi/transparent.png
new file mode 100644
index 00000000..3411463c
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/transparent.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/undo.png b/qpython/src/main/res/drawable-xxhdpi/undo.png
new file mode 100644
index 00000000..12489094
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/undo.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/up.png b/qpython/src/main/res/drawable-xxhdpi/up.png
new file mode 100644
index 00000000..8e7a44c3
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/up.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/web.png b/qpython/src/main/res/drawable-xxhdpi/web.png
new file mode 100644
index 00000000..3eb5647c
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/web.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/web_light.png b/qpython/src/main/res/drawable-xxhdpi/web_light.png
new file mode 100644
index 00000000..a0f8bb46
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/web_light.png differ
diff --git a/qpython/src/main/res/drawable/bg_item.xml b/qpython/src/main/res/drawable/bg_item.xml
new file mode 100644
index 00000000..1d513895
--- /dev/null
+++ b/qpython/src/main/res/drawable/bg_item.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <solid android:color="@android:color/holo_orange_dark" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@android:color/white" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/qpython/src/main/res/drawable/bg_layout.xml b/qpython/src/main/res/drawable/bg_layout.xml
new file mode 100644
index 00000000..8e2cc258
--- /dev/null
+++ b/qpython/src/main/res/drawable/bg_layout.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="true">
+        <shape>
+            <solid android:color="@color/ripple_normal" />
+        </shape>
+    </item>
+
+    <item>
+        <shape>
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+
+</selector>
\ No newline at end of file
diff --git a/qpython/src/main/res/drawable/close_background.xml b/qpython/src/main/res/drawable/close_background.xml
new file mode 100644
index 00000000..74dc2a21
--- /dev/null
+++ b/qpython/src/main/res/drawable/close_background.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@android:color/white" />
+    <item android:drawable="@android:color/transparent" />
+</selector>
diff --git a/qpython/src/main/res/drawable/corners_5_white_bg.xml b/qpython/src/main/res/drawable/corners_5_white_bg.xml
new file mode 100644
index 00000000..0efd639c
--- /dev/null
+++ b/qpython/src/main/res/drawable/corners_5_white_bg.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <corners android:radius="5dp"/>
+    <solid android:color="@color/white"/>
+</shape>
\ No newline at end of file
diff --git a/qpython/src/main/res/drawable/edit_text_background.xml b/qpython/src/main/res/drawable/edit_text_background.xml
new file mode 100644
index 00000000..af844f4a
--- /dev/null
+++ b/qpython/src/main/res/drawable/edit_text_background.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:left="-2dp"
+        android:right="-2dp"
+        android:top="-2dp">
+        <shape>
+            <solid android:color="@android:color/transparent"/>
+            <stroke
+                android:width="1dp"
+                android:color="#FFE4E4E4"/>
+        </shape>
+    </item>
+
+</layer-list>
\ No newline at end of file
diff --git a/qpython/src/main/res/drawable/edit_text_cursor.xml b/qpython/src/main/res/drawable/edit_text_cursor.xml
new file mode 100644
index 00000000..f516179c
--- /dev/null
+++ b/qpython/src/main/res/drawable/edit_text_cursor.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+    <size android:width="3dp" />
+    <solid android:color="#FF4BAC07"  />
+</shape>
\ No newline at end of file
diff --git a/qpython/src/main/res/drawable/edit_text_green_bg.xml b/qpython/src/main/res/drawable/edit_text_green_bg.xml
new file mode 100644
index 00000000..b63f9896
--- /dev/null
+++ b/qpython/src/main/res/drawable/edit_text_green_bg.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:left="-4dp"
+        android:right="-4dp"
+        android:top="-4dp">
+        <shape>
+            <solid android:color="@android:color/transparent"/>
+            <stroke
+                android:width="2dp"
+                android:color="#FF4BAC07"/>
+        </shape>
+    </item>
+
+</layer-list>
\ No newline at end of file
diff --git a/qpython/src/main/res/drawable/gray_btn_rect.xml b/qpython/src/main/res/drawable/gray_btn_rect.xml
new file mode 100644
index 00000000..17597226
--- /dev/null
+++ b/qpython/src/main/res/drawable/gray_btn_rect.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    >
+    <solid
+        android:color="@color/text_gray"/>
+    <corners
+        android:radius="3dp"/>
+</shape>
\ No newline at end of file
diff --git a/qpython/src/main/res/drawable/gray_line_btn_bg.xml b/qpython/src/main/res/drawable/gray_line_btn_bg.xml
new file mode 100644
index 00000000..3621343c
--- /dev/null
+++ b/qpython/src/main/res/drawable/gray_line_btn_bg.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <stroke
+        android:width="1dp"
+        android:color="@color/text_gray"/>
+</shape>
\ No newline at end of file
diff --git a/qpython/src/main/res/drawable/green_btn_bg.xml b/qpython/src/main/res/drawable/green_btn_bg.xml
new file mode 100644
index 00000000..bce26f9d
--- /dev/null
+++ b/qpython/src/main/res/drawable/green_btn_bg.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    >
+    <solid
+        android:color="#FF4BAC07"/>
+    <corners
+        android:radius="100dp"/>
+</shape>
\ No newline at end of file
diff --git a/qpython/src/main/res/drawable/green_btn_rect.xml b/qpython/src/main/res/drawable/green_btn_rect.xml
new file mode 100644
index 00000000..92951483
--- /dev/null
+++ b/qpython/src/main/res/drawable/green_btn_rect.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    >
+    <solid
+        android:color="#FF4BAC07"/>
+    <corners
+        android:radius="3dp"/>
+</shape>
\ No newline at end of file
diff --git a/qpython/src/main/res/drawable/green_dot_shape.xml b/qpython/src/main/res/drawable/green_dot_shape.xml
new file mode 100644
index 00000000..b21d95ab
--- /dev/null
+++ b/qpython/src/main/res/drawable/green_dot_shape.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+<solid android:color="@color/theme_green"/>
+    <size android:height="5dp" android:width="5dp"/>
+</shape>
\ No newline at end of file
diff --git a/qpython/src/main/res/drawable/green_gray_btn.xml b/qpython/src/main/res/drawable/green_gray_btn.xml
new file mode 100644
index 00000000..39a58fac
--- /dev/null
+++ b/qpython/src/main/res/drawable/green_gray_btn.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:drawable="@drawable/green_btn_rect"
+        android:state_enabled="true"/>
+    <item
+        android:drawable="@drawable/gray_btn_rect"
+        android:state_enabled="false"/>
+
+</selector>
\ No newline at end of file
diff --git a/qpython/src/main/res/drawable/green_rect_line.xml b/qpython/src/main/res/drawable/green_rect_line.xml
new file mode 100644
index 00000000..9272d5c3
--- /dev/null
+++ b/qpython/src/main/res/drawable/green_rect_line.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <stroke
+        android:width="2dp"
+        android:color="@color/theme_green"/>
+</shape>
diff --git a/qpython/src/main/res/drawable/ic_check_circle.xml b/qpython/src/main/res/drawable/ic_check_circle.xml
new file mode 100644
index 00000000..5bd94ed2
--- /dev/null
+++ b/qpython/src/main/res/drawable/ic_check_circle.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="18dp"
+        android:height="18dp"
+        android:viewportHeight="24.0"
+        android:viewportWidth="24.0">
+    <path
+        android:fillColor="@color/colorAccent"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM10,17l-5,-5 1.41,-1.41L10,14.17l7.59,-7.59L19,8l-9,9z"/>
+</vector>
diff --git a/qpython/src/main/res/drawable/ic_clear_24dp.xml b/qpython/src/main/res/drawable/ic_clear_24dp.xml
new file mode 100644
index 00000000..c8204159
--- /dev/null
+++ b/qpython/src/main/res/drawable/ic_clear_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+</vector>
diff --git a/qpython/src/main/res/drawable/ic_right_a.xml b/qpython/src/main/res/drawable/ic_right_a.xml
new file mode 100644
index 00000000..2972f8ab
--- /dev/null
+++ b/qpython/src/main/res/drawable/ic_right_a.xml
@@ -0,0 +1,9 @@
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+<item android:state_pressed="true" android:drawable="@drawable/ic_right" />
+
+<item android:drawable="@drawable/ic_right" />
+
+<item android:state_checked="true" android:drawable="@drawable/ic_right" />
+
+</selector>
\ No newline at end of file
diff --git a/qpython/src/main/res/drawable/notebook_checkbox.xml b/qpython/src/main/res/drawable/notebook_checkbox.xml
new file mode 100644
index 00000000..515d6924
--- /dev/null
+++ b/qpython/src/main/res/drawable/notebook_checkbox.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/checked" android:state_checked="true"/>
+    <item android:drawable="@drawable/download"/>
+</selector>
\ No newline at end of file
diff --git a/qpython/src/main/res/drawable/purchase_bg.xml b/qpython/src/main/res/drawable/purchase_bg.xml
new file mode 100644
index 00000000..63e66340
--- /dev/null
+++ b/qpython/src/main/res/drawable/purchase_bg.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <stroke
+        android:width="2dp"
+        android:color="@color/theme_yellow"/>
+</shape>
diff --git a/qpython/src/main/res/drawable/richpush_btn_selector.xml b/qpython/src/main/res/drawable/richpush_btn_selector.xml
new file mode 100644
index 00000000..4750de92
--- /dev/null
+++ b/qpython/src/main/res/drawable/richpush_btn_selector.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?> 
+<selector xmlns:android="http://schemas.android.com/apk/res/android" > 
+    <!-- 获得焦点但未按下时的背景图片 --> 
+    <item 
+        android:state_focused="true" 
+        android:state_enabled="true" 
+        android:state_pressed="false" 
+        android:drawable="@drawable/ic_richpush_actionbar_back" /> 
+     <!-- 按下时的背景图片 --> 
+    <item 
+        android:state_enabled="true" 
+        android:state_pressed="true" 
+        android:drawable="@android:color/darker_gray" /> 
+    <!-- 按下时的背景图片 --> 
+    <item 
+        android:state_enabled="true" 
+        android:state_checked="true" 
+        android:drawable="@android:color/darker_gray" /> 
+    <!-- 默认时的背景图片 --> 
+    <item android:drawable="@drawable/ic_richpush_actionbar_back" /> 
+</selector> 
\ No newline at end of file
diff --git a/qpython/src/main/res/drawable/rotate_arrow.xml b/qpython/src/main/res/drawable/rotate_arrow.xml
new file mode 100644
index 00000000..8e634521
--- /dev/null
+++ b/qpython/src/main/res/drawable/rotate_arrow.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <rotate
+            android:drawable="@drawable/ic_arrow_drop_down_a"
+            android:pivotX="50%"
+            android:pivotY="50%"
+            android:fromDegrees="0"
+            android:toDegrees="180" />
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/qpython/src/main/res/drawable/select_green_text.xml b/qpython/src/main/res/drawable/select_green_text.xml
new file mode 100644
index 00000000..b524eecf
--- /dev/null
+++ b/qpython/src/main/res/drawable/select_green_text.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/Color_White"/>
+    <item android:state_selected="true" android:color="@color/theme_green" />
+</selector>
\ No newline at end of file
diff --git a/qpython/src/main/res/drawable/select_tab_indicator.xml b/qpython/src/main/res/drawable/select_tab_indicator.xml
new file mode 100644
index 00000000..92273b4e
--- /dev/null
+++ b/qpython/src/main/res/drawable/select_tab_indicator.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- UNSELECTED TAB STATE -->
+    <item android:state_pressed="false" android:state_selected="false">
+        <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+            <!-- Bottom indicator color for the UNSELECTED tab state -->
+            <item android:left="-5dp" android:right="-5dp" android:top="-5dp">
+                <shape android:shape="rectangle">
+                    <stroke android:width="2dp" android:color="@color/colorPrimary"/>
+                </shape>
+            </item>
+        </layer-list>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/qpython/src/main/res/drawable/silver_button.xml b/qpython/src/main/res/drawable/silver_button.xml
new file mode 100644
index 00000000..2885a5b6
--- /dev/null
+++ b/qpython/src/main/res/drawable/silver_button.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@drawable/btn_silver_press" />
+    <item android:state_focused="true" android:drawable="@drawable/btn_silver_focus" />
+    <item android:drawable="@drawable/btn_silver" />
+</selector>
diff --git a/qpython/src/main/res/drawable/star_selector.xml b/qpython/src/main/res/drawable/star_selector.xml
new file mode 100644
index 00000000..6b4731a6
--- /dev/null
+++ b/qpython/src/main/res/drawable/star_selector.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_selected="true" android:drawable="@drawable/ic_com_liked"/>
+    <item android:drawable="@drawable/ic_com_like"/>
+</selector>
\ No newline at end of file
diff --git a/qpython/src/main/res/drawable/toolbar_button_bg.xml b/qpython/src/main/res/drawable/toolbar_button_bg.xml
new file mode 100644
index 00000000..4e716595
--- /dev/null
+++ b/qpython/src/main/res/drawable/toolbar_button_bg.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="true">
+        <shape>
+            <solid android:color="@color/colorPrimaryDark" />
+        </shape>
+    </item>
+
+    <item>
+        <shape>
+            <solid android:color="@color/colorPrimary" />
+        </shape>
+    </item>
+
+</selector>
\ No newline at end of file
diff --git a/qpython/src/main/res/drawable/white_dot_shape.xml b/qpython/src/main/res/drawable/white_dot_shape.xml
new file mode 100644
index 00000000..b1c67e16
--- /dev/null
+++ b/qpython/src/main/res/drawable/white_dot_shape.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+<solid android:color="@color/white"/>
+    <size android:height="5dp" android:width="5dp"/>
+</shape>
\ No newline at end of file
diff --git a/qpython/src/main/res/drawable/white_rect_stroke.xml b/qpython/src/main/res/drawable/white_rect_stroke.xml
new file mode 100644
index 00000000..97556408
--- /dev/null
+++ b/qpython/src/main/res/drawable/white_rect_stroke.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <stroke
+        android:width="2dp"
+        android:color="#FFF"/>
+</shape>
\ No newline at end of file
diff --git a/qpython/src/main/res/drawable/widget_title_background.xml b/qpython/src/main/res/drawable/widget_title_background.xml
new file mode 100644
index 00000000..9f4efaef
--- /dev/null
+++ b/qpython/src/main/res/drawable/widget_title_background.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <solid android:color="#88000000" />
+
+    <padding
+        android:bottom="2dp"
+        android:left="6dp"
+        android:right="6dp"
+        android:top="2dp" />
+
+    <corners android:radius="8dp" />
+
+</shape>
\ No newline at end of file
diff --git a/qpython/src/main/res/drawable/yellow_bg_thumbs_up.xml b/qpython/src/main/res/drawable/yellow_bg_thumbs_up.xml
new file mode 100644
index 00000000..7fa79c9a
--- /dev/null
+++ b/qpython/src/main/res/drawable/yellow_bg_thumbs_up.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape
+            android:shape="oval">
+            <solid
+                android:color="@color/theme_yellow"
+                />
+            <size
+                android:width="50dp"
+                android:height="50dp"/>
+        </shape>
+    </item>
+    <item android:drawable="@drawable/ic_thumb_up"
+          android:bottom="10dp"
+          android:left="10dp"
+          android:right="10dp"
+          android:top="10dp"/>
+</layer-list>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout-land/activity_main.xml b/qpython/src/main/res/layout-land/activity_main.xml
new file mode 100644
index 00000000..daeca16c
--- /dev/null
+++ b/qpython/src/main/res/layout-land/activity_main.xml
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/img_home_bg_land"
+        android:orientation="horizontal">
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:orientation="vertical">
+
+            <ImageView
+                android:id="@+id/icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="50dp"
+                android:src="@drawable/img_home_logo"/>
+
+            <ImageView
+                android:id="@+id/ll_qpy_app"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/ic_home_qpyapp"/>
+
+            <TextView
+                android:id="@+id/login"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/login"
+                android:textColor="#FFF"/>
+            <!--<TextView-->
+            <!--android:layout_width="wrap_content"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:text="@string/read_from_QR"-->
+            <!--android:textColor="#9B9B9B"/>-->
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_margin="25dp"
+            android:layout_weight="1.2"
+            android:background="#4A4A4A"
+            android:elevation="2dp"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <LinearLayout
+                    android:id="@+id/ll_terminal"
+                    style="@style/grid_item">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_home_terminal"/>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/icon_margin_top"
+                        android:text="@string/terminal"
+                        android:textColor="#FFF"/>
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/ll_editor"
+                    style="@style/grid_item">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_home_editor"/>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/icon_margin_top"
+                        android:text="@string/editor"
+                        android:textColor="#FFF"/>
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/ll_file"
+                    style="@style/grid_item">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_home_file"/>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/icon_margin_top"
+                        android:text="@string/file"
+                        android:textColor="#FFF"/>
+                </LinearLayout>
+
+
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <LinearLayout
+                    android:id="@+id/iv_scan"
+                    style="@style/grid_item">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_home_scan"/>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/icon_margin_top"
+                        android:text="@string/scan"
+                        android:textColor="#FFF"/>
+                </LinearLayout>
+
+
+
+                <LinearLayout
+                    android:id="@+id/ll_library"
+                    style="@style/grid_item">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_home_library"/>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/icon_margin_top"
+                        android:text="@string/qpypi_up"
+                        android:textColor="#FFF"/>
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/ll_gist"
+                    style="@style/grid_item">
+
+                    <!--ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_home_gist"/>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/icon_margin_top"
+                        android:text="@string/gist"
+                        android:textColor="#FFF"/-->
+                </LinearLayout>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <LinearLayout
+                    android:id="@+id/ll_setting"
+                    style="@style/grid_item">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_home_more"/>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/icon_margin_top"
+                        android:text="@string/more"
+                        android:textColor="#FFF"/>
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/ll_course"
+                    style="@style/row_ll">
+
+                    <!--ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_home_course"/>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/icon_margin_top"
+                        android:text="@string/course"
+                        android:textColor="#FFF"/-->
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/ll_community"
+                    style="@style/grid_item">
+
+                    <!--ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_home_club"/>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/icon_margin_top"
+                        android:text="@string/community"
+                        android:textColor="#FFF"/-->
+                </LinearLayout>
+
+
+
+
+            </LinearLayout>
+        </LinearLayout>
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout-v11/widget.xml b/qpython/src/main/res/layout-v11/widget.xml
new file mode 100644
index 00000000..761fac16
--- /dev/null
+++ b/qpython/src/main/res/layout-v11/widget.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/widgetLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="@dimen/widget_margin" >
+
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal|top"
+        android:padding="2dp"
+        android:src="@null" />
+
+    <TextView
+        android:id="@+id/textFileName"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|center_horizontal"
+        android:layout_marginBottom="8dp"
+        android:ellipsize="end"
+        android:gravity="center_horizontal|bottom"
+        android:shadowColor="#000000"
+        android:shadowDy="2"
+        android:shadowRadius="4"
+        android:singleLine="true"
+        android:text=""
+        android:textColor="#ffffff"
+        android:textSize="12dp" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout-v14/buttons_ok_cancel.xml b/qpython/src/main/res/layout-v14/buttons_ok_cancel.xml
new file mode 100644
index 00000000..88f2629e
--- /dev/null
+++ b/qpython/src/main/res/layout-v14/buttons_ok_cancel.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal" >
+
+    <Button
+        android:id="@+id/buttonCancel"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:text="@string/ui_cancel" />
+
+    <View
+        android:layout_width="@dimen/dialog_buttons_margin"
+        android:layout_height="match_parent" />
+
+    <Button
+        android:id="@+id/buttonOk"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:text="@string/ui_ok" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/about.xml b/qpython/src/main/res/layout/about.xml
new file mode 100644
index 00000000..3c376a0c
--- /dev/null
+++ b/qpython/src/main/res/layout/about.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <RelativeLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/about_box"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:background="@color/colorPrimary"
+        android:orientation="vertical">
+        <FrameLayout
+            android:layout_height="wrap_content"
+            android:layout_width="fill_parent"
+            android:layout_weight="1"
+            >
+        <ScrollView
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            >
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <include
+                android:id="@+id/lt"
+                layout="@layout/layout_toolbar"/>
+
+            <TextView
+                android:id="@+id/title"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5dp"
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp"
+                android:text="@string/log"
+                android:textColor="@color/colorAccent"
+                android:textSize="17sp"/>
+
+            <TextView
+                android:id="@+id/time"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5dp"
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp"
+                android:textColor="@color/colorAccent"
+                android:visibility="gone"
+                />
+
+            <TextView
+                android:id="@+id/path"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5dp"
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp"
+                android:textColor="@color/colorAccent"
+                />
+
+            <View
+                android:id="@+id/about_line"
+                style="@style/p_line"
+                />
+
+            <TextView
+                android:id="@+id/content"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp"
+                android:text="@string/about_content"
+                android:textColor="#FFF"
+                />
+        </LinearLayout>
+        </ScrollView>
+        </FrameLayout>>
+
+
+        <!--ImageButton
+            android:id="@+id/ib_mail"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:background="@color/colorPrimaryDark"
+            android:padding="5.0dip"
+            android:src="@drawable/ic_action_mail"
+            /-->
+
+    </RelativeLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/about_generic.xml b/qpython/src/main/res/layout/about_generic.xml
new file mode 100644
index 00000000..66733bca
--- /dev/null
+++ b/qpython/src/main/res/layout/about_generic.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <TextView
+        style="@style/TextTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:text="@string/ui_contact_title" />
+
+    <TextView
+        style="@style/TextContent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/ui_feedback" />
+
+
+    <Button
+        android:id="@+id/buttonRate"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="@dimen/dialog_buttons_margin"
+        android:text="@string/ui_app_rating" />
+
+
+    <TextView
+        style="@style/TextTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:text="@string/ui_licence_title" />
+
+    <TextView
+        style="@style/TextContent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:autoLink="email"
+        android:text="@string/ui_licence_content" />
+
+    <TextView
+        style="@style/TextTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:text="@string/ui_art_licence_title" />
+
+    <TextView
+        style="@style/TextContent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:autoLink="email"
+        android:text="@string/ui_art_licence_content" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/activity_about.xml b/qpython/src/main/res/layout/activity_about.xml
new file mode 100644
index 00000000..5bd4ddb6
--- /dev/null
+++ b/qpython/src/main/res/layout/activity_about.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <ScrollView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scrollbars="none">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/colorPrimaryDark"
+            android:orientation="vertical">
+
+            <include
+                layout="@layout/layout_toolbar"/>
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="40dp"
+                android:src="@drawable/img_home_logo"/>
+
+            <TextView
+                android:id="@+id/version"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="30dp"
+                android:textColor="#FFF"/>
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="30dp"
+                android:background="@drawable/white_rect_stroke"
+                android:padding="@dimen/default_margin"
+                android:text="@string/qpy_description"
+                android:textColor="#FFF"
+                android:textSize="18sp"/>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/toolbar"/>
+
+            <TextView
+                android:id="@+id/tv_privacy"
+                style="@style/setting_tv"
+                android:text="@string/privacy_title"/>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/toolbar"/>
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <TextView
+                    android:id="@+id/tv_update"
+                    style="@style/setting_tv"
+                    android:text="@string/check_update"/>
+
+                <TextView
+                    android:id="@+id/tv_new_hint"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:layout_marginRight="60dp"
+                    android:gravity="center_vertical"
+                    android:text="@string/already_newest"
+                    android:textColor="@color/text_color_hint"/>
+            </RelativeLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/toolbar"/>
+
+            <TextView
+                android:id="@+id/tv_star"
+                style="@style/setting_tv"
+                android:text="@string/star_it"/>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/toolbar"/>
+
+            <TextView
+                android:id="@+id/tv_feedback"
+                style="@style/setting_tv"
+                android:text="@string/feedback"/>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/toolbar"/>
+
+            <TextView
+                android:id="@+id/tv_thanks"
+                style="@style/setting_tv"
+                android:text="@string/thank"/>
+        </LinearLayout>
+    </ScrollView>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/activity_add_gist.xml b/qpython/src/main/res/layout/activity_add_gist.xml
new file mode 100644
index 00000000..297c3fa4
--- /dev/null
+++ b/qpython/src/main/res/layout/activity_add_gist.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <android.support.design.widget.AppBarLayout
+            xmlns:android="http://schemas.android.com/apk/res/android"
+            xmlns:app="http://schemas.android.com/apk/res-auto"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize">
+
+            <android.support.v7.widget.Toolbar
+                android:id="@+id/toolbar"
+                style="@style/Toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:background="#FF4A4A4A"
+                android:elevation="2dp"
+                app:contentInsetEnd="0dp"
+                app:popupTheme="@style/DefaultBlueToolbar"
+                app:theme="@style/ToolbarTheme">
+
+                <Button
+                    android:id="@+id/send_btn"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end"
+                    android:background="@null"
+                    android:text="@string/post"
+                    android:textColor="@color/text_gray"/>
+            </android.support.v7.widget.Toolbar>
+
+        </android.support.design.widget.AppBarLayout>
+
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <!--<android.support.design.widget.TextInputLayout-->
+                <!--android:layout_width="match_parent"-->
+                <!--android:layout_height="wrap_content"-->
+                <!--android:layout_marginTop="20dp">-->
+
+                <!--<android.support.design.widget.TextInputEditText-->
+                <!--android:id="@+id/title"-->
+                <!--android:layout_width="match_parent"-->
+                <!--android:layout_height="wrap_content"-->
+                <!--android:layout_margin="@dimen/default_margin"-->
+                <!--android:hint="@string/gist_title"-->
+                <!--/>-->
+                <!--</android.support.design.widget.TextInputLayout>-->
+
+                <android.support.design.widget.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp">
+
+                    <android.support.design.widget.TextInputEditText
+                        android:id="@+id/description"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="@dimen/default_margin"
+                        android:layout_marginTop="10dp"
+                        android:hint="@string/summary"
+                        />
+                </android.support.design.widget.TextInputLayout>
+
+                <TextView
+                    android:id="@+id/text_count"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end"
+                    android:layout_marginEnd="@dimen/default_margin"
+                    android:layout_marginRight="@dimen/default_margin"
+                    android:textColor="@color/text_gray"/>
+
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="200dp"
+                    android:padding="@dimen/default_margin">
+
+                    <org.qpython.qpy.texteditor.ui.view.AdvancedEditText
+                        android:id="@+id/code_content_tv"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:background="@color/white"
+                        android:gravity="top|start"
+                        android:imeOptions="flagNoFullscreen"
+                        android:inputType="textMultiLine|textNoSuggestions"
+                        android:padding="@dimen/default_margin"
+                        android:scrollbarAlwaysDrawHorizontalTrack="true"
+                        android:scrollbarAlwaysDrawVerticalTrack="true"
+                        android:scrollbarSize="5dp"
+                        android:scrollbars="horizontal|vertical"
+                        android:typeface="monospace"
+                        />
+
+                    <ProgressBar
+                        android:id="@+id/progress_bar"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_horizontal"
+                        android:visibility="gone"/>
+
+                </FrameLayout>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_gravity="center"
+                android:orientation="vertical"
+                android:padding="@dimen/default_margin">
+
+
+                <CheckBox
+                    android:id="@+id/dess"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center"
+
+                    android:text="@string/gist_own"
+                    android:textColor="@color/text_gray"
+                    android:checked="true"
+                    android:clickable="false"/>
+
+                <CheckBox
+                    android:id="@+id/gist_share"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center"
+
+                    android:text="@string/gist_intro"
+                    android:textColor="@color/text_gray"/>
+
+
+            </LinearLayout>
+
+            </LinearLayout>
+        </ScrollView>
+    </LinearLayout>
+
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/activity_code_detail.xml b/qpython/src/main/res/layout/activity_code_detail.xml
new file mode 100644
index 00000000..1dc341ae
--- /dev/null
+++ b/qpython/src/main/res/layout/activity_code_detail.xml
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <android.support.v4.widget.NestedScrollView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/scroll"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <include
+                android:id="@+id/lt"
+                layout="@layout/layout_toolbar"/>
+
+            <RelativeLayout
+                android:id="@+id/top"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/lt"
+                android:padding="@dimen/default_margin">
+
+                <ImageView
+                    android:id="@+id/avatar"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
+                    android:layout_marginBottom="10dp"
+                    android:layout_marginEnd="@dimen/default_margin"
+                    android:layout_marginRight="@dimen/default_margin"
+                    android:src="@drawable/empty"/>
+
+                <TextView
+                    android:id="@+id/name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_toEndOf="@id/avatar"
+                    android:layout_toRightOf="@id/avatar"
+                    android:textColor="#FFF"
+                    android:textSize="12sp"/>
+
+                <TextView
+                    android:id="@+id/date"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignBottom="@id/avatar"
+                    android:layout_toEndOf="@id/avatar"
+                    android:layout_toRightOf="@id/avatar"
+                    android:textSize="12sp"/>
+
+                <TextView
+                    android:id="@+id/bookmark_count"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:drawableLeft="@drawable/ic_com_like"
+                    android:drawablePadding="5dp"
+                    android:drawableStart="@drawable/ic_com_like"
+                    android:textSize="12sp"/>
+
+            </RelativeLayout>
+
+
+            <TextView
+                android:id="@+id/title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/top"
+                android:layout_marginBottom="10dp"
+                android:layout_marginLeft="@dimen/default_margin"
+                android:layout_marginRight="@dimen/default_margin"
+                android:ellipsize="end"
+                android:maxLines="3"
+                android:textColor="#FFF"/>
+
+            <TextView
+                android:id="@+id/description"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/title"
+                android:layout_marginLeft="@dimen/default_margin"
+                android:layout_marginRight="@dimen/default_margin"
+                android:layout_marginTop="10dp"
+                android:textColor="#FFF"/>
+
+            <TextView
+                android:id="@+id/code"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/description"
+                android:layout_margin="@dimen/default_margin"
+                android:layout_marginLeft="@dimen/default_margin"
+                android:layout_marginStart="@dimen/default_margin"
+                android:background="#FFF"
+                android:padding="10dp"
+                android:textColor="@color/text_gray"/>
+
+            <Button
+                android:id="@+id/btn_copy"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/code"
+                android:layout_centerHorizontal="true"
+                android:layout_gravity="center_horizontal"
+                android:background="@drawable/green_btn_rect"
+                android:padding="10dp"
+                android:text="@string/copy_hint"/>
+
+            <TextView
+                android:id="@+id/comment_count"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
+                android:layout_below="@id/btn_copy"
+                android:layout_marginEnd="@dimen/default_margin"
+                android:layout_marginRight="@dimen/default_margin"
+                android:layout_marginTop="10dp"
+                android:drawableLeft="@drawable/ic_com_comment"
+                android:drawablePadding="5dp"
+                android:drawableStart="@drawable/ic_com_comment"
+                android:textSize="12sp"/>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_below="@id/comment_count"
+                android:layout_marginTop="10dp"
+                android:background="@color/colorPrimary"/>
+
+            <TextView
+                android:id="@+id/empty_hint"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/comment_count"
+                android:layout_centerInParent="true"
+                android:layout_marginTop="30dp"
+                android:drawablePadding="5dp"
+                android:drawableTop="@drawable/empty"
+                android:paddingBottom="100dp"
+                android:text="@string/sofa_hint"/>
+
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/recyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_below="@id/comment_count"
+                android:layout_marginTop="11dp"/>
+        </RelativeLayout>
+    </android.support.v4.widget.NestedScrollView>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/activity_code_share.xml b/qpython/src/main/res/layout/activity_code_share.xml
new file mode 100644
index 00000000..20876a84
--- /dev/null
+++ b/qpython/src/main/res/layout/activity_code_share.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <include
+            android:id="@+id/lt"
+            layout="@layout/layout_toolbar"/>
+
+        <LinearLayout
+            xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:id="@+id/btns"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <Button
+                    android:id="@+id/btn_project"
+                    style="@style/tab_btn"
+                    android:text="@string/project"/>
+
+                <Button
+                    android:id="@+id/btn_script"
+                    style="@style/tab_btn"
+                    android:text="@string/script"/>
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/lines"
+                android:layout_width="match_parent"
+                android:layout_height="3dp"
+                android:orientation="horizontal">
+
+                <View
+                    android:id="@+id/line_one"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:background="#FF4BAC07"/>
+
+                <View
+                    android:id="@+id/line_two"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:background="@color/theme_bg"/>
+            </LinearLayout>
+        </LinearLayout>
+
+
+        <android.support.v4.view.ViewPager
+            android:id="@+id/viewPager"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
+
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/activity_community.xml b/qpython/src/main/res/layout/activity_community.xml
new file mode 100644
index 00000000..c1cbe5f4
--- /dev/null
+++ b/qpython/src/main/res/layout/activity_community.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <include
+            android:id="@+id/lt"
+            layout="@layout/layout_toolbar"/>
+
+        <org.qpython.qpy.main.widget.MyNestedScrollView
+            android:id="@+id/scroll"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_below="@id/lt"
+            android:fillViewport="true">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <com.quseit.view.AdSlidShowView
+                    android:id="@+id/ad_slide"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:focusable="true"
+                    android:focusableInTouchMode="true"/>
+
+                <include
+                    android:id="@+id/tabs"
+                    layout="@layout/tabs"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"/>
+
+                <org.qpython.qpy.main.widget.WrapContentHeightViewPager
+                    android:id="@+id/vp"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"/>
+            </LinearLayout>
+        </org.qpython.qpy.main.widget.MyNestedScrollView>
+
+        <ProgressBar
+            android:id="@+id/progress_bar"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"/>
+
+        <include
+            android:id="@+id/top_tabs"
+            layout="@layout/tabs"
+            android:layout_width="match_parent"
+            android:visibility="gone"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/lt"/>
+    </RelativeLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/activity_course.xml b/qpython/src/main/res/layout/activity_course.xml
new file mode 100644
index 00000000..517c9092
--- /dev/null
+++ b/qpython/src/main/res/layout/activity_course.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <RelativeLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/root"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        >
+
+        <include
+            android:id="@+id/lt"
+            layout="@layout/layout_toolbar"/>
+
+        <org.qpython.qpy.main.widget.MyNestedScrollView
+            android:id="@+id/scroll"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_below="@id/lt"
+            android:fillViewport="true">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <com.quseit.view.AdSlidShowView
+                    android:id="@+id/ad_slide"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:focusable="true"
+                    android:focusableInTouchMode="true"/>
+
+                <include
+                    android:id="@+id/tabs"
+                    layout="@layout/tabs"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"/>
+
+                <org.qpython.qpy.main.widget.WrapContentHeightViewPager
+                    android:id="@+id/vp"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"/>
+            </LinearLayout>
+        </org.qpython.qpy.main.widget.MyNestedScrollView>
+
+        <ProgressBar
+            android:id="@+id/progress_bar"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"/>
+
+        <include
+            android:id="@+id/top_tabs"
+            layout="@layout/tabs"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/lt"/>
+    </RelativeLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/activity_course_crowdfunding.xml b/qpython/src/main/res/layout/activity_course_crowdfunding.xml
new file mode 100644
index 00000000..04199e2d
--- /dev/null
+++ b/qpython/src/main/res/layout/activity_course_crowdfunding.xml
@@ -0,0 +1,284 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    >
+
+    <data>
+
+        <variable
+            name="course"
+            type="org.qpython.qpy.main.server.model.CourseModel"/>
+    </data>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/colorPrimaryDark"
+        android:orientation="vertical">
+
+        <include
+            android:id="@+id/tl"
+            layout="@layout/layout_toolbar"/>
+
+        <org.qpython.qpy.main.widget.MyNestedScrollView
+            android:id="@+id/scroll"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_below="@id/tl"
+            android:layout_marginBottom="40dp">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+
+                <RelativeLayout
+                    android:id="@+id/img"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <org.qpython.qpy.main.widget.RatioImageView
+                        android:id="@+id/iv_theme"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:background="@color/white"
+                        android:scaleType="fitXY"
+                        android:src="@drawable/img_course"
+                        android:transitionName="img"/>
+
+                    <TextView
+                        android:id="@+id/tv_level"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignBottom="@id/iv_theme"
+                        android:layout_alignEnd="@id/iv_theme"
+                        android:layout_alignRight="@id/iv_theme"
+                        android:background="@color/theme_yellow"
+                        android:paddingBottom="3dp"
+                        android:paddingLeft="5dp"
+                        android:paddingRight="5dp"
+                        android:paddingTop="3dp"
+                        android:textColor="#FFF"
+                        android:textSize="12sp"
+                        android:textStyle="bold"
+                        android:transitionName="level"/>
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <TextView
+                        android:id="@+id/tv_title"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:ellipsize="end"
+                        android:maxLines="1"
+                        android:paddingLeft="@dimen/default_margin"
+                        android:paddingRight="@dimen/default_margin"
+                        android:paddingTop="@dimen/default_margin"
+                        android:text="@{course.title}"
+                        android:textColor="#FFF"
+                        android:textSize="16sp"
+                        android:textStyle="bold"
+                        android:transitionName="title"/>
+
+                </RelativeLayout>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/default_margin"
+                    android:layout_marginStart="@dimen/default_margin"
+                    android:layout_marginTop="@dimen/default_margin"
+                    android:text="@string/course_introduction"
+                    android:textColor="#FFF"/>
+
+                <TextView
+                    android:id="@+id/course_desc"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/default_margin"
+                    android:layout_marginStart="@dimen/default_margin"
+                    android:text="@{course.description}"/>
+
+                <TextView
+                    android:id="@+id/author_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/default_margin"
+                    android:layout_marginStart="@dimen/default_margin"
+                    android:layout_marginTop="10dp"
+                    android:text="@string/author"
+                    android:textColor="#FFF"/>
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingBottom="@dimen/default_margin"
+                    android:paddingLeft="@dimen/default_margin"
+                    android:paddingRight="@dimen/default_margin"
+                    android:paddingTop="5dp">
+
+
+                    <ImageView
+                        android:id="@+id/author_avatar"
+                        android:layout_width="60dp"
+                        android:layout_height="60dp"
+                        android:layout_marginEnd="@dimen/default_margin"
+                        android:layout_marginRight="@dimen/default_margin"
+                        android:src="@drawable/img_home_logo"/>
+
+                    <TextView
+                        android:id="@+id/author_desc"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignBottom="@id/author_avatar"
+                        android:layout_marginTop="10dp"
+                        android:layout_toEndOf="@id/author_avatar"
+                        android:layout_toRightOf="@id/author_avatar"
+                        android:text="@{course.auth_desc}"/>
+
+                    <TextView
+                        android:id="@+id/author_name"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_above="@id/author_desc"
+                        android:layout_toEndOf="@id/author_avatar"
+                        android:layout_toRightOf="@id/author_avatar"
+                        android:text="@{course.auth}"
+                        android:textColor="#FFF"
+                        android:textStyle="bold"/>
+                </RelativeLayout>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:padding="@dimen/default_margin"
+                    android:text="@string/course_content"
+                    android:textColor="#FFF"
+                    android:textSize="16sp"
+                    android:textStyle="bold"/>
+
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="@color/colorPrimary"/>
+
+
+                <org.qpython.qpy.main.widget.NonScrollListView
+                    android:id="@+id/rv_index"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:scrollbars="none"/>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="10dp"
+                    android:background="@color/colorPrimary"/>
+
+                <org.qpython.qpy.main.widget.scheduleview.ScheduleView
+                    android:id="@+id/schedule"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="46dp"
+                    android:layout_marginRight="46dp"
+                    android:layout_marginTop="@dimen/default_margin"
+                    app:dot_radius="8dp"
+                    app:margin="15dp"
+                    app:text_size="14sp"/>
+
+                <RelativeLayout
+                    android:id="@+id/purchase"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="10dp">
+
+                    <Button
+                        android:id="@+id/support_btn"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:background="@color/theme_yellow"
+                        android:paddingLeft="@dimen/default_margin"
+                        android:paddingRight="@dimen/default_margin"
+                        android:text="@string/funding"
+                        android:textColor="#000"
+                        android:textSize="16sp"/>
+
+                    <ImageButton
+                        android:id="@+id/thumb_btn"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/default_margin"
+                        android:background="@drawable/yellow_bg_thumbs_up"
+                        android:visibility="gone"/>
+                </RelativeLayout>
+
+                <TextView
+                    android:id="@+id/support_percent"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="@dimen/default_margin"
+                    android:paddingRight="@dimen/default_margin"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginBottom="@dimen/default_margin"
+                    android:layout_marginTop="5dp"
+                    android:textColor="#FFF"/>
+
+                <TextView
+                    android:id="@+id/explanation"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingBottom="@dimen/default_margin"
+                    android:paddingLeft="@dimen/default_margin"
+                    android:paddingRight="@dimen/default_margin"
+                    android:text="@string/explanation"
+                    android:textColor="#FF9B9B9B"/>
+
+                <org.qpython.qpy.main.widget.expandableview.ExpandableRelativeLayout
+                    android:id="@+id/explanation_more"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <TextView
+                        android:id="@+id/more_text"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:paddingLeft="@dimen/default_margin"
+                        android:paddingRight="@dimen/default_margin"
+                        android:text="@string/explanation_more"
+                        android:textColor="#FF9B9B9B"/>
+                </org.qpython.qpy.main.widget.expandableview.ExpandableRelativeLayout>
+
+                <TextView
+                    android:id="@+id/more"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end"
+                    android:paddingBottom="@dimen/default_margin"
+                    android:paddingLeft="@dimen/default_margin"
+                    android:paddingRight="@dimen/default_margin"
+                    android:text="@string/more"/>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="10dp"
+                    android:background="@color/colorPrimary"/>
+            </LinearLayout>
+
+        </org.qpython.qpy.main.widget.MyNestedScrollView>
+
+        <Button
+            android:id="@+id/btn_start_learn"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:background="@drawable/green_gray_btn"
+            android:text="@string/start_learn"/>
+    </RelativeLayout>
+
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/activity_course_index.xml b/qpython/src/main/res/layout/activity_course_index.xml
new file mode 100644
index 00000000..daedea95
--- /dev/null
+++ b/qpython/src/main/res/layout/activity_course_index.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    >
+
+    <data>
+
+        <variable
+            name="course"
+            type="org.qpython.qpy.main.server.model.CourseModel"/>
+    </data>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/colorPrimary"
+        android:orientation="vertical">
+
+        <include
+            android:id="@+id/tl"
+            layout="@layout/layout_toolbar"/>
+
+        <include
+            android:id="@+id/item"
+            app:course="@{course}"
+            layout="@layout/item_course"/>
+
+        <ListView
+            android:id="@+id/rv_index"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="10dp"
+            android:background="@color/colorPrimaryDark"
+            android:scrollbars="none"/>
+
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/activity_free_course.xml b/qpython/src/main/res/layout/activity_free_course.xml
new file mode 100644
index 00000000..a735634f
--- /dev/null
+++ b/qpython/src/main/res/layout/activity_free_course.xml
@@ -0,0 +1,326 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <android.support.constraint.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <include
+            android:id="@+id/tl"
+            layout="@layout/layout_toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.0"/>
+
+        <org.qpython.qpy.main.widget.RatioImageView
+            android:id="@+id/iv_theme"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:background="@color/white"
+            android:scaleType="fitXY"
+            android:src="@drawable/img_course"
+            android:transitionName="img"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tl"/>
+
+        <TextView
+            android:id="@+id/tv_level"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignBottom="@id/iv_theme"
+            android:layout_alignEnd="@id/iv_theme"
+            android:layout_alignRight="@id/iv_theme"
+            android:background="@color/theme_yellow"
+            android:paddingBottom="3dp"
+            android:paddingLeft="5dp"
+            android:paddingRight="5dp"
+            android:paddingTop="3dp"
+            android:textColor="#FFF"
+            android:textSize="12sp"
+            android:textStyle="bold"
+            android:transitionName="level"
+            app:layout_constraintBottom_toBottomOf="@+id/iv_theme"
+            app:layout_constraintEnd_toEndOf="@+id/iv_theme"
+            app:layout_constraintHorizontal_bias="1.0"
+            app:layout_constraintStart_toStartOf="@+id/iv_theme"
+            app:layout_constraintTop_toTopOf="@+id/iv_theme"
+            app:layout_constraintVertical_bias="1.0"/>
+
+        <TextView
+            android:id="@+id/tv_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:padding="@dimen/default_margin"
+            android:textColor="#FFF"
+            android:textSize="16sp"
+            android:textStyle="bold"
+            android:transitionName="title"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/iv_theme"
+            app:layout_constraintVertical_bias="0.0"/>
+
+        <TextView
+            android:id="@+id/textView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginRight="16dp"
+            android:layout_marginTop="8dp"
+            android:drawableTop="@drawable/ic_com_share"
+            android:text="@string/share"
+            android:textColor="@color/text_gray"
+            app:layout_constraintBottom_toBottomOf="@+id/tv_title"
+            app:layout_constraintEnd_toEndOf="@+id/tv_title"
+            app:layout_constraintTop_toTopOf="@+id/tv_title"/>
+
+        <TextView
+            android:id="@+id/author"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="8dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="8dp"
+            android:text="@string/author"
+            android:textColor="#FFF"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.023"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tv_title"/>
+
+        <TextView
+            android:id="@+id/textView5"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="8dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="8dp"
+            android:text="@string/course_introduction"
+            android:textColor="#FFF"
+            android:textSize="16sp"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toStartOf="@+id/intro_expand"
+            app:layout_constraintHorizontal_bias="0.038"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/author"/>
+
+        <TextView
+            android:id="@+id/intro_expand"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:layout_marginBottom="8dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginRight="16dp"
+            android:text="@string/show"
+            android:textColor="#FF9B9B9B"
+            app:layout_constraintBottom_toBottomOf="@+id/textView5"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/textView5"/>
+
+        <org.qpython.qpy.main.widget.expandableview.ExpandableRelativeLayout
+            android:id="@+id/intro_content"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/colorPrimaryDark"
+            android:paddingEnd="@dimen/default_margin"
+            android:paddingLeft="@dimen/default_margin"
+            android:paddingRight="@dimen/default_margin"
+            android:paddingStart="@dimen/default_margin"
+            app:ael_interpolator="fastOutSlowIn"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/textView5">
+
+            <TextView
+                android:id="@+id/course_desc"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textColor="#FFF"/>
+
+            <TextView
+                android:id="@+id/author_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/course_desc"
+                android:layout_marginTop="10dp"
+                android:text="@string/about_the_author"
+                android:textColor="#FFF"
+                android:textSize="16sp"
+                android:textStyle="bold"/>
+
+            <ImageView
+                android:id="@+id/author_avatar"
+                android:layout_width="60dp"
+                android:layout_height="60dp"
+                android:layout_below="@id/author_text"
+                android:layout_marginTop="10dp"/>
+
+            <TextView
+                android:id="@+id/author_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignTop="@id/author_avatar"
+                android:layout_toEndOf="@id/author_avatar"
+                android:layout_toRightOf="@id/author_avatar"
+                android:textColor="#FFF"
+                android:textStyle="bold"/>
+
+            <TextView
+                android:id="@+id/author_desc"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/author_name"
+                android:layout_marginTop="10dp"
+                android:layout_toEndOf="@id/author_avatar"
+                android:layout_toRightOf="@id/author_avatar"/>
+        </org.qpython.qpy.main.widget.expandableview.ExpandableRelativeLayout>
+
+        <TextView
+            android:id="@+id/textView6"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="16dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="8dp"
+            android:text="@string/course_content"
+            android:textColor="#FFF"
+            android:textSize="16sp"
+            android:textStyle="bold"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/intro_content"/>
+
+        <TextView
+            android:id="@+id/content_expand"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:layout_marginBottom="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginStart="8dp"
+            android:text="@string/show"
+            android:textColor="#FF9B9B9B"
+            app:layout_constraintBottom_toBottomOf="@+id/textView6"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.966"
+            app:layout_constraintStart_toEndOf="@+id/textView6"
+            app:layout_constraintTop_toTopOf="@+id/textView6"
+            app:layout_constraintVertical_bias="0.0"/>
+
+        <org.qpython.qpy.main.widget.expandableview.ExpandableRelativeLayout
+            android:id="@+id/course_content"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginStart="8dp"
+            android:background="@color/colorPrimaryDark"
+            app:ael_interpolator="fastOutSlowIn"
+            app:layout_constraintBottom_toTopOf="@+id/view"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/textView6"
+            app:layout_constraintVertical_bias="0.0">
+
+            <org.qpython.qpy.main.widget.NonScrollListView
+                android:id="@+id/rv_index"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:scrollbars="none"/>
+        </org.qpython.qpy.main.widget.expandableview.ExpandableRelativeLayout>
+
+        <View
+            android:id="@+id/view"
+            android:layout_width="match_parent"
+            android:layout_height="8dp"
+            android:layout_marginTop="8dp"
+            android:background="@color/colorPrimary"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/textView6"/>
+
+        <View
+            android:id="@+id/view2"
+            android:layout_width="match_parent"
+            android:layout_height="10dp"
+            android:layout_marginTop="20dp"
+            android:background="@color/colorPrimary"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/textView7"/>
+
+        <TextView
+            android:id="@+id/textView7"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="8dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="28dp"
+            android:drawablePadding="16dp"
+            android:drawableTop="@drawable/yellow_bg_thumbs_up"
+            android:text="@string/crowdfunding"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/view"/>
+
+
+        <WebView
+            android:id="@+id/from_content"
+            android:layout_width="match_parent"
+            android:layout_height="17dp"
+            android:layout_marginBottom="8dp"
+            android:background="@color/colorPrimaryDark"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/view2"
+            app:layout_constraintVertical_bias="0.0"/>
+
+        <ProgressBar
+            android:id="@+id/progress_bar"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:layout_margin="@dimen/default_margin"
+            android:layout_marginBottom="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="16dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="@+id/from_content"
+            app:layout_constraintHorizontal_bias="0.498"
+            app:layout_constraintStart_toStartOf="@+id/from_content"
+            app:layout_constraintTop_toTopOf="@+id/from_content"/>
+
+        <TextView
+            android:id="@+id/author_name_top"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            android:layout_marginLeft="4dp"
+            android:layout_marginStart="4dp"
+            app:layout_constraintBottom_toBottomOf="@+id/author"
+            app:layout_constraintStart_toEndOf="@+id/author"
+            app:layout_constraintTop_toTopOf="@+id/author"
+            app:layout_constraintVertical_bias="0.0"/>
+    </android.support.constraint.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/activity_ftp.xml b/qpython/src/main/res/layout/activity_ftp.xml
new file mode 100644
index 00000000..38234206
--- /dev/null
+++ b/qpython/src/main/res/layout/activity_ftp.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/theme_bg"
+        android:orientation="vertical">
+
+        <include
+            layout="@layout/layout_toolbar"/>
+
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/theme_bg"
+            android:gravity="center"
+            android:padding="@dimen/default_margin"
+            android:textColor="#FFF"/>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/toolbar"/>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="@dimen/default_margin">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:text="@string/service_toggle"
+                android:textColor="#FFF"/>
+
+            <org.qpython.qpy.main.widget.ToggleView
+                android:id="@+id/tb_open"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"/>
+        </RelativeLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/toolbar"/>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="@dimen/default_margin">
+
+            <TextView
+                style="@style/param_hint"
+                android:text="@string/ftp_root"/>
+
+            <TextView
+                android:id="@+id/tv_path"
+                style="@style/param_text"/>
+        </RelativeLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/toolbar"/>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="@dimen/default_margin">
+
+            <TextView
+                style="@style/param_hint"
+                android:text="@string/port_hint"/>
+
+            <TextView
+                android:id="@+id/tv_port"
+                style="@style/param_text"/>
+        </RelativeLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/toolbar"/>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="@dimen/default_margin">
+
+            <TextView
+                style="@style/param_hint"
+                android:text="@string/ftp_account"/>
+
+            <TextView
+                android:id="@+id/tv_account"
+                style="@style/param_text"/>
+        </RelativeLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/toolbar"/>
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/activity_funding_purchase.xml b/qpython/src/main/res/layout/activity_funding_purchase.xml
new file mode 100644
index 00000000..ca015ba0
--- /dev/null
+++ b/qpython/src/main/res/layout/activity_funding_purchase.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <android.support.constraint.ConstraintLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <include
+            android:id="@+id/lt"
+            layout="@layout/layout_toolbar"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"/>
+
+
+        <TextView
+            android:id="@+id/tv_thanks"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginEnd="8dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="56dp"
+            android:text="@string/thanks"
+            android:textColor="#FFF"
+            android:textSize="24sp"
+            android:visibility="gone"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/lt"/>
+
+        <TextView
+            android:id="@+id/price"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="8dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="64dp"
+            android:background="@drawable/purchase_bg"
+            android:gravity="center"
+            android:padding="@dimen/default_margin"
+            android:textColor="@color/theme_yellow"
+            android:textStyle="bold"
+            android:visibility="gone"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tv_thanks"/>
+
+        <include
+            android:id="@+id/no_data"
+            layout="@layout/widget_no_net"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:layout_marginBottom="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="8dp"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"/>
+
+        <ProgressBar
+            android:id="@+id/pb"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:visibility="gone"/>
+    </android.support.constraint.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/activity_lib.xml b/qpython/src/main/res/layout/activity_lib.xml
new file mode 100644
index 00000000..a041be94
--- /dev/null
+++ b/qpython/src/main/res/layout/activity_lib.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:android="http://schemas.android.com/apk/res/android"
+    >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/colorPrimary"
+        android:orientation="vertical">
+
+
+        <include
+            layout="@layout/layout_toolbar"/>
+
+        <android.support.design.widget.TabLayout
+            android:id="@+id/tabs"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/colorPrimaryDark"
+            android:textSize="16sp"
+            app:tabBackground="@drawable/select_tab_indicator"/>
+
+        <android.support.v4.view.ViewPager
+            android:id="@+id/vp"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/colorPrimaryDark"/>
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/activity_local_app.xml b/qpython/src/main/res/layout/activity_local_app.xml
new file mode 100644
index 00000000..ef51f7e5
--- /dev/null
+++ b/qpython/src/main/res/layout/activity_local_app.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/rootView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/mohu"
+        android:orientation="vertical"
+        android:padding="@dimen/default_margin">
+
+        <TextView
+            android:id="@+id/tv_folder_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="@string/qpy_app"
+            android:textColor="#FFF"
+            android:textSize="28sp"/>
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/rv_app"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="40dp"
+            android:background="@null"/>
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/activity_local_plugin_install.xml b/qpython/src/main/res/layout/activity_local_plugin_install.xml
new file mode 100644
index 00000000..ebd57e37
--- /dev/null
+++ b/qpython/src/main/res/layout/activity_local_plugin_install.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:app="http://schemas.android.com/apk/res-auto"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
+
+    <!--<android.support.v7.widget.Toolbar-->
+    <!--android:id="@+id/toolbar"-->
+    <!--android:layout_width="match_parent"-->
+    <!--android:layout_height="?attr/actionBarSize"-->
+    <!--android:background="?attr/colorPrimary"-->
+    <!--app:popupTheme="@style/DefaultBlueToolbar"-->
+    <!--app:titleTextColor="@color/white" />-->
+    <include
+        layout="@layout/layout_toolbar"/>
+
+    <FrameLayout
+        android:id="@+id/container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/activity_main.xml b/qpython/src/main/res/layout/activity_main.xml
new file mode 100644
index 00000000..265907b4
--- /dev/null
+++ b/qpython/src/main/res/layout/activity_main.xml
@@ -0,0 +1,256 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/img_home_bg"
+        android:gravity="center_horizontal"
+        android:orientation="vertical">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:background="@drawable/img_homebar_bg"
+            android:padding="@dimen/layout_padding">
+
+            <ImageView
+                android:id="@+id/icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerHorizontal="true"
+                android:layout_marginTop="@dimen/layout_padding"
+                android:src="@drawable/img_home_logo"/>
+        </RelativeLayout>
+
+        <ImageView
+            android:id="@+id/ll_qpy_app"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_weight="2"
+            android:src="@drawable/ic_home_qpyapp"/>
+
+        <TextView
+            android:id="@+id/login"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/login"
+            android:textColor="#FFF"/>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_margin="25dp"
+            android:layout_weight="5"
+            android:background="#4A4A4A"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <LinearLayout
+                    android:id="@+id/ll_terminal"
+                    style="@style/row_ll">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_home_terminal"/>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/icon_margin_top"
+                        android:text="@string/terminal"
+                        android:textColor="#FFF"/>
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/ll_editor"
+                    style="@style/row_ll">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_home_editor"/>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/icon_margin_top"
+                        android:text="@string/editor"
+                        android:textColor="#FFF"/>
+                </LinearLayout>
+
+
+                <LinearLayout
+                    android:id="@+id/ll_file"
+                    style="@style/row_ll">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_home_file"/>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/icon_margin_top"
+                        android:text="@string/file"
+                        android:textColor="#FFF"/>
+                </LinearLayout>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <LinearLayout
+                    android:id="@+id/iv_scan"
+                    style="@style/row_ll">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_home_scan"/>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/icon_margin_top"
+                        android:text="@string/scan"
+                        android:textColor="#FFF"/>
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/ll_library"
+                    style="@style/row_ll">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_home_library"/>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/icon_margin_top"
+                        android:text="@string/qpypi_up"
+                        android:textColor="#FFF"/>
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/ll_gist"
+                    style="@style/row_ll">
+
+                    <!--ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_home_gist"/>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/icon_margin_top"
+                        android:text="@string/gist"
+                        android:textColor="#FFF"/-->
+                </LinearLayout>
+
+                <!--<LinearLayout-->
+                <!--android:id="@+id/ll_local_app"-->
+                <!--style="@style/row_ll">-->
+
+                <!--<ImageView-->
+                <!--android:layout_width="wrap_content"-->
+                <!--android:layout_height="wrap_content"-->
+                <!--android:src="@drawable/ic_home_app"/>-->
+
+                <!--<TextView-->
+                <!--android:layout_width="wrap_content"-->
+                <!--android:layout_height="wrap_content"-->
+                <!--android:layout_marginTop="@dimen/icon_margin_top"-->
+                <!--android:text="@string/local_app"-->
+                <!--android:textColor="#FFF"/>-->
+                <!--</LinearLayout>-->
+
+
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <LinearLayout
+                    android:id="@+id/ll_setting"
+                    style="@style/row_ll">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_home_more"/>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/icon_margin_top"
+                        android:text="@string/more"
+                        android:textColor="#FFF"/>
+                </LinearLayout>
+
+
+                <LinearLayout
+                    android:id="@+id/ll_course"
+                    style="@style/row_ll">
+
+                    <!--ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_home_course"/>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/icon_margin_top"
+                        android:text="@string/course"
+                        android:textColor="#FFF"/-->
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/ll_community"
+                    style="@style/row_ll">
+
+                    <!--ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_home_club"/>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/icon_margin_top"
+                        android:text="@string/community"
+                        android:textColor="#FFF"/-->
+                </LinearLayout>
+
+
+
+
+            </LinearLayout>
+        </LinearLayout>
+    </LinearLayout>
+
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/activity_my_share.xml b/qpython/src/main/res/layout/activity_my_share.xml
new file mode 100644
index 00000000..bc35a42e
--- /dev/null
+++ b/qpython/src/main/res/layout/activity_my_share.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <include
+            android:id="@+id/lt"
+            layout="@layout/layout_toolbar"/>
+
+        <android.support.design.widget.TabLayout
+            android:id="@+id/tabs"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/colorPrimaryDark"
+            android:textSize="16sp"
+            app:tabBackground="@drawable/select_tab_indicator"
+            app:tabSelectedTextColor="@color/theme_green"
+            app:tabTextColor="@color/white"/>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+            <android.support.v4.view.ViewPager
+                android:id="@+id/vp"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"/>
+            <ProgressBar
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:id="@+id/progress_bar"
+                android:visibility="gone"/>
+        </FrameLayout>
+
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/activity_news_detail.xml b/qpython/src/main/res/layout/activity_news_detail.xml
new file mode 100644
index 00000000..6f6734cc
--- /dev/null
+++ b/qpython/src/main/res/layout/activity_news_detail.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <include
+            android:id="@+id/lt"
+            layout="@layout/layout_toolbar"/>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+            <android.support.v4.widget.SwipeRefreshLayout
+                android:id="@+id/refresh_layou"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+                <android.support.v7.widget.RecyclerView
+                    android:id="@+id/news_rv"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"/>
+            </android.support.v4.widget.SwipeRefreshLayout>
+
+            <LinearLayout
+                android:id="@+id/comment_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom"
+                android:background="@color/colorPrimary"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:paddingBottom="10dp"
+                android:paddingLeft="20dp"
+                android:paddingRight="20dp"
+                android:paddingTop="10dp"
+                android:visibility="gone">
+
+                <EditText
+                    android:id="@+id/comment_edit"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:hint="input"
+                    android:textColor="@color/white"
+                    android:textColorHint="@color/text_gray"
+                    />
+
+                <TextView
+                    android:id="@+id/send_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="20dp"
+                    android:text="SEND"
+                    android:textColor="@color/theme_green"
+                    android:textSize="16sp"
+                    android:layout_marginStart="20dp"/>
+            </LinearLayout>
+
+            <ProgressBar
+                android:id="@+id/progress_bar"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:visibility="gone"/>
+        </FrameLayout>
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/activity_notebook.xml b/qpython/src/main/res/layout/activity_notebook.xml
new file mode 100644
index 00000000..53c50dde
--- /dev/null
+++ b/qpython/src/main/res/layout/activity_notebook.xml
@@ -0,0 +1,237 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <ProgressBar
+            android:id="@+id/WebViewProgress"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/toolbar_layout"
+            android:layout_marginLeft="0dip"
+            android:layout_marginRight="0dip"
+            android:elevation="2dp"
+            android:indeterminate="false"
+            android:maxHeight="3dp"
+            android:minHeight="3dp"/>
+
+        <android.support.design.widget.AppBarLayout
+            xmlns:app="http://schemas.android.com/apk/res-auto"
+            android:id="@+id/toolbar_layout"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize">
+
+            <android.support.v7.widget.Toolbar
+                android:id="@+id/toolbar"
+                style="@style/Toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:background="#FF4A4A4A"
+                android:elevation="2dp"
+                app:popupTheme="@style/DefaultBlueToolbar"
+                app:theme="@style/ToolbarTheme">
+
+                <Spinner
+                    android:id="@+id/spinner_toolbar"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:visibility="gone"/>
+            </android.support.v7.widget.Toolbar>
+
+        </android.support.design.widget.AppBarLayout>
+
+        <org.qpython.qpy.main.widget.WebviewEX
+            android:id="@+id/web_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_above="@+id/bottom_layout"
+            android:layout_below="@+id/toolbar_layout"
+            >
+
+        </org.qpython.qpy.main.widget.WebviewEX>
+
+        <ProgressBar
+            android:id="@+id/progress_bar"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:visibility="gone"/>
+
+        <TextView
+            android:id="@+id/error_tv"
+            android:layout_width="250dp"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:text="Notebook resource is not released"
+            android:textColor="@color/black"
+            android:visibility="gone"/>
+
+        <LinearLayout
+            android:id="@+id/bottom_layout"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/shortcut_height"
+            android:layout_alignParentBottom="true"
+            android:background="#FFE8E8E8"
+            android:orientation="horizontal">
+
+
+            <ImageView
+                android:id="@+id/switch_terminal_img"
+                android:layout_width="47dp"
+                android:layout_height="47dp"
+                android:layout_gravity="center_vertical"
+                android:padding="6dp"
+                android:src="@drawable/ic_open"
+                />
+
+            <View
+                android:layout_width="2dp"
+                android:layout_height="21dp"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="5dp"
+                android:layout_marginRight="5dp"
+                android:background="#FFD5D5D5"/>
+
+            <HorizontalScrollView
+                android:id="@+id/hs_shortcut"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="#FFE8E8E8"
+                android:baselineAligned="false"
+                android:fadingEdgeLength="30dp"
+                android:requiresFadingEdge="horizontal">
+
+                <LinearLayout
+                    xmlns:android="http://schemas.android.com/apk/res/android"
+                    android:id="@+id/ll_control"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+
+                    <ImageView
+                        android:id="@+id/markdown_add_img"
+                        android:layout_width="47dp"
+                        android:layout_height="47dp"
+                        android:layout_gravity="center_vertical"
+                        android:padding="6dp"
+                        android:src="@drawable/ic_edittext_add"
+                        />
+
+                    <ImageView
+                        android:id="@+id/code_add_img"
+                        android:layout_width="47dp"
+                        android:layout_height="47dp"
+                        android:layout_gravity="center_vertical"
+                        android:padding="6dp"
+                        android:src="@drawable/ic_editcode_add"
+                        />
+
+                    <ImageView
+                        android:id="@+id/save_img"
+                        android:layout_width="47dp"
+                        android:layout_height="47dp"
+                        android:layout_gravity="center_vertical"
+                        android:padding="6dp"
+                        android:src="@drawable/ic_save2"
+                        />
+
+
+                    <ImageView
+                        android:id="@+id/stepin_img"
+                        android:layout_width="47dp"
+                        android:layout_height="47dp"
+                        android:layout_gravity="center_vertical"
+                        android:padding="6dp"
+                        android:src="@drawable/ic_stepin"
+                        />
+
+
+
+                    <ImageView
+                        android:id="@+id/undo_img"
+                        android:layout_width="47dp"
+                        android:layout_height="47dp"
+                        android:layout_gravity="center_vertical"
+                        android:padding="6dp"
+                        android:src="@drawable/ic_undo"
+                        android:visibility="gone"
+                        />
+
+                    <ImageView
+                        android:id="@+id/switch_code_img"
+                        android:layout_width="47dp"
+                        android:layout_height="47dp"
+                        android:layout_gravity="center_vertical"
+                        android:padding="6dp"
+                        android:src="@drawable/ic_editcode"
+                        />
+
+                    <ImageView
+                        android:id="@+id/switch_markdown_img"
+                        android:layout_width="47dp"
+                        android:layout_height="47dp"
+                        android:layout_gravity="center_vertical"
+                        android:padding="6dp"
+                        android:src="@drawable/ic_edittext"
+                        />
+
+                    <ImageView
+                        android:id="@+id/playall_img"
+                        android:layout_width="47dp"
+                        android:layout_height="47dp"
+                        android:layout_gravity="center_vertical"
+                        android:padding="6dp"
+                        android:src="@drawable/ic_play"
+                        />
+
+                    <ImageView
+                        android:id="@+id/refresh_img"
+                        android:layout_width="47dp"
+                        android:layout_height="47dp"
+                        android:layout_gravity="center_vertical"
+                        android:padding="12dp"
+                        android:src="@drawable/ic_library_reinstall"
+                        android:tint="@color/colorPrimary"
+                        />
+
+
+                    <ImageView
+                        android:id="@+id/cell_down_img"
+                        android:layout_width="47dp"
+                        android:layout_height="47dp"
+                        android:layout_gravity="center_vertical"
+                        android:padding="6dp"
+                        android:src="@drawable/ic_editor_arrow_down"
+                        />
+
+                    <ImageView
+                        android:id="@+id/cell_up_img"
+                        android:layout_width="47dp"
+                        android:layout_height="47dp"
+                        android:layout_gravity="center_vertical"
+                        android:padding="6dp"
+                        android:src="@drawable/ic_editor_arrow_up"
+                        />
+
+
+                    <ImageView
+                        android:id="@+id/delete_cell_img"
+                        android:layout_width="47dp"
+                        android:layout_height="47dp"
+                        android:layout_gravity="center_vertical"
+                        android:padding="14dp"
+                        android:src="@drawable/ic_com_delete"
+                        android:tint="@color/colorPrimary"
+                        />
+
+    
+                </LinearLayout>
+            </HorizontalScrollView>
+        </LinearLayout>
+    </RelativeLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/activity_notebooklist.xml b/qpython/src/main/res/layout/activity_notebooklist.xml
new file mode 100644
index 00000000..b3685534
--- /dev/null
+++ b/qpython/src/main/res/layout/activity_notebooklist.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+        <android.support.design.widget.AppBarLayout
+            xmlns:android="http://schemas.android.com/apk/res/android"
+            xmlns:app="http://schemas.android.com/apk/res-auto"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize">
+
+            <android.support.v7.widget.Toolbar
+                android:id="@+id/toolbar"
+                style="@style/Toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:background="#FF4A4A4A"
+                android:elevation="2dp"
+                app:popupTheme="@style/DefaultBlueToolbar"
+                app:theme="@style/ToolbarTheme"/>
+        </android.support.design.widget.AppBarLayout>
+        <RelativeLayout
+            android:id="@+id/rl_path"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="#FF363636">
+
+            <TextView
+                android:id="@+id/tv_path"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="@dimen/default_margin"
+                android:layout_marginRight="@dimen/default_margin"
+                android:layout_toLeftOf="@+id/iv_new_folder"
+                android:layout_toStartOf="@+id/iv_new_folder"
+                android:ellipsize="start"
+                android:gravity="start"
+                android:singleLine="true"
+                android:textColor="#FF9B9B9B"
+                android:text="/"/>
+
+            <ImageView
+                android:id="@+id/iv_new_folder"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_marginEnd="@dimen/default_margin"
+                android:layout_marginRight="@dimen/default_margin"
+                android:src="@drawable/ic_editor_newfolder"
+                android:visibility="gone"/>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_alignParentBottom="true"
+                android:background="@color/colorPrimary"/>
+        </RelativeLayout>
+        <android.support.v7.widget.RecyclerView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:id="@+id/rv_files"/>
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/activity_plugin_manager.xml b/qpython/src/main/res/layout/activity_plugin_manager.xml
new file mode 100644
index 00000000..739de711
--- /dev/null
+++ b/qpython/src/main/res/layout/activity_plugin_manager.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <android.support.v7.widget.Toolbar
+
+        android:id="@+id/toolbar"
+        style="@style/AppTheme.AppBarOverlay"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="@color/colorPrimary"
+        android:title="@string/title_plugin_manage"
+        app:navigationIcon="@drawable/ic_arrow_back" />
+
+    <android.support.design.widget.TabLayout
+        android:id="@+id/tab_layout"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        app:tabBackground="@android:color/white"
+        app:tabIndicatorColor="@color/colorPrimary"
+        app:tabMode="fixed"
+        app:tabSelectedTextColor="@color/colorPrimary"
+        app:tabTextColor="@android:color/black" />
+
+    <android.support.v4.view.ViewPager
+        android:id="@+id/view_pager"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</LinearLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/activity_purchase.xml b/qpython/src/main/res/layout/activity_purchase.xml
new file mode 100644
index 00000000..96832249
--- /dev/null
+++ b/qpython/src/main/res/layout/activity_purchase.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <LinearLayout
+            xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <include
+                android:id="@+id/lt"
+                layout="@layout/layout_toolbar"/>
+
+            <TextView
+                android:id="@+id/tv_thanks"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="40dp"
+                android:text="@string/thanks"
+                android:textColor="#FFF"
+                android:textSize="24sp"
+                android:visibility="gone"/>
+
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/list"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginTop="@dimen/default_margin"
+                android:padding="40dp"
+                android:visibility="gone"/>
+        </LinearLayout>
+
+        <include
+            android:id="@+id/no_data"
+            layout="@layout/widget_no_net"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"/>
+
+        <ProgressBar
+            android:id="@+id/pb"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:visibility="gone"/>
+    </RelativeLayout>
+
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/activity_qrcode.xml b/qpython/src/main/res/layout/activity_qrcode.xml
new file mode 100644
index 00000000..0a3ce940
--- /dev/null
+++ b/qpython/src/main/res/layout/activity_qrcode.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <include
+        android:id="@+id/lt"
+        layout="@layout/layout_toolbar"/>
+
+    <me.dm7.barcodescanner.zxing.ZXingScannerView
+        android:id="@+id/scanner"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/activity_qwebview.xml b/qpython/src/main/res/layout/activity_qwebview.xml
new file mode 100644
index 00000000..e3199444
--- /dev/null
+++ b/qpython/src/main/res/layout/activity_qwebview.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <include
+            android:id="@+id/lt"
+            layout="@layout/layout_toolbar"/>
+
+        <ProgressBar
+            android:id="@+id/WebViewProgress"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="0dip"
+            android:layout_marginRight="0dip"
+            android:elevation="2dp"
+            android:indeterminate="false"
+            android:maxHeight="3dp"
+            android:minHeight="3dp"/>
+
+
+        <WebView
+            android:id="@+id/wv"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
+
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/activity_setting.xml b/qpython/src/main/res/layout/activity_setting.xml
new file mode 100644
index 00000000..fce170fa
--- /dev/null
+++ b/qpython/src/main/res/layout/activity_setting.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                xmlns:app="http://schemas.android.com/apk/res-auto"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@color/colorPrimaryDark"
+                android:orientation="vertical">
+
+    <android.support.design.widget.AppBarLayout
+        android:id="@+id/app_bar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize">
+
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            style="@style/Toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="#FF4A4A4A"
+            android:elevation="2dp"
+            app:popupTheme="@style/DefaultBlueToolbar"
+            app:theme="@style/ToolbarTheme"/>
+    </android.support.design.widget.AppBarLayout>
+
+    <FrameLayout
+        android:id="@+id/setting_fragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/app_bar"
+        android:orientation="vertical"/>
+</RelativeLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/activity_sign_in.xml b/qpython/src/main/res/layout/activity_sign_in.xml
new file mode 100644
index 00000000..952bf46b
--- /dev/null
+++ b/qpython/src/main/res/layout/activity_sign_in.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+    >
+
+    <android.support.constraint.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/img_home_bg"
+        android:orientation="vertical">
+
+        <ImageView
+            android:id="@+id/logo"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:layout_marginLeft="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_marginTop="78dp"
+            android:contentDescription="@string/logo"
+            android:src="@drawable/img_home_logo"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"/>
+
+        <TextView
+            android:id="@+id/google"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/logo"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="8dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_marginTop="8dp"
+            android:gravity="center_horizontal"
+            android:text="@string/best_python_development_ide_non_mobile"
+            android:textColor="#949494"
+            app:layout_constraintBottom_toTopOf="@+id/button2"
+            app:layout_constraintHorizontal_bias="0.503"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/logo"
+            app:layout_constraintVertical_bias="0.407"
+            app:layout_constraintVertical_chainStyle="spread"/>
+
+        <Button
+            android:id="@+id/button2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/google"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="8dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_marginTop="8dp"
+            android:background="#FFF"
+            android:drawableLeft="@drawable/ic_login"
+            android:drawablePadding="@dimen/default_margin"
+            android:drawableStart="@drawable/ic_login"
+            android:paddingLeft="@dimen/default_margin"
+            android:paddingRight="@dimen/default_margin"
+            android:text="@string/sign_in_with_google"
+            android:textAllCaps="false"
+            android:textColor="@color/black"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"/>
+
+        <TextView
+            android:id="@+id/textView3"
+            android:layout_width="wrap_content"
+            android:layout_height="68dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="41dp"
+            android:maxWidth="300dp"
+            android:gravity="center"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/button2"/>
+
+        <ImageButton
+            android:id="@+id/button3"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@color/transparency"
+            android:padding="8dp"
+            android:src="@drawable/ic_library_delete"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.962"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.017"/>
+
+        <ProgressBar
+            android:id="@+id/progressBar2"
+            style="?android:attr/progressBarStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_marginTop="8dp"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintHorizontal_bias="0.498"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.418"/>
+
+    </android.support.constraint.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/activity_splash.xml b/qpython/src/main/res/layout/activity_splash.xml
new file mode 100644
index 00000000..ce6f6cd4
--- /dev/null
+++ b/qpython/src/main/res/layout/activity_splash.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <RelativeLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:background="#103606"
+        android:layout_height="match_parent">
+
+        <ImageView
+            android:layout_width="70dp"
+            android:layout_height="50dp"
+            android:layout_centerInParent="true"
+            android:src="@drawable/img_home_logo"/>
+    </RelativeLayout>
+</layout>       
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/activity_user.xml b/qpython/src/main/res/layout/activity_user.xml
new file mode 100644
index 00000000..a69c140a
--- /dev/null
+++ b/qpython/src/main/res/layout/activity_user.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    >
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingBottom="@dimen/default_margin">
+
+        <android.support.design.widget.AppBarLayout
+            android:id="@+id/appbar_layout"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="#00ffffff">
+
+            <android.support.v7.widget.Toolbar
+                android:id="@+id/toolbar"
+                style="@style/Toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:background="#00ffffff"/>
+
+        </android.support.design.widget.AppBarLayout>
+
+        <ImageView
+            android:id="@+id/bg"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:scaleType="fitXY"
+            android:src="@drawable/img_me_bg"/>
+
+        <ImageView
+            android:id="@+id/avatar"
+            android:layout_width="70dp"
+            android:layout_height="70dp"
+            android:layout_below="@id/appbar_layout"
+            android:layout_margin="@dimen/default_margin"
+            android:src="@drawable/empty"/>
+
+        <!--<TextView-->
+            <!--android:id="@+id/email"-->
+            <!--android:layout_width="wrap_content"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:layout_alignBottom="@id/avatar"-->
+            <!--android:layout_marginLeft="@dimen/default_margin"-->
+            <!--android:layout_marginStart="@dimen/default_margin"-->
+            <!--android:layout_toEndOf="@id/avatar"-->
+            <!--android:layout_toRightOf="@id/avatar"-->
+            <!--android:textColor="#FFF"/>-->
+
+        <TextView
+            android:id="@+id/name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="10dp"
+            android:layout_alignTop="@id/avatar"
+            android:layout_marginLeft="@dimen/default_margin"
+            android:layout_marginStart="@dimen/default_margin"
+            android:layout_toEndOf="@id/avatar"
+            android:layout_toRightOf="@id/avatar"
+            android:textColor="#FFF"
+            android:textSize="18sp"
+            android:textStyle="bold"/>
+
+        <TextView
+            android:id="@+id/usage"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/bg"
+            android:layout_margin="@dimen/default_margin"
+            android:text="@string/my_space_empty"/>
+
+        <LinearLayout
+            android:id="@+id/my_share_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/usage"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            >
+
+            <ImageView
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:src="@drawable/empty"
+                />
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="5dp"
+                android:layout_marginStart="5dp"
+                android:layout_weight="1"
+                android:text="@string/my_share"/>
+
+            <ImageView
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:src="@drawable/ic_editor_arrow_right"
+                android:tint="@color/white"
+                android:visibility="gone"/>
+        </LinearLayout>
+
+        <Button
+            android:id="@+id/logout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_margin="@dimen/default_margin"
+            android:background="@drawable/gray_line_btn_bg"
+            android:text="@string/log_out"
+            android:textAllCaps="false"
+            android:textColor="@color/text_gray"
+            />
+    </RelativeLayout>
+</layout>
diff --git a/qpython/src/main/res/layout/buttons_ok_cancel.xml b/qpython/src/main/res/layout/buttons_ok_cancel.xml
new file mode 100644
index 00000000..19e12553
--- /dev/null
+++ b/qpython/src/main/res/layout/buttons_ok_cancel.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal" >
+
+    <Button
+        android:id="@+id/buttonOk"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:text="@string/ui_ok" />
+
+    <View
+        android:layout_width="@dimen/dialog_buttons_margin"
+        android:layout_height="match_parent" />
+
+    <Button
+        android:id="@+id/buttonCancel"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:text="@string/ui_cancel" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/dialog__setting_notebook.xml b/qpython/src/main/res/layout/dialog__setting_notebook.xml
new file mode 100644
index 00000000..d558724a
--- /dev/null
+++ b/qpython/src/main/res/layout/dialog__setting_notebook.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_width="300dp"
+              android:layout_height="wrap_content"
+              android:layout_gravity="center"
+              android:background="@color/colorPrimary"
+              android:orientation="vertical"
+              android:padding="14dp">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="10dp"
+        android:text="Enable QPyNotebook"
+        android:textColor="@color/theme_green"
+        android:textSize="18sp"/>
+
+    <CheckBox
+        android:id="@+id/notebook_app"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:button="@drawable/notebook_checkbox"
+        android:buttonTint="@color/theme_green"
+        android:text="Install QPyNotebook Plugin"
+        android:textColor="@color/white"
+        android:textSize="16sp"
+        />
+
+    <CheckBox
+        android:id="@+id/notebook_lib"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:button="@drawable/notebook_checkbox"
+        android:buttonTint="@color/theme_green"
+        android:text="Install Related Libraries"
+        android:textColor="@color/white"
+        android:textSize="16sp"
+        android:layout_marginTop="5dp"
+        />
+</LinearLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/dialog_code_review.xml b/qpython/src/main/res/layout/dialog_code_review.xml
new file mode 100644
index 00000000..944aa5a3
--- /dev/null
+++ b/qpython/src/main/res/layout/dialog_code_review.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent"
+             android:id="@+id/root_layout">
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="400dp"
+        android:background="@drawable/corners_5_white_bg"
+        android:layout_gravity="center"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp">
+        <HorizontalScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <TextView
+                android:id="@+id/code_content_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:padding="@dimen/default_margin"
+                android:textColor="@color/black"
+                />
+        </HorizontalScrollView>
+    </ScrollView>
+</FrameLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/dialog_enter.xml b/qpython/src/main/res/layout/dialog_enter.xml
new file mode 100644
index 00000000..b29f1895
--- /dev/null
+++ b/qpython/src/main/res/layout/dialog_enter.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="60dp"
+        android:background="#FF4A4A4A"
+        android:orientation="vertical"
+        android:padding="@dimen/default_margin">
+
+        <TextView
+            android:id="@+id/tv_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="标题"
+            android:textColor="@color/colorAccent"
+            android:textSize="18sp"
+            android:textStyle="bold"/>
+
+        <EditText
+            android:id="@+id/et_enter"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="30dp"
+            android:layout_marginTop="30dp"
+            android:background="@drawable/edit_text_green_bg"
+            android:padding="5dp"
+            android:textColor="#FFF"
+            android:textColorHint="@color/text_gray"
+            android:textCursorDrawable="@drawable/edit_text_cursor"/>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="right"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/tv_negative"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="25dp"
+                android:text="@string/cancel"
+                android:textColor="@color/colorAccent"/>
+
+            <TextView
+                android:id="@+id/tv_positive"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/confirm"
+                android:textColor="@color/colorAccent"/>
+        </LinearLayout>
+
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/dialog_feedback.xml b/qpython/src/main/res/layout/dialog_feedback.xml
new file mode 100644
index 00000000..e664e543
--- /dev/null
+++ b/qpython/src/main/res/layout/dialog_feedback.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+          android:id="@android:id/text1"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:layout_marginLeft="@dimen/default_margin"
+          android:layout_marginStart="@dimen/default_margin"
+          android:ellipsize="marquee"
+          android:gravity="center_vertical"
+          android:padding="8dp"
+          android:paddingEnd="@dimen/default_margin"
+          android:paddingLeft="32dp"
+          android:paddingRight="@dimen/default_margin"
+          android:paddingStart="32dp"
+          android:textAppearance="?android:attr/textAppearanceLarge"
+          android:textColor="?android:attr/textColorAlertDialogListItem"
+          android:textSize="16sp"/>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/dialog_history.xml b/qpython/src/main/res/layout/dialog_history.xml
new file mode 100644
index 00000000..a3a8df5d
--- /dev/null
+++ b/qpython/src/main/res/layout/dialog_history.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+          android:id="@android:id/text1"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:layout_marginLeft="@dimen/default_margin"
+          android:layout_marginStart="@dimen/default_margin"
+          android:ellipsize="marquee"
+          android:gravity="center_vertical"
+          android:padding="8dp"
+          android:paddingEnd="@dimen/default_margin"
+          android:paddingLeft="32dp"
+          android:paddingRight="@dimen/default_margin"
+          android:paddingStart="32dp"
+          android:textAppearance="?android:attr/textAppearanceLarge"
+          android:textColor="?android:attr/textColorAlertDialogListItem"
+          android:textSize="14sp"/>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/dialog_loading.xml b/qpython/src/main/res/layout/dialog_loading.xml
new file mode 100644
index 00000000..ffae18c0
--- /dev/null
+++ b/qpython/src/main/res/layout/dialog_loading.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent">
+
+    <ProgressBar
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        />
+</FrameLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/dialog_share.xml b/qpython/src/main/res/layout/dialog_share.xml
new file mode 100644
index 00000000..13f43fca
--- /dev/null
+++ b/qpython/src/main/res/layout/dialog_share.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="130dp"
+              android:background="@color/white"
+              android:orientation="vertical"
+    >
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_margin="20dp"
+        android:text="SHARE TO"
+        android:textColor="@color/black"
+        android:textSize="16sp"/>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:gravity="center"
+        android:orientation="horizontal"
+        >
+
+        <ImageView
+            android:id="@+id/facebook_iv"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:visibility="gone"
+            android:src="@drawable/ic_com_facebook"/>
+
+        <ImageView
+            android:id="@+id/twitter_iv"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_marginLeft="30dp"
+            android:layout_marginRight="30dp"
+            android:visibility="gone"
+            android:src="@drawable/ic_com_twitter"/>
+
+        <ImageView
+            android:id="@+id/copy_link_iv"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:src="@drawable/ic_com_copylink"/>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/drawer_editor.xml b/qpython/src/main/res/layout/drawer_editor.xml
new file mode 100644
index 00000000..c52e1bee
--- /dev/null
+++ b/qpython/src/main/res/layout/drawer_editor.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <include
+            android:id="@+id/lt"
+            layout="@layout/layout_toolbar"/>
+
+        <android.support.v4.widget.DrawerLayout
+            android:id="@+id/drawer_layout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+            <!-- The main content view -->
+            <FrameLayout
+                android:id="@+id/content_frame"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"/>
+            <!-- The navigation drawer -->
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/left_drawer"
+                android:layout_width="240dp"
+                android:layout_height="match_parent"
+                android:layout_gravity="start"
+                android:background="@color/colorPrimary"
+                android:choiceMode="singleChoice"
+                android:divider="@android:color/transparent"
+                android:dividerHeight="0dp"/>
+        </android.support.v4.widget.DrawerLayout>
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/fragment_course.xml b/qpython/src/main/res/layout/fragment_course.xml
new file mode 100644
index 00000000..d08cad7e
--- /dev/null
+++ b/qpython/src/main/res/layout/fragment_course.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <RelativeLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/root"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/colorPrimary">
+
+        <LinearLayout
+            android:id="@+id/type_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="2dp"
+            android:background="@color/colorPrimaryDark"
+            android:orientation="horizontal"
+            android:padding="@dimen/default_margin">
+
+            <TextView
+                android:id="@+id/basic"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:drawableTop="@drawable/basics_light"
+                android:gravity="center_horizontal"
+                android:text="@string/basics"
+                android:textColor="@color/theme_green"/>
+
+            <TextView
+                android:id="@+id/database"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:drawableTop="@drawable/database"
+                android:gravity="center_horizontal"
+                android:text="@string/tools"/>
+
+            <TextView
+                android:id="@+id/arvr"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:drawableTop="@drawable/arvr"
+                android:gravity="center_horizontal"
+                android:text="@string/funny"/>
+
+            <TextView
+                android:id="@+id/aipy"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:drawableTop="@drawable/aipy"
+                android:gravity="center_horizontal"
+                android:text="@string/aipy"/>
+
+            <TextView
+                android:id="@+id/web"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:drawableTop="@drawable/web"
+                android:gravity="center_horizontal"
+                android:text="@string/other"/>
+        </LinearLayout>
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/swipe_list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_below="@id/type_layout"
+            android:background="@color/colorPrimaryDark"/>
+
+        <TextView
+            android:id="@+id/empty_hint"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:drawablePadding="10dp"
+            android:drawableTop="@drawable/empty"
+            android:gravity="center_horizontal"
+            android:text="@string/nothing_here_yet"
+            android:textColor="#FFF"
+            android:visibility="gone"/>
+
+        <ProgressBar
+            android:id="@+id/progress_bar"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:visibility="gone"/>
+    </RelativeLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/fragment_explorer.xml b/qpython/src/main/res/layout/fragment_explorer.xml
new file mode 100644
index 00000000..57f88090
--- /dev/null
+++ b/qpython/src/main/res/layout/fragment_explorer.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <RelativeLayout
+            android:id="@+id/rl_path"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="#FF363636">
+
+            <TextView
+                android:id="@+id/tv_path"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="@dimen/default_margin"
+                android:layout_marginRight="@dimen/default_margin"
+                android:layout_toLeftOf="@+id/iv_new_folder"
+                android:layout_toStartOf="@+id/iv_new_folder"
+                android:ellipsize="start"
+                android:gravity="start"
+                android:singleLine="true"
+                android:textColor="#FF9B9B9B"/>
+
+            <ImageView
+                android:id="@+id/iv_new_folder"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_marginEnd="@dimen/default_margin"
+                android:layout_marginRight="@dimen/default_margin"
+                android:src="@drawable/ic_editor_newfolder"/>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_alignParentBottom="true"
+                android:background="@color/colorPrimary"/>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/prev_folder"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+
+            <ImageView
+                android:id="@+id/iv_file_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginEnd="@dimen/default_margin"
+                android:layout_marginLeft="@dimen/default_margin"
+                android:layout_marginRight="16dp"
+                android:layout_marginStart="@dimen/default_margin"
+                android:src="@drawable/prev"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_toEndOf="@id/iv_file_icon"
+                android:layout_toRightOf="@id/iv_file_icon"
+                android:text=".."
+                android:textColor="#FFF"
+                android:textSize="18sp"
+                android:textStyle="bold"
+                tools:ignore="HardcodedText"/>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_below="@id/iv_file_icon"
+                android:layout_marginTop="@dimen/default_margin"
+                android:background="@color/colorPrimary"/>
+        </RelativeLayout>
+
+        <TextView
+            android:id="@+id/net_error_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="50dp"
+            android:drawablePadding="10dp"
+            android:drawableTop="@drawable/img_empty_net"
+            android:text="@string/net_error"
+            android:visibility="gone"
+            />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <com.yanzhenjie.recyclerview.swipe.SwipeMenuRecyclerView
+                android:id="@+id/swipe_list"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                />
+
+            <TextView
+                android:id="@+id/empty_hint"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:drawablePadding="10dp"
+                android:drawableTop="@drawable/empty"
+                android:text="@string/no_recent_file"
+                android:textColor="#FFF"
+                android:visibility="gone"/>
+        </RelativeLayout>
+
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/fragment_local.xml b/qpython/src/main/res/layout/fragment_local.xml
new file mode 100644
index 00000000..79822280
--- /dev/null
+++ b/qpython/src/main/res/layout/fragment_local.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <android.support.design.widget.TabLayout
+            android:id="@+id/tabs"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/colorPrimaryDark"
+            android:textSize="16sp"
+            app:tabBackground="@drawable/select_tab_indicator"/>
+
+        <android.support.v4.view.ViewPager
+            android:id="@+id/vp"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/fragment_my_course.xml b/qpython/src/main/res/layout/fragment_my_course.xml
new file mode 100644
index 00000000..03ed944e
--- /dev/null
+++ b/qpython/src/main/res/layout/fragment_my_course.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <RelativeLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/root"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/swipe_list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
+
+        <Button
+            android:id="@+id/explore"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:background="@drawable/green_rect_line"
+            android:paddingLeft="@dimen/default_margin"
+            android:paddingRight="@dimen/default_margin"
+            android:text="@string/explore_course"
+            android:textColor="@color/theme_green"/>
+
+        <ImageView
+            android:id="@+id/empty_hint"
+            android:layout_centerHorizontal="true"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_above="@id/explore"
+            android:drawablePadding="10dp"
+            android:gravity="center_horizontal"
+            android:src="@drawable/img_emptycourse"/>
+
+        <ProgressBar
+            android:id="@+id/pb"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:visibility="gone"/>
+    </RelativeLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/fragment_my_share.xml b/qpython/src/main/res/layout/fragment_my_share.xml
new file mode 100644
index 00000000..ccaaf764
--- /dev/null
+++ b/qpython/src/main/res/layout/fragment_my_share.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent"
+             android:orientation="vertical">
+
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/rv_myshare"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+    <ProgressBar
+        android:id="@+id/progress_bar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:visibility="gone"/>
+
+    <TextView
+        android:id="@+id/empty"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:drawablePadding="10dp"
+        android:drawableTop="@drawable/empty"
+        android:text="@string/no_data"
+        android:visibility="gone"/>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/fragment_plugin_cloud.xml b/qpython/src/main/res/layout/fragment_plugin_cloud.xml
new file mode 100644
index 00000000..919d945c
--- /dev/null
+++ b/qpython/src/main/res/layout/fragment_plugin_cloud.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/rv_plugin"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+        <LinearLayout
+            android:id="@+id/none_item_bg"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+
+            <ImageView
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="3"
+                android:adjustViewBounds="true"
+                android:scaleType="center"
+                android:src="@drawable/sorry" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+        </LinearLayout>
+    </FrameLayout>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/fragment_plugin_local.xml b/qpython/src/main/res/layout/fragment_plugin_local.xml
new file mode 100644
index 00000000..049cedb8
--- /dev/null
+++ b/qpython/src/main/res/layout/fragment_plugin_local.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/rv_plugin"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+        <LinearLayout
+            android:id="@+id/none_item_bg"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+
+            <ImageView
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="3"
+                android:adjustViewBounds="true"
+                android:scaleType="center"
+                android:src="@drawable/sorry" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+        </LinearLayout>
+    </FrameLayout>
+
+
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/fab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentRight="true"
+        android:layout_marginBottom="16dp"
+        android:layout_marginRight="16dp"
+        android:src="@android:drawable/ic_input_add"
+        app:backgroundTint="@color/white" />
+</RelativeLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/fragment_qpy_pi.xml b/qpython/src/main/res/layout/fragment_qpy_pi.xml
new file mode 100644
index 00000000..32502ecc
--- /dev/null
+++ b/qpython/src/main/res/layout/fragment_qpy_pi.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/colorPrimaryDark">
+
+        <com.yanzhenjie.recyclerview.swipe.SwipeMenuRecyclerView
+            android:id="@+id/swipe_list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
+
+        <ProgressBar
+            android:id="@+id/progress_bar"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:visibility="gone"/>
+
+        <TextView
+            android:id="@+id/net_error"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:layout_marginTop="50dp"
+            android:drawablePadding="10dp"
+            android:drawableTop="@drawable/img_empty_net"
+            android:text="@string/net_error"
+            android:textColor="#FFF"
+            android:visibility="gone"
+            />
+    </RelativeLayout>
+</layout>
diff --git a/qpython/src/main/res/layout/fragment_refresh_rv.xml b/qpython/src/main/res/layout/fragment_refresh_rv.xml
new file mode 100644
index 00000000..3dee4be2
--- /dev/null
+++ b/qpython/src/main/res/layout/fragment_refresh_rv.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <RelativeLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/colorPrimaryDark"
+        android:orientation="vertical">
+
+        <com.yanzhenjie.recyclerview.swipe.SwipeMenuRecyclerView
+            android:id="@+id/swipe_list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
+
+        <TextView
+            android:id="@+id/net_error"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:drawablePadding="10dp"
+            android:drawableTop="@drawable/img_empty_net"
+            android:gravity="center"
+            android:padding="@dimen/default_margin"
+            android:text="@string/net_error"
+            android:textColor="#FFF"
+            android:visibility="gone"
+            />
+
+        <ProgressBar
+            android:id="@+id/progress_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"/>
+    </RelativeLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/fragment_rv.xml b/qpython/src/main/res/layout/fragment_rv.xml
new file mode 100644
index 00000000..7c07025f
--- /dev/null
+++ b/qpython/src/main/res/layout/fragment_rv.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <RelativeLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/root"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/swipe_list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
+
+        <TextView
+            android:id="@+id/empty_hint"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:drawablePadding="10dp"
+            android:drawableTop="@drawable/empty"
+            android:gravity="center_horizontal"
+            android:text="@string/nothing_here_yet"
+            android:textColor="#FFF"
+            android:visibility="gone"/>
+
+        <TextView
+            android:id="@+id/net_error_hint"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:drawablePadding="10dp"
+            android:drawableTop="@drawable/empty"
+            android:gravity="center_horizontal"
+            android:padding="@dimen/default_margin"
+            android:text="@string/net_error"
+            android:textColor="#FFF"
+            android:visibility="gone"/>
+
+        <ProgressBar
+            android:id="@+id/progress_bar"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:visibility="gone"/>
+    </RelativeLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/header_last_refresh_time.xml b/qpython/src/main/res/layout/header_last_refresh_time.xml
new file mode 100644
index 00000000..10eaf341
--- /dev/null
+++ b/qpython/src/main/res/layout/header_last_refresh_time.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/colorPrimary"
+    android:gravity="center"
+    android:padding="5dp"
+    android:text="@string/last_refresh"
+    android:textColor="#FFF"
+    android:textSize="12sp"/>
diff --git a/qpython/src/main/res/layout/header_lib_description.xml b/qpython/src/main/res/layout/header_lib_description.xml
new file mode 100644
index 00000000..0697ced1
--- /dev/null
+++ b/qpython/src/main/res/layout/header_lib_description.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/lib_description"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/colorPrimaryDark"
+        android:padding="@dimen/default_margin"
+        android:text="@string/aipy_lib_hint"
+        android:textColor="#FFF"/>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="10dp"
+        android:background="@color/colorPrimary"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/header_lib_install.xml b/qpython/src/main/res/layout/header_lib_install.xml
new file mode 100644
index 00000000..dc855ecd
--- /dev/null
+++ b/qpython/src/main/res/layout/header_lib_install.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/tv_open_pypi"
+        style="@style/top_hint"
+        android:drawableEnd="@drawable/ic_keyboard_arrow_right_white"
+        android:drawableRight="@drawable/ic_keyboard_arrow_right_white"
+        android:text="@string/install_with_python_s_pypi"/>
+
+    <TextView
+        style="@style/top_describe"
+        android:text="@string/py_pi"/>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="10dp"
+        android:background="@color/colorPrimary"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/item_app_list.xml b/qpython/src/main/res/layout/item_app_list.xml
new file mode 100644
index 00000000..55dd347c
--- /dev/null
+++ b/qpython/src/main/res/layout/item_app_list.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="5dp"
+        android:orientation="vertical">
+
+        <ImageView
+            android:id="@+id/ci_app_icon"
+            android:layout_width="@dimen/icon_size"
+            android:layout_height="@dimen/icon_size"
+            android:layout_gravity="center_horizontal"/>
+
+        <TextView
+            android:id="@+id/tv_app_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginBottom="5dp"
+            android:layout_marginTop="3dp"
+            android:ellipsize="middle"
+            android:gravity="center"
+            android:maxLines="2"
+            android:textColor="#FFF"/>
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/item_comment.xml b/qpython/src/main/res/layout/item_comment.xml
new file mode 100644
index 00000000..dbee9b12
--- /dev/null
+++ b/qpython/src/main/res/layout/item_comment.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <RelativeLayout
+            xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="@dimen/default_margin">
+
+            <ImageView
+                android:id="@+id/avatar"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_marginBottom="10dp"
+                android:layout_marginEnd="@dimen/default_margin"
+                android:layout_marginRight="@dimen/default_margin"
+                android:src="@drawable/empty"/>
+
+            <TextView
+                android:id="@+id/name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_toEndOf="@id/avatar"
+                android:layout_toRightOf="@id/avatar"
+                android:textColor="#FFF"
+                android:textSize="12sp"/>
+
+            <TextView
+                android:id="@+id/date"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignBottom="@id/avatar"
+                android:layout_toEndOf="@id/avatar"
+                android:layout_toRightOf="@id/avatar"
+                android:textSize="12sp"/>
+
+            <TextView
+                android:id="@+id/from_content"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/avatar"
+                android:layout_toEndOf="@id/avatar"
+                android:layout_toRightOf="@id/avatar"
+                android:textColor="#FFF"/>
+
+            <TextView
+                android:id="@+id/re_comment"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/from_content"
+                android:layout_marginTop="5dp"
+                android:layout_toEndOf="@id/avatar"
+                android:layout_toRightOf="@id/avatar"
+                android:background="@color/colorPrimary"
+                android:padding="10dp"
+                android:textColor="#FFF"/>
+        </RelativeLayout>
+
+        <View
+            android:id="@+id/line"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_marginTop="6dp"
+            android:background="@color/colorPrimary"/>
+    </LinearLayout>
+
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/item_course.xml b/qpython/src/main/res/layout/item_course.xml
new file mode 100644
index 00000000..b424349a
--- /dev/null
+++ b/qpython/src/main/res/layout/item_course.xml
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <variable
+            name="course"
+            type="org.qpython.qpy.main.server.model.CourseModel"/>
+    </data>
+
+    <LinearLayout
+        android:id="@+id/root"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/colorPrimaryDark"
+        android:elevation="2dp"
+        android:orientation="vertical"
+        android:paddingBottom="5dp"
+        tools:ignore="UnusedAttribute">
+
+        <RelativeLayout
+            android:id="@+id/img"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <org.qpython.qpy.main.widget.RatioImageView
+                android:id="@+id/iv_theme"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/white"
+                android:scaleType="fitXY"
+                android:src="@drawable/img_course"
+                android:transitionName="img"/>
+
+            <TextView
+                android:id="@+id/tv_level"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignBottom="@id/iv_theme"
+                android:layout_alignEnd="@id/iv_theme"
+                android:layout_alignRight="@id/iv_theme"
+                android:background="@color/theme_yellow"
+                android:paddingBottom="3dp"
+                android:paddingLeft="5dp"
+                android:paddingRight="5dp"
+                android:paddingTop="3dp"
+                android:textColor="#FFF"
+                android:textSize="12sp"
+                android:textStyle="bold"
+                android:transitionName="level"/>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:id="@+id/tv_title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_toLeftOf="@+id/free"
+                android:layout_toStartOf="@+id/free"
+                android:text="@{course.title}"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:padding="@dimen/default_margin"
+                android:textColor="#FFF"
+                android:textSize="16sp"
+                android:textStyle="bold"
+                android:transitionName="title"/>
+
+            <TextView
+                android:id="@+id/free"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignBottom="@id/tv_title"
+                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
+                android:layout_alignTop="@id/tv_title"
+                android:layout_marginBottom="10dp"
+                android:layout_marginEnd="10dp"
+                android:layout_marginLeft="@dimen/default_margin"
+                android:layout_marginRight="@dimen/default_margin"
+                android:layout_marginTop="10dp"
+                android:background="@color/theme_green"
+                android:gravity="center"
+                android:visibility="gone"
+                android:paddingBottom="5dp"
+                android:paddingLeft="@dimen/default_margin"
+                android:paddingRight="@dimen/default_margin"
+                android:paddingTop="5dp"
+                android:text="@string/free"
+                android:textStyle="bold"
+                android:transitionName="free"/>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/view_count"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:paddingLeft="@dimen/default_margin"
+            android:paddingRight="@dimen/default_margin">
+
+            <TextView
+                android:id="@+id/tv_date"
+                android:layout_width="wrap_content"
+                android:text="@{course.rdate}"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="@dimen/course_gap"
+                android:layout_marginRight="@dimen/course_gap"
+                android:textColor="@color/text_gray"
+                android:textSize="12sp"
+                android:transitionName="date"/>
+
+            <TextView
+                android:id="@+id/tv_author"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@{course.auth}"
+                android:layout_marginEnd="@dimen/course_gap"
+                android:layout_marginLeft="@dimen/default_margin"
+                android:layout_marginRight="@dimen/course_gap"
+                android:layout_marginStart="@dimen/default_margin"
+                android:layout_toEndOf="@id/tv_date"
+                android:layout_toRightOf="@id/tv_date"
+                android:textColor="#FFF"
+                android:textSize="12sp"
+                android:transitionName="author"/>
+
+            <TextView
+                android:id="@+id/tv_view"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
+                android:drawableLeft="@drawable/ic_course_clicks"
+                android:text="@{course.downloads}"
+                android:drawableStart="@drawable/ic_course_clicks"
+                android:gravity="center"
+                android:textSize="12sp"
+                android:transitionName="view"/>
+        </RelativeLayout>
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/item_course_funding_index.xml b/qpython/src/main/res/layout/item_course_funding_index.xml
new file mode 100644
index 00000000..87e5dea6
--- /dev/null
+++ b/qpython/src/main/res/layout/item_course_funding_index.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_vertical"
+    android:padding="@dimen/default_margin"
+    android:textColor="#FFF"/>
diff --git a/qpython/src/main/res/layout/item_course_index.xml b/qpython/src/main/res/layout/item_course_index.xml
new file mode 100644
index 00000000..5fb95c84
--- /dev/null
+++ b/qpython/src/main/res/layout/item_course_index.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:drawableEnd="@drawable/ic_white_arrow_right"
+    android:drawableRight="@drawable/ic_white_arrow_right"
+    android:gravity="center_vertical"
+    android:padding="@dimen/default_margin"
+    android:textColor="#FFF"
+    android:textSize="16sp"
+    android:textStyle="bold"/>
diff --git a/qpython/src/main/res/layout/item_file.xml b/qpython/src/main/res/layout/item_file.xml
new file mode 100644
index 00000000..6db31e23
--- /dev/null
+++ b/qpython/src/main/res/layout/item_file.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="#FF363636"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:padding="@dimen/default_margin">
+
+        <TextView
+            android:id="@+id/textFileName"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:drawablePadding="@dimen/default_margin"
+            android:gravity="center_vertical"
+            android:textColor="#FFF"
+            android:typeface="sans">
+        </TextView>
+
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/item_folder.xml b/qpython/src/main/res/layout/item_folder.xml
new file mode 100644
index 00000000..ba60aafa
--- /dev/null
+++ b/qpython/src/main/res/layout/item_folder.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    >
+
+    <RelativeLayout
+        android:id="@+id/ll_folder_item"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/colorPrimaryDark"
+        android:paddingLeft="@dimen/default_margin"
+        android:paddingRight="@dimen/default_margin"
+        android:paddingTop="@dimen/default_margin">
+
+        <ImageView
+            android:id="@+id/iv_file_icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/default_margin"
+            android:layout_marginRight="16dp"
+            android:src="@drawable/ic_editor_folder"/>
+
+        <ImageView
+            android:id="@+id/uploaded"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignBottom="@id/iv_file_icon"
+            android:layout_marginEnd="10dp"
+            android:layout_marginRight="10dp"
+            android:layout_toLeftOf="@+id/rl"
+            android:layout_toStartOf="@+id/rl"
+            android:visibility="gone"
+            />
+
+        <ProgressBar
+            android:id="@+id/uploading"
+            android:layout_width="25dp"
+            android:layout_height="25dp"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:visibility="gone"
+            />
+
+        <RelativeLayout
+            android:id="@+id/rl"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_toEndOf="@id/iv_file_icon"
+            android:layout_toRightOf="@id/iv_file_icon"
+            >
+
+            <TextView
+                android:id="@+id/tv_file_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="#FFF"/>
+
+            <TextView
+                android:id="@+id/tv_path"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/tv_file_name"
+                android:textColor="@color/text_color_hint"
+                android:textSize="12sp"
+                android:visibility="gone"/>
+        </RelativeLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_below="@id/iv_file_icon"
+            android:layout_marginTop="@dimen/default_margin"
+            android:background="@color/colorPrimary"/>
+
+    </RelativeLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/item_folder_little.xml b/qpython/src/main/res/layout/item_folder_little.xml
new file mode 100644
index 00000000..6ad392ae
--- /dev/null
+++ b/qpython/src/main/res/layout/item_folder_little.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <RelativeLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="5dp"
+        android:orientation="horizontal">
+
+        <LinearLayout
+            android:id="@+id/expand_click_zone"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <ImageButton
+                android:id="@+id/arrow"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginEnd="5dp"
+                android:layout_marginRight="5dp"
+                android:background="@null"
+                android:src="@drawable/ic_arrow_drop_down_b"/>
+
+            <TextView
+                android:id="@+id/item"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:drawablePadding="5dp"
+                android:textSize="16sp"
+                android:gravity="center_vertical"
+                android:textColor="#FFF"/>
+        </LinearLayout>
+
+
+        <CheckBox
+            android:id="@+id/checkbox"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:visibility="gone"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"/>
+    </RelativeLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/item_lib_list.xml b/qpython/src/main/res/layout/item_lib_list.xml
new file mode 100644
index 00000000..41f3b960
--- /dev/null
+++ b/qpython/src/main/res/layout/item_lib_list.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/ll_item"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        >
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/colorPrimaryDark"
+            >
+
+            <ImageView
+                android:id="@+id/iv_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginBottom="@dimen/default_margin"
+                android:layout_marginLeft="@dimen/default_margin"
+                android:layout_marginStart="@dimen/default_margin"
+                android:layout_marginTop="@dimen/default_margin"
+                android:src="@drawable/ic_program"/>
+
+
+            <TextView
+                android:id="@+id/tv_download_count"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignBottom="@+id/tv_description"
+                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
+                android:layout_marginEnd="@dimen/default_margin"
+                android:layout_marginRight="@dimen/default_margin"
+                android:drawablePadding="5dp"
+                android:textColor="#FF9B9B9B"/>
+
+
+            <TextView
+                android:id="@+id/tv_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignTop="@id/iv_icon"
+                android:layout_marginBottom="5dp"
+                android:layout_marginLeft="@dimen/default_margin"
+                android:layout_marginStart="@dimen/default_margin"
+                android:layout_toEndOf="@id/iv_icon"
+                android:layout_toRightOf="@id/iv_icon"
+                android:textColor="#FFF"/>
+
+
+            <TextView
+                android:id="@+id/tv_description"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/tv_name"
+                android:layout_marginLeft="@dimen/default_margin"
+                android:layout_marginRight="@dimen/default_margin"
+                android:layout_toEndOf="@id/iv_icon"
+                android:layout_toLeftOf="@id/tv_download_count"
+                android:layout_toRightOf="@id/iv_icon"
+                android:layout_toStartOf="@id/tv_download_count"
+                android:ellipsize="end"
+                android:gravity="start"
+                android:maxLines="2"
+                android:textColor="#FF9B9B9B"/>
+        </RelativeLayout>
+
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_marginTop="5dp"
+            android:background="#FF4A4A4A"/>
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/item_my_course.xml b/qpython/src/main/res/layout/item_my_course.xml
new file mode 100644
index 00000000..2e85dce8
--- /dev/null
+++ b/qpython/src/main/res/layout/item_my_course.xml
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <variable
+            name="course"
+            type="org.qpython.qpy.main.server.model.MyCourse.DataBean.InfoBean"/>
+    </data>
+
+    <LinearLayout
+        android:id="@+id/root"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/colorPrimaryDark"
+        android:elevation="2dp"
+        android:orientation="vertical"
+        android:paddingBottom="5dp"
+        tools:ignore="UnusedAttribute">
+
+        <RelativeLayout
+            android:id="@+id/img"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <org.qpython.qpy.main.widget.RatioImageView
+                android:id="@+id/iv_theme"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/white"
+                android:scaleType="fitXY"
+                android:transitionName="img"/>
+
+            <TextView
+                android:id="@+id/status"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textStyle="bold"
+                android:layout_centerInParent="true"
+                android:text="@string/c_funding"
+                android:textColor="@color/theme_yellow"/>
+
+            <TextView
+                android:id="@+id/tv_level"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignBottom="@id/iv_theme"
+                android:layout_alignEnd="@id/iv_theme"
+                android:layout_alignRight="@id/iv_theme"
+                android:background="@color/theme_yellow"
+                android:paddingBottom="3dp"
+                android:paddingLeft="5dp"
+                android:paddingRight="5dp"
+                android:paddingTop="3dp"
+                android:textColor="#FFF"
+                android:textSize="12sp"
+                android:textStyle="bold"
+                android:transitionName="level"/>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:id="@+id/tv_title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:padding="@dimen/default_margin"
+                android:text="@{course.title}"
+                android:textColor="#FFF"
+                android:textSize="16sp"
+                android:textStyle="bold"
+                android:transitionName="title"/>
+
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/view_count"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:paddingLeft="@dimen/default_margin"
+            android:paddingRight="@dimen/default_margin">
+
+            <TextView
+                android:id="@+id/tv_date"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="@dimen/course_gap"
+                android:layout_marginRight="@dimen/course_gap"
+                android:text="@{course.rdate}"
+                android:textColor="@color/text_gray"
+                android:textSize="12sp"
+                android:transitionName="date"/>
+
+            <TextView
+                android:id="@+id/tv_author"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="@dimen/course_gap"
+                android:layout_marginLeft="@dimen/default_margin"
+                android:layout_marginRight="@dimen/course_gap"
+                android:layout_marginStart="@dimen/default_margin"
+                android:layout_toEndOf="@id/tv_date"
+                android:layout_toRightOf="@id/tv_date"
+                android:text="@{course.auth}"
+                android:textColor="#FFF"
+                android:textSize="12sp"
+                android:transitionName="author"/>
+
+            <TextView
+                android:id="@+id/tv_view"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
+                android:drawableLeft="@drawable/ic_course_clicks"
+                android:drawableStart="@drawable/ic_course_clicks"
+                android:gravity="center"
+                android:text="@{course.downloads}"
+                android:textSize="12sp"
+                android:transitionName="view"/>
+        </RelativeLayout>
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/item_notebook.xml b/qpython/src/main/res/layout/item_notebook.xml
new file mode 100644
index 00000000..43682725
--- /dev/null
+++ b/qpython/src/main/res/layout/item_notebook.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+    >
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:padding="14dp"
+        android:gravity="center_vertical">
+        <ImageView
+            android:layout_width="36dp"
+            android:layout_height="36dp"
+            android:src="@drawable/ic_ipynb"
+            android:layout_marginRight="10dp"/>
+        <TextView
+            android:id="@+id/file_name_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/white"
+            android:text="file"/>
+    </LinearLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="@color/colorPrimary"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/item_plugin_cloud.xml b/qpython/src/main/res/layout/item_plugin_cloud.xml
new file mode 100644
index 00000000..6ad668da
--- /dev/null
+++ b/qpython/src/main/res/layout/item_plugin_cloud.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    app:cardElevation="1dp">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp">
+
+
+        <TextView
+            android:id="@+id/plugin_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:layout_margin="5dp"
+            android:textAppearance="@style/TextAppearance.AppCompat.Title"
+            android:textColor="@android:color/black" />
+
+        <TextView
+            android:id="@+id/plugin_description"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/plugin_name"
+            android:layout_margin="5dp"
+            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+            android:textColor="@android:color/black" />
+
+        <ImageView
+            android:id="@+id/plugin_menu"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:src="@drawable/ic_plugin" />
+    </RelativeLayout>
+</android.support.v7.widget.CardView>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/item_plugin_local.xml b/qpython/src/main/res/layout/item_plugin_local.xml
new file mode 100644
index 00000000..2e4da55c
--- /dev/null
+++ b/qpython/src/main/res/layout/item_plugin_local.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    app:cardElevation="1dp">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp">
+
+
+        <TextView
+            android:id="@+id/plugin_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:layout_margin="5dp"
+            android:textAppearance="@style/TextAppearance.AppCompat.Title"
+            android:textColor="@android:color/black" />
+
+        <TextView
+            android:id="@+id/plugin_description"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/plugin_name"
+            android:layout_margin="5dp"
+            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+            android:textColor="@android:color/black" />
+
+        <ImageView
+            android:id="@+id/plugin_menu"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:src="@drawable/ic_plugin" />
+    </RelativeLayout>
+</android.support.v7.widget.CardView>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/item_pop_up.xml b/qpython/src/main/res/layout/item_pop_up.xml
new file mode 100644
index 00000000..415e46f1
--- /dev/null
+++ b/qpython/src/main/res/layout/item_pop_up.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/title"
+    android:descendantFocusability="blocksDescendants"
+    style="@style/dialog_item"/>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/item_price.xml b/qpython/src/main/res/layout/item_price.xml
new file mode 100644
index 00000000..20019d7f
--- /dev/null
+++ b/qpython/src/main/res/layout/item_price.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    >
+
+    <TextView
+        android:id="@+id/tv_prices"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/purchase_bg"
+        android:gravity="center"
+        android:padding="@dimen/default_margin"
+        android:textColor="@color/theme_yellow"
+        android:textStyle="bold"/>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/item_run_program.xml b/qpython/src/main/res/layout/item_run_program.xml
new file mode 100644
index 00000000..d67c6ba7
--- /dev/null
+++ b/qpython/src/main/res/layout/item_run_program.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/tv_name"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/bg_item"
+    android:gravity="center_vertical"
+    android:padding="8dp"
+    android:textSize="24sp" />
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/item_share_code.xml b/qpython/src/main/res/layout/item_share_code.xml
new file mode 100644
index 00000000..3bdff9c7
--- /dev/null
+++ b/qpython/src/main/res/layout/item_share_code.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <RelativeLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:padding="@dimen/default_margin">
+
+        <ImageView
+            android:id="@+id/avatar"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:layout_marginBottom="10dp"
+            android:layout_marginRight="@dimen/default_margin"
+            android:src="@drawable/empty"/>
+
+        <TextView
+            android:id="@+id/name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_toRightOf="@id/avatar"
+            android:textColor="#FFF"
+            android:textSize="12sp"/>
+
+        <TextView
+            android:id="@+id/date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignBottom="@id/avatar"
+            android:layout_toRightOf="@id/avatar"
+            android:textSize="12sp"/>
+
+        <ImageButton
+            android:id="@+id/delete"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignBottom="@id/avatar"
+            android:layout_alignParentRight="true"
+            android:layout_alignTop="@id/avatar"
+            android:background="@null"
+            android:src="@drawable/ic_com_delete"
+            android:visibility="gone"/>
+
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/avatar"
+            android:layout_marginBottom="10dp"
+            android:ellipsize="end"
+            android:maxLines="3"
+            android:textColor="#FFF"/>
+
+
+        <TextView
+            android:id="@+id/bookmark_count"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_below="@id/title"
+            android:drawableLeft="@drawable/ic_com_like"
+            android:drawablePadding="5dp"
+            android:textSize="12sp"/>
+
+        <TextView
+            android:id="@+id/comment_count"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignBottom="@id/bookmark_count"
+            android:layout_marginRight="@dimen/default_margin"
+            android:layout_toLeftOf="@id/bookmark_count"
+            android:drawableLeft="@drawable/ic_com_comment"
+            android:drawablePadding="5dp"
+            android:textSize="12sp"/>
+    </RelativeLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/item_square_img.xml b/qpython/src/main/res/layout/item_square_img.xml
new file mode 100644
index 00000000..793c6e37
--- /dev/null
+++ b/qpython/src/main/res/layout/item_square_img.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <ImageView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/item_img"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_marginRight="7dp"/>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/jpush_popwin_layout.xml b/qpython/src/main/res/layout/jpush_popwin_layout.xml
new file mode 100644
index 00000000..64e5d0c9
--- /dev/null
+++ b/qpython/src/main/res/layout/jpush_popwin_layout.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/MyDialogStyle"
+    android:orientation="vertical"
+    android:layout_width="280dp"
+    android:layout_height="250dp" >
+
+        <WebView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/jpush_webview_layout.xml b/qpython/src/main/res/layout/jpush_webview_layout.xml
new file mode 100644
index 00000000..07c6fc77
--- /dev/null
+++ b/qpython/src/main/res/layout/jpush_webview_layout.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<cn.jpush.android.ui.FullScreenView xmlns:android="http://schemas.android.com/apk/res/android"
+                                    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="40.0dp"
+        android:background="#29313a">
+
+        <ImageButton
+            android:id="@+id/imgRichpushBtnBack"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="9dp"
+            android:layout_marginRight="10dp"
+            android:background="@drawable/richpush_btn_selector" />
+
+        <ImageView
+            android:id="@+id/imgView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_toRightOf="@id/imgRichpushBtnBack"
+            android:clickable="false"
+            android:src="@drawable/ic_richpush_actionbar_divider" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="7dp"
+            android:layout_toRightOf="@id/imgView"
+            android:clickable="false"
+            android:text=" "
+            android:textSize="20sp"
+            android:textColor="#ffffff" />
+    </RelativeLayout>
+
+    <WebView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="#000000" />
+
+</cn.jpush.android.ui.FullScreenView>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/layout_about.xml b/qpython/src/main/res/layout/layout_about.xml
new file mode 100644
index 00000000..82e32fbc
--- /dev/null
+++ b/qpython/src/main/res/layout/layout_about.xml
@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:padding="4dp" >
+
+        <include layout="@layout/about_generic" />
+
+        <TextView
+            style="@style/TextTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:text="@string/ui_history" />
+
+        <TextView
+            style="@style/TextSubTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/release18" />
+
+        <TextView
+            style="@style/TextContent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/release18_log" />
+
+        <TextView
+            style="@style/TextSubTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/release17" />
+
+        <TextView
+            style="@style/TextContent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/release17_log" />
+
+        <TextView
+            style="@style/TextSubTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/release16" />
+
+        <TextView
+            style="@style/TextContent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/release16_log" />
+
+        <TextView
+            style="@style/TextSubTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/release15" />
+
+        <TextView
+            style="@style/TextContent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/release15_log" />
+
+        <TextView
+            style="@style/TextSubTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/release13" />
+
+        <TextView
+            style="@style/TextContent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/release13_log" />
+
+        <TextView
+            style="@style/TextSubTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/release12" />
+
+        <TextView
+            style="@style/TextContent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/release12_log" />
+
+        <TextView
+            style="@style/TextSubTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/release11" />
+
+        <TextView
+            style="@style/TextContent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/release11_log" />
+
+        <TextView
+            style="@style/TextSubTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/release1" />
+
+        <TextView
+            style="@style/TextContent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/release1_log" />
+
+        <TextView
+            style="@style/TextSubTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/beta9" />
+
+        <TextView
+            style="@style/TextContent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/beta9_log" />
+
+        <TextView
+            style="@style/TextSubTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/beta8" />
+
+        <TextView
+            style="@style/TextContent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/beta8_log" />
+
+        <TextView
+            style="@style/TextSubTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/beta7" />
+
+        <TextView
+            style="@style/TextContent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/beta7_log" />
+
+        <TextView
+            style="@style/TextSubTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/beta6" />
+
+        <TextView
+            style="@style/TextContent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/beta6_log" />
+
+        <TextView
+            style="@style/TextSubTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/beta5" />
+
+        <TextView
+            style="@style/TextContent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/beta5_log" />
+
+        <TextView
+            style="@style/TextSubTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/beta4" />
+
+        <TextView
+            style="@style/TextContent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/beta4_log" />
+
+        <TextView
+            style="@style/TextSubTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/beta3" />
+
+        <TextView
+            style="@style/TextContent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/beta3_log" />
+
+        <TextView
+            style="@style/TextSubTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/beta2" />
+
+        <TextView
+            style="@style/TextContent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/beta2_log" />
+    </LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/layout_editor.xml b/qpython/src/main/res/layout/layout_editor.xml
new file mode 100644
index 00000000..3b75221c
--- /dev/null
+++ b/qpython/src/main/res/layout/layout_editor.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/editor_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <ViewStub
+            android:id="@+id/vs_search_top"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:inflatedId="@+id/ii_search_top"
+            android:layout="@layout/search_top"/>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="4">
+
+            <org.qpython.qpy.texteditor.ui.view.AdvancedEditText
+                android:id="@+id/editor"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:gravity="top|start"
+                android:imeOptions="flagNoFullscreen"
+                android:inputType="textMultiLine|textNoSuggestions"
+                android:scrollbarAlwaysDrawHorizontalTrack="true"
+                android:scrollbarAlwaysDrawVerticalTrack="true"
+                android:scrollbarSize="5dp"
+                android:scrollbars="horizontal|vertical"
+                android:typeface="monospace">
+
+                <requestFocus/>
+            </org.qpython.qpy.texteditor.ui.view.AdvancedEditText>
+
+            <android.support.design.widget.FloatingActionButton
+                android:id="@+id/share"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentBottom="true"
+                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
+                android:layout_margin="@dimen/default_margin"
+                android:src="@drawable/ic_gist"
+                android:visibility="gone"
+                />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <LinearLayout
+                android:id="@+id/return_bar_box"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:background="#FFE8E8E8"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                >
+
+                <ImageButton
+                    android:id="@+id/ib_more"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="5dp"
+                    android:layout_marginStart="5dp"
+                    android:background="@null"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:padding="5dp"
+                    android:src="@drawable/ic_editcode"
+                    />
+
+                <View
+                    android:layout_width="2dp"
+                    android:layout_height="21dp"
+                    android:layout_marginLeft="5dp"
+                    android:layout_marginRight="5dp"
+                    android:background="#FFD5D5D5"/>
+
+                <HorizontalScrollView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:fadingEdgeLength="30dp"
+                    android:requiresFadingEdge="horizontal">
+
+                    <include
+                        android:id="@+id/control"
+                        layout="@layout/widget_editor_control"/>
+
+                </HorizontalScrollView>
+
+            </LinearLayout>
+
+            <include
+                android:id="@+id/search_bottom"
+                layout="@layout/search"/>
+        </RelativeLayout>
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/layout_open.xml b/qpython/src/main/res/layout/layout_open.xml
new file mode 100644
index 00000000..97c2d324
--- /dev/null
+++ b/qpython/src/main/res/layout/layout_open.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="@color/toolbar">
+
+        <TextView
+            android:id="@+id/tv_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:text="@string/choose_ttf"
+            android:textColor="#FFF"
+            android:textSize="18sp"/>
+
+        <ImageView
+            android:id="@+id/buttonCancel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:layout_margin="@dimen/default_margin"
+            android:src="@drawable/ic_editor_filetree_close"
+            android:layout_alignParentEnd="true"/>
+    </RelativeLayout>
+
+    <ListView
+        android:id="@android:id/list"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:background="@color/toolbar">
+    </ListView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/layout_prefs.xml b/qpython/src/main/res/layout/layout_prefs.xml
new file mode 100644
index 00000000..6dbf8ea1
--- /dev/null
+++ b/qpython/src/main/res/layout/layout_prefs.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:paddingTop="25dp"
+        android:background="@color/colorPrimary">
+
+        <include
+            android:id="@+id/top_bar"
+            layout="@layout/layout_toolbar"/>
+
+        <org.qpython.qpy.texteditor.ui.view.AdvancedEditText
+            android:id="@+id/sample_editor"
+            android:layout_width="match_parent"
+            android:layout_height="64dp"
+            android:layout_margin="2dp"
+            android:gravity="top|start"
+            android:scrollbarAlwaysDrawHorizontalTrack="true"
+            android:scrollbarAlwaysDrawVerticalTrack="true"
+            android:scrollbarSize="5dp"
+            android:scrollbars="horizontal|vertical"
+            android:text="@string/lorem_ipsum"
+            android:typeface="monospace"/>
+
+
+        <FrameLayout
+            android:id="@+id/setting_fragment"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_below="@id/app_bar"
+            android:orientation="vertical"/>
+        <!--<ListView-->
+            <!--android:id="@android:id/list"-->
+            <!--android:layout_width="match_parent"-->
+            <!--android:layout_height="match_parent"-->
+            <!--android:background="@color/colorPrimaryDark"/>-->
+
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/layout_save_as.xml b/qpython/src/main/res/layout/layout_save_as.xml
new file mode 100644
index 00000000..3062a049
--- /dev/null
+++ b/qpython/src/main/res/layout/layout_save_as.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:orientation="horizontal" >
+
+        <EditText
+            android:id="@+id/editFileName"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:drawablePadding="8dp"
+            android:hint="@string/ui_hint_file_name"
+            android:inputType="text" >
+        </EditText>
+    </LinearLayout>
+
+    <ListView
+        android:id="@android:id/list"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1" >
+    </ListView>
+
+    <include layout="@layout/buttons_ok_cancel" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/layout_toolbar.xml b/qpython/src/main/res/layout/layout_toolbar.xml
new file mode 100644
index 00000000..3d412267
--- /dev/null
+++ b/qpython/src/main/res/layout/layout_toolbar.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <android.support.design.widget.AppBarLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize">
+
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            style="@style/Toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="#FF4A4A4A"
+            android:elevation="2dp"
+            app:popupTheme="@style/DefaultBlueToolbar"
+            app:theme="@style/ToolbarTheme"/>
+    </android.support.design.widget.AppBarLayout>
+
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/layout_widget_config.xml b/qpython/src/main/res/layout/layout_widget_config.xml
new file mode 100644
index 00000000..15281884
--- /dev/null
+++ b/qpython/src/main/res/layout/layout_widget_config.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <CheckBox
+        android:id="@+id/readOnly"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:checked="false"
+        android:gravity="center_vertical|right"
+        android:padding="4dp"
+        android:text="@string/ui_force_read_only" />
+
+    <ListView
+        android:id="@android:id/list"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1" >
+    </ListView>
+
+    <Button
+        android:id="@+id/buttonCancel"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:text="@string/ui_cancel" >
+    </Button>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/list_file_item.xml b/qpython/src/main/res/layout/list_file_item.xml
new file mode 100644
index 00000000..d615cf70
--- /dev/null
+++ b/qpython/src/main/res/layout/list_file_item.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/bg_layout"
+    android:orientation="horizontal"
+    android:padding="8dp">
+
+    <ImageView
+        android:id="@+id/file_dialog_item_img"
+        android:layout_width="42dp"
+        android:layout_height="42dp"
+        android:layout_gravity="center_vertical"
+        android:layout_margin="8dp" />
+
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/file_dialog_item_name"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textSize="18sp"
+            android:textStyle="bold" />
+
+        <TextView
+            android:id="@+id/file_dialog_item_path"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textSize="14sp" />
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/qpython/src/main/res/layout/new_rule_dialog.xml b/qpython/src/main/res/layout/new_rule_dialog.xml
new file mode 100644
index 00000000..45860c43
--- /dev/null
+++ b/qpython/src/main/res/layout/new_rule_dialog.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <TextView
+        android:id="@+id/If"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="true"
+        android:text="If file ends with:"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+
+    <EditText
+        android:id="@+id/should_endwith"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_below="@+id/If"
+        android:ems="10" >
+
+        <requestFocus />
+    </EditText>
+
+    <TextView
+        android:id="@+id/textView1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_below="@+id/should_endwith"
+        android:text="Send to app:"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+
+    <Button
+        android:id="@+id/pick_app_button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_below="@+id/textView1"
+        android:text="Pick App" />
+
+    <TextView
+        android:id="@+id/textView2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_below="@+id/pick_app_button"
+        android:text="Send as:"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+
+     <RadioGroup
+         android:layout_width="wrap_content"
+         android:layout_height="wrap_content"
+         android:layout_alignParentLeft="true"
+         android:layout_below="@+id/textView2" >
+
+         <RadioButton
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content"
+             android:checked="true"
+             android:text="File" />
+
+         <RadioButton
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content"
+             android:text="String" />
+
+     </RadioGroup>
+
+</RelativeLayout>
diff --git a/qpython/src/main/res/layout/popup_add_editor.xml b/qpython/src/main/res/layout/popup_add_editor.xml
new file mode 100644
index 00000000..ab24fab4
--- /dev/null
+++ b/qpython/src/main/res/layout/popup_add_editor.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="180dp"
+    android:layout_height="wrap_content">
+
+    <ListView
+        android:id="@+id/list_view"
+        android:layout_width="180dp"
+        android:layout_height="wrap_content"
+        android:clickable="true"
+        android:focusable="true"/>
+</FrameLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/run_rules.xml b/qpython/src/main/res/layout/run_rules.xml
new file mode 100644
index 00000000..19c1d2ce
--- /dev/null
+++ b/qpython/src/main/res/layout/run_rules.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" >
+
+        <!--
+             <TextView
+            android:id="@+id/textView1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:layout_centerVertical="true"
+            android:text="hello world" />
+        -->
+        
+        <ListView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_above="@+id/add_rule_button"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentTop="true" >
+        </ListView>
+
+        <ListView
+            android:id="@android:id/list"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_above="@+id/add_rule_button" />
+
+        <Button
+            android:id="@+id/add_rule_button"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:text="Add Rule" />
+        
+    </RelativeLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/rv_item_news.xml b/qpython/src/main/res/layout/rv_item_news.xml
new file mode 100644
index 00000000..e92346a9
--- /dev/null
+++ b/qpython/src/main/res/layout/rv_item_news.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <LinearLayout
+        android:id="@+id/root_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingTop="@dimen/default_margin"
+        >
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingLeft="20dp"
+            android:paddingRight="20dp">
+
+            <ImageView
+                android:id="@+id/user_avatar_iv"
+                android:layout_width="35dp"
+                android:layout_height="35dp"
+                android:src="@drawable/empty"
+                />
+
+            <TextView
+                android:id="@+id/user_name_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:layout_marginStart="10dp"
+                android:includeFontPadding="false"
+                android:layout_toEndOf="@+id/user_avatar_iv"
+                android:layout_toRightOf="@+id/user_avatar_iv"
+                android:textColor="@color/white"/>
+
+            <TextView
+                android:id="@+id/commit_time_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignBottom="@+id/user_avatar_iv"
+                android:layout_marginLeft="10dp"
+                android:includeFontPadding="false"
+                android:layout_marginStart="10dp"
+                android:layout_toEndOf="@+id/user_avatar_iv"
+                android:layout_toRightOf="@+id/user_avatar_iv"/>
+
+            <ImageView
+                android:id="@+id/delete_iv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
+                android:layout_alignTop="@+id/user_name_tv"
+                android:padding="10dp"
+                android:src="@drawable/ic_com_delete"/>
+        </RelativeLayout>
+
+        <TextView
+            android:id="@+id/content_tv"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:paddingLeft="20dp"
+            android:paddingRight="20dp"
+            android:textColor="@color/white"
+            android:textSize="16sp"/>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:paddingLeft="20dp"
+            android:paddingRight="20dp">
+
+            <LinearLayout
+                android:id="@+id/comment_count_layout"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end"
+                android:layout_marginEnd="60dp"
+                android:layout_marginRight="60dp"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="18dp"
+                    android:layout_height="18dp"
+                    android:src="@drawable/ic_com_comment"/>
+
+                <TextView
+                    android:id="@+id/comment_count_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="4dp"
+                    android:layout_marginStart="4dp"
+                    android:maxLines="1"/>
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/star_count_layout"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end"
+                android:gravity="start"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="18dp"
+                    android:layout_height="18dp"
+                    android:src="@drawable/star_selector"/>
+
+                <TextView
+                    android:id="@+id/star_count_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="4dp"
+                    android:layout_marginStart="4dp"/>
+            </LinearLayout>
+        </FrameLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_marginTop="10dp"
+            android:background="@color/colorPrimary"/>
+    </LinearLayout>
+</layout>
diff --git a/qpython/src/main/res/layout/rv_item_news_comment.xml b/qpython/src/main/res/layout/rv_item_news_comment.xml
new file mode 100644
index 00000000..69831396
--- /dev/null
+++ b/qpython/src/main/res/layout/rv_item_news_comment.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <LinearLayout
+        android:id="@+id/root_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingTop="15dp"
+        >
+
+
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingLeft="20dp"
+            android:paddingRight="20dp">
+
+            <ImageView
+                android:id="@+id/user_avatar_iv"
+                android:layout_width="38dp"
+                android:layout_height="38dp"
+                android:src="@drawable/empty"/>
+
+            <TextView
+                android:id="@+id/user_name_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:layout_toRightOf="@+id/user_avatar_iv"
+                android:text="JACK"
+                android:textColor="@color/white"
+                />
+
+            <TextView
+                android:id="@+id/commit_time_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignBottom="@+id/user_avatar_iv"
+                android:layout_marginLeft="10dp"
+                android:layout_toRightOf="@+id/user_avatar_iv"
+                android:text="1h ago"
+                />
+
+            <TextView
+                android:id="@+id/comment_content_tv"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignLeft="@+id/commit_time_tv"
+                android:layout_below="@+id/commit_time_tv"
+                android:layout_marginBottom="10dp"
+                android:layout_marginTop="10dp"
+                android:text="Re @jack: hello world"
+                android:textColor="@color/white"
+                android:textSize="16sp"/>
+            <TextView
+                android:id="@+id/reply_content_tv"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:maxHeight="250dp"
+                android:padding="@dimen/default_margin"
+                android:textColor="@color/white"
+                android:background="@color/colorPrimary"
+                android:text="Hello world Hello world Hello world Hello world Hello world Hello world"
+                android:layout_alignLeft="@+id/comment_content_tv"
+                android:layout_below="@+id/comment_content_tv"
+                android:visibility="gone"
+                />
+
+        </RelativeLayout>
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_marginTop="10dp"
+            android:background="@color/colorPrimary"/>
+    </LinearLayout>
+</layout>
diff --git a/qpython/src/main/res/layout/rv_item_news_head.xml b/qpython/src/main/res/layout/rv_item_news_head.xml
new file mode 100644
index 00000000..26826b52
--- /dev/null
+++ b/qpython/src/main/res/layout/rv_item_news_head.xml
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        >
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingLeft="20dp"
+            android:paddingRight="20dp"
+            android:paddingTop="15dp">
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <ImageView
+                    android:id="@+id/user_avatar_iv"
+                    android:layout_width="38dp"
+                    android:layout_height="38dp"
+                    android:src="@drawable/empty"/>
+
+                <TextView
+                    android:id="@+id/user_name_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
+                    android:layout_marginStart="10dp"
+                    android:layout_toRightOf="@+id/user_avatar_iv"
+                    android:textColor="@color/white"/>
+
+                <TextView
+                    android:id="@+id/commit_time_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignBottom="@+id/user_avatar_iv"
+                    android:layout_marginLeft="10dp"
+                    android:layout_marginStart="10dp"
+                    android:layout_toEndOf="@+id/user_avatar_iv"
+                    android:layout_toRightOf="@+id/user_avatar_iv"/>
+
+                <LinearLayout
+                    android:id="@+id/star_count_layout"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentRight="true"
+                    android:gravity="start|center_vertical"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:layout_width="20dp"
+                        android:layout_height="match_parent"
+                        android:src="@drawable/star_selector"/>
+
+                    <TextView
+                        android:id="@+id/star_count_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="5dp"
+                        android:layout_marginStart="5dp"/>
+                </LinearLayout>
+            </RelativeLayout>
+
+            <TextView
+                android:id="@+id/news_content_tv"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="10dp"
+                android:layout_marginTop="10dp"
+                android:textColor="@color/white"
+                android:textSize="18sp"
+                android:textStyle="bold"/>
+
+            <!--<TextView-->
+            <!--android:id="@+id/news_content_tv"-->
+            <!--android:layout_width="match_parent"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:textColor="@color/white"/>-->
+
+            <TextView
+                android:id="@+id/code_content_tv"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:background="@color/white"
+                android:maxHeight="250dp"
+                android:padding="@dimen/default_margin"
+                android:textColor="@color/black"
+                />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginTop="20dp"
+                android:gravity="center"
+                android:orientation="horizontal">
+
+                <Button
+                    android:id="@+id/btn_run"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@color/theme_green"
+                    android:text="@string/view_code"
+                    android:textAllCaps="false"/>
+
+                <Button
+                    android:id="@+id/btn_fork"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="20dp"
+                    android:layout_marginStart="20dp"
+                    android:layout_weight="1"
+                    android:background="@color/theme_yellow"
+                    android:text="@string/fork_code"
+                    android:textAllCaps="false"/>
+            </LinearLayout>
+
+
+            <LinearLayout
+                android:id="@+id/comment_count_layout"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end"
+                android:layout_marginBottom="14dp"
+                android:layout_marginTop="14dp"
+                android:gravity="start|center_vertical"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="20dp"
+                    android:src="@drawable/ic_com_comment"/>
+
+                <TextView
+                    android:id="@+id/comment_count_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_marginLeft="5dp"
+                    android:layout_marginStart="5dp"
+                    android:text="@string/default_text"/>
+            </LinearLayout>
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="5dp"
+            android:background="@color/colorPrimary"/>
+
+        <TextView
+            android:id="@+id/empty_tv"
+            android:layout_width="match_parent"
+            android:layout_height="200dp"
+            android:gravity="center"
+            android:text="@string/write_a_response"
+            />
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/search.xml b/qpython/src/main/res/layout/search.xml
new file mode 100644
index 00000000..bdf68a2e
--- /dev/null
+++ b/qpython/src/main/res/layout/search.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <RelativeLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/rl_search_bottom"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="@color/search_bottom"
+        android:gravity="center_vertical"
+        android:padding="5dp"
+        android:visibility="gone">
+
+        <ImageButton
+            android:id="@+id/buttonSearchPrev"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@drawable/transparent"
+            android:padding="5dp"
+            android:src="@drawable/ic_editor_arrow_left"/>
+
+        <ImageView
+            android:id="@+id/iv_search"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:src="@drawable/ic_editor_search"/>
+
+
+        <ImageButton
+            android:id="@+id/buttonSearchNext"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:background="@color/transparency"
+            android:padding="5dp"
+            android:src="@drawable/ic_editor_arrow_right"/>
+
+    </RelativeLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/search_top.xml b/qpython/src/main/res/layout/search_top.xml
new file mode 100644
index 00000000..c9bb1cf6
--- /dev/null
+++ b/qpython/src/main/res/layout/search_top.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/ll_search"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="@color/toolbar"
+        android:clickable="true"
+        android:gravity="center_vertical"
+        android:padding="5dp">
+
+        <ImageButton
+            android:id="@+id/ib_close"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="#0FFF"
+            android:padding="5dp"
+            android:src="@drawable/ic_arrow_back_white"/>
+
+        <EditText
+            android:id="@+id/textSearch"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="5dp"
+            android:layout_weight="1"
+            android:background="#0FFF"
+            android:drawablePadding="8dp"
+            android:hint="@string/ui_hint_search"
+            android:inputType="text"
+            android:textColor="#FFF"
+            android:textColorHint="@color/text_color_hint"/>
+
+        <ImageButton
+            android:id="@+id/ib_clear"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="#0FFF"
+            android:padding="5dp"
+            android:src="@drawable/ic_delete"/>
+
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/snippet_list_row.xml b/qpython/src/main/res/layout/snippet_list_row.xml
new file mode 100644
index 00000000..03637d96
--- /dev/null
+++ b/qpython/src/main/res/layout/snippet_list_row.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content" >
+ 
+    <ImageView
+        android:id="@+id/app_icon"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:padding="3dp"
+        android:scaleType="centerCrop" />
+ 
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:gravity="center_vertical"
+        android:orientation="vertical"
+        android:paddingLeft="5dp" >
+ 
+        <TextView
+            android:id="@+id/app_name"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:textStyle="bold" />
+ 
+        <TextView
+            android:id="@+id/app_paackage"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical" />
+    </LinearLayout>
+ 
+</LinearLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/tabs.xml b/qpython/src/main/res/layout/tabs.xml
new file mode 100644
index 00000000..1e499d64
--- /dev/null
+++ b/qpython/src/main/res/layout/tabs.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <android.support.design.widget.TabLayout
+        android:id="@+id/root"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+    </android.support.design.widget.TabLayout>
+    <!--<LinearLayout-->
+    <!--xmlns:android="http://schemas.android.com/apk/res/android"-->
+    <!--android:id="@+id/root"-->
+    <!--android:layout_width="match_parent"-->
+    <!--android:layout_height="match_parent"-->
+    <!--android:orientation="vertical">-->
+
+    <!--<LinearLayout-->
+    <!--android:id="@+id/btns"-->
+    <!--android:layout_width="match_parent"-->
+    <!--android:layout_height="wrap_content"-->
+    <!--android:orientation="horizontal">-->
+
+    <!--<Button-->
+    <!--android:id="@+id/latestBtn"-->
+    <!--style="@style/tab_btn"-->
+    <!--android:text="@string/newest_course"/>-->
+
+    <!--<Button-->
+    <!--android:id="@+id/recommendBtn"-->
+    <!--style="@style/tab_btn"-->
+    <!--android:text="@string/recommend"/>-->
+    <!--</LinearLayout>-->
+
+    <!--<LinearLayout-->
+    <!--android:id="@+id/lines"-->
+    <!--android:layout_width="match_parent"-->
+    <!--android:layout_height="3dp"-->
+    <!--android:orientation="horizontal">-->
+
+    <!--<View-->
+    <!--android:id="@+id/line_latest"-->
+    <!--android:layout_width="0dp"-->
+    <!--android:layout_height="match_parent"-->
+    <!--android:layout_weight="1"-->
+    <!--android:background="#FF4BAC07"/>-->
+
+    <!--<View-->
+    <!--android:id="@+id/line_recommend"-->
+    <!--android:layout_width="0dp"-->
+    <!--android:layout_height="match_parent"-->
+    <!--android:layout_weight="1"-->
+    <!--android:background="@color/theme_bg"/>-->
+    <!--</LinearLayout>-->
+    <!--</LinearLayout>-->
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/term_activity.xml b/qpython/src/main/res/layout/term_activity.xml
new file mode 100644
index 00000000..adecbf92
--- /dev/null
+++ b/qpython/src/main/res/layout/term_activity.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+/* Copyright 2007, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:fitsSystemWindows="true"
+    android:orientation="vertical">
+
+    <android.support.design.widget.AppBarLayout
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/toolbar_layout"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize">
+
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            style="@style/Toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="#FF4A4A4A"
+            android:elevation="2dp"
+            app:popupTheme="@style/DefaultBlueToolbar"
+            app:theme="@style/ToolbarTheme">
+
+            <Spinner
+                android:id="@+id/spinner_toolbar"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"/>
+        </android.support.v7.widget.Toolbar>
+
+    </android.support.design.widget.AppBarLayout>
+
+    <!--android:layout_above="@+id/bottom_layout"-->
+
+    <org.qpython.qpy.console.TermViewFlipper
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/view_flipper"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@+id/bottom_layout"
+        android:layout_below="@id/toolbar_layout"
+        android:background="@android:color/black"/>
+
+    <LinearLayout
+        android:id="@+id/bottom_layout"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/shortcut_height"
+        android:layout_alignParentBottom="true"
+        android:background="#FFE8E8E8"
+        android:orientation="horizontal">
+
+
+        <ImageView
+            android:id="@+id/switch_notebook_img"
+            android:layout_width="47dp"
+            android:layout_height="47dp"
+            android:src="@drawable/ic_notebook"
+            android:layout_gravity="center_vertical"
+            android:padding="6dp"
+            android:visibility="gone"
+            />
+
+        <View
+            android:layout_width="2dp"
+            android:layout_height="21dp"
+            android:layout_marginLeft="5dp"
+            android:layout_marginRight="5dp"
+            android:background="#FFD5D5D5"
+            android:layout_gravity="center_vertical"
+            android:visibility="gone"/>
+
+        <ImageButton
+            android:id="@+id/notebook"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:padding="@dimen/default_margin"
+            android:background="@color/transparency"
+            android:src="@drawable/ic_terminal"
+            />
+
+        <HorizontalScrollView
+            android:id="@+id/hs_shortcut"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="#FFE8E8E8"
+            android:baselineAligned="false"
+            android:fadingEdgeLength="30dp"
+            android:requiresFadingEdge="horizontal">
+
+            <jackpal.androidterm.emulatorview.TermShortcutLayout
+                android:id="@+id/term_shortcut"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@null"/>
+        </HorizontalScrollView>
+    </LinearLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/view_stub_save_prompt.xml b/qpython/src/main/res/layout/view_stub_save_prompt.xml
new file mode 100644
index 00000000..eca410d8
--- /dev/null
+++ b/qpython/src/main/res/layout/view_stub_save_prompt.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="#FFF"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:padding="@dimen/default_margin"
+        android:visibility="gone">
+
+        <EditText
+            android:id="@+id/et_name"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="8"
+            android:background="@drawable/edit_text_background"
+            android:drawableEnd="@drawable/ic_editor_delete_name"
+            android:drawableRight="@drawable/ic_editor_delete_name"
+            android:hint="@string/file_name"
+            android:textColor="@color/black"/>
+
+        <Button
+            android:id="@+id/btn_save"
+            style="@style/green_btn"
+            android:layout_gravity="end"
+            android:layout_marginLeft="@dimen/default_margin"
+            android:layout_marginStart="@dimen/default_margin"
+            android:layout_weight="1"
+            android:text="@string/save"/>
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/widget.xml b/qpython/src/main/res/layout/widget.xml
new file mode 100644
index 00000000..9fed17de
--- /dev/null
+++ b/qpython/src/main/res/layout/widget.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/widgetLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="@dimen/widget_margin" >
+
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal|top"
+        android:layout_marginTop="8dp"
+        android:padding="12dp"
+        android:src="@drawable/file_qpy" />
+
+    <TextView
+        android:id="@+id/textFileName"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|center_horizontal"
+        android:layout_marginBottom="4dp"
+        android:background="@drawable/widget_title_background"
+        android:ellipsize="end"
+        android:gravity="center_horizontal|bottom"
+        android:shadowColor="#000000"
+        android:shadowDy="2"
+        android:shadowRadius="4"
+        android:singleLine="true"
+        android:text="filename.ext"
+        android:textColor="#ffffff"
+        android:textSize="12dp" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/widget_banner.xml b/qpython/src/main/res/layout/widget_banner.xml
new file mode 100644
index 00000000..aa431b47
--- /dev/null
+++ b/qpython/src/main/res/layout/widget_banner.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <com.youth.banner.Banner
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/banner"
+        android:layout_width="match_parent"
+        android:layout_height="150dp"
+        app:delay_time="3000"
+        app:indicator_drawable_selected="@drawable/green_dot_shape"
+        app:indicator_drawable_unselected="@drawable/white_dot_shape"
+        app:indicator_height="8dp"
+        app:indicator_margin="4dp"
+        app:indicator_width="8dp"/>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/widget_editor_control.xml b/qpython/src/main/res/layout/widget_editor_control.xml
new file mode 100644
index 00000000..27139a3b
--- /dev/null
+++ b/qpython/src/main/res/layout/widget_editor_control.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <RelativeLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="#FFE8E8E8">
+
+        <LinearLayout
+            xmlns:android="http://schemas.android.com/apk/res/android"
+            android:id="@+id/ll_control"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <ImageButton
+                android:id="@+id/ib_lock"
+                style="@style/editor_bottom_btn"
+                android:src="@drawable/ic_editor_keyboard"/>
+
+            <ImageButton
+                android:id="@+id/ib_jump_to"
+                style="@style/editor_bottom_btn"
+                android:src="@drawable/ic_editor_next"
+                />
+
+            <ImageButton
+                android:id="@+id/ib_save"
+                style="@style/editor_bottom_btn"
+                android:src="@drawable/ic_editor_save"
+                />
+
+            <ImageButton
+                android:id="@+id/play_btn"
+                style="@style/editor_bottom_btn"
+                android:src="@drawable/ic_editor_run"/>
+
+
+            <ImageButton
+                android:id="@+id/ib_search"
+                style="@style/editor_bottom_btn"
+                android:src="@drawable/ic_editor_search"
+                />
+
+            <ImageButton
+                android:id="@+id/ib_undo"
+                style="@style/editor_bottom_btn"
+                android:src="@drawable/undo"/>
+
+            <ImageButton
+                android:id="@+id/ib_redo"
+                style="@style/editor_bottom_btn"
+                android:src="@drawable/redo"/>
+
+            <ImageButton
+                android:id="@+id/ib_save_as"
+                style="@style/editor_bottom_btn"
+                android:src="@drawable/ic_editor_saveas"
+                />
+
+            <ImageButton
+                android:id="@+id/ib_recent"
+                style="@style/editor_bottom_btn"
+                android:src="@drawable/ic_recent"/>
+
+            <ImageButton
+                android:id="@+id/ib_snippet"
+                style="@style/editor_bottom_btn"
+                android:src="@drawable/ic_editor_sharecode"/>
+        </LinearLayout>
+
+        <ViewStub
+            android:id="@+id/vs_shortcut"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:inflatedId="@+id/vs_shortcut"
+            android:layout="@layout/widget_shortcut"/>
+    </RelativeLayout>
+
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/widget_no_net.xml b/qpython/src/main/res/layout/widget_no_net.xml
new file mode 100644
index 00000000..3ee029f9
--- /dev/null
+++ b/qpython/src/main/res/layout/widget_no_net.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    >
+
+    <LinearLayout
+        android:id="@+id/ll_root"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:src="@drawable/img_empty_net"/>
+
+        <TextView
+            android:id="@+id/tv_hint"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/default_margin"
+            android:gravity="center_horizontal"
+            android:text="@string/oops_seems_like_your_net_have_some_trouble"/>
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/widget_save.xml b/qpython/src/main/res/layout/widget_save.xml
new file mode 100644
index 00000000..9a8b1c53
--- /dev/null
+++ b/qpython/src/main/res/layout/widget_save.xml
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/ll_root"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="#FFF"
+        android:orientation="vertical">
+
+        <RelativeLayout
+            android:id="@+id/rl_save"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/list_item_height"
+            android:paddingLeft="5dp"
+            android:visibility="gone"
+            >
+
+            <ImageView
+                android:id="@+id/ib_save"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginEnd="5dp"
+                android:layout_marginRight="5dp"
+                android:src="@drawable/ic_editor_save"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_toEndOf="@id/ib_save"
+                android:layout_toRightOf="@id/ib_save"
+                android:text="@string/save"
+                android:textColor="@color/text_dark"/>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_alignParentBottom="true"
+                android:layout_toEndOf="@id/ib_save"
+                android:layout_toRightOf="@id/ib_save"
+                android:background="@color/divide_line"/>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/rl_saveas"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/list_item_height"
+            android:paddingLeft="5dp"
+            android:paddingRight="5dp"
+            android:paddingStart="5dp"
+            >
+
+            <ImageView
+                android:id="@+id/iv_saveas_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginEnd="5dp"
+                android:layout_marginRight="5dp"
+                android:src="@drawable/ic_editor_saveas"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_toEndOf="@id/iv_saveas_icon"
+                android:layout_toRightOf="@id/iv_saveas_icon"
+                android:text="@string/save_as"
+                android:textColor="@color/text_dark"/>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_alignParentBottom="true"
+                android:layout_toEndOf="@id/iv_saveas_icon"
+                android:layout_toRightOf="@id/iv_saveas_icon"
+                android:background="@color/divide_line"/>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/rl_save_push"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/list_item_height"
+            android:paddingLeft="5dp"
+            android:paddingRight="5dp"
+            android:visibility="gone"
+            >
+
+            <ImageView
+                android:id="@+id/iv_save_push"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginEnd="5dp"
+                android:layout_marginRight="5dp"
+                android:src="@drawable/ic_editor_saveup"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_toEndOf="@id/iv_save_push"
+                android:layout_toRightOf="@id/iv_save_push"
+                android:text="@string/save_amp_push"
+                android:textColor="@color/text_dark"/>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_alignParentBottom="true"
+                android:layout_toEndOf="@id/iv_save_push"
+                android:layout_toRightOf="@id/iv_save_push"
+                android:background="@color/divide_line"/>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/rl_recent"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/list_item_height"
+            android:paddingLeft="5dp"
+            android:paddingRight="5dp"
+            >
+
+            <ImageView
+                android:id="@+id/iv_recent"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginEnd="5dp"
+                android:layout_marginRight="5dp"
+                android:src="@drawable/ic_editor_recent"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_toEndOf="@id/iv_recent"
+                android:layout_toRightOf="@id/iv_recent"
+                android:text="@string/recent"
+                android:textColor="@color/text_dark"/>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_alignParentBottom="true"
+                android:layout_toEndOf="@id/iv_recent"
+                android:layout_toRightOf="@id/iv_recent"
+                android:background="@color/divide_line"/>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/rl_share_code"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/list_item_height"
+            android:paddingLeft="5dp"
+            android:paddingRight="5dp"
+            >
+
+            <ImageView
+                android:id="@+id/ib_share_code"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginEnd="5dp"
+                android:layout_marginRight="5dp"
+                android:src="@drawable/ic_editor_snippet"
+                />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_toEndOf="@id/ib_share_code"
+                android:layout_toRightOf="@id/ib_share_code"
+                android:text="@string/snippet"
+                android:textColor="@color/text_dark"/>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_alignParentBottom="true"
+                android:layout_toEndOf="@id/ib_share_code"
+                android:layout_toRightOf="@id/ib_share_code"
+                android:background="@color/divide_line"/>
+        </RelativeLayout>
+
+        <ImageButton
+            style="@style/editor_bottom_btn"
+            />
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/widget_send_comment.xml b/qpython/src/main/res/layout/widget_send_comment.xml
new file mode 100644
index 00000000..62b34052
--- /dev/null
+++ b/qpython/src/main/res/layout/widget_send_comment.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/colorPrimary"
+        android:orientation="horizontal"
+        android:paddingLeft="@dimen/default_margin"
+        android:paddingStart="@dimen/default_margin">
+
+        <EditText
+            android:id="@+id/edit"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="9"
+            android:maxLines="5"/>
+
+        <Button
+            android:id="@+id/btn_send"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:background="@null"
+            android:text="@string/send"
+            android:textAllCaps="false"
+            android:textColor="@color/colorAccent"
+            android:textSize="18sp"/>
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/widget_shortcut.xml b/qpython/src/main/res/layout/widget_shortcut.xml
new file mode 100644
index 00000000..d37b2fa4
--- /dev/null
+++ b/qpython/src/main/res/layout/widget_shortcut.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<org.qpython.qpy.main.widget.ShortcutLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/root_shortcut"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="horizontal"/>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/widget_shortcut_btn.xml b/qpython/src/main/res/layout/widget_shortcut_btn.xml
new file mode 100644
index 00000000..ed920fb8
--- /dev/null
+++ b/qpython/src/main/res/layout/widget_shortcut_btn.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Button
+    style="@style/editor_marks_btn"/>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/widget_shortcut_imgbtn.xml b/qpython/src/main/res/layout/widget_shortcut_imgbtn.xml
new file mode 100644
index 00000000..32bfbf2c
--- /dev/null
+++ b/qpython/src/main/res/layout/widget_shortcut_imgbtn.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ImageButton
+    style="@style/editor_bottom_btn"/>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/window_list_item.xml b/qpython/src/main/res/layout/window_list_item.xml
new file mode 100644
index 00000000..74894ece
--- /dev/null
+++ b/qpython/src/main/res/layout/window_list_item.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+/* Copyright 2007, The Android Open Source Project
+** Copyright 2011 Steven Luo
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<layout>
+
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/window_list_label"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:maxLines="1"
+            android:padding="15dp"
+            android:singleLine="true"
+            android:text="#FFF"
+            />
+        <!--android:textAppearance="?android:attr/textAppearanceLarge"-->
+
+        <View
+            android:id="@+id/window_list_separator"
+            android:layout_width="1dp"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="5dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginTop="5dp"
+            android:background="#ff313431"/>
+
+        <ImageView
+            android:id="@+id/window_list_close"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@drawable/close_background"
+            android:paddingLeft="15dp"
+            android:paddingRight="15dp"
+            android:scaleType="center"
+            android:src="@drawable/btn_close_window"/>
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/window_list_new_window.xml b/qpython/src/main/res/layout/window_list_new_window.xml
new file mode 100644
index 00000000..345a8586
--- /dev/null
+++ b/qpython/src/main/res/layout/window_list_new_window.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+/* Copyright 2007, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:padding="15dp"
+    android:maxLines="1"
+    android:singleLine="true"
+    android:textAppearance="?android:attr/textAppearanceLarge"
+    android:text="@string/new_window" />
diff --git a/qpython/src/main/res/menu/about_menu.xml b/qpython/src/main/res/menu/about_menu.xml
new file mode 100644
index 00000000..fc17a17e
--- /dev/null
+++ b/qpython/src/main/res/menu/about_menu.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/menu_mail"
+        android:icon="@drawable/ic_about_mail"
+        android:title="@string/feed_back"
+        app:showAsAction="ifRoom"/>
+    <item
+        android:id="@+id/menu_share"
+        android:icon="@drawable/ic_about_share"
+        android:title="@string/share"
+        app:showAsAction="always"/>
+</menu>
\ No newline at end of file
diff --git a/qpython/src/main/res/menu/activity_console_menu.xml b/qpython/src/main/res/menu/activity_console_menu.xml
new file mode 100644
index 00000000..12a3e01d
--- /dev/null
+++ b/qpython/src/main/res/menu/activity_console_menu.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/menu_new_window"
+        android:icon="@drawable/ic_add"
+        app:showAsAction="ifRoom"
+        android:title="@string/new_window"/>
+    <item
+        android:id="@+id/menu_new_more"
+        android:icon="@drawable/ic_more"
+        android:title="@string/more"
+        app:showAsAction="always"/>
+
+    <!--<item-->
+        <!--android:id="@+id/menu_close_window"-->
+        <!--android:visible="false"-->
+        <!--android:icon="@drawable/ic_editor_filetree_close"-->
+        <!--android:title="@string/close_window"/>-->
+    <!--<item-->
+        <!--android:id="@+id/menu_window_list"-->
+        <!--android:icon="@drawable/ic_menu_windows"-->
+        <!--android:title="@string/window_list"/>-->
+    <!--<item-->
+        <!--android:id="@+id/menu_toggle_soft_keyboard"-->
+        <!--android:visible="false"-->
+        <!--android:title="@string/toggle_soft_keyboard"/>-->
+    <!--<item-->
+        <!--android:id="@+id/menu_special_keys"-->
+        <!--android:visible="false"-->
+        <!--android:title="@string/special_keys"/>-->
+    <!--<item-->
+        <!--android:id="@+id/menu_preferences"-->
+        <!--android:icon="@drawable/ic_menu_preferences"-->
+        <!--android:title="@string/preferences"/>-->
+    <!--<item-->
+        <!--android:id="@+id/menu_reset"-->
+        <!--android:visible="false"-->
+        <!--android:title="@string/reset"/>-->
+    <!--<item-->
+        <!--android:id="@+id/menu_send_email"-->
+        <!--android:title="@string/send_email"/>-->
+    <!--<item-->
+        <!--android:id="@+id/menu_toggle_wakelock"-->
+        <!--android:title="@string/enable_wakelock"/>-->
+    <!--<item-->
+        <!--android:id="@+id/menu_toggle_wifilock"-->
+        <!--android:title="@string/enable_wifilock"/>-->
+    <!--<item-->
+        <!--android:visible="false"-->
+        <!--android:id="@+id/action_help"-->
+        <!--android:title="@string/help"/>-->
+</menu>
\ No newline at end of file
diff --git a/qpython/src/main/res/menu/comment_menu.xml b/qpython/src/main/res/menu/comment_menu.xml
new file mode 100644
index 00000000..5e5229d0
--- /dev/null
+++ b/qpython/src/main/res/menu/comment_menu.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+<item
+    android:id="@+id/menu_comment"
+    android:title="@string/from_content"
+    app:showAsAction="ifRoom"/>
+</menu>
\ No newline at end of file
diff --git a/qpython/src/main/res/menu/community_menu.xml b/qpython/src/main/res/menu/community_menu.xml
new file mode 100644
index 00000000..9d97789a
--- /dev/null
+++ b/qpython/src/main/res/menu/community_menu.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/news_edit"
+        app:showAsAction="always"
+        android:title="@string/my"/>
+</menu>
\ No newline at end of file
diff --git a/qpython/src/main/res/menu/editor_menu.xml b/qpython/src/main/res/menu/editor_menu.xml
new file mode 100644
index 00000000..542d5c13
--- /dev/null
+++ b/qpython/src/main/res/menu/editor_menu.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/menu_open"
+        android:icon="@drawable/ic_editor_open"
+        android:title="@string/open"
+        app:showAsAction="always"/>
+    <item
+        android:id="@+id/menu_add"
+        android:icon="@drawable/ic_add"
+        android:title="@string/share"
+        app:showAsAction="always"/>
+    <item
+        android:id="@+id/menu_more"
+        android:icon="@drawable/ic_more"
+        android:title="@string/share"
+        app:showAsAction="always"/>
+</menu>
\ No newline at end of file
diff --git a/qpython/src/main/res/menu/log_menu.xml b/qpython/src/main/res/menu/log_menu.xml
new file mode 100644
index 00000000..e12d727d
--- /dev/null
+++ b/qpython/src/main/res/menu/log_menu.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/menu_more"
+        android:icon="@drawable/ic_about_mail"
+        android:title="@string/feed_back"
+        app:showAsAction="always"/>
+</menu>
\ No newline at end of file
diff --git a/qpython/src/main/res/menu/news_menu.xml b/qpython/src/main/res/menu/news_menu.xml
new file mode 100644
index 00000000..718347c6
--- /dev/null
+++ b/qpython/src/main/res/menu/news_menu.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/news_share"
+        android:icon="@drawable/ic_com_share"
+        android:title="@string/share"
+        app:showAsAction="always"/>
+
+    <item
+        android:id="@+id/news_edit"
+        android:icon="@drawable/gist_editor"
+        app:showAsAction="always"
+        android:title="Edit"/>
+</menu>
\ No newline at end of file
diff --git a/qpython/src/main/res/menu/notebook_menu.xml b/qpython/src/main/res/menu/notebook_menu.xml
new file mode 100644
index 00000000..4028024f
--- /dev/null
+++ b/qpython/src/main/res/menu/notebook_menu.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+    <!--item
+        android:id="@+id/menu_open"
+        android:icon="@drawable/ic_editor_open"
+        android:title="@string/open"
+        app:showAsAction="always"/-->
+    <item
+        android:id="@+id/menu_add"
+        android:icon="@drawable/ic_add"
+        android:title="@string/share"
+        app:showAsAction="always"/>
+
+    <item
+        android:id="@+id/menu_new_more"
+        android:icon="@drawable/ic_more"
+        android:title="@string/more"
+        app:showAsAction="always"/>
+</menu>
\ No newline at end of file
diff --git a/qpython/src/main/res/menu/plugin_installed_menu.xml b/qpython/src/main/res/menu/plugin_installed_menu.xml
new file mode 100644
index 00000000..68910a29
--- /dev/null
+++ b/qpython/src/main/res/menu/plugin_installed_menu.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/detail"
+        android:title="@string/plugin_detail" />
+
+    <item
+        android:id="@+id/uninstall"
+        android:title="@string/plugin_uninstall" />
+</menu>
\ No newline at end of file
diff --git a/qpython/src/main/res/menu/plugin_uninstalled_menu.xml b/qpython/src/main/res/menu/plugin_uninstalled_menu.xml
new file mode 100644
index 00000000..5dfd6956
--- /dev/null
+++ b/qpython/src/main/res/menu/plugin_uninstalled_menu.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/install"
+        android:title="@string/plugin_install" />
+</menu>
\ No newline at end of file
diff --git a/qpython/src/main/res/menu/plugin_update_menu.xml b/qpython/src/main/res/menu/plugin_update_menu.xml
new file mode 100644
index 00000000..b722dcc1
--- /dev/null
+++ b/qpython/src/main/res/menu/plugin_update_menu.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/detail"
+        android:title="@string/plugin_detail" />
+
+    <item
+        android:id="@+id/update"
+        android:title="@string/plugin_update" />
+
+    <item
+        android:id="@+id/uninstall"
+        android:title="@string/plugin_uninstall" />
+
+</menu>
\ No newline at end of file
diff --git a/qpython/src/main/res/menu/qr_menu.xml b/qpython/src/main/res/menu/qr_menu.xml
new file mode 100644
index 00000000..19b623ea
--- /dev/null
+++ b/qpython/src/main/res/menu/qr_menu.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/album"
+        android:icon="@drawable/scan_image"
+        android:title="@string/album"
+        app:showAsAction="always"/>
+</menu>
\ No newline at end of file
diff --git a/qpython/src/main/res/menu/refresh_menu.xml b/qpython/src/main/res/menu/refresh_menu.xml
new file mode 100644
index 00000000..e7f4f967
--- /dev/null
+++ b/qpython/src/main/res/menu/refresh_menu.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/log_menu"
+        android:title="@string/log"
+        android:visible="false"
+        app:showAsAction="ifRoom"/>
+
+    <item
+        android:id="@+id/refresh_menu"
+        android:icon="@drawable/ic_library_reinstall"
+        android:title="@string/refresh"
+        app:showAsAction="ifRoom"/>
+</menu>
\ No newline at end of file
diff --git a/res/raw/beep.ogg b/qpython/src/main/res/raw/beep.ogg
similarity index 100%
rename from res/raw/beep.ogg
rename to qpython/src/main/res/raw/beep.ogg
diff --git a/qpython/src/main/res/raw/keep.xml b/qpython/src/main/res/raw/keep.xml
new file mode 100644
index 00000000..ff102017
--- /dev/null
+++ b/qpython/src/main/res/raw/keep.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools"
+    tools:keep="
+    @drawable/jpush_*,
+    @drawable/ic_richpush_*,
+    @drawable/richpush_*,
+    @layout/jpush*,
+    @layout/customer*,
+    @values/jpush* "/>
\ No newline at end of file
diff --git a/qpython/src/main/res/raw/projects2.zip b/qpython/src/main/res/raw/projects2.zip
new file mode 100644
index 00000000..1ae44ac1
Binary files /dev/null and b/qpython/src/main/res/raw/projects2.zip differ
diff --git a/qpython/src/main/res/raw/projects3.zip b/qpython/src/main/res/raw/projects3.zip
new file mode 100644
index 00000000..862aacb1
Binary files /dev/null and b/qpython/src/main/res/raw/projects3.zip differ
diff --git a/qpython/src/main/res/raw/scripts2.zip b/qpython/src/main/res/raw/scripts2.zip
new file mode 100644
index 00000000..0a99086e
Binary files /dev/null and b/qpython/src/main/res/raw/scripts2.zip differ
diff --git a/qpython/src/main/res/raw/scripts3.zip b/qpython/src/main/res/raw/scripts3.zip
new file mode 100644
index 00000000..5c454290
Binary files /dev/null and b/qpython/src/main/res/raw/scripts3.zip differ
diff --git a/qpython/src/main/res/values-ja/arrays.xml b/qpython/src/main/res/values-ja/arrays.xml
new file mode 100644
index 00000000..f917ed87
--- /dev/null
+++ b/qpython/src/main/res/values-ja/arrays.xml
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ -->
+
+<resources>
+    <string-array name="entries_statusbar_preference">
+        <item>ステータスバーを表示</item>
+        <item>ステータスバーを隠す</item>
+    </string-array>
+
+    <string-array name="entries_actionbar_preference">
+        <!-- <item>Action bar disabled</item> -->
+        <item>アクションバーを表示</item>
+        <item>アクションバーを隠す(画面の上部かメニューボタンを押すと再表示)</item>
+    </string-array>
+
+    <string-array name="entries_orientation_preference">
+        <item>自動</item>
+        <item>水平</item>
+        <item>垂直</item>
+    </string-array>
+
+    <string-array name="entries_fontsize_preference">
+        <item>4 x 8px</item>
+        <item>6 pt</item>
+        <item>7 pt</item>
+        <item>8 pt</item>
+        <item>9 pt</item>
+        <item>10 pt</item>
+        <item>12 pt</item>
+        <item>14 pt</item>
+        <item>16 pt</item>
+        <item>20 pt</item>
+        <item>24 pt</item>
+        <item>28 pt</item>
+        <item>32 pt</item>
+        <item>36 pt</item>
+        <item>42 pt</item>
+        <item>48 pt</item>
+        <item>64 pt</item>
+        <item>72 pt</item>
+        <item>96 pt</item>
+        <item>144 pt</item>
+        <item>288 pt</item>
+    </string-array>
+
+    <string-array name="entries_color_preference">
+        <item>白の背景・黒の文字</item>
+        <item>黒の背景・白の文字</item>
+        <item>青の背景・白の文字</item>
+        <item>黒の背景・緑の文字</item>
+        <item>黒の背景・黄の文字</item>
+        <item>黒の背景・赤の文字</item>
+        <item>ホログラム</item>
+        <item>高露光</item>
+        <item>低露光</item>
+        <item>Linuxスタイル</item>
+    </string-array>
+
+    <string-array name="entries_backaction_preference">
+        <item>すべてのウィンドウを閉じる</item>
+        <item>現在のウィンドウを閉じる</item>
+        <item>セッションを維持したまま現在のウィンドウを閉じる</item>
+        <item>ESCをコンソールに送る</item>
+        <item>TABをコンソールに送る</item>
+    </string-array>
+
+    <string-array name="entries_controlkey_preference">
+        <item>Ball</item>
+        <item>\@</item>
+        <item>左Alt</item>
+        <item>右Alt</item>
+        <item>音量上げボタン</item>
+        <item>音量下げボタン</item>
+        <item>カメラボタン</item>
+        <item>無し</item>
+    </string-array>
+
+    <string-array name="entries_fnkey_preference">
+        <item>Ball</item>
+        <item>\@</item>
+        <item>左Alt</item>
+        <item>右Alt</item>
+        <item>音量上げボタン</item>
+        <item>音量下げボタン</item>
+        <item>カメラボタン</item>
+        <item>無し</item>
+    </string-array>
+
+    <string-array name="entries_ime_preference">
+        <item>文字</item>
+        <item>単語</item>
+    </string-array>
+
+
+    <!-- These are the 'short' names for the control keys. They are used in the special keys dialog. -->
+    <string-array name="control_keys_short_names">
+        <item>Ball</item>
+        <item>\@</item>
+        <item>左Alt</item>
+        <item>右Alt</item>
+        <item>音量上げボタン</item>
+        <item>音量下げボタン</item>
+        <item>カメラボタン</item>
+        <item>無し</item>
+    </string-array>
+
+    <!-- These are the 'short' names for the Fn keys. They are used in the special keys dialog. -->
+    <string-array name="fn_keys_short_names">
+        <item>Ball</item>
+        <item>\@</item>
+        <item>左Alt</item>
+        <item>右Alt</item>
+        <item>音量上げボタン</item>
+        <item>音量下げボタン</item>
+        <item>カメラボタン</item>
+        <item>無し</item>
+    </string-array>
+
+
+    <!-- Color themes -->
+
+
+    <string-array name="color_theme_names">
+        <item>クラシック</item>
+        <item>ダーク</item>
+        <item>マトリクス</item>
+        <item>スカイ</item>
+        <item>ドラキュラ</item>
+    </string-array>
+
+</resources>
\ No newline at end of file
diff --git a/qpython/src/main/res/values-ja/strings.xml b/qpython/src/main/res/values-ja/strings.xml
new file mode 100644
index 00000000..18a6d9fb
--- /dev/null
+++ b/qpython/src/main/res/values-ja/strings.xml
@@ -0,0 +1,489 @@
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="ExtraTranslation">
+
+    <string name="terminal">コンソール</string>
+    <string name="recent">最近</string>
+    <string name="snippet">スニペット</string>
+    <string name="script">スクリプト</string>
+    <string name="project">プロジェクト</string>
+
+    <string name="setting">設定</string>
+    <string name="editor">エディタ</string>
+    <string name="community">コミュニティ</string>
+
+    <string name="more">さらに</string>
+    <string name="sl4a_server">SL4Aサーバー</string>
+    <string name="ftp_server">FTPサーバー</string>
+
+
+    <!---->
+    <string name="application_terminal">コンソール</string>
+    <string name="preferences">設定</string>
+    <string name="new_window">新しくコンソールを開始</string>
+    <string name="close_window">コンソールを閉じる</string>
+    <string name="window_list">現在のコンソール一覧</string>
+    <string name="reset">コンソールをリセット</string>
+    <string name="send_email">メールを送る...</string>
+    <string name="special_keys">特殊キー</string>
+    <string name="toggle_soft_keyboard">仮想キーボードを表示・非表示</string>
+
+    <string name="reset_toast_notification">現在の状態はリセットされます。</string>
+
+    <string name="enable_wakelock">wakelockを有効化</string>
+    <string name="disable_wakelock">wakelockを無効化</string>
+    <string name="enable_wifilock">WIFI lockを有効化</string>
+    <string name="disable_wifilock">WIFI lockを無効化</string>
+
+    <string name="edit_text">テキストの編集</string>
+    <string name="select_text">テキストを選択</string>
+    <string name="copy_all">すべてコピー</string>
+    <string name="send_control_key">Ctrlキーを送信</string>
+    <string name="send_fn_key">Fnキーを送信</string>
+
+    <string name="window_title">コンソール%1$d</string>
+
+    <string name="process_exit_message">セッションは終了しました。</string>
+
+    <!-- Preference dialog -->
+    <string name="screen_preferences">画面</string>
+
+    <string name="title_statusbar_preference">ステータスバー</string>
+    <string name="summary_statusbar_preference">ステータスバーの表示・非表示</string>
+    <string name="dialog_title_statusbar_preference">ステータスバー</string>
+
+    <string name="title_actionbar_preference">アクションバー</string>
+    <string name="summary_actionbar_preference">アクションバーの動作を選択(Android 3.0以上)</string>
+    <string name="dialog_title_actionbar_preference">アクションバーの動作</string>
+
+    <string name="title_orientation_preference">画面の向き</string>
+    <string name="summary_orientation_preference">画面の向きの動作を選択</string>
+    <string name="dialog_title_orientation_preference">画面の向きの動作</string>
+
+    <string name="text_preferences">テキスト</string>
+
+    <string name="title_utf8_by_default_preference">デフォルトでUTF-8を使用</string>
+    <string name="summary_utf8_by_default_preference">デフォルトでUTF-8を使用中</string>
+
+    <string name="title_fontsize_preference">文字の大きさ</string>
+    <string name="summary_fontsize_preference">文字サイズを選択</string>
+    <string name="dialog_title_fontsize_preference">文字の大きさ</string>
+
+    <string name="title_color_preference">文字色</string>
+    <string name="summary_color_preference">文字の色を選択</string>
+    <string name="dialog_title_color_preference">文字色</string>
+
+    <string name="keyboard_preferences">キーボード</string>
+
+    <string name="title_backaction_preference">戻るボタンの動作</string>
+    <string name="summary_backaction_preference">戻るボタンの動作を選択</string>
+    <string name="dialog_title_backaction_preference">戻るボタンの動作</string>
+
+    <string name="title_controlkey_preference">Ctrlキー</string>
+    <string name="summary_controlkey_preference">Ctrlキーの動作を選択</string>
+    <string name="dialog_title_controlkey_preference">Ctrlキー</string>
+
+    <string name="title_fnkey_preference">Fnキー</string>
+    <string name="summary_fnkey_preference">Fnキーの動作を選択</string>
+    <string name="dialog_title_fnkey_preference">Fnキー</string>
+
+    <string name="title_ime_preference">入力方式</string>
+    <string name="summary_ime_preference">入力方式を選択</string>
+    <string name="dialog_title_ime_preference">入力方式</string>
+
+    <string name="shell_preferences">シェル</string>
+    <string name="title_shell_preference">コンソール</string>
+    <string name="summary_shell_preference">シェルを選択</string>
+    <string name="dialog_title_shell_preference">シェル</string>
+
+    <string name="title_initialcommand_preference">自動実行コマンド</string>
+    <string name="summary_initialcommand_preference">スタート時に自動実行するコマンドを設定</string>
+    <string name="dialog_title_initialcommand_preference">自動実行コマンド</string>
+
+    <string name="title_termtype_preference">コンソールのタイプ</string>
+    <string name="summary_termtype_preference">コンソールのタイプを設定</string>
+    <string name="dialog_title_termtype_preference">コンソールのタイプ</string>
+
+    <string name="title_close_window_on_process_exit_preference">終了時にコンソールを閉じる</string>
+    <string name="summary_close_window_on_process_exit_preference">終了時にコンソールを閉じる</string>
+
+    <string name="title_verify_path_preference">PATHを検証</string>
+    <string name="summary_verify_path_preference">不正なPATHを削除</string>
+
+    <string name="title_do_path_extensions_preference">PATHの拡張を許可</string>
+    <string name="summary_do_path_extensions_preference">PATHへのコマンドの追加を許可</string>
+
+    <string name="title_allow_prepend_path_preference">PATHの先頭に追加することを許可</string>
+    <string name="summary_allow_prepend_path_preference">PATH既存のコマンドの上書を許可</string>
+
+    <string name="title_home_path_preference">HOMEディレクトリ</string>
+    <string name="summary_home_path_preference">HOMEディレクトリとして使用する書き込み可能なディレクトリ</string>
+
+    <string name="control_key_dialog_title">CtrlとFnキー</string>
+    <string name="control_key_dialog_control_text">CTRL+Space : Control-@ (NUL)\nCTRL+A..Z : Control-A..Z\nCTRL+5 : Control-]\nCTRL+6 : Control-^\nCTRL+7 : Control-_\nCTRL+9 : F11\nCTRL+0 : F12</string>
+    <string name="control_key_dialog_control_disabled_text">Ctrl キー unset</string>
+    <string name="control_key_dialog_fn_text">FN+1..9 : F1-F9\nFN+0 : F10\nFN+W : Up\nFN+A : Left\nFN+S : Down\nFN+D : Right\nFN+P : PageUp\nFN+N : PageDown\nFN+T : Tab\nFN+L : | (pipe)\nFN+U : _ (アンダースコア)\nFN+E : Control-[ (ESC)\nFN+X : Delete\nFN+I : Insert\nFN+H : Home\nFN+F : End\nFN+. : Control-\\\n</string>
+    <string name="control_key_dialog_fn_disabled_text">Fnキーの設定を削除</string>
+
+    <string name="confirm_window_close_message">コンソールを閉じますか?</string>
+
+    <string name="email_transcript_subject">コンソールのコピー</string>
+    <string name="feedback_email_subject">QPythonのフィードバック</string>
+    <string name="email_transcript_chooser_title">フィードバック...</string>
+    <string name="email_transcript_no_email_activity_found">メーラーアプリが見つかりませんでした。</string>
+
+    <string name="alt_sends_esc">AltキーをESCとして使う</string>
+    <string name="alt_sends_esc_summary_on">AltキーをESCとして使用中</string>
+    <string name="alt_sends_esc_summary_off">AltキーのESCとしての使用をやめる</string>
+
+    <string name="title_mouse_tracking_preference">マウスイベントの送信</string>
+    <string name="summary_mouse_tracking_preference">タッチとスクロールを無視しますか?</string>
+
+    <string name="dialog_title_script">スクリプト</string>
+    <string name="dialog_title_project">プロジェクト</string>
+
+
+    <string name="title_use_keyboard_shortcuts">キーボードショートカットを使用</string>
+    <string name="use_keyboard_shortcuts_summary_on">Ctrl-Tab: コンソールの切り替え、 Ctrl-Shift-N: 新規コンソール、 Ctrl-Shift-V: 貼り付け</string>
+    <string name="use_keyboard_shortcuts_summary_off">キーボードショートカットが無効になっています</string>
+    <string name="help">ヘルプ</string>
+    <string name="activity_term_here_title">活動期間</string>
+    <!-- BEGIN SHORTCUT RELATED STRINGS -->
+    <!-- AndroidManifest.xml -->
+    <string name="activity_shortcut_create">"Term shortcut"</string>
+    <string name="addshortcut_button_find_command">Find command</string>
+    <string name="addshortcut_command_hint">command</string>
+    <string name="addshortcut_example_hint">--example=\""a\"</string>
+    <string name="addshortcut_navigator_title">SELECT SHORTCUT TARGET</string>
+    <string name="addshortcut_command_window_instructions">Command terminal requires full mPath, no arguments. For other commands use Arguments terminal (ex: cd /sdcard).</string>
+    <string name="addshortcut_arguments_label">Add to dictionary</string>
+    <string name="addshortcut_shortcut_label">Shortcut label\:</string>
+    <string name="addshortcut_button_text_icon">Text icon</string>
+    <string name="addshortcut_make_text_icon">MAKE TEXT ICON</string>
+    <string name="addshortcut_text_icon_instructions"></string>
+    <string name="addshortcut_title">Term shortcut</string>
+    <!-- FSNavigator.java -->
+    <string name="fsnavigator_title">FILE SELECTOR</string>
+    <string name="fsnavigator_no_external_storage">External storage not available</string>
+    <string name="fsnavigator_optional_enter_path">Or enter mPath here.</string>
+    <string name="fsnavigator_change_theme">Change theme</string>
+    <!-- ColorValue.java -->
+    <string name="colorvalue_label_lock_button_column">LOCK</string>
+    <string name="colorvalue_icon_text_entry_hint">Enter icon text</string>
+
+    <string name="help_url">https://www.qpython.org</string>
+
+    <string name="read_only">読み取り専用</string>
+    <string name="file">探索</string>
+    <string name="yes">はい</string>
+    <string name="no">いいえ</string>
+    <string name="ok">了解</string>
+    <string name="close">閉じる</string>
+    <string name="no_change">変更なし</string>
+    <string name="feedback">フィードバック</string>
+    <string name="about">QPythonについて</string>
+    <string name="file_not_exists">ファイルが見つかりません</string>
+    <string name="enable_root">rootモードを有効にする</string>
+    <string name="send">送信</string>
+    <string name="no_camera">有効なカメラが見つかりませんでした。カメラへのアクセス権限を確認してください。</string>
+    <string name="no_storage">ストレージの読み取り権限がありません。</string>
+
+
+    <string name="pref_initialcommand_default_qpython">python</string>
+    <string name="qpy_app">QPY</string>
+    <string name="local_app">ローカルアプリ</string>
+    <string name="task">タスク</string>
+    <string name="root_mode">rootモード</string>
+    <string name="star_it">評価する</string>
+    <string name="disable_root">無効化</string>
+    <string name="http_qpypi_qpython_org">https://pypi.python.org/simple/</string>
+    <string name="add">add</string>
+    <string name="sl4a_running">SL4Aは動作中です</string>
+    <string name="sl4a_un_running">SL4Aは動作していません。</string>
+    <string name="service_toggle">Server taggle</string>
+    <string name="qpy_description">QPythonはAndroidデバイス上で動作するスクリプトエンジンです。QPythonはAndoidのタブレットやスマートホン上で動作します。</string>
+    <string name="warning">警告</string>
+    <string name="reset_warning">この操作を続行すると、設定やダウンロードしたライブラリがすべて失われます。続行しますか?</string>
+    <string name="downloading">ライブラリ</string>
+    <string name="location">ロケーション</string>
+
+
+    <!-- Titles -->
+    <string name="title_untitled">名称未設定</string>
+    <string name="title_editor">%1$s</string>
+    <string name="title_editor_dirty">%1$s *</string>
+    <string name="title_editor_readonly">[%1$s]</string>
+
+    <string name="title_settings">設定</string>
+
+    <!-- Config screen strings -->
+    <string name="config_cat_display">表示</string>
+    <string name="config_title_line_numbers">行番号を表示</string>
+    <string name="config_title_word_wrap">文字を折り返す</string>
+    <string name="config_title_font">フォントの変更</string>
+    <string name="config_title_text_size">文字の大きさ</string>
+    <string name="config_title_color_theme">色のテーマ</string>
+    <string name="config_title_scroll_fling">スクロースの高速化のために整理する</string>
+    <string name="config_summary_line_numbers">ページの左側に行番号を表示</string>
+    <string name="config_summary_word_wrap">長すぎる行を折り返す</string>
+    <string name="config_summary_scroll_fling">パフォーマンスを検証しない</string>
+
+    <!-- Options Menu in QEdit -->
+
+    <!-- Misc UI strings -->
+    <string name="ui_save_text">"保存しますか? 保存していない内容は失われます。"</string>
+    <string name="ui_save">保存</string>
+    <string name="ui_delete">削除</string>
+    <string name="ui_no_save">保存しない</string>
+    <string name="ui_cancel">取り消し</string>
+    <string name="ui_hint_file_name">ファイル名</string>
+    <string name="ui_hint_search">検索</string>
+    <string name="ui_history">履歴</string>
+    <string name="ui_force_read_only">読み取り専用で開く</string>
+    <string name="about_content">QEditはAndroid用のテキストエディタです。Python / HTMLの編集に特化しており、使いやすいエディタです。</string>
+
+    <!-- Misc Strings -->
+    <string name="lorem_ipsum">"QEditは素晴らしいテキストエディタです。"</string>
+
+    <string name="file_exists">ファイルが既に存在します。別の名前にしてください。</string>
+
+    <string name="video_src">動画 {0}</string>
+    <string name="play_video">再生</string>
+    <string name="no_videos_found">このページに動画はありません。</string>
+    <string name="pls_install_a8_play">A8 Video Playerを先にインストールしてください。</string>
+    <string name="download_as">ダウンロードして保存</string>
+    <string name="info_browser">QBrowser</string>
+
+    <!--  added by kyle -->
+    <string name="share">共有</string>
+    <string name="save_as_snippets">スニペットとして保存</string>
+    <string name="snippet_exist">すでにスニペットが存在します。別の名前で試してください。</string>
+    <string name="save_as_snippets_1">スニペットが次の名前で保存されました: </string>
+    <string name="fail_to_insert">スニペットの挿入に失敗しました</string>
+    <string name="fail_to_goto">有効な数字を入力してください。</string>
+    <string name="max_lines_num_with_syntax_title">行を自動ハイライト</string>
+    <string name="max_lines_num_with_syntax_summary">%s行より少なければ自動ハイライト</string>
+    <string name="qedit_not_support">QEditは以下のタイプのファイルのみプレビュー・実行をサポートします。\n.py, .sh, .lua, .html, .md.</string>
+
+    <string name="pls_install_lua">Luaを実行するにはQLuaを先にインストールする必要があります。</string>
+    <string name="pls_install_qpy">Pythonを実行するにはQPythonを先にインストールする必要があります。</string>
+    <string name="info_snippets">スニペット</string>
+
+    <string name="ui_ok">OK</string>
+    <string name="ui_contact_title">連絡を取る</string>
+    <string name="ui_licence_title">ライセンス</string>
+    <string name="ui_mail">support@qpython.org</string>
+    <string name="ui_choose_mail">メールを開く...</string>
+    <string name="ui_market_url">"https://market.android.com/developer?pub=Xavier+Gouchet"</string>
+    <string name="ui_market_app_url">"https://play.google.com/store/apps/details?id=%s"</string>
+    <string name="ui_market">"ほかのアプリ"</string>
+    <string name="ui_app_rating">"このアプリを評価する \n フィードバックを残す"</string>
+    <string name="ui_feedback">"どうぞご遠慮なくフィードバック、機能提案、または不具合報告をしてください。. "</string>
+    <string name="ui_licence_content">"このソフトウエアは現状のまま提供されており、いかなる保証もありません。このソフトウエアの著作者は、このソフトウエアを利用したことによって発生したいかなる損害でもその責任を負いません。"</string>
+    <string name="ui_art_licence_title">Artistic Licence</string>
+    <string name="ui_art_licence_content">"このアプリに使用されているアイコンはQPythonの著作者の製作であり、その権利はその著作者に帰属します。"</string>
+    <string name="ui_whats_new">"最新情報"</string>
+    <string name="save">保存</string>
+    <string name="save_as">ファイル名を指定して保存</string>
+    <string name="open">開く</string>
+    <string name="file_name">ファイル名</string>
+    <string name="file_exist_hint">そのファイルは既に存在します。名前を変えてください。</string>
+    <string name="empty_file">空ファイル</string>
+    <string name="confirm">確認</string>
+    <string name="cancel">取り消し</string>
+    <string name="new_project">新規プロジェクト</string>
+    <string name="error_dont_kn">エラーが発生しました。</string>
+    <string name="project_name">プロジェクト名</string>
+    <string name="jump_to">移動する</string>
+    <string name="choose_ttf">フォントファイルを選択(.ttf)</string>
+    <string name="explorer">エクスプローラ</string>
+    <string name="new_script">新規スクリプト</string>
+    <string name="enter_name_hint">スクリプト名を入力</string>
+
+    <string name="paste">貼り付け</string>
+    <string name="download_fail">ダウンロード失敗</string>
+    <string name="key_reset">reset_storage</string>
+    <string name="key_ftp_state">running_state</string>
+    <string name="key_username">username</string>
+    <string name="key_ftp_pwd">password</string>
+    <string name="key_port_num">portNum</string>
+    <string name="key_show_pwd">show_password</string>
+    <string name="key_root_dir">chrootDir</string>
+    <string name="key_stay_awake">stayAwake</string>
+    <string name="key_about">about</string>
+    <string name="dir_not_valid">不正なディレクトリです</string>
+    <string name="already_newest">すでに最新です</string>
+    <string name="share_text">QPythonはAndroidデバイス上で動作するスクリプトエンジンです。Pythonインタプリタ、コンソール、エディタ、SL4Aライブラリを組み込みで持っており、それらはAndroid上でのPythonの実行を可能にします。https://www.qpython.com/privacy.html</string>
+    <string name="new_folder">新規フォルダ</string>
+    <string name="folder_name">フォルダ名</string>
+    <string name="untitled_folder">名称未設定フォルダ</string>
+    <string name="toast_folder_exist">操作に失敗しました。別の名前で再度お試しください。</string>
+    <string name="fail_open_file">ファイルが存在しないため、ファイルを開けません。</string>
+    <string name="run_dirty_hint">先に保存しますか?</string>
+    <string name="no_im_good">必要ありません。</string>
+    <string name="convert_fail">変換に失敗しました。</string>
+    <string name="delete_file_hint">このファイルを消去しますか?</string>
+    <string name="rename">名前の変更</string>
+    <string name="rename_fail">名前を変更できませんでした。</string>
+    <string name="delete_fail">削除できませんでした。</string>
+    <string name="runtime_log">実行時ログ: %s</string>
+    <string name="fedback_mail">[フィードバック]\n\n</string>
+    <string name="log_title">実行時ログ</string>
+
+    <string name="date_format">[ %s ]</string>
+    <string name="not_root_yet">このデバイスはルート化されていません。</string>
+    <string name="download_apk">APKをダウンロードしますか?</string>
+    <string name="download_apk_hint">WiFi未接続の場合、モバイル通信料がかかる可能性があります。</string>
+    <string name="downloading_new_apk">新規パッケージをダウンロード</string>
+    <string name="checking_update">アップデートの確認</string>
+    <string name="run_bg_title">バックグラウンドで実行する</string>
+    <string name="scan">スキャン</string>
+    <string name="read_script_from_qrcode">QRCodeからコードを読み込み</string>
+
+    <string name="course">コース</string>
+    <string name="lost_connect">接続失敗</string>
+    <string name="featured_courses">コース</string>
+    <string name="programs">プログラム</string>
+    <string name="open_gl2_is_not_supported">OpenGL2はサポートされていません。</string>
+    <string name="unable_extract">Pythonコードを抽出できません。</string>
+    <string name="get_setting_data_fail">設定を読み込めませんでした。</string>
+    <string name="terminal_bg_hint">コンソールをバックグラウンドで続行しますか?</string>
+    <string name="thanks">ありがとうございます!</string>
+    <string name="extra_pypi">PYPIを設定</string>
+    <string name="already_newest_current_version">すでに最新です。現在のバージョンは</string>
+    <string name="reward">報酬</string>
+    <string name="oops_seems_like_your_net_have_some_trouble">しまった! \nインターネット接続に問題があるようです!</string>
+    <string name="lose_google_server">Google Playに接続できませんでした。ネットワークを確認してください。</string>
+    <string name="thanks_your_support">応援してくださってありがとうございます!</string>
+    <string name="under_16_status_bar_hint">ステータスバーの表示・非表示はコンソールを再起動すると適用されます。</string>
+    <string name="refresh">最新の状態に更新する</string>
+    <string name="reset_suc">リセットに成功しました。</string>
+    <string name="reset_hint">この操作はアプリの再起動後に適用されます。</string>
+    <string name="restart">アプリを再起動</string>
+    <string name="fail_resume_console">コンソールを続行できません。</string>
+    <string name="failed_bind_term">TermServiceに接続できませんでした。!</string>
+    <string name="console_running">QPythonコンソール動作中</string>
+    <string name="qpy_console">QPythonコンソール</string>
+    <string name="recommend">推奨</string>
+    <string name="newest_course">最新</string>
+    <string name="best_python_development_ide_non_mobile">モバイル上の最高のPythonアプリケーション</string>
+    <string name="sign_in_with_google">Googleでサインイン</string>
+    <string name="by_signing_in_you_agree_to_out_privacy_policy_term_of_service"><![CDATA[サインインするには、当サービスの<font color="#4BAC07">プライバシーポリシー</font>に同意する必要があります。]]></string>
+    <string name="copy_hint">実行のため、エディタにコピーします</string>
+    <string name="my_scripts">スクリプト</string>
+    <string name="my_share">共有済み</string>
+    <string name="gist_title">Gistのタイトル</string>
+    <string name="description">説明</string>
+    <string name="too_long_hint">値が長すぎます。140文字以内にしてください。</string>
+    <string name="enter_snippet">スニペットの名前を入力</string>
+    <string name="welcome_s">ようこそ、<![CDATA[<font color="#4BAC07"><u>%s</u></font>]]>さん</string>
+    <string name="re_format">Re <![CDATA[<font color="#ECCD00">@%1$s</font>]]>:\u0020 %2$s</string>
+    <string name="replied_format"><![CDATA[<font color="#ECCD00">@%1$s</font>]]>:\u0020 %2$s</string>
+    <string name="login"><u>サインイン</u></string>
+    <string name="auth_failed">認証に失敗しました。</string>
+    <string name="log_out">サインアウト</string>
+    <string name="me">Me</string>
+    <string name="grant_storage_hint">ストレージへのアクセスを許可をする必要があります。</string>
+    <string name="lost_google_hint">Googleのサーバーに接続できませんでした。ネットワークを確認してください。</string>
+    <string name="upload_suc">正常にコードをアップロードしました。</string>
+    <string name="upload_fail">コードをアップロードできませんでした。</string>
+    <string name="my_program">プログラム</string>
+    <string name="nothing_here_yet">まだ何もありません。 :(</string>
+    <string name="sofa_hint">初めにコメントしますか?</string>
+    <string name="null_comment_hint">コメントに内容がありません。</string>
+    <string name="initial">初期</string>
+    <string name="share_empty_hint">共有前に保存する必要があります。</string>
+    <string name="need_login">サインインしてください。</string>
+    <string name="upload_login_hint">サインインせずにコードをアップロードすることはできません。</string>
+    <string name="login_now">ログインする</string>
+    <string name="cloud_empty_hint">クラウド上にコードがありません。</string>
+    <string name="mkdir_fail">ディレクトリの作成に失敗しました。</string>
+    <string name="not_support_type_hint">このファイルタイプのアップロードはサポートされていません。</string>
+    <string name="conflict_hint"><Data>
+        <![CDATA[ <b>オンラインのファイル:</b>   <br/>
+    <u>サイズ:</u>  %4$s   <br/>
+    <u>最終更新:</u> %3$s   <br/><br/>
+    <b>ローカルのファイル:</b><br/>
+    <u>大きさ:</u> %2$s<br/>
+    <u>最終更新:</u> %1$s <br/><br/>
+    上書きしますか?]]></Data></string>
+    <string name="override_fail_hint">上書きできませんでした。時間をおいて再度お試しください。</string>
+    <string name="delete_remote_suc">オンラインのファイルを正常に削除しました。</string>
+    <string name="delete_suc">ファイルを正常に削除しました。</string>
+    <string name="click_retry">リクエストに失敗しました。画面をタップして再試行します。</string>
+    <string name="lout">ログアウトしますか?</string>
+    <string name="log_noti">ログ通知</string>
+    <string name="app_noti">アプリの通知</string>
+    <string name="override_hint">ローカルのファイルを上書きしますか?</string>
+    <string name="file_downloaded">ファイルがダウンロードされました。</string>
+    <string name="login_error">ログイン中にエラーが発生しました。</string>
+    <string name="my_space">容量 (%d / 100文件)</string>
+    <string name="my_space_empty">空き容量 (? / 10文件)</string>
+    <string name="save_amp_push"><![CDATA[保存して上書き]]></string>
+    <string name="shortcut_create_suc">ショートカット%sは正常に作成されました。</string>
+    <string name="need_grant">これらの権限を許可する必要があります。</string>
+    <string name="no_space">容量が足りません。</string>
+    <string name="no_file">このフォルダにはファイルが存在しません。</string>
+    <string name="no_recent_file">最近ファイルを開いていません。</string>
+    <string name="cant_open">このファイルは開けません。</string>
+    <string name="toolbar_showing">プロジェクトの構造</string>
+    <string name="toolbar_close">エディタ</string>
+    <string name="not_support_yet">まだサポートされていません。</string>
+    <string name="new_file">新規ファイル</string>
+    <string name="tools">ツール</string>
+    <string name="aipy_not_install"><![CDATA[<font color="#4BAC07">依存しているパッケージ</font>をインストールしてからAIPYをインストールしてください。]]></string>
+
+    <!--color string-->
+
+    <string name="update_time_hint">更新: %s</string>
+    <string name="aipy_list_empty_hint">AIPyが見つかりません。AIPyを探すか、以下の手順でインストールしてください。\n
+        1. AIPyアプリをインストール\n
+        2. QPythonにファイル書き込みを許可\n
+        3. 右上部の角にあるボタンを押して最新の状態に更新\n\n
+        動かない場合は遠慮なくメールかGithubに連絡してください。
+    </string>
+    <string name="package_installed">このパッケージは既にインストールされています。</string>
+    <string name="install_suc">インストール成功</string>
+    <string name="install_fail">インストールに失敗しました。時間をおいて再度お試しください。</string>
+    <string name="install_package_fail">パッケージのインストールに失敗しました。時間をおいて再度お試しください。</string>
+    <string name="aipy_not_release">AIPyのアプリからインストールとセットアップをしてください。</string>
+    <string name="aipy_not_support">AIPyはQPY3をまだサポートしていません。</string>
+
+    <string name="album">アルバム</string>
+    <string name="last_refresh">最終更新: %s</string>
+    <string name="data_saver">データサーバー</string>
+    <string name="saver_on">ローカルのキャッシュを使う</string>
+    <string name="saver_off">毎回再読み込みする</string>
+    <string name="library">ライブラリ</string>
+    <string name="run">実行</string>
+
+    <string name="insert_if">if :\n</string>
+    <string name="insert_def">def ():\n</string>
+    <string name="insert_for">for\u0020\u0020in :\n</string>
+    <string name="insert_import">import\u0020\n</string>
+    <string name="insert_import_f">from\u0020\u0020import\u0020\n</string>
+    <string name="insert_clz">class\u0020\u0020:</string>
+    <string name="insert_ef">elif\u0020\u0020:\n</string>
+    <string name="insert_el">else:\n</string>
+    <string name="insert_ret">return\n</string>
+
+    <string name="file_new">ファイル</string>
+    <string name="install_py3">Python 3をインストール</string>
+    <string name="py2_now">現在Python 2を使用中</string>
+    <string name="py3_now">現在Python 3を使用中</string>
+    <string name="switch_py3">Python 3に切り替え</string>
+    <string name="enter_history">履歴</string>
+    <string name="qpy_featured">QPythonの特集</string>
+    <string name="history_emp">履歴はありません</string>
+    <string name="no_google">Googleサービスなしでログインできません。</string>
+    <string name="pip_no_net">ネットワークなしでpipを開くことはできません。</string>
+    <string name="py3_not_install">QPY3はインストールされていません。</string>
+    <string name="open_app_market">アプリマーケットに移動</string>
+    <string name="release_error">パッケージが解放されていません。</string>
+    <string name="open_py3_hint">先にPython3からパッケージを開放してください。</string>
+    <string name="open_py3">Python3を開く</string>
+    <string name="unzip_pac_fail">zipの解凍に失敗しました。</string>
+    <string name="retry_hint">再試行してください。</string>
+    <string name="browser">ブラウザ</string>
+    <string name="switch_py3_hint">現在Python2を使用中です。Python3に切り替えますか?</string>
+    <string name="goto_setting">設定に移動</string>
+    <string name="net_lagging">ネットワークにラグが発生しています。しばらくお待ちください。</string>
+</resources>
diff --git a/qpython/src/main/res/values-ja/toasts.xml b/qpython/src/main/res/values-ja/toasts.xml
new file mode 100644
index 00000000..440eb69a
--- /dev/null
+++ b/qpython/src/main/res/values-ja/toasts.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="toast_recent_files_invalid">"ファイルが見つかりませんでした。最近使ったファイルの項目から削除します。"</string>
+    <string name="toast_recent_files_deleted">最近使ったファイルの項目から削除しました。</string>
+    <string name="toast_intent_invalid_uri">ファイルが開けません。URIが不正です。</string>
+    <string name="toast_intent_illegal">ファイルが開けません。</string>
+    <string name="toast_activity_open">ファイルブラウザを読み込めません。</string>
+    <string name="toast_memory_open">メモリ不足のため、ファイルが開けません。</string>
+    <string name="toast_open_error">ファイルが開けません。 (ファイルが大きすぎるか、破損しています)</string>
+    <string name="toast_save_null">パスがnullのため、保存できません。</string>
+    <string name="toast_save_temp">一時ファイルに保存することはできません。</string>
+    <string name="toast_save_delete">保存できません (一時ファイルのコピーでエラーが発生しました。)</string>
+    <string name="toast_save_rename">保存できません (一時ファイルのコピーでエラーが発生しました。)</string>
+    <string name="toast_save_success">保存しました。</string>
+    <string name="toast_folder_cant_write">"このフォルダは書き込み可能ではないため使用できません。"</string>
+    <string name="toast_file_cant_read">"このファイルは読み取り可能ではないため使用できません。"</string>
+    <string name="toast_search_not_found">ファイルが見つかりませんでした。</string>
+    <string name="toast_search_eof">これ以上ファイルが見つかりませんでした。</string>
+    <string name="toast_search_no_input">検索バーに入力すると検索できます。</string>
+    <string name="toast_filename_empty">ファイル名を空にすることはできません。</string>
+    <string name="toast_warn_no_undo">これ以上元に戻せません。</string>
+    <string name="toast_open_home_page_error">既定のファイルが見つかりません。設定から新たに選択してください。</string>
+    <string name="toast_home_page_cant_read">"既定のファイルが読み込み可能ではないため使用できません"</string>
+    <string name="toast_widget_select">新しいウィジェットに関連付けるファイルを選択してください。</string>
+    <string name="toast_open_select">ファイルを選択して開きます。</string>
+    <string name="toast_home_page_select">ホーム画面からTedを起動したときに開くファイルを選択してください。</string>
+    <string name="toast_file_saved_auto">"現在開いているファイルは自動保存されました。次回起動時はこのファイルが自動で開かれます。"</string>
+
+
+    <!--  -->
+    <string name="toast_folder_doesnt_exist">"フォルダが存在していません。"</string>
+    <string name="toast_folder_not_folder">フォルダではありません。</string>
+    <string name="toast_folder_cant_read">"読み取り可能なフォルダではありません。"</string>
+    <string name="toast_no_market">このデバイス上にPlay Storeが存在しません。</string>
+
+</resources>
\ No newline at end of file
diff --git a/qpython/src/main/res/values-ru/arrays.xml b/qpython/src/main/res/values-ru/arrays.xml
new file mode 100644
index 00000000..28ea4ea9
--- /dev/null
+++ b/qpython/src/main/res/values-ru/arrays.xml
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ -->
+
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="ExtraTranslation">
+    <string-array name="entries_statusbar_preference">
+        <item>Показать Status bar</item>
+        <item>Скрыть Status bar</item>
+    </string-array>
+
+    <string-array name="entries_actionbar_preference">
+        <!-- <item>Action bar disabled</item> -->
+        <item>Показать Панель действий</item>
+        <item>Скрыть Панель действий(Нажмите на верхнюю часть экрана или кнопку меню, чтобы показать снова)</item>
+    </string-array>
+
+    <string-array name="entries_orientation_preference">
+        <item>Автоматически</item>
+        <item>Горизонтальная</item>
+        <item>Вертикальная</item>
+    </string-array>
+
+    <string-array name="entries_fontsize_preference">
+        <item>4 x 8 Pixel</item>
+        <item>6 point type</item>
+        <item>7 point type</item>
+        <item>8 point type</item>
+        <item>9 point type</item>
+        <item>10 point type</item>
+        <item>12 point type</item>
+        <item>14 point type</item>
+        <item>16 point type</item>
+        <item>20 point type</item>
+        <item>24 point type</item>
+        <item>28 point type</item>
+        <item>32 point type</item>
+        <item>36 point type</item>
+        <item>42 point type</item>
+        <item>48 point type</item>
+        <item>64 point type</item>
+        <item>72 point type</item>
+        <item>96 point type</item>
+        <item>144 point type</item>
+        <item>288 point type</item>
+    </string-array>
+
+    <string-array name="entries_color_preference">
+        <item>Чёрные символы на белом фоне</item>
+        <item>Белые символы на чёрном фоне</item>
+        <item>Белые символы на голубом фоне</item>
+        <item>Зелёные символы на чёрном фоне</item>
+        <item>Жёлтые символы на чёрном фоне</item>
+        <item>Красные символы на чёрном фоне</item>
+        <item>Стиль Holo</item>
+        <item>over-exposed</item>
+        <item>lack-exposed</item>
+        <item>Стиль Linux</item>
+    </string-array>
+
+    <string-array name="entries_backaction_preference">
+        <item>Закрыть все окна</item>
+        <item>Закрыть текущее окно</item>
+        <item>Закрыть текущее окно, но оставить сессии работать</item>
+        <item>Отправить ESC в терминал</item>
+        <item>Отправить TAB в терминал</item>
+    </string-array>
+
+    <string-array name="entries_controlkey_preference">
+        <item>Ball</item>
+        <item>\@</item>
+        <item>Left-Alt</item>
+        <item>Right-Alt</item>
+        <item>Vol-Up</item>
+        <item>Vol-Dn</item>
+        <item>Camera</item>
+        <item>None</item>
+    </string-array>
+
+    <string-array name="entries_fnkey_preference">
+        <item>Ball</item>
+        <item>\@</item>
+        <item>Left-Alt</item>
+        <item>Right-Alt</item>
+        <item>Vol-Up</item>
+        <item>Vol-Dn</item>
+        <item>Camera</item>
+        <item>None</item>
+    </string-array>
+
+    <string-array name="entries_ime_preference">
+        <item>Символьный</item>
+        <item>Слова</item>
+    </string-array>
+
+    <string name="list_select">
+        <item>Открыть оедактором</item>
+        <item>Открыть в ...</item>
+         <item>Сканировать заново</item>
+    </string>
+
+
+    <!-- These are the 'short' names for the control keys. They are used in the special keys dialog. -->
+    <string-array name="control_keys_short_names">
+        <item>Ball</item>
+        <item>\@</item>
+        <item>Left-Alt</item>
+        <item>Right-Alt</item>
+        <item>Vol-Up</item>
+        <item>Vol-Dn</item>
+        <item>Camera</item>
+        <item>None</item>
+    </string-array>
+
+    <!-- These are the 'short' names for the Fn keys. They are used in the special keys dialog. -->
+    <string-array name="fn_keys_short_names">
+        <item>Ball</item>
+        <item>\@</item>
+        <item>Left-Alt</item>
+        <item>Right-Alt</item>
+        <item>Vol-Up</item>
+        <item>Vol-Dn</item>
+        <item>Camera</item>
+        <item>None</item>
+    </string-array>
+
+    <string-array name="screen_orientation_values" translatable="false">
+        <item>auto</item>
+        <item>landscape</item>
+        <item>portrait</item>
+    </string-array>
+
+    <string-array name="file_explorer_tab">
+        <item>Скрипт</item>
+        <item>Проект</item>
+    </string-array>
+
+
+    <!-- Color themes -->
+    <string-array name="files_new">
+        <item>Пустой файл</item>
+        <item>Скрипт</item>
+        <item>Веб-приложение (Проект)</item>
+        <item>Консольное приложение (Проект)</item>
+        <item>Приложение Kivy (Проект)</item>
+    </string-array>
+
+
+    <string-array name="color_theme_names">
+        <item>Классическая</item>
+        <item>Негатив</item>
+        <item>Матрица</item>
+        <item>Небесная</item>
+        <item>Дракула</item>
+    </string-array>
+    <string-array name="color_theme_values">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+    </string-array>
+
+    <!-- End of lines -->
+
+    <!-- Recent files -->
+
+    <!-- Recent files -->
+
+    <!-- Encoding -->
+
+    <string-array name="max_lines_num_with_syntax_values">
+        <item>100</item>
+        <item>300</item>
+        <item>600</item>
+        <item>1000</item>
+        <item>2000</item>
+    </string-array>
+
+</resources>
diff --git a/qpython/src/main/res/values-ru/strings.xml b/qpython/src/main/res/values-ru/strings.xml
new file mode 100644
index 00000000..33a26d74
--- /dev/null
+++ b/qpython/src/main/res/values-ru/strings.xml
@@ -0,0 +1,433 @@
+<resources tools:ignore="ExtraTranslation" xmlns:tools="http://schemas.android.com/tools">
+    <string name="terminal">Терминал</string>
+    <string name="library">Библиотека</string>
+    <string name="recent">Недавние</string>
+    <string name="script">Скрипт</string>
+    <string name="project">Проект</string>
+
+    <string name="setting">Настройки</string>
+    <string name="editor">Редактор</string>
+    <string name="community">Сообщество</string>
+
+    <string name="more">Больше</string>
+    <string name="sl4a_server">SL4A Сервер</string>
+    <string name="ftp_server">FTP сервер</string>
+
+    <!---->
+    <string name="application_terminal">Терминал</string>
+    <string name="preferences">Настройки</string>
+    <string name="new_window">Открыть новое терминал</string>
+    <string name="close_window">Закрыть терминал</string>
+    <string name="window_list">Список окон</string>
+    <string name="reset">Перезапустить терминал</string>
+    <string name="send_email">Отправить email на…</string>
+    <string name="special_keys">Особые ключи</string>
+    <string name="toggle_soft_keyboard">Открыть/Закрыть клавиатуру</string>
+
+    <string name="reset_toast_notification">The state at present will be reset.</string>
+
+    <string name="enable_wakelock">Включить блокировку сна</string>
+    <string name="disable_wakelock">Отключить блокировку сна</string>
+    <string name="enable_wifilock">Включить блокировку WIFI</string>
+    <string name="disable_wifilock">Отключить блокировку WIFI</string>
+
+    <string name="edit_text">Редактировать текст</string>
+    <string name="select_text">Выбрать текст</string>
+    <string name="copy_all">Копировать всё</string>
+    <string name="send_control_key">Нажать клавишу control</string>
+    <string name="send_fn_key">Нажать клавишу Fn</string>
+
+    <string name="window_title">Окно %1$d</string>
+
+    <string name="process_exit_message">Сессия не активна</string>
+
+    <!-- Preference dialog -->
+    <string name="screen_preferences">Экран</string>
+
+    <string name="title_statusbar_preference">Статусбар</string>
+    <string name="summary_statusbar_preference">Показать/Скрыть статусбар</string>
+    <string name="dialog_title_statusbar_preference">Статусбар</string>
+
+    <string name="title_actionbar_preference">Action Bar</string>
+    <string name="summary_actionbar_preference">Выберите поведение панели действий(Android 3.0 и выше)</string>
+    <string name="dialog_title_actionbar_preference">Поведение панели действий</string>
+
+    <string name="title_orientation_preference">Ориентация экрана</string>
+    <string name="summary_orientation_preference">Выберите ориентацию экрана</string>
+    <string name="dialog_title_orientation_preference">ориентация экрана</string>
+
+    <string name="text_preferences">Текст</string>
+
+    <string name="title_utf8_by_default_preference">Использовать UTF-8 по умолчанию</string>
+    <string name="summary_utf8_by_default_preference">Использовать UTF-8 по умолчанию</string>
+
+    <string name="title_fontsize_preference">Размер шрифта</string>
+    <string name="summary_fontsize_preference">Выберите размер шрифта</string>
+    <string name="dialog_title_fontsize_preference">Размер шрифта</string>
+
+    <string name="title_color_preference">Цвет текста</string>
+    <string name="summary_color_preference">Выберите цвет текста</string>
+    <string name="dialog_title_color_preference">Цвет текста</string>
+
+    <string name="keyboard_preferences">Клавиатура</string>
+
+    <string name="title_backaction_preference">Поведение кнопки назад</string>
+    <string name="summary_backaction_preference">Выберите поведение кнопки назад</string>
+    <string name="dialog_title_backaction_preference">Поведение кнопки назад</string>
+
+    <string name="title_controlkey_preference">Клавиша Ctrl</string>
+    <string name="summary_controlkey_preference">Выберите поведение клавиши Ctrl</string>
+    <string name="dialog_title_controlkey_preference">Клавиша Ctrl</string>
+
+    <string name="title_fnkey_preference">Клавиша Fn</string>
+    <string name="summary_fnkey_preference">Выберите поведение клавиши Fn</string>
+    <string name="dialog_title_fnkey_preference">Клавиша Fn</string>
+
+    <string name="title_ime_preference">Способ ввода</string>
+    <string name="summary_ime_preference">Выберите способ ввода</string>
+    <string name="dialog_title_ime_preference">Способ ввода</string>
+
+    <string name="shell_preferences">Оболочка</string>
+    <string name="title_shell_preference">Терминал</string>
+    <string name="summary_shell_preference">Выберите оболочку</string>
+    <string name="dialog_title_shell_preference">Оболочка</string>
+
+    <string name="title_initialcommand_preference">Команда инициализации</string>
+    <string name="summary_initialcommand_preference">Автоматическое выполнение команды инициализации при запуске</string>
+    <string name="dialog_title_initialcommand_preference">Команда инициализации</string>
+
+    <string name="title_termtype_preference">Тип терминала</string>
+    <string name="summary_termtype_preference">Установить оболочку терминала</string>
+    <string name="dialog_title_termtype_preference">Тип терминала</string>
+
+    <string name="title_close_window_on_process_exit_preference">Закрывать терминал при выходе</string>
+    <string name="summary_close_window_on_process_exit_preference">Закрывать терминал при выходе</string>
+
+    <string name="title_verify_path_preference">проверить PATH</string>
+    <string name="summary_verify_path_preference">Очистить неправильный PATH</string>
+
+    <string name="title_do_path_extensions_preference">Разрешить расширение PATH</string>
+    <string name="summary_do_path_extensions_preference">Разрешать добавлять команды к PATH</string>
+
+    <string name="title_allow_prepend_path_preference">Разрешить препозицию PATH</string>
+    <string name="summary_allow_prepend_path_preference">Разрешить перезапись существующих команд в PATH</string>
+
+    <string name="title_home_path_preference">Домашняя папка</string>
+    <string name="summary_home_path_preference">Использовать как переменную пути PATH</string>
+
+    <string name="control_key_dialog_title">Клавиши Ctrl и Fn</string>
+    <string name="control_key_dialog_control_text">CTRLKEY Пробел : Control-@ (NUL)\nCTRLKEY A..Z : Control-A..Z\nCTRLKEY 5 : Control-]\nCTRLKEY 6 : Control-^\nCTRLKEY 7 : Control-_\nCTRLKEY 9 : F11\nCTRLKEY 0 : F12</string>
+    <string name="control_key_dialog_control_disabled_text">Разбиндить клавишу Ctrl</string>
+    <string name="control_key_dialog_fn_text">FNKEY 1..9 : F1-F9\nFNKEY 0 : F10\nFNKEY W : Up\nFNKEY A : Left\nFNKEY S : Down\nFNKEY D : Right\nFNKEY P : PageUp\nFNKEY N : PageDown\nFNKEY T : Tab\nFNKEY L : | (столбик)\nFNKEY U : _ (нижнее подчёркивание)\nFNKEY E : Control-[ (ESC)\nFNKEY X : Delete\nFNKEY I : Insert\nFNKEY H : Home\nFNKEY F : End\nFNKEY . : Control-\\\n</string>
+    <string name="control_key_dialog_fn_disabled_text">Fn key unset</string>
+
+    <string name="confirm_window_close_message">Закрыть терминал?</string>
+
+    <string name="email_transcript_subject">Копия терминала</string>
+    <string name="feedback_email_subject">Обратная связь - QPython</string>
+    <string name="email_transcript_chooser_title">Обратная связь ...</string>
+    <string name="email_transcript_no_email_activity_found">Не удалось найти подходящее приложение для отправки E-mail</string>
+
+    <string name="alt_sends_esc">Использовать Alt как ESC</string>
+    <string name="alt_sends_esc_summary_on">Используется Alt как ESC</string>
+    <string name="alt_sends_esc_summary_off">Отменить использование Alt как ESC</string>
+
+    <string name="title_mouse_tracking_preference">Отправить событие мыши</string>
+    <string name="summary_mouse_tracking_preference">События касания и прокрутки игнорируются?</string>
+
+    <string name="dialog_title_script">скрипт</string>
+    <string name="dialog_title_project">проект</string>
+
+
+    <string name="title_use_keyboard_shortcuts">Use Keyboard Shortcuts</string>
+    <string name="use_keyboard_shortcuts_summary_on">Ctrl-Tab: пролистнуть терминал, Ctrl-Shift-N: новое терминал, Ctrl-Shift-V: вставить.</string>
+    <string name="use_keyboard_shortcuts_summary_off">Сокращения для клавиатуры отключены.</string>
+    <string name="help">Помощь</string>
+    <string name="activity_term_here_title">Называть здесь</string>
+    <!-- BEGIN SHORTCUT RELATED STRINGS -->
+    <!-- AndroidManifest.xml -->
+    <string name="activity_shortcut_create">"Временный ярлык"</string>
+    <string name="addshortcut_button_find_command">Команда поиска</string>
+    <string name="addshortcut_command_hint">команда</string>
+    <string name="addshortcut_example_hint">--пример=\""a\"</string>
+    <string name="addshortcut_navigator_title">ВЫБЕРИТЕ ЦЕЛЬ ДЛЯ ЯРЛЫКА</string>
+    <string name="addshortcut_command_window_instructions">Command window requires full mPath, no arguments. For other commands use Arguments window (ex: cd /sdcard).</string>
+    <string name="addshortcut_arguments_label">Добавить в директорию</string>
+    <string name="addshortcut_shortcut_label">Надпись ярлыка\:</string>
+    <string name="addshortcut_button_text_icon">Текстовая иконка</string>
+    <string name="addshortcut_make_text_icon">СДЕЛАТЬ ТЕКСТОВУЮ ИКОНКУ</string>
+    <string name="addshortcut_text_icon_instructions"></string>
+    <string name="addshortcut_title">Временный ярлык</string>
+    <!-- FSNavigator.java -->
+    <string name="fsnavigator_title">ВЫБОР ФАЙЛА</string>
+    <string name="fsnavigator_no_external_storage">Внешнее хранилище недоступно</string>
+    <string name="fsnavigator_optional_enter_path">Or enter mPath here.</string>
+    <string name="fsnavigator_change_theme">Изменить тему</string>
+    <!-- ColorValue.java -->
+    <string name="colorvalue_label_lock_button_column">БЛОКИРОВКА</string>
+    <string name="colorvalue_icon_text_entry_hint">Введите текст иконк </string>
+
+    <string name="help_url">https://www.qpython.org</string>
+
+    <string name="new_file">Новый файл</string>
+    <string name="read_only">Только чтение</string>
+    <string name="file">Файловый менеджер</string>
+    <string name="yes">Да</string>
+    <string name="no">Нет</string>
+    <string name="ok">ОК</string>
+    <string name="close">Закрыть</string>
+    <string name="no_change">Нет изменений</string>
+    <string name="feedback">Обратная свзяь</string>
+    <string name="about">О приложении</string>
+    <string name="file_not_exists">Файл не существует</string>
+    <string name="enable_root">Включён</string>
+    <!--<string name="my_name">作者：彭春瑜</string>-->
+    <!--<string name="qq_group">QQ群：87272821</string>-->
+    <string name="send">Отправить</string>
+    <string name="no_camera">Не удаётся подключиться к камере. Проверьте соответствующее разрешение для приложения.</string>
+    <string name="no_storage">Нет разрешения для доступа к хранилищу</string>
+    <plurals name="x_text_replaced">
+        <item quantity="zero">0 найдено</item>
+        <item quantity="other">%d текст заменён</item>
+    </plurals>
+    <string-array name="insert_datetime_lang">
+        <item>English</item>
+        <item>Chinese</item>
+    </string-array>
+    <string-array name="wrap_char_list">
+        <item>Использовать \\n（Linux/OSX）</item>
+        <item>Использовать \\r\\n（Windows）</item>
+    </string-array>
+    <string-array name="date_number">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
+        <item>7</item>
+        <item>8</item>
+        <item>9</item>
+        <item>100</item>
+    </string-array>
+    <string-array name="screen_orientation">
+        <item>Автоматически</item>
+        <item>Горизонтальная</item>
+        <item>Вертикальная</item>
+    </string-array>
+
+    <string-array name="list_select">
+        <item>Открыть в редакторе</item>
+        <item>Открыть в .....</item>
+        <item>Мканировать заново</item>
+    </string-array>
+
+
+    <array name="library">Net библиотека</array>
+
+
+    <string-array name="tab_string">
+        <item>Net библиотека</item>
+        <item>Загружено</item>
+    </string-array>
+
+
+    <string name="pref_initialcommand_default_qpython">python</string>
+    <string name="qpy_app">QPY</string>
+    <string name="local_app">Локальное приложение</string>
+    <string name="task">Задача</string>
+    <string name="root_mode">Root режим</string>
+    <string name="star_it">Оценить</string>
+    <string name="disable_root">Отключён</string>
+    <string name="http_qpypi_qpython_org">https://pypi.python.org/simple/</string>
+    <string name="add">добавить</string>
+    <string name="sl4a_running">SL4A сервер запущен</string>
+    <string name="sl4a_un_running">SL4A сеовер не активен</string>
+    <string name="service_toggle">Переключить сервер</string>
+    <string name="qpy_description">QPython это движок для скриптов, запускаемый на устройствах Android, таких, как телефоны и планшеты.</string>
+    <string name="warning">Предупреждение</string>
+    <string name="reset_warning">Сброс удалит все данные и загруженные библиотеки. Вы уверены, что хотите продолжить?</string>
+    <string name="downloading">Библиотека</string>
+    <string name="location">Расположение</string>
+
+
+    <!--  -->
+
+    <!-- Titles -->
+    <string name="title_editor">QEdit - %1$s</string>
+    <string name="title_editor_dirty">QEdit - %1$s *</string>
+    <string name="title_editor_readonly">QEdit - [%1$s]</string>
+
+    <string name="title_settings">QEdit - Настройки</string>
+
+    <!-- Config screen strings -->
+    <string name="config_cat_display">Дисплей</string>
+    <string name="config_title_line_numbers">Показывать номера строк</string>
+    <string name="config_title_word_wrap">Перенос слов</string>
+    <string name="config_title_font">Изменить шрифт</string>
+    <string name="config_title_text_size">Размер текста</string>
+    <string name="config_title_color_theme">Цветовая схема</string>
+    <string name="config_title_scroll_fling">Бросьте для быстрой прокрутки</string>
+    <string name="config_summary_line_numbers">Отображать номера строк слева</string>
+    <string name="config_summary_word_wrap">Строки будут делиться, если они не умещаются на экран</string>
+    <string name="config_summary_scroll_fling">Выключите, если у вас проблемы с производительностью</string>
+
+    <!-- Options Menu in QEdit -->
+
+    <!-- Misc UI strings -->
+    <string name="ui_save_text">"Хотите сохранить файл? \nНесохранённые изменения будут потеряны."</string>
+    <string name="ui_save">Сохранить</string>
+    <string name="ui_delete">Удалить</string>
+    <string name="ui_no_save">"Не сохранять"</string>
+    <string name="ui_cancel">Отмена</string>
+    <string name="ui_hint_file_name">Имя файла</string>
+    <string name="ui_hint_search">Поиск</string>
+    <string name="ui_history">История</string>
+    <string name="ui_force_read_only">Открыть только для чтения</string>
+    <string name="about_content">QEdit это текстовый редактор для планшетов и телеыонов на платформе Android. Кроме редактирования теста, он может сделать разработку на python / HTML on гораздо более интересной и очень удобной.</string>
+
+    <!-- Misc Strings -->
+    <string name="lorem_ipsum">"QEdit отличный редактор кода."</string>
+
+    <string name="file_exists">Файл существует. Пожалуйста, измените название</string>
+    <string name="search_hint"></string>
+
+    <string name="video_src">Видео {0}</string>
+    <string name="play_video">Запустить видео</string>
+    <string name="no_videos_found">На странице не найдены видео</string>
+    <string name="pls_install_a8_play">Пожалуйста, установите A8 Video Player</string>
+    <string name="download_as">Загрузить и сохранить как</string>
+    <string name="info_browser">QBrowser</string>
+
+    <!--  added by kyle -->
+    <string name="share">Расшарить</string>
+    <string name="save_as_snippets">Сохранить как фоагмент</string>
+    <string name="snippet_exist">Фрагменты существуют. Пожалуйста, измените название.</string>
+    <string name="save_as_snippets_1">Фрагменты были сохранены как: </string>
+    <string name="fail_to_insert">Не удалось вставить фрагмент</string>
+    <string name="fail_to_goto">Пожалуйста, введите корректное число</string>
+    <string name="max_lines_num_with_syntax_title">Авто-подсветка строк</string>
+    <string name="max_lines_num_with_syntax_summary">Авто-подсветка при количестве строк меньше, чем %s</string>
+    <string name="qedit_not_support">QEdit поддерживает просмотр/запуск форматов\n.py, .sh, .lua, .html, .md.</string>
+
+    <string name="pls_install_lua">Пожалуйста, установите QLua для запуска скрипта</string>
+    <string name="pls_install_qpy">Пожалуйста, установите QPython для запуска скрипта</string>
+    <string name="info_snippets">Snippets</string>
+
+    <string name="ui_ok">ОК</string>
+    <string name="ui_contact_title">Контакты</string>
+    <string name="ui_licence_title">Лицензия</string>
+    <string name="ui_mail">support@qpython.org</string>
+    <string name="ui_choose_mail">Открыть почту, используя &#8230; </string>
+    <string name="ui_market_url">"https://market.android.com/developer?pub=Xavier+Gouchet"</string>
+    <string name="ui_market_app_url">"https://play.google.com/store/apps/details?id=%s"</string>
+    <string name="ui_market">"Взгляните на другие приложения от меня"</string>
+    <string name="ui_app_rating">"Оценить приложение \n Оставить отзыв"</string>
+    <string name="ui_feedback">"Вы можете связаться со мной для обсуждения любого бага или новой фнкции. "</string>
+    <string name="ui_licence_content">"Это программное обеспечение предоставляется 'как есть', без каких-либо гарантий явно выраженных или подразумеваемых. Ни при каких обстоятельствах автор не несет ответственности за любой ущерб, возникший в результате использования этого программного обеспечения."</string>
+    <string name="ui_art_licence_title">Художественная лицензия</string>
+    <string name="ui_art_licence_content">"Все иконки для этого приложения были созданы и принадлежат его автору: QPython."</string>
+    <string name="ui_whats_new">"Что нового"</string>
+    <string name="save">Сохранить</string>
+    <string name="save_as">Сохранить как</string>
+    <string name="open">Открыть</string>
+    <string name="file_name">Имя файла</string>
+    <string name="file_exist_hint">Файл сушествует. Пожалуйста, переименуйте его.</string>
+    <string name="empty_file">Пустой файл</string>
+w    <string name="confirm">Подтвердить</string>
+    <string name="cancel">Отмена</string>
+    <string name="new_project">Новый проект</string>
+    <string name="error_dont_kn">Возникла ошибка.</string>
+    <string name="project_name">Имя проекта</string>
+    <string name="jump_to">Переместиться к</string>
+    <string name="choose_ttf">Выберите файл шрифта(.ttf)</string>
+    <string name="explorer">Файловый менеджер</string>
+    <string name="new_script">Новый скрипт</string>
+    <string name="enter_name_hint">Ваедите имя скрипта</string>
+
+    <string name="paste">Вставить</string>
+    <string name="download_fail">Не удалось загрузить</string>
+    <string name="key_reset">reset_storage</string>
+    <string name="key_ftp_state">running_state</string>
+    <string name="key_username">username</string>
+    <string name="key_ftp_pwd">password</string>
+    <string name="key_port_num">portNum</string>
+    <string name="key_show_pwd">show_password</string>
+    <string name="key_root_dir">chrootDir</string>
+    <string name="key_stay_awake">stayAwake</string>
+    <string name="key_about">about</string>
+    <string name="dir_not_valid">Недоступная директория</string>
+    <string name="already_newest">Уже последняя</string>
+    <string name="share_text">QPython это движок скриптов, работающий на устройствах Android, таких как телефон или планшет. Он включает в себя интерпретатор Python, консоль, редактор, библиотеку SL4A для Android, что позволяет вашему устройству Android работать с Python\'ом https://www.qpython.com/privacy.html</string>
+    <string name="new_folder">Новая папка</string>
+    <string name="folder_name">Название папки</string>
+    <string name="untitled_folder">untitled folder</string>
+    <string name="toast_folder_exist">Операция провалена! Пожалуйста, выберите другое имя папки</string>
+    <string name="fail_open_file">Не удалось открыть файл. Файл не существует</string>
+    <string name="run_dirty_hint">Сохранить изменения?</string>
+    <string name="no_im_good">Нет, и так сойдёт</string>
+    <string name="convert_fail">Не удалось конвертировать</string>
+    <string name="delete_file_hint">Вы хотите удалить этот файл?</string>
+    <string name="rename">Переименовать</string>
+    <string name="rename_fail">Не удалось переименовать</string>
+    <string name="delete_fail">Не удалось удалить</string>
+    <string name="runtime_log">Лог: %s</string>
+    <string name="log_title">Лог</string>
+
+    <string name="fedback_mail">[Обоатная связь]\n\n</string>
+    <string name="date_format">[ %s ]</string>
+    <string name="not_root_yet">Устройство ещё не рутировано</string>
+    <string name="download_apk">Загрузить APK?</string>
+    <string name="download_apk_hint">Загрузка может быть платной, если вы не используете WIFI</string>
+    <string name="downloading_new_apk">Загрузка нового пакета</string>
+    <string name="checking_update">Проверка обновлений</string>
+    <string name="run_bg_title">Запустить в фоновом режиме</string>
+    <string name="scan">Сканировать</string>
+    <string name="read_script_from_qrcode">Чтение кода с QRCode</string>
+
+    <string name="course">Курсы</string>
+    <string name="lost_connect">Потеряно соединение</string>
+    <string name="featured_courses">Курсы</string>
+    <string name="programs">Программы</string>
+    <string name="open_gl2_is_not_supported">OpenGL2 не поддерживается</string>
+    <string name="unable_extract">Невозможно извлечь файлы python</string>
+    <string name="get_setting_data_fail">Не удалось получить данные ностроек</string>
+    <string name="terminal_bg_hint">Оставить терминал работать в фоновом режиме?</string>
+    <string name="thanks">СПАСИБО!</string>
+    <string name="extra_pypi">Установить PYPI</string>
+    <string name="already_newest_current_version">Установлена последняя версия. Номер версии: </string>
+    <string name="reward">Reward</string>
+    <string name="oops_seems_like_your_net_have_some_trouble">Ой! \n Похоже, у вас пробелмы с сетью…</string>
+    <string name="lose_google_server">Не удаётся подключиться к сервисам Google Play. Пожалуйста, проверьте ваше соединение.</string>
+    <string name="thanks_your_support">Спасибо за вашу помощь!</string>
+    <string name="under_16_status_bar_hint">Изменение праметра видимости статус-бара будет применено только при следующем запуске терминала.</string>
+    <string name="refresh">Обновить</string>
+    <string name="reset_suc">Успешный перезапуск</string>
+    <string name="reset_hint">Эта операция будет актовной только после перезапуска</string>
+    <string name="restart">Перезапуск</string>
+    <string name="fail_resume_console">Не удалось восстановить консоль</string>
+    <string name="failed_bind_term">Не удалось забиндить TermService!</string>
+    <string name="console_running">Консоль QPython запущена</string>
+    <string name="qpy_console">Консоль QPython</string>
+    <string name="recommend">Рекомендованное</string>
+    <string name="newest_course">Последнее</string>
+    <string name="best_python_development_ide_non_mobile">Лучшее приложение Python на мобильных устройствах</string>
+    <string name="sign_in_with_google">Войти через Google</string>
+    <string name="by_signing_in_you_agree_to_out_privacy_policy_term_of_service"><![CDATA[By signing in you agree to out privacy policy & term of service]]></string>
+    <string name="copy_hint">Скопируйте в редактор, чтобы запустить</string>
+    <string name="my_scripts">Мои скрипты</string>
+    <string name="my_share">Моё расшаренное</string>
+    <string name="snippet">Фрагмент</string>
+    <string name="gist_title">Gist заголовок</string>
+    <string name="description">Описание</string>
+    <string name="too_long_hint">Текст должен включать 140 или меньше символов.</string>
+    <string name="enter_snippet">Введите имя фрагмента</string>
+    <string name="welcome_s">Приветствую, <![CDATA[<font color="#4BAC07"><u>%s</u></font>]]></string>
+    <string name="login"><u>войти</u></string>
+    <string name="auth_failed">Неудачная аторизация.</string>
+    <string name="log_out">выйти</string>
+    <string name="me">Я</string>
+    <string name="grant_storage_hint">Необходимо получить разрешение для доступа к хранилищу.</string>
+    <string name="lost_google_hint">Не могу подключиться к серверу Google. Пожалуйста, проверьте ваше соединение.</string>
+</resources>
\ No newline at end of file
diff --git a/qpython/src/main/res/values-v11/dimens.xml b/qpython/src/main/res/values-v11/dimens.xml
new file mode 100644
index 00000000..20a66d10
--- /dev/null
+++ b/qpython/src/main/res/values-v11/dimens.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<!-- V14 -->
+    <dimen name="widget_margin">4dp</dimen>
+
+</resources>
\ No newline at end of file
diff --git a/qpython/src/main/res/values-v11/styles.xml b/qpython/src/main/res/values-v11/styles.xml
new file mode 100644
index 00000000..1b541abc
--- /dev/null
+++ b/qpython/src/main/res/values-v11/styles.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- The Holo-era theme. This theme is only used for API level 11..20.
+ -->
+
+<resources>
+
+    <style name="TransparentTheme" parent="@style/Theme.AppCompat">
+
+        <item name="android:background">@android:color/transparent</item>
+        <item name="background">@android:color/transparent</item>
+
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:colorBackgroundCacheHint">@android:color/transparent</item>
+        <item name="android:windowContentOverlay">@android:color/transparent</item>
+        <item name="android:windowIsTranslucent">@android:color/transparent</item>
+        <item name="android:windowAnimationStyle">@android:color/transparent</item>
+    </style>
+
+    <style name="AppTheme" parent="Theme.AppCompat.NoActionBar">
+
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+        <item name="android:textColorPrimary">@color/white</item>
+        <item name="android:textColorSecondary">#FF9B9B9B</item>
+        <item name="colorControlNormal">@color/white</item>
+        <item name="android:dialogPreferenceStyle">@style/MyDialog</item>
+        <item name="android:windowBackground">@color/colorPrimaryDark</item>
+        <item name="selectableItemBackground">@drawable/toolbar_button_bg</item>
+        <item name="android:textAppearanceSmallPopupMenu">@style/popupMenuTextAppearanceSmall</item>
+        <item name="android:textAppearanceLargePopupMenu">@style/popupMenuTextAppearanceLarge</item>
+        <item name="android:colorBackground">@color/colorPrimaryDark</item>
+    </style>
+    <!-- This style is used for all activities except the main terminal
+         window. (Example: console_preferences.)
+     -->
+    <style name="ConsoleTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:colorBackground">@color/colorPrimaryDark</item>
+        <item name="android:textColor">@color/Color_White</item>
+        <item name="android:windowFrame">@null</item>
+        <item name="android:windowContentOverlay">@null</item>
+    </style>
+    <!-- This style is used for the main terminal window when the action bar
+         is visible. It is set programmatically at run time.
+     -->
+    <!-- This style is used for the main terminal window when the action bar
+         is hidden. It is set programmatically at run time.
+     -->
+</resources>
+
diff --git a/qpython/src/main/res/values-v21/colors.xml b/qpython/src/main/res/values-v21/colors.xml
new file mode 100644
index 00000000..ba378432
--- /dev/null
+++ b/qpython/src/main/res/values-v21/colors.xml
@@ -0,0 +1,3 @@
+<resources>
+    <color name="accent">#8BC34A</color>
+</resources>
diff --git a/qpython/src/main/res/values-v21/styles.xml b/qpython/src/main/res/values-v21/styles.xml
new file mode 100644
index 00000000..54ce51a2
--- /dev/null
+++ b/qpython/src/main/res/values-v21/styles.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- The Material Design theme. This theme is only used for API level 21...
+ -->
+
+<resources>
+
+    <style name="TransparentTheme" parent="@style/Theme.AppCompat">
+
+        <item name="android:background">@android:color/transparent</item>
+        <item name="background">@android:color/transparent</item>
+
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:colorBackgroundCacheHint">@android:color/transparent</item>
+        <item name="android:windowContentOverlay">@android:color/transparent</item>
+        <item name="android:windowIsTranslucent">@android:color/transparent</item>
+        <item name="android:windowAnimationStyle">@android:color/transparent</item>
+    </style>
+
+    <style name="AppTheme" parent="Theme.AppCompat.NoActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+        <item name="android:textColorPrimary">@color/white</item>
+        <item name="android:textColorSecondary">#FF9B9B9B</item>
+        <item name="colorControlNormal">@color/white</item>
+        <item name="android:dialogPreferenceStyle">@style/MyDialog</item>
+        <item name="android:windowBackground">@color/colorPrimaryDark</item>
+        <item name="android:windowContentTransitions">true</item>
+        <item name="selectableItemBackground">@drawable/toolbar_button_bg</item>
+        <item name="android:textAppearanceSmallPopupMenu">@style/popupMenuTextAppearanceSmall</item>
+        <item name="android:textAppearanceLargePopupMenu">@style/popupMenuTextAppearanceLarge</item>
+        <item name="android:colorBackground">@color/colorPrimaryDark</item>
+    </style>
+    <!-- This style is used for all activities.
+     -->
+    <style name="ConsoleTheme" parent="@android:style/Theme.DeviceDefault">
+        <item name="android:windowFrame">@null</item>
+        <item name="android:windowContentOverlay">@null</item>
+
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+        <!-- Main theme colors -->
+        <!--   your app branding color for the app bar -->
+        <item name="android:colorPrimary">@color/colorPrimary</item>
+        <!--   darker variant for the status bar and contextual app bars -->
+        <item name="android:colorPrimaryDark">@color/colorPrimaryDark</item>
+        <!--   theme UI controls like checkboxes and text fields -->
+        <item name="android:colorAccent">@color/accent</item>
+    </style>
+
+</resources>
+
diff --git a/qpython/src/main/res/values-w820dp/dimens.xml b/qpython/src/main/res/values-w820dp/dimens.xml
new file mode 100644
index 00000000..63fc8164
--- /dev/null
+++ b/qpython/src/main/res/values-w820dp/dimens.xml
@@ -0,0 +1,6 @@
+<resources>
+    <!-- Example customization of dimensions originally defined in res/values/dimens.xml
+         (such as screen margins) for screens with more than 820dp of available width. This
+         would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
+    <dimen name="activity_horizontal_margin">64dp</dimen>
+</resources>
diff --git a/qpython/src/main/res/values-zh-rCN/arrays.xml b/qpython/src/main/res/values-zh-rCN/arrays.xml
new file mode 100644
index 00000000..496694bb
--- /dev/null
+++ b/qpython/src/main/res/values-zh-rCN/arrays.xml
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ -->
+
+<resources>
+    <string-array name="entries_statusbar_preference">
+        <item>显示状态栏</item>
+        <item>隐藏状态栏</item>
+    </string-array>
+
+    <string-array name="entries_actionbar_preference">
+        <!-- <item>Action bar disabled</item> -->
+        <item>显示操作栏</item>
+        <item>隐藏操作栏 (点击屏幕上方或按菜单键显示)</item>
+    </string-array>
+
+    <string-array name="entries_orientation_preference">
+        <item>自动</item>
+        <item>横屏</item>
+        <item>竖屏</item>
+    </string-array>
+
+    <string-array name="entries_fontsize_preference">
+        <item>4 x 8 像素</item>
+        <item>6 磅</item>
+        <item>7 磅</item>
+        <item>8 磅</item>
+        <item>9 磅</item>
+        <item>10 磅</item>
+        <item>12 磅</item>
+        <item>14 磅</item>
+        <item>16 磅</item>
+        <item>20 磅</item>
+        <item>24 磅</item>
+        <item>28 磅</item>
+        <item>32 磅</item>
+        <item>36 磅</item>
+        <item>42 磅</item>
+        <item>48 磅</item>
+        <item>64 磅</item>
+        <item>72 磅</item>
+        <item>96 磅</item>
+        <item>144 磅</item>
+        <item>288 磅</item>
+    </string-array>
+
+    <string-array name="entries_color_preference">
+        <item>白底黑字</item>
+        <item>黑底白字</item>
+        <item>蓝底白字</item>
+        <item>黑底绿字</item>
+        <item>黑底黄字</item>
+        <item>黑底红字</item>
+        <item>Holo 风格</item>
+        <item>爆光过度</item>
+        <item>爆光不足</item>
+        <item>Linux 终端</item>
+    </string-array>
+
+    <string-array name="entries_backaction_preference">
+        <item>关闭所有窗口</item>
+        <item>关闭当前窗口</item>
+        <item>关闭当前实例，保留正在运行的会话</item>
+        <item>给终端发送 ESC</item>
+        <item>给终端发送 TAB</item>
+    </string-array>
+
+    <string-array name="entries_controlkey_preference">
+        <item>轨迹球</item>
+        <item>\@ 键</item>
+        <item>左 Alt 键</item>
+        <item>右 Alt 键</item>
+        <item>提升音量键</item>
+        <item>降低音量键</item>
+        <item>相机快门键</item>
+        <item>无</item>
+    </string-array>
+
+    <string-array name="entries_fnkey_preference">
+        <item>轨迹球</item>
+        <item>\@ 键</item>
+        <item>左 Alt 键</item>
+        <item>右 Alt 键</item>
+        <item>提升音量键</item>
+        <item>降低音量键</item>
+        <item>相机快门键</item>
+        <item>无</item>
+    </string-array>
+
+    <string-array name="entries_ime_preference">
+        <item>字本</item>
+        <item>词本</item>
+    </string-array>
+
+
+    <!-- These are the 'short' names for the control keys. They are used in the special keys dialog. -->
+    <string-array name="control_keys_short_names">
+        <item>Ball</item>
+        <item>\@</item>
+        <item>Left-Alt</item>
+        <item>Right-Alt</item>
+        <item>Vol-Up</item>
+        <item>Vol-Dn</item>
+        <item>Camera</item>
+        <item>None</item>
+    </string-array>
+
+    <!-- These are the 'short' names for the Fn keys. They are used in the special keys dialog. -->
+    <string-array name="fn_keys_short_names">
+        <item>Ball</item>
+        <item>\@</item>
+        <item>Left-Alt</item>
+        <item>Right-Alt</item>
+        <item>Vol-Up</item>
+        <item>Vol-Dn</item>
+        <item>Camera</item>
+        <item>None</item>
+    </string-array>
+
+
+    <!-- Color themes -->
+
+
+    <string-array name="color_theme_names">
+        <item>Classic</item>
+        <item>Negative</item>
+        <item>Matrix</item>
+        <item>Sky</item>
+        <item>Dracula</item>
+    </string-array>
+    <string-array name="color_theme_values">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+    </string-array>
+
+    <!-- End of lines -->
+
+    <!-- Recent files -->
+
+    <!-- Recent files -->
+
+    <!-- Encoding -->
+
+    <string-array name="max_lines_num_with_syntax_values">
+        <item>100</item>
+        <item>300</item>
+        <item>600</item>
+        <item>1000</item>
+        <item>2000</item>
+    </string-array>
+
+    <string-array name="funding_price">
+        <item>36</item>
+        <item>48</item>
+        <item>60</item>
+        <item>96</item>
+    </string-array>
+
+    <string-array name="funding_stage">
+        <item>初级课程</item>
+        <item>中级课程</item>
+        <item>高级课程</item>
+    </string-array>
+</resources>
diff --git a/qpython/src/main/res/values-zh-rCN/strings.xml b/qpython/src/main/res/values-zh-rCN/strings.xml
new file mode 100644
index 00000000..aeff98b2
--- /dev/null
+++ b/qpython/src/main/res/values-zh-rCN/strings.xml
@@ -0,0 +1,454 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Titles -->
+    <string name="title_editor">%1$s</string>
+    <string name="title_editor_dirty">%1$s *</string>
+    <string name="title_editor_readonly">[%1$s]</string>
+    <string name="title_settings">设置</string>
+    <!-- Config screen strings -->
+    <string name="config_cat_display">显示(改变后请重新启动编辑器)</string>
+    <string name="config_title_line_numbers">显示行号</string>
+    <string name="config_title_word_wrap">自动换行</string>
+    <string name="config_title_font">更改文本字体</string>
+    <string name="config_title_text_size">文字大小</string>
+    <string name="config_title_color_theme">颜色主题</string>
+    <string name="config_title_scroll_fling">快速滚动</string>
+    <string name="config_summary_line_numbers">在左侧显示的行号</string>
+    <string name="config_summary_word_wrap">如果某行对于屏幕太宽时，自动换行</string>
+    <string name="config_summary_scroll_fling">如果有性能问题，不要选中</string>
+
+    <string name="config_gist_icon"></string>
+    <string name="config_title_gist">显示Gist按钮</string>
+
+    <!-- Options Menu in QEdit -->
+    <!-- Misc UI strings -->
+    <string name="ui_save_text">保存文档？\n任何未保存更改将丢失。</string>
+    <string name="ui_save">保存</string>
+    <string name="ui_delete">删除</string>
+    <string name="ui_no_save">不保存</string>
+    <string name="ui_cancel">取消</string>
+    <string name="ui_hint_file_name">文件名</string>
+    <string name="ui_hint_search">搜索</string>
+    <string name="ui_history">历史</string>
+    <string name="ui_force_read_only">打开为只读</string>
+    <string name="about_content">QEdit 是一个文本编辑器，针对Android平板电脑和手机，除了文本编辑，它可以使安卓上的Python/HTML 开发更方便和有趣。 </string>
+    <!-- Misc Strings -->
+    <string name="lorem_ipsum">“QEdit 是一个伟大的脚本编辑器”</string>
+    <string name="file_exists">文件已存在，请重命名</string>
+    <string name="video_src">视频{0}</string>
+    <string name="play_video">播放</string>
+    <string name="no_videos_found">没有发现影片在本页面</string>
+    <string name="pls_install_a8_play">请首先安装A8视频播放器</string>
+    <string name="download_as">下载并保存为</string>
+    <string name="info_browser">QBrowser</string>
+    <!-- added by kyle -->
+    <string name="share">分享</string>
+    <string name="save_as_snippets">另存为片段</string>
+    <string name="info_snippets">片段</string>
+    <string name="save_as_snippets_1">片段已另存为： </string>
+    <string name="fail_to_insert">无法插入片段</string>
+    <string name="fail_to_goto">请输入正确的号码</string>
+    <string name="max_lines_num_with_syntax_title">自动高亮</string>
+    <string name="max_lines_num_with_syntax_summary">自动突出显示，如果行数少于%s</string>
+    <string name="qedit_not_support">QEdit 仅仅支持预览或执行以下类型的文件\n.py，.sh，.lua，html，.md, .log, .kv。 </string>
+    <string name="pls_install_lua">请安装QLua 运行LUA 脚本</string>
+    <string name="pls_install_qpy">请安装QPython 运行python 脚本</string>
+    <string name="ui_ok">OK</string>
+    <string name="ui_contact_title">联系</string>
+    <string name="ui_licence_title">授权</string>
+    <string name="ui_mail">support@quseit.com</string>
+    <string name="ui_choose_mail">打开邮件… </string>
+    <string name="ui_market_url">http://quseit.com"</string>
+    <string name="ui_market_app_url">"https://play.google.com/store/apps/details?id=%s"</string>
+    <string name="ui_market">“看看我们的其他应用程序”</string>
+    <string name="ui_app_rating">“评价我们的应用程序\n留下您的反馈”</string>
+    <string name="ui_feedback">“请随时联系我们不管是反馈，功能要求或错误报告等。”</string>
+    <string name="ui_licence_content">“本软件提供“原样”,无任何明示或暗示的保证。不管在任何情况下，笔者应该对因使用本软件所引起的任何损失负责。”</string>
+    <string name="ui_art_licence_title">设计授权</string>
+    <string name="ui_art_licence_content">“创建所有的图标为这个应用程序，并属于该应用程序的作者：QPython."</string>
+    <string name="ui_whats_new">“有什么新闻？”</string>
+    <string name="addshortcut_arguments_label">添加到字典</string>
+    <string name="alt_sends_esc">Ale 键发送 ESC</string>
+    <string name="alt_sends_esc_summary_off">关闭Alt 键发送 ESC</string>
+    <string name="alt_sends_esc_summary_on">使用Alt 键发送ESC</string>
+    <string name="application_terminal">终端模拟器</string>
+    <string name="choose_ttf">选择字体文件(.ttf)</string>
+    <string name="close_window">关闭终端</string>
+    <string name="use_keyboard_shortcuts_summary_off">禁用键盘快捷键</string>
+    <string name="toggle_soft_keyboard">打开/关闭软键盘</string>
+    <string name="toast_plugin_uninstall_complete">插件删除成功</string>
+    <string name="toast_plugin_install_failure">插件安装失败</string>
+    <string name="tools">工具</string>
+    <string name="toast_plugin_install_complete">插件安装完成</string>
+    <string name="title_verify_path_preference">验证PATH路径</string>
+    <string name="title_utf8_by_default_preference">默认 UTF-8</string>
+    <string name="title_termtype_preference">终端类型</string>
+    <string name="title_statusbar_preference">状态栏</string>
+    <string name="title_shell_preference">命令行</string>
+    <string name="title_select_plugin">选择插件</string>
+    <string name="title_plugin_manage">插件管理</string>
+    <string name="title_orientation_preference">屏幕方位</string>
+    <string name="title_mouse_tracking_preference">发送鼠标事件</string>
+    <string name="title_initialcommand_preference">初始命令</string>
+    <string name="title_ime_preference">输入方式</string>
+    <string name="title_home_path_preference">HOME 文件夹</string>
+    <string name="title_fontsize_preference">文本大小</string>
+    <string name="title_fnkey_preference">Fn 键</string>
+    <string name="title_do_path_extensions_preference">允许PATH后扩</string>
+    <string name="title_controlkey_preference">Ctrl 键</string>
+    <string name="title_color_preference">颜色</string>
+    <string name="title_close_window_on_process_exit_preference">退出时关闭终端</string>
+    <string name="title_backaction_preference">返回键行为</string>
+    <string name="title_allow_prepend_path_preference">允许PATH前置</string>
+    <string name="title_actionbar_preference">操作栏</string>
+    <string name="text_preferences">文本</string>
+    <string name="terminal">终端</string>
+    <string name="summary_verify_path_preference">是否将PATH中无效d路径清除</string>
+    <string name="summary_utf8_by_default_preference">是否将UTF-8模式设为默认</string>
+    <string name="summary_termtype_preference">设置 Shell 的终端类型</string>
+    <string name="summary_statusbar_preference">显示/隐藏状态栏</string>
+    <string name="summary_shell_preference">指定命令行使用的 Shell</string>
+    <string name="summary_orientation_preference">选择屏幕方位行为</string>
+    <string name="read_only">只读模式</string>
+    <string name="file">文件</string>
+    <string name="yes">是</string>
+    <string name="no">否</string>
+    <string name="ok">确定</string>
+    <string name="close">关闭</string>
+    <string name="no_change">没有任何改变</string>
+    <string name="feedback">意见反馈</string>
+    <string name="about">关于</string>
+    <string name="file_not_exists">文件不存在</string>
+    m
+    <string name="enable_root">启用Root权限</string>
+    <string name="send">发送</string>
+    <string name="no_camera">没有发现可用的摄像头，请查看是否开启摄像头权限</string>
+    <string name="no_storage">没有文件读取权限</string>
+
+
+    <string name="pref_initialcommand_default_qpython">python</string>
+    <string name="qpy_app">QPY</string>
+    <string name="local_app">本机应用</string>
+    <string name="root_mode">Root模式</string>
+    <string name="star_it">点评</string>
+    <string name="disable_root">已禁用</string>
+    <string name="http_qpypi_qpython_org">https://pypi.python.org/simple/</string>
+    <string name="add">添加</string>
+    <string name="sl4a_running">SL4A服务运行中</string>
+    <string name="service_toggle">服务开关</string>
+    <string name="qpy_description">QPython is a script engine running on android devices like phone or tablet.QPython is a script engine running on android devices like phone or tablet.</string>
+    <string name="warning">警告</string>
+    <string name="reset_warning">将重置所有设置并删除已下载的库,确定重置吗?</string>
+    <string name="downloading">库文件</string>
+    <string name="save">保存</string>
+    <string name="save_as">另存为</string>
+    <string name="open">打开</string>
+    <string name="file_name">File Name</string>
+    <string name="empty_file">空白文件</string>
+    <string name="confirm">确定</string>
+    <string name="cancel">取消</string>
+    <string name="new_project">新建项目</string>
+    <string name="error_dont_kn">发生了某些错误</string>
+    <string name="project_name">项目名</string>
+    <string name="jump_to">转至某行</string>
+    <string name="explorer">文件夹</string>
+    <string name="new_script">新建脚本</string>
+    <string name="enter_name_hint">请输入文件名</string>
+
+    <string name="paste">粘贴</string>
+    <string name="install_with_python_s_pypi">QPYPI客户端</string>
+    <string name="py_pi">你可以管理、通过从QPYPI或者Python的PYPI来安装或升级Python包</string>
+    <string name="download_fail">下载失败</string>
+    <string name="activity_shortcut_create">终端快捷方式</string>
+    <string name="activity_term_here_title">在此处运行终端</string>
+    <string name="addshortcut_button_find_command">查找命令</string>
+    <string name="addshortcut_button_text_icon">文字图标</string>
+    <string name="addshortcut_command_hint">命令</string>
+    <string name="addshortcut_example_hint">--示例=\"\"a\"</string>
+    <string name="addshortcut_make_text_icon">制作文字图标</string>
+    <string name="addshortcut_navigator_title">选择快捷方式文件</string>
+    <string name="addshortcut_shortcut_label">快捷方式标签</string>
+    <string name="addshortcut_title">终端快捷方式</string>
+    <string name="colorvalue_icon_text_entry_hint">输入标签文字</string>
+    <string name="colorvalue_label_lock_button_column">锁</string>
+    <string name="control_key_dialog_control_disabled_text">Crtl 键未设置</string>
+    <string name="control_key_dialog_fn_disabled_text">Fn 键未设置</string>
+    <string name="control_key_dialog_title">Ctrl 和 Fn 键</string>
+    <string name="copy_all">复制全部</string>
+    <string name="dialog_plugin_detail_positive">确定</string>
+    <string name="dialog_title_actionbar_preference">操作栏行为</string>
+    <string name="dialog_title_backaction_preference">返回键行为</string>
+    <string name="dialog_title_color_preference">文字颜色</string>
+    <string name="dialog_title_controlkey_preference">Ctrl 键</string>
+    <string name="dialog_title_fnkey_preference">Fn 键</string>
+    <string name="dialog_title_fontsize_preference">文字大小</string>
+    <string name="dialog_title_ime_preference">输入方式</string>
+    <string name="dialog_title_initialcommand_preference">初始化命令</string>
+    <string name="dialog_title_orientation_preference">屏幕方向事件</string>
+    <string name="dialog_title_project">项目</string>
+    <string name="dialog_title_script">脚本</string>
+    <string name="dialog_title_shell_preference">Shell</string>
+    <string name="dialog_title_statusbar_preference">状态栏</string>
+    <string name="dialog_title_termtype_preference">终端类型</string>
+    <string name="disable_wakelock">禁用弱锁</string>
+    <string name="disable_wifilock">禁用Wifi 锁</string>
+    <string name="edit_text">编辑文字</string>
+    <string name="editor">编辑器</string>
+    <string name="email_transcript_chooser_title">反馈 ...</string>
+    <string name="email_transcript_no_email_activity_found">找不到邮件实例发送</string>
+    <string name="email_transcript_subject">复製终端</string>
+    <string name="enable_wakelock">启用弱锁模式</string>
+    <string name="enable_wifilock">启用Wifi 锁</string>
+    <string name="fsnavigator_change_theme">选择主题</string>
+    <string name="fsnavigator_no_external_storage">内存无法访问</string>
+    <string name="fsnavigator_optional_enter_path">或在此输入mPath</string>
+    <string name="fsnavigator_title">文件选择器</string>
+    <string name="ftp_server">FTP服务</string>
+    <string name="help">帮助</string>
+    <string name="help_url">http://jackpal.github.com/Android-Terminal-Emulator/help/index.html</string>
+    <string name="internal_space"><![CDATA[权限 & 存储]]></string>
+    <string name="keyboard_preferences">键盘</string>
+    <string name="qpypi">精选</string>
+    <string name="location">位置</string>
+    <string name="more">更多</string>
+    <string name="new_window">打开新终端</string>
+    <string name="already_newest">当前已是最新版本</string>
+    <string name="checking_update">检查更新</string>
+    <string name="confirm_window_close_message">确定要关闭终端吗？</string>
+    <string name="convert_fail">转换失败</string>
+    <string name="course">课程</string>
+    <string name="date_format">[ %s ]</string>
+    <string name="delete_fail">删除失败</string>
+    <string name="delete_file_hint">确定要删除该文件吗？</string>
+    <string name="dir_not_valid">该目录不可用</string>
+    <string name="download_apk">下载最新安装包</string>
+    <string name="download_apk_hint">下载可能会消耗运营商流量，确认下载吗？</string>
+    <string name="downloading_new_apk">下载新的包</string>
+    <string name="fail_open_file">无法打开，该文件不存在</string>
+    <string name="featured_courses">课程中心</string>
+    <string name="folder_name">文件夹名</string>
+    <string name="get_setting_data_fail">获取设置信息失败</string>
+    <string name="key_about">关于</string>
+    <string name="key_ftp_pwd">密码</string>
+    <string name="key_ftp_state">运行状态</string>
+    <string name="key_port_num">端口号</string>
+    <string name="key_reset">重置内存空间</string>
+    <string name="key_root_dir">根目录</string>
+    <string name="key_show_pwd">显示密码</string>
+    <string name="key_stay_awake">保持唤醒</string>
+    <string name="key_username">用户名</string>
+    <string name="new_folder">新建文件夹</string>
+    <string name="not_root_yet">该设备未进入Root模式</string>
+    <string name="open_gl2_is_not_supported">当前设备不支持OpenGL2</string>
+    <string name="plugin_detail">详情</string>
+    <string name="plugin_install">安装</string>
+    <string name="plugin_uninstall">卸载</string>
+    <string name="plugin_update">更新</string>
+    <string name="pref_termtype_default">屏幕</string>
+    <string name="process_exit_message">会话已结束</string>
+    <string name="programs">程序</string>
+    <string name="project">项目</string>
+    <string name="recent">最近</string>
+    <string name="rename">重命名</string>
+    <string name="rename_fail">重命名失败</string>
+    <string name="reset">重置Terminal</string>
+    <string name="reset_toast_notification">当前状态将被重置</string>
+    <string name="run_bg_title">在后台运行</string>
+    <string name="run_dirty_hint">保存当前修改吗？</string>
+    <string name="runtime_log">运行日誌 : %s</string>
+    <string name="log_title">运行日誌</string>
+
+    <string name="scan">二维码</string>
+    <string name="read_script_from_qrcode">从二维码中读取代码</string>
+
+    <string name="screen_preferences">屏幕</string>
+    <string name="script">脚本</string>
+    <string name="select_text">选择文字</string>
+    <string name="send_email">发送邮件至…</string>
+    <string name="setting">设置</string>
+    <string name="sl4a_server">SL4A服务</string>
+    <string name="sl4a_un_running">SL4A服务未启动</string>
+    <string name="special_keys">特殊键</string>
+    <string name="task">Task</string>
+    <string name="title_use_keyboard_shortcuts">使用键盘快捷键</string>
+    <string name="unable_extract">解压python文件失败，可能影响部分功能使用</string>
+    <string name="untitled_folder">未命名文件夹</string>
+    <string name="window_list">终端列表</string>
+    <string name="window_title">终端 %1$d</string>
+    <string name="file_exist_hint">文件已存在，请重命名</string>
+    <string name="community">社区</string>
+    <string name="terminal_bg_hint">在后台运行此控制台？</string>
+    <string name="preferences">偏好</string>
+    <string name="toast_folder_doesnt_exist">无法显示列表, 文件不存在</string>
+    <string name="library">库</string>
+    <string name="summary_fontsize_preference">选择字体大小</string>
+    <string name="summary_color_preference">选择字体颜色</string>
+    <string name="summary_backaction_preference">选择返回键行为</string>
+    <string name="summary_controlkey_preference">选择Ctrl键行为</string>
+    <string name="summary_fnkey_preference">选择Fn键行为</string>
+    <string name="thanks">十分感谢!</string>
+    <string name="extra_pypi">设置PYPI</string>
+    <string name="already_newest_current_version">"已是最新, 目前的版本是: "</string>
+    <string name="reward">赞赏</string>
+    <string name="lose_google_server">无法连接到Google服务器, 请检查您的网络</string>
+    <string name="thanks_your_support">感谢你的支持!</string>
+    <string name="under_16_status_bar_hint">状态栏的显示状态将会在下一次打开时更新</string>
+    <string name="refresh">刷新</string>
+    <string name="reset_suc">重置成功</string>
+    <string name="reset_hint">重启后操作生效</string>
+    <string name="restart">重启</string>
+    <string name="fail_resume_console">重启Console失败</string>
+    <string name="failed_bind_term">绑定TermService失败</string>
+    <string name="console_running">QPython Console正在后台运行</string>
+    <string name="qpy_console">QPython Console</string>
+    <string name="not_support_yet">无法打开该类型文件</string>
+    <string name="last_refresh">上一次更新: %s</string>
+    <string name="data_saver">省流量模式</string>
+    <string name="saver_on">使用本地缓存</string>
+    <string name="saver_off">使用最新数据</string>
+    <string name="aipy_lib_hint">你可以安装或更新AIPY应用获得更多功能</string>
+    <string name="aipy_not_release">请先安装并运行AIPY</string>
+    <string name="aipy_not_support">AIPy尚未支持QPY3</string>
+    <string name="install_package_fail">安装库文件失败, 请稍后重试</string>
+    <string name="install_fail">安装失败, 请稍后重试</string>
+    <string name="install_suc">安装成功</string>
+    <string name="package_installed">这个库文件已存在</string>
+    <string name="update_time_hint">更新: %s</string>
+    <string name="toolbar_close">编辑器</string>
+    <string name="toolbar_showing">项目结构</string>
+    <string name="cant_open">该文件无法打开</string>
+    <string name="no_recent_file">您最近未打开任何文件</string>
+    <string name="no_file">该文件夹里没有任何文件</string>
+    <string name="no_space">上传空间已达10M, 无法继续上传</string>
+    <string name="need_grant">使用功能前你需要授予权限</string>
+    <string name="shortcut_create_suc">快捷方式 %s 已创建</string>
+    <string name="save_amp_push"><![CDATA[保存 & 上传]]></string>
+    <string name="my_space_empty">我的空间 (— / 100 文件)</string>
+    <string name="my_space">我的空间 (%d / 100 文件)</string>
+    <string name="login_error">登录失败</string>
+    <string name="file_downloaded">文件已下载</string>
+    <string name="override_hint">覆写本地文件?</string>
+    <string name="app_noti">应用消息推送</string>
+    <string name="log_noti">Log消息推送</string>
+    <string name="lout">退出吗?</string>
+    <string name="delete_suc">删除文件成功</string>
+    <string name="delete_remote_suc">删除远程文件成功</string>
+    <string name="override_fail_hint">覆写失败, 请稍后重试</string>
+    <string name="not_support_type_hint">现在还不支持上传该类型文件</string>
+    <string name="mkdir_fail">创建文件夹失败</string>
+    <string name="cloud_empty_hint">你还未上传任何文件</string>
+    <string name="login_now">现在登录</string>
+    <string name="upload_login_hint">上传文件前需要登录</string>
+    <string name="need_login">登录</string>
+    <string name="share_empty_hint">分享前请先保存</string>
+    <string name="initial">初始化</string>
+    <string name="null_comment_hint">没有评论内容…</string>
+    <string name="title_untitled">未命名</string>
+    <string name="sofa_hint">抢个沙发吗?</string>
+    <string name="nothing_here_yet">这里还没有东西.. :(</string>
+    <string name="my_program">我的程序</string>
+    <string name="upload_fail">上传代码失败</string>
+    <string name="upload_suc">上传代码成功</string>
+    <string name="lost_google_hint">无法连接Google服务器, 请检查您的网络</string>
+    <string name="grant_storage_hint">进行该操作前您需要授予存储权限</string>
+    <string name="me">我的</string>
+    <string name="log_out">退出登录</string>
+    <string name="auth_failed">认证失败</string>
+    <string name="login"><u>登录</u></string>
+    <string name="welcome_s">欢迎, <![CDATA[<font color="#4BAC07"><u>%s</u></font>]]></string>
+    <string name="enter_snippet">输入片段名</string>
+    <string name="too_long_hint">输入文字过长</string>
+    <string name="description">描述</string>
+    <string name="gist_title">片段标题</string>
+    <string name="snippet">片段</string>
+    <string name="my_share">我的GIST</string>
+    <string name="my_scripts">我的代码</string>
+    <string name="copy_hint">使用编辑器打开该段代码</string>
+    <string name="newest_course">最新</string>
+    <string name="recommend">推荐</string>
+    <string name="lost_connect">失去连接</string>
+    <string name="no_im_good">不用了</string>
+    <string name="toast_folder_exist">操作失败, 请重新命名</string>
+    <string name="snippet_exist">该片段已存在, 请重新命名</string>
+    <string name="new_file">新文件</string>
+    <string name="feedback_email_subject">反馈 - QPython</string>
+    <string name="toast_intent_invalid_uri">无法打开该文件, URI无效</string>
+    <string name="toast_intent_illegal">无法打开该文件</string>
+    <string name="toast_save_success">文件已保存</string>
+    <string name="share_body">Share the body</string>
+
+    <string name="by_signing_in_you_agree_to_out_privacy_policy_term_of_service"><![CDATA[登录即表示您同意我们的<font color="#4BAC07">隐私政策和服务条款</font>]]></string>
+    <string name="about_the_author">作者简介</string>
+    <string name="course_content">课程内容</string>
+    <string name="show">展开</string>
+    <string name="course_introduction">课程简介</string>
+    <string name="my">我的</string>
+    <string name="support">支持</string>
+    <string name="crowdfunding">众筹中%d%%</string>
+    <string name="hide">收起</string>
+    <string name="support_count">已有%s人支持</string>
+    <string name="free">学习</string>
+    <string name="free_plan">套餐类型: 免费(10M Max)</string>
+    <string name="author">作者</string>
+    <string name="from_content">评论&amp;提问</string>
+    <string name="other">其他</string>
+    <string name="featured">推荐</string>
+    <string name="explore_course">探索更多课程</string>
+    <string name="database">数据库</string>
+    <string name="basics">基础</string>
+    <string name="funding">众筹</string>
+    <string name="explanation">众筹说明：\n\n\u0020\u0020欢迎参与QPython精品课程众筹，QPython通过众筹能鼓励优质原创的Python教材内容产生，方便您的学习。</string>
+    <string name="explanation_more">\u0020\u0020超100人完成众筹，作者会在1星期之内推出精品初级学习课程；超500人完成众筹，作者会在2个星期之内推出中级学习课程；超过2000人完成众筹，作者会在3个星期内推出高级学习课程。\n\n\u0020\u0020不同阶段众筹所需要的费用是不一样的，在前100人的初级阶段，您只需要 %1$s，中级阶段，您就需要 %2$s，在高级阶段，您需要 %3$s，众筹完成后如果你想参与学习，您需要支付至少 %4$s。\n\n\u0020\u0020您可以在任何一阶段参与众筹，之后您就有权利参与对应课程的学习。您可以阅读学习材料，练习编程，分享程序以及获得更多有趣的学习体验。如果你感兴趣这门课程，欢迎尽快参与。</string>
+    <string name="support_explanation">您的赞赏是我们持续写出好教材的驱动力</string>
+    <string name="rmb">¥ %s </string>
+    <string name="thank">致谢</string>
+    <string name="notebook_installed">启动QPyNotebook服务后，你可以从文件中打开后缀为.ipynb的文件了</string>
+    <string name="jupyter_not_release">请先安装并运行Jupyter</string>
+    <string name="jupyter_not_support">Jupyter暂时未支持Python 3</string>
+    <string name="aipy_install">安装AIPY</string>
+    <string name="aipy_installed">AIPY已安装</string>
+    <string name="install_aipy">启用AIPY</string>
+    <string name="install_notebook">安装 QPyNotebook</string>
+    <string name="support_us">支持我们</string>
+    <string name="start">开始</string>
+    <string name="buy_course">购买课程</string>
+    <string name="start_learn">开始学习</string>
+    <string name="entertainment">娱乐</string>
+    <string name="ennable_notebook_first">请先在设置中启用QPyNotebook</string>
+    <string name="funny">有趣</string>
+    <string name="c_funding">众筹中</string>
+    <string name="back_course">众筹该课程</string>
+    <string name="dialog_alert">提示</string>
+    <string name="conn_error">无法连接服务器</string>
+    <string name="jupyter_not_install"><![CDATA[请<font color="#4BAC07">安装基础库</font> ]]></string>
+    <string name="elementary">初级课程</string>
+    <string name="intermediate">中级课程</string>
+    <string name="advanced">高级课程</string>
+    <string name="goto_setting">去设置</string>
+    <string name="switch_py3_hint">编译器目前正在使用的是Python2, 是否切换成Python 3?</string>
+    <string name="browser">浏览器</string>
+    <string name="retry_hint">请重试</string>
+    <string name="unzip_pac_fail">解压失败</string>
+    <string name="open_py3">打开Python 3应用</string>
+    <string name="open_py3_hint">请先打开QPY3应用释放相关资源</string>
+    <string name="release_error">资源未释放</string>
+    <string name="open_app_market">从应用商店安装</string>
+    <string name="install_py3_hint">确认下载 Python 3 资源?</string>
+    <string name="py3_not_install">Python 3未安装</string>
+    <string name="pip_no_net">当前无网络, 无法打开pip</string>
+    <string name="no_google">无法连接Google</string>
+    <string name="history_emp">历史记录为空</string>
+    <string name="enter_history">历史记录</string>
+    <string name="switch_py3">切换到Python 3</string>
+    <string name="switch_py2">切换到Python 2</string>
+    <string name="update_py3"><![CDATA[安装 或 升级 Python 3 资源]]></string>
+
+    <string name="py3_now">目前使用Python 3</string>
+    <string name="py2_now">目前使用Python 2</string>
+    <string name="install_py3">安装Python 3</string>
+    <string name="file_new">文件</string>
+    <string name="run">运行</string>
+    <string name="install_kivy_first">请先从QPYPI中安装kivy库</string>
+    <string name="get_help">获得帮助</string>
+
+</resources>
diff --git a/qpython/src/main/res/values-zh-rCN/toasts.xml b/qpython/src/main/res/values-zh-rCN/toasts.xml
new file mode 100644
index 00000000..b4aa336d
--- /dev/null
+++ b/qpython/src/main/res/values-zh-rCN/toasts.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="toast_recent_files_invalid">文件不存在</string>
+    <string name="toast_recent_files_deleted">文件已经从最近编辑中移除</string>
+</resources>
\ No newline at end of file
diff --git a/qpython/src/main/res/values-zh-rTW/strings.xml b/qpython/src/main/res/values-zh-rTW/strings.xml
new file mode 100644
index 00000000..6677a532
--- /dev/null
+++ b/qpython/src/main/res/values-zh-rTW/strings.xml
@@ -0,0 +1,295 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Titles -->
+    <string name="title_editor">%1$s</string>
+    <string name="title_editor_dirty">%1$s *</string>
+    <string name="title_editor_readonly">[%1$s]</string>
+    <string name="title_settings">設置</string>
+    <!-- Config screen strings -->
+    <string name="config_cat_display">顯示</string>
+    <string name="config_title_line_numbers">顯示行號</string>
+    <string name="config_title_word_wrap">自動換行</string>
+    <string name="config_title_font">更改文本字體</string>
+    <string name="config_title_text_size">文字大小</string>
+    <string name="config_title_color_theme">顏色主題</string>
+    <string name="config_title_scroll_fling">快速滾動</string>
+    <string name="config_summary_line_numbers">在左側顯示的行號</string>
+    <string name="config_summary_word_wrap">如果某行對於屏幕太寬時，自動換行</string>
+    <string name="config_summary_scroll_fling">如果有性能問題，不要選中</string>
+    <!-- Options Menu in QEdit -->
+    <!-- Misc UI strings -->
+    <string name="ui_save_text">“你想保存文檔？\n任何未保存更改將丟失。”</string>
+    <string name="ui_save">保存</string>
+    <string name="ui_delete">刪除</string>
+    <string name="ui_no_save">不保存</string>
+    <string name="ui_cancel">取消</string>
+    <string namfe="ui_hint_file_name">文件名</string>
+    <string name="ui_hint_search">搜索</string>
+    <string name="ui_history">歷史</string>
+    <string name="ui_force_read_only">打開為只讀</string>
+    <string name="about_content">QEdit 是一個文本編輯器，針對Android平板電腦和手機，除了文本編輯，它可以使安卓上的Python/HTML 開發更方便和有趣。 </string>
+    <!-- Misc Strings -->
+    <string name="lorem_ipsum">“QEdit 是一個偉大的腳本編輯器”</string>
+    <string name="file_exists">文件已存在，請重命名</string>
+    <string name="video_src">視頻{0}</string>
+    <string name="play_video">播放</string>
+    <string name="no_videos_found">沒有發現影片在本頁面</string>
+    <string name="pls_install_a8_play">請首先安裝A8視頻播放器</string>
+    <string name="download_as">下載並保存為</string>
+    <string name="info_browser">QBrowser</string>
+    <!-- added by kyle -->
+    <string name="share">分享</string>
+    <string name="save_as_snippets">另存為片段</string>
+    <string name="info_snippets">片段</string>
+    <string name="save_as_snippets_1">片段已另存為： </string>
+    <string name="fail_to_insert">無法插入片段</string>
+    <string name="fail_to_goto">請輸入正確的號碼</string>
+    <string name="max_lines_num_with_syntax_title">自動高亮</string>
+    <string name="max_lines_num_with_syntax_summary">自動突出顯示，如果行數少於%s</string>
+    <string name="qedit_not_support">QEdit 僅僅支持預覽或執行以下類型的文件\n.py，.SH，.lua，html，.md。 </string>
+    <string name="pls_install_lua">請安裝QLua 運行LUA 腳本</string>
+    <string name="pls_install_qpy">請安裝QPython 運行python 腳本</string>
+    <string name="ui_ok">OK</string>
+    <string name="ui_contact_title">聯繫</string>
+    <string name="ui_licence_title">授權</string>
+    <string name="ui_mail">support@quseit.com</string>
+    <string name="ui_choose_mail">打開郵件… </string>
+    <string name="ui_market_url">http://quseit.com"</string>
+    <string name="ui_market_app_url">"https://play.google.com/store/apps/details?id=%s"</string>
+    <string name="ui_market">“看看我們的其他應用程序”</string>
+    <string name="ui_app_rating">“評價我們的應用程序\n留下您的反饋”</string>
+    <string name="ui_feedback">“請隨時聯繫我們不管是反饋，功能要求或錯誤報告等。”</string>
+    <string name="ui_licence_content">“本軟件提供“原樣”,無任何明示或暗示的保證。不管在任何情況下，筆者應該對因使用本軟件所引起的任何損失負責。”</string>
+    <string name="ui_art_licence_title">設計授權</string>
+    <string name="ui_art_licence_content">“創建所有的圖標為這個應用程序，並屬於該應用程序的作者： QPython."</string>
+    <string name="ui_whats_new">“有什麼新聞？”</string>
+    <string name="addshortcut_arguments_label">添加到字典</string>
+    <string name="alt_sends_esc">Ale 鍵發送 ESC</string>
+    <string name="alt_sends_esc_summary_off">關閉Alt 鍵發送 ESC</string>
+    <string name="alt_sends_esc_summary_on">使用Alt 鍵發送ESC</string>
+    <string name="application_terminal">終端模擬器</string>
+    <string name="choose_ttf">選擇字體文件(.ttf)</string>
+    <string name="close_window">關閉終端</string>
+    <string name="use_keyboard_shortcuts_summary_off">禁用鍵盤快捷鍵</string>
+    <string name="toggle_soft_keyboard">打開/關閉軟鍵盤</string>
+    <string name="toast_plugin_uninstall_complete">插件刪除成功</string>
+    <string name="toast_plugin_install_failure">插件安裝失敗</string>
+    <string name="toast_plugin_install_complete">插件安裝完成</string>
+    <string name="title_verify_path_preference">驗證PATH路徑</string>
+    <string name="title_utf8_by_default_preference">默認 UTF-8</string>
+    <string name="title_termtype_preference">終端類型</string>
+    <string name="title_statusbar_preference">狀態欄</string>
+    <string name="title_shell_preference">命令行</string>
+    <string name="title_select_plugin">選擇插件</string>
+    <string name="title_plugin_manage">插件管理</string>
+    <string name="title_orientation_preference">屏幕方位</string>
+    <string name="title_mouse_tracking_preference">發送鼠標事件</string>
+    <string name="title_initialcommand_preference">初始命令</string>
+    <string name="title_ime_preference">輸入方式</string>
+    <string name="title_home_path_preference">HOME 文件夾</string>
+    <string name="title_fontsize_preference">文本大小</string>
+    <string name="title_fnkey_preference">Fn 鍵</string>
+    <string name="title_do_path_extensions_preference">允許PATH後擴</string>
+    <string name="title_controlkey_preference">Ctrl 鍵</string>
+    <string name="title_color_preference">顏色</string>
+    <string name="title_close_window_on_process_exit_preference">退出時關閉終端</string>
+    <string name="title_backaction_preference">返回鍵行爲</string>
+    <string name="title_allow_prepend_path_preference">允許PATH前置</string>
+    <string name="title_actionbar_preference">操作欄</string>
+    <string name="text_preferences">文本</string>
+    <string name="terminal">終端</string>
+    <string name="summary_verify_path_preference">是否將PATH中無效d路徑清除</string>
+    <string name="summary_utf8_by_default_preference">是否將UTF-8模式設爲默認</string>
+    <string name="summary_termtype_preference">設置 Shell 的終端類型</string>
+    <string name="summary_statusbar_preference">顯示/隱藏狀態欄</string>
+    <string name="summary_shell_preference">指定命令行使用的 Shell</string>
+    <string name="summary_orientation_preference">選擇屏幕方位行爲</string>
+    <string name="read_only">只讀模式</string>
+    <string name="file">文件</string>
+    <string name="yes">是</string>
+    <string name="no">否</string>
+    <string name="ok">確定</string>
+    <string name="close">關閉</string>
+    <string name="no_change">沒有任何改變</string>
+    <string name="feedback">意見反饋</string>
+    <string name="about">關於</string>
+    <string name="file_not_exists">文件不存在</string>
+    m
+    <string name="enable_root">啟用Root權限</string>
+    <string name="send">發送</string>
+    <string name="no_camera">沒有發現可用的攝像頭，請查看是否開啟攝像頭權限</string>
+    <string name="no_storage">沒有文件讀取權限</string>
+
+
+    <string name="pref_initialcommand_default_qpython">python</string>
+    <string name="qpy_app">QPY</string>
+    <string name="local_app">本機應用</string>
+    <string name="root_mode">Root模式</string>
+    <string name="star_it">點評</string>
+    <string name="disable_root">已禁用</string>
+    <string name="http_qpypi_qpython_org">https://pypi.python.org/simple/</string>
+    <string name="add">添加</string>
+    <string name="sl4a_running">SL4A服務運行中</string>
+    <string name="service_toggle">服務開關</string>
+    <string name="qpy_description">QPython is a script engine running on android devices like phone or tablet.QPython is a script engine running on android devices like phone or tablet.</string>
+    <string name="warning">警告</string>
+    <string name="reset_warning">重置空間將刪除所有在/qpython下的文件,包括您新建的文件,確定重置嗎?</string>
+    <string name="downloading">庫文件</string>
+    <string name="save">保存</string>
+    <string name="save_as">另存為</string>
+    <string name="open">打開</string>
+    <string name="file_name">File Name</string>
+    <string name="empty_file">空白文件</string>
+    <string name="confirm">確定</string>
+    <string name="cancel">取消</string>
+    <string name="new_project">新建項目</string>
+    <string name="error_dont_kn">發生了某些錯誤</string>
+    <string name="project_name">項目名</string>
+    <string name="jump_to">轉至某行</string>
+    <string name="explorer">文件夾</string>
+    <string name="new_script">新建腳本</string>
+    <string name="enter_name_hint">請輸入文件名</string>
+
+    <string name="paste">粘貼</string>
+    <string name="download_fail">下載失敗</string>
+    <string name="activity_shortcut_create">終端快捷方式</string>
+    <string name="activity_term_here_title">在此處運行終端</string>
+    <string name="addshortcut_button_find_command">查找命令</string>
+    <string name="addshortcut_button_text_icon">文字圖標</string>
+    <string name="addshortcut_command_hint">命令</string>
+    <string name="addshortcut_example_hint">--示例=\"\"a\"</string>
+    <string name="addshortcut_make_text_icon">製作文字圖標</string>
+    <string name="addshortcut_navigator_title">選擇快捷方式文件</string>
+    <string name="addshortcut_shortcut_label">快捷方式標籤</string>
+    <string name="addshortcut_title">終端快捷方式</string>
+    <string name="colorvalue_icon_text_entry_hint">輸入標籤文字</string>
+    <string name="colorvalue_label_lock_button_column">鎖</string>
+    <string name="control_key_dialog_control_disabled_text">Crtl 鍵未設置</string>
+    <string name="control_key_dialog_fn_disabled_text">Fn 鍵未設置</string>
+    <string name="control_key_dialog_title">Ctrl 和 Fn 鍵</string>
+    <string name="copy_all">複製全部</string>
+    <string name="dialog_plugin_detail_positive">確定</string>
+    <string name="dialog_title_actionbar_preference">操作欄行爲</string>
+    <string name="dialog_title_backaction_preference">返回鍵行爲</string>
+    <string name="dialog_title_color_preference">文字顏色</string>
+    <string name="dialog_title_controlkey_preference">Ctrl 鍵</string>
+    <string name="dialog_title_fnkey_preference">Fn 鍵</string>
+    <string name="dialog_title_fontsize_preference">文字大小</string>
+    <string name="dialog_title_ime_preference">輸入方式</string>
+    <string name="dialog_title_initialcommand_preference">初始化命令</string>
+    <string name="dialog_title_orientation_preference">屏幕方向事件</string>
+    <string name="dialog_title_project">項目</string>
+    <string name="dialog_title_script">腳本</string>
+    <string name="dialog_title_shell_preference">Shell</string>
+    <string name="dialog_title_statusbar_preference">狀態欄</string>
+    <string name="dialog_title_termtype_preference">終端類型</string>
+    <string name="disable_wakelock">禁用弱鎖</string>
+    <string name="disable_wifilock">禁用Wifi 鎖</string>
+    <string name="edit_text">編輯文字</string>
+    <string name="editor">編輯器</string>
+    <string name="email_transcript_chooser_title">反饋 ...</string>
+    <string name="email_transcript_no_email_activity_found">找不到郵件實例發送</string>
+    <string name="email_transcript_subject">複製終端</string>
+    <string name="enable_wakelock">啓用Root模式</string>
+    <string name="enable_wifilock">啓用Wifi 鎖</string>
+    <string name="fsnavigator_change_theme">選擇主題</string>
+    <string name="fsnavigator_no_external_storage">內存無法訪問</string>
+    <string name="fsnavigator_optional_enter_path">或在此輸入mPath</string>
+    <string name="fsnavigator_title">文件選擇器</string>
+    <string name="ftp_server">FTP服務</string>
+    <string name="help">幫助</string>
+    <string name="help_url">http://jackpal.github.com/Android-Terminal-Emulator/help/index.html</string>
+    <string name="internal_space"><![CDATA[許可權 & 存儲]]></string>
+    <string name="keyboard_preferences">鍵盤</string>
+    <string name="location">位置</string>
+    <string name="more">更多</string>
+    <string name="new_window">打開新終端</string>
+    <string name="already_newest">當前已是最新版本</string>
+    <string name="extra_pypi">設置PYPI</string>
+
+    <string name="checking_update">檢查更新</string>
+    <string name="confirm_window_close_message">確定要關閉終端嗎？</string>
+    <string name="convert_fail">轉換失敗</string>
+    <string name="course">課程</string>
+    <string name="date_format">[ %s ]</string>
+    <string name="delete_fail">刪除失敗</string>
+    <string name="delete_file_hint">確定要刪除該文件嗎？</string>
+    <string name="dir_not_valid">該目錄不可用</string>
+    <string name="download_apk">下載最新安裝包</string>
+    <string name="download_apk_hint">下載可能會消耗運營商流量，確認下載嗎？</string>
+    <string name="downloading_new_apk">下載新的包</string>
+    <string name="fail_open_file">無法打開，該文件不存在</string>
+    <string name="featured_courses">課程中心</string>
+    <string name="folder_name">文件夾名</string>
+    <string name="get_setting_data_fail">獲取設置信息失敗</string>
+    <string name="key_about">關於</string>
+    <string name="key_ftp_pwd">密碼</string>
+    <string name="key_ftp_state">運行狀態</string>
+    <string name="key_port_num">端口號</string>
+    <string name="key_reset">重置內存空間</string>
+    <string name="key_root_dir">根目錄</string>
+    <string name="key_show_pwd">顯示密碼</string>
+    <string name="key_stay_awake">保持喚醒</string>
+    <string name="key_username">用戶名</string>
+    <string name="new_folder">新建文件夾</string>
+    <string name="not_root_yet">該設備未進入Root模式</string>
+    <string name="open_gl2_is_not_supported">當前設備不支持OpenGL2</string>
+    <string name="plugin_detail">詳情</string>
+    <string name="plugin_install">安裝</string>
+    <string name="plugin_uninstall">卸載</string>
+    <string name="plugin_update">更新</string>
+    <string name="pref_termtype_default">屏幕</string>
+    <string name="process_exit_message">會話已結束</string>
+    <string name="programs">程序</string>
+    <string name="project">項目</string>
+    <string name="recent">最近</string>
+    <string name="rename">重命名</string>
+    <string name="rename_fail">重命名失敗</string>
+    <string name="reset">重置Terminal</string>
+    <string name="reset_toast_notification">當前狀態將被重置</string>
+    <string name="run_bg_title">在後臺運行</string>
+    <string name="run_dirty_hint">保存當前修改嗎？</string>
+    <string name="runtime_log">運行日誌 : %s</string>
+    <string name="log_title">運行日誌</string>
+
+    <string name="scan">二維碼</string>
+    <string name="read_script_from_qrcode">從二維碼中讀取代碼</string>
+
+    <string name="screen_preferences">屏幕</string>
+    <string name="script">腳本</string>
+    <string name="select_text">選擇文字</string>
+    <string name="send_email">發送郵件至…</string>
+    <string name="setting">設置</string>
+    <string name="sl4a_server">SL4A服務</string>
+    <string name="sl4a_un_running">SL4A服務未啓動</string>
+    <string name="special_keys">特殊鍵</string>
+    <string name="task">Task</string>
+    <string name="title_use_keyboard_shortcuts">使用鍵盤快捷鍵</string>
+    <string name="unable_extract">解壓python文件失敗，可能影響部分功能使用</string>
+    <string name="untitled_folder">未命名文件夾</string>
+    <string name="window_list">終端列表</string>
+    <string name="window_title">終端 %1$d</string>
+    <string name="file_exist_hint">文件已存在，請重命名</string>
+    <string name="community">社區</string>
+    <string name="terminal_bg_hint">在後臺運行此控制臺？</string>
+    <string name="preferences">偏好</string>
+    <string name="crowdfunding">衆籌中%d%%</string>
+    <string name="support">支持</string>
+    <string name="my">我的</string>
+    <string name="course_introduction">課程簡介</string>
+    <string name="show">展開</string>
+    <string name="course_content">課程內容</string>
+    <string name="elementary">初級課程</string>
+    <string name="intermediate">中級課程</string>
+    <string name="advanced">高級課程</string>
+    <string name="about_the_author">作者簡介</string>
+    <string name="support_count">已有%s人支持</string>
+    <string name="free">學習</string>
+    <string name="hide">收起</string>
+    <string name="author">作者</string>
+    <string name="from_content">評論&amp;提問</string>
+    <string name="funding">衆籌</string>
+    <string name="c_funding">衆籌中</string>
+    <string name="get_help">獲得幫助</string>
+
+</resources>
\ No newline at end of file
diff --git a/qpython/src/main/res/values-zh-rTW/toasts.xml b/qpython/src/main/res/values-zh-rTW/toasts.xml
new file mode 100644
index 00000000..f937668a
--- /dev/null
+++ b/qpython/src/main/res/values-zh-rTW/toasts.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="toast_recent_files_invalid">文件不存在</string>
+<string name="toast_recent_files_deleted">文件已經從最近編輯中移除</string>
+</resources>
diff --git a/qpython/src/main/res/values/arrays.xml b/qpython/src/main/res/values/arrays.xml
new file mode 100644
index 00000000..c24b108a
--- /dev/null
+++ b/qpython/src/main/res/values/arrays.xml
@@ -0,0 +1,313 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ -->
+
+<resources>
+    <string-array name="entries_statusbar_preference">
+        <item>Show Status bar</item>
+        <item>Hide Status bar</item>
+    </string-array>
+
+    <string-array name="entries_actionbar_preference">
+        <!-- <item>Action bar disabled</item> -->
+        <item>Show Action Bar</item>
+        <item>Hide Action Bar(Click screen top or menu button to reshow)</item>
+    </string-array>
+
+    <string-array name="entries_orientation_preference">
+        <item>Automate</item>
+        <item>Horizontal</item>
+        <item>Vertical</item>
+    </string-array>
+
+    <string-array name="entries_fontsize_preference">
+        <item>4 x 8 Pixel</item>
+        <item>6 point type</item>
+        <item>7 point type</item>
+        <item>8 point type</item>
+        <item>9 point type</item>
+        <item>10 point type</item>
+        <item>12 point type</item>
+        <item>14 point type</item>
+        <item>16 point type</item>
+        <item>20 point type</item>
+        <item>24 point type</item>
+        <item>28 point type</item>
+        <item>32 point type</item>
+        <item>36 point type</item>
+        <item>42 point type</item>
+        <item>48 point type</item>
+        <item>64 point type</item>
+        <item>72 point type</item>
+        <item>96 point type</item>
+        <item>144 point type</item>
+        <item>288 point type</item>
+    </string-array>
+
+    <string-array name="entries_color_preference">
+        <item>Black character on white background</item>
+        <item>White character on black background</item>
+        <item>White character on blue background</item>
+        <item>Green character on black background</item>
+        <item>Yellow character on black background</item>
+        <item>Red character on black background</item>
+        <item>Holo style</item>
+        <item>over-exposed</item>
+        <item>lack-exposed</item>
+        <item>Linux style</item>
+    </string-array>
+
+    <string-array name="entries_backaction_preference">
+        <item>Close all windows</item>
+        <item>Close current window</item>
+        <item>Close current window,but keep running sessions</item>
+        <item>Send ESC to Terminal</item>
+        <item>Send TAB to Terminal</item>
+    </string-array>
+
+    <string-array name="entries_controlkey_preference">
+        <item>Ball</item>
+        <item>\@</item>
+        <item>Left-Alt</item>
+        <item>Right-Alt</item>
+        <item>Vol-Up</item>
+        <item>Vol-Dn</item>
+        <item>Camera</item>
+        <item>None</item>
+    </string-array>
+
+    <string-array name="entries_fnkey_preference">
+        <item>Ball</item>
+        <item>\@</item>
+        <item>Left-Alt</item>
+        <item>Right-Alt</item>
+        <item>Vol-Up</item>
+        <item>Vol-Dn</item>
+        <item>Camera</item>
+        <item>None</item>
+    </string-array>
+
+    <string-array name="entries_ime_preference">
+        <item>Character</item>
+        <item>Word</item>
+    </string-array>
+
+
+    <!-- These are the 'short' names for the control keys. They are used in the special keys dialog. -->
+    <string-array name="control_keys_short_names">
+        <item>Ball</item>
+        <item>\@</item>
+        <item>Left-Alt</item>
+        <item>Right-Alt</item>
+        <item>Vol-Up</item>
+        <item>Vol-Dn</item>
+        <item>Camera</item>
+        <item>None</item>
+    </string-array>
+
+    <!-- These are the 'short' names for the Fn keys. They are used in the special keys dialog. -->
+    <string-array name="fn_keys_short_names">
+        <item>Ball</item>
+        <item>\@</item>
+        <item>Left-Alt</item>
+        <item>Right-Alt</item>
+        <item>Vol-Up</item>
+        <item>Vol-Dn</item>
+        <item>Camera</item>
+        <item>None</item>
+    </string-array>
+
+
+    <!-- Color themes -->
+
+
+    <string-array name="color_theme_names">
+        <item>Classic</item>
+        <item>Negative</item>
+        <item>Matrix</item>
+        <item>Sky</item>
+        <item>Dracula</item>
+    </string-array>
+    <string-array name="color_theme_values">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+    </string-array>
+
+    <!-- Text size -->
+    <string-array name="text_size_names">
+        <item>6 pt</item>
+        <item>8 pt</item>
+        <item>10 pt</item>
+        <item>12 pt</item>
+        <item>14 pt</item>
+        <item>16 pt</item>
+        <item>18 pt</item>
+        <item>24 pt</item>
+        <item>32 pt</item>
+        <item>48 pt</item>
+    </string-array>
+    <string-array name="text_size_values">
+        <item>6</item>
+        <item>8</item>
+        <item>10</item>
+        <item>12</item>
+        <item>14</item>
+        <item>16</item>
+        <item>18</item>
+        <item>24</item>
+        <item>32</item>
+        <item>48</item>
+    </string-array>
+
+    <!-- End of lines -->
+
+    <!-- Recent files -->
+
+    <!-- Recent files -->
+
+    <!-- Encoding -->
+
+    <string-array name="max_lines_num_with_syntax_values">
+        <item>100</item>
+        <item>300</item>
+        <item>600</item>
+        <item>1000</item>
+        <item>2000</item>
+    </string-array>
+
+    <string-array name="sku" translatable="false">
+        <item>course_0.99</item>
+        <item>course_1.99</item>
+        <item>course_2.99</item>
+        <item>course_3.99</item>
+        <item>course_4.99</item>
+    </string-array>
+
+    <string-array name="crowdfunding">
+        <item>crowdfunding_5.99</item>
+        <item>crowdfunding_7.99</item>
+        <item>crowdfunding_9.99</item>
+        <item>crowdfunding15.99</item>
+    </string-array>
+
+    <string-array name="support_file_ext" translatable="false">
+        <item>py</item>
+        <item>txt</item>
+        <item>kv</item>
+        <item>html</item>
+        <item>htm</item>
+        <item>js</item>
+        <item>css</item>
+        <item>less</item>
+        <item>vue</item>
+        <item>ini</item>
+        <item>md</item>
+        <item>pyx</item>
+        <item>png</item>
+        <item>jpg</item>
+        <item>ipynb</item>
+    </string-array>
+
+    <string-array name="text_ext" translatable="false">
+        <item>py</item>
+        <item>txt</item>
+        <item>kv</item>
+        <item>html</item>
+        <item>htm</item>
+        <item>js</item>
+        <item>css</item>
+        <item>md</item>
+        <item>pyx</item>
+        <item>log</item>
+        <item>c</item>
+        <item>h</item>
+
+    </string-array>
+
+    <string-array name="syntax_ext" translatable="false">
+        <item>css</item>
+        <item>html</item>
+        <item>htm</item>
+        <item>js</item>
+        <item>json</item>
+        <item>py</item>
+        <item>xml</item>
+        <item>log</item>
+        <item>kv</item>
+        <item>pyx</item>
+        <item>pxd</item>
+    </string-array>
+
+    <string-array name="qpy2compatible_zip" translatable="false">
+        <item>private21.mp3</item>
+        <item>private22.mp3</item>
+        <item>private23.mp3</item>
+    </string-array>
+
+
+    <string-array name="qpy3_zip" translatable="false">
+        <item>private31.mp3</item>
+        <item>private32.mp3</item>
+        <item>private33.mp3</item>
+    </string-array>
+
+    <string-array name="funding_count_divider" translatable="false">
+        <item>100</item>
+        <item>500</item>
+        <item>2000</item>
+    </string-array>
+
+    <string-array name="funding_price">
+        <item>5.99</item>
+        <item>7.99</item>
+        <item>9.99</item>
+        <item>15.99</item>
+    </string-array>
+
+     <!--CN Only-->
+    <string-array name="wechat_funding_price">
+        <item>36</item>
+        <item>48</item>
+        <item>60</item>
+        <item>96</item>
+    </string-array>
+
+    <string-array name="funding_stage">
+        <item>Elementary</item>
+        <item>Intermediate</item>
+        <item>Advanced</item>
+    </string-array>
+
+    <string-array name="time_label">
+        <item> month ago</item>
+        <item> days ago</item>
+        <item> hours ago</item>
+        <item> minutes ago</item>
+        <item> secs ago</item>
+    </string-array>
+
+
+    <string-array name="switch_py_inters_val">
+        <item>0</item>
+        <item>1</item>
+    </string-array>
+    <string-array name="switch_py_inters">
+        <item>Switch to Python 3</item>
+        <item>Switch to Python 2</item>
+    </string-array>
+</resources>
\ No newline at end of file
diff --git a/qpython/src/main/res/values/arraysNoLocalize.xml b/qpython/src/main/res/values/arraysNoLocalize.xml
new file mode 100644
index 00000000..6ffc5cdb
--- /dev/null
+++ b/qpython/src/main/res/values/arraysNoLocalize.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ -->
+
+<!-- Don't localize this file -->
+
+<resources>
+    <string-array name="entryvalues_statusbar_preference">
+        <item>1</item>
+        <item>0</item>
+    </string-array>
+
+    <string-array name="entryvalues_actionbar_preference">
+        <!-- <item>0</item> -->
+        <item>1</item>
+        <item>2</item>
+    </string-array>
+
+    <string-array name="entryvalues_orientation_preference">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+    </string-array>
+
+    <!-- Note: Must also modify the maximum allowed editor_preference value in TermSettings.readPrefs -->
+    <string-array name="entryvalues_fontsize_preference">
+        <item>0</item>
+        <item>6</item>
+        <item>7</item>
+        <item>8</item>
+        <item>9</item>
+        <item>10</item>
+        <item>12</item>
+        <item>14</item>
+        <item>16</item>
+        <item>20</item>
+        <item>24</item>
+        <item>28</item>
+        <item>32</item>
+        <item>36</item>
+        <item>42</item>
+        <item>48</item>
+        <item>64</item>
+        <item>72</item>
+        <item>96</item>
+        <item>144</item>
+        <item>288</item>
+    </string-array>
+
+    <string-array name="entryvalues_color_preference">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
+        <item>7</item>
+        <item>8</item>
+        <item>9</item>
+    </string-array>
+
+    <string-array name="entryvalues_backaction_preference">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+    </string-array>
+
+    <string-array name="entryvalues_controlkey_preference">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
+        <item>7</item>
+    </string-array>
+
+    <string-array name="entryvalues_fnkey_preference">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
+        <item>7</item>
+    </string-array>
+
+    <string-array name="entryvalues_ime_preference">
+        <item>0</item>
+        <item>1</item>
+    </string-array>
+
+    <string-array name="entries_termtype_preference">
+        <item>vt100</item>
+        <item>screen</item>
+        <item>linux</item>
+        <item>screen-256color</item>
+        <item>xterm</item>
+    </string-array>
+</resources>
diff --git a/qpython/src/main/res/values/attrs.xml b/qpython/src/main/res/values/attrs.xml
new file mode 100644
index 00000000..89100483
--- /dev/null
+++ b/qpython/src/main/res/values/attrs.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <declare-styleable name="PagerSlidingTabStrip">
+        <attr name="pstsIndicatorColor" format="color"/>
+        <attr name="pstsUnderlineColor" format="color"/>
+        <attr name="pstsDividerColor" format="color"/>
+        <attr name="pstsIndicatorHeight" format="dimension"/>
+        <attr name="pstsUnderlineHeight" format="dimension"/>
+        <attr name="pstsDividerPadding" format="dimension"/>
+        <attr name="pstsTabPaddingLeftRight" format="dimension"/>
+        <attr name="pstsScrollOffset" format="dimension"/>
+        <attr name="pstsTabBackground" format="reference"/>
+        <attr name="pstsShouldExpand" format="boolean"/>
+        <attr name="pstsTextAllCaps" format="boolean"/>
+    </declare-styleable>
+
+    <declare-styleable name="ToggleView">
+        <attr name="sb_shadow_radius" format="reference|dimension"/>
+        <attr name="sb_shadow_offset" format="reference|dimension"/>
+        <attr name="sb_shadow_color" format="reference|color"/>
+        <attr name="sb_uncheck_color" format="reference|color"/>
+        <attr name="sb_checked_color" format="reference|color"/>
+
+        <attr name="sb_border_width" format="reference|dimension"/>
+        <attr name="sb_checkline_color" format="reference|color"/>
+        <attr name="sb_checkline_width" format="reference|dimension"/>
+        <attr name="sb_uncheckcircle_color" format="reference|color"/>
+        <attr name="sb_uncheckcircle_width" format="reference|dimension"/>
+        <attr name="sb_uncheckcircle_radius" format="reference|dimension"/>
+
+        <attr name="sb_checked" format="reference|boolean"/>
+        <attr name="sb_shadow_effect" format="reference|boolean"/>
+        <attr name="sb_effect_duration" format="reference|integer"/>
+        <attr name="sb_button_color" format="reference|color"/>
+        <attr name="sb_show_indicator" format="reference|boolean"/>
+        <attr name="sb_background" format="reference|color"/>
+        <attr name="sb_enable_effect" format="reference|boolean"/>
+    </declare-styleable>
+
+    <declare-styleable name="ScheduleView">
+        <attr name="dot_count" format="reference|integer"/>
+        <attr name="light_color" format="reference|color"/>
+        <attr name="dim_color" format="reference|color"/>
+        <attr name="dot_radius" format="reference|dimension"/>
+        <attr name="line_width" format="reference|dimension"/>
+        <attr name="margin" format="reference|dimension"/>
+        <attr name="text_size" format="reference|dimension"/>
+    </declare-styleable>
+
+    <declare-styleable name="PercentView">
+        <attr name="pv_light_color" format="reference|color"/>
+        <attr name="pv_dim_color" format="reference|color"/>
+        <attr name="pv_width" format="reference|dimension"/>
+        <attr name="pv_text_size" format="reference|dimension"/>
+    </declare-styleable>
+
+    <declare-styleable name="expandableLayout">
+        <attr name="ael_duration" format="integer" />
+        <attr name="ael_expanded" format="boolean" />
+        <attr name="ael_defaultChildIndex" format="integer" />
+        <attr name="ael_defaultPosition" format="dimension" />
+        <attr name="ael_orientation" format="enum">
+            <enum name="horizontal" value="0" />
+            <enum name="vertical" value="1" />
+        </attr>
+        <attr name="ael_interpolator" format="enum">
+            <enum name="accelerateDecelerate" value="0" />
+            <enum name="accelerate" value="1" />
+            <enum name="anticipate" value="2" />
+            <enum name="anticipateOvershoot" value="3" />
+            <enum name="bounce" value="4" />
+            <enum name="decelerate" value="5" />
+            <enum name="fastOutLinearIn" value="6" />
+            <enum name="fastOutSlowIn" value="7" />
+            <enum name="linear" value="8" />
+            <enum name="linearOutSlowIn" value="9" />
+            <enum name="overshoot" value="10" />
+        </attr>
+    </declare-styleable>
+</resources>
\ No newline at end of file
diff --git a/qpython/src/main/res/values/colors.xml b/qpython/src/main/res/values/colors.xml
new file mode 100644
index 00000000..2516e6f8
--- /dev/null
+++ b/qpython/src/main/res/values/colors.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#FF4A4A4A</color>
+    <color name="colorPrimaryDark">#FF363636</color>
+    <color name="colorAccent">#FF4BAC07</color>
+    <color name="theme_yellow">#ECCD00</color>
+    <color name="theme_bg">#FF4A4A4A</color>
+    <color name="theme_gray">#c5c5c5</color>
+    <!--<color name="white">#ffffff</color>-->
+
+    <color name="error">#D2483D</color>
+    <color name="Color_White">#FFF</color>
+    <color name="ripple_normal">#CACCCB</color>
+    <color name="text_dark">#333333</color>
+
+
+    <color name="ripple_material_light">#40000000</color>
+
+    <color name="topbar">#1f1f1f</color>
+    <color name="divide_line">#FFE4E4E4</color>
+    <color name="link">#FF0066CC</color>
+    <!--<color name="divider">#fef8ec</color>-->
+
+    <color name="cmain3">#c8c800</color>
+
+    <color name="cmain8">#2eb3e4</color>
+
+    <color name="cwhite">#ffffff</color>
+    <color name="cwhite3">#fbfbfb</color>
+
+    <color name="cgrey6">#e8e8e8</color>
+    \
+
+    <color name="white">#ffffff</color>
+    <color name="black">#000000</color>
+</resources>
diff --git a/qpython/src/main/res/values/defaults.xml b/qpython/src/main/res/values/defaults.xml
new file mode 100644
index 00000000..fa95f180
--- /dev/null
+++ b/qpython/src/main/res/values/defaults.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Don't localize these default values -->
+    <string name="pref_statusbar_default" translatable="false">1</string>
+    <integer name="pref_actionbar_default">1</integer>
+    <integer name="pref_orientation_default">0</integer>
+    <string name="pref_cursorstyle_default" translatable="false">0</string>
+    <string name="pref_cursorblink_default" translatable="false">0</string>
+    <string name="pref_fontsize_default" translatable="false">14</string>
+    <string name="pref_color_default" translatable="false">1</string>
+    <bool name="pref_utf8_by_default_default">true</bool>
+    <string name="pref_backaction_default" translatable="false">2</string>
+    <string name="pref_controlkey_default" translatable="false">5</string>
+    <string name="pref_fnkey_default" translatable="false">4</string>
+    <string name="pref_ime_default" translatable="false">0</string>
+    <bool name="pref_alt_sends_esc_default">false</bool>
+    <string name="pref_shell_default" translatable="false">/system/bin/sh -</string>
+    <string name="pref_initialcommand_default" translatable="false"></string>
+    <string name="pref_termtype_default" >screen</string>
+    <bool name="pref_close_window_on_process_exit_default">true</bool>
+    <bool name="pref_verify_path_default">true</bool>
+    <bool name="pref_do_path_extensions_default">true</bool>
+    <bool name="pref_allow_prepend_path_default">true</bool>
+    <!-- the home_path default is set dynamically in Term.onResume() -->
+    <bool name="pref_mouse_tracking_default">false</bool>
+    <bool name="pref_use_keyboard_shortcuts_default">true</bool>
+</resources>
diff --git a/qpython/src/main/res/values/dimens.xml b/qpython/src/main/res/values/dimens.xml
new file mode 100644
index 00000000..54cc8de3
--- /dev/null
+++ b/qpython/src/main/res/values/dimens.xml
@@ -0,0 +1,21 @@
+<resources>
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
+
+
+    <dimen name="layout_padding">16dp</dimen>
+    <dimen name="icon_margin_top">5dp</dimen>
+    <!--<dimen name="default_margin">16dp</dimen>-->
+    <dimen name="icon_size">60dp</dimen>
+
+    
+    <dimen name="dialog_buttons_margin">16dp</dimen>
+
+    <dimen name="widget_margin">4dp</dimen>
+
+    <dimen name="list_item_height">45dp</dimen>
+    <dimen name="default_margin">16dp</dimen>
+    <dimen name="course_gap">6dp</dimen>
+    <dimen name="shortcut_height">45dp</dimen>
+</resources>
diff --git a/qpython/src/main/res/values/history.xml b/qpython/src/main/res/values/history.xml
new file mode 100644
index 00000000..0b4b4892
--- /dev/null
+++ b/qpython/src/main/res/values/history.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- EN -->
+    <!--  -->
+    <string name="release18" translatable="false">1.8 (10 nov 2012)</string>
+    <string name="release18_log" translatable="false">"- Bug fixed : current file / last loaded file
+- Updated notification system
+- Possibility to modify the text font used by the editor (You can use any ttf font located on your device's internal and/or external storage)"</string>
+
+    <!--  -->
+    <string name="release17" translatable="false">1.7 (16 july 2012)</string>
+    <string name="release17_log" translatable="false">"- Bug fixed : Save/Save As crash on some phone
+- Added option to disable autosave on existing files"</string>
+
+    <!--  -->
+    <string name="release16" translatable="false">1.6 (9 july 2012)</string>
+    <string name="release16_log" translatable="false">"- Added the Auto Save feature
+- fixed the bug with Search case "</string>
+
+    <!--  -->
+    <string name="release15" translatable="false">1.5 (21 june 2012)</string>
+    <string name="release15_log" translatable="false">"- Adapted for Ice Cream Sandwich
+- Improved the Undo option (bugs with suggestions) 
+- Added a Home Screen Widgets (shortcut to favorite files)
+- Added option to open a file by default when starting Ted
+- New Graphics (all made by myself ^^)"</string>
+
+    <!--  -->
+    <string name="release13" translatable="false">1.3 (5 may 2012)</string>
+    <string name="release13_log" translatable="false">"- Added an undo option (check the settings)
+- Added some performance tweaks"</string>
+
+    <!--  -->
+    <string name="release12" translatable="false">1.2 (18 apr. 2012)</string>
+    <string name="release12_log" translatable="false">"- Fixed the scroll bug since last update
+- fixed the fling options in the settings (option was always active)"</string>
+
+    <!--  -->
+    <string name="release11" translatable="false">1.1 (10 apr. 2012)</string>
+    <string name="release11_log" translatable="false">"- Fixed the crash at start caused by the last update
+- Added Fling to Scroll (launches the scroll to navigate in large files)
+- Display the active line
+- Added new color theme (ask for more if needed)"</string>
+    <string name="release1" translatable="false">1.0 (27 feb. 2012)</string>
+    <string name="release1_log" translatable="false">"- Brand new release version
+- Supports multiple encoding (including UTF-8)
+- Prevent data loss when saving really big files (note that Ted is not meant to open big files though)
+- Added new color theme (ask for more if needed)
+- Replaced the autosave with a warning and popup (prevent saving unwanted changes)"</string>
+    <string name="beta9" translatable="false">βetα 0.9 (7 jan. 2010)</string>
+    <string name="beta9_log" translatable="false">"- Bug fixed : severall crash on start
+- Added a search tool
+- Ted is listed when opening html, rss, css, php and xml files from any file browser (ask for other types if needed)"</string>
+    <string name="beta8" translatable="false">βetα 0.8 (23 dec. 2010)</string>
+    <string name="beta8_log" translatable="false">"- Automatic save can be disabled in the settings"</string>
+    <string name="beta7" translatable="false">βetα 0.7 (19 dec. 2010)</string>
+    <string name="beta7_log" translatable="false">"- App can be installed on the SD Card (on Android 2.2)
+- Automatic detection of end of line in opened files, possibility to define a default end of line for new files 
+- Bigger dialog boxes
+- Bug fixed when openning big files"</string>
+    <string name="beta6" translatable="false">βetα 0.6 (8 dec. 2010)</string>
+    <string name="beta6_log" translatable="false">"- Possibility to change text size in the settings.
+- Possibility to open read-only text files from other location than the SD card 
+- Added a backup function for unsaved text "</string>
+    <string name="beta5" translatable="false">βetα 0.5 (29 nov. 2010)</string>
+    <string name="beta5_log" translatable="false">"- Bug fixed while opening some files
+- New Graphics"</string>
+    <string name="beta4" translatable="false">βetα 0.4 (27 nov. 2010)</string>
+    <string name="beta4_log" translatable="false">"- Remembers the files opened recently (number of recent files can be changed)
+- display lines numbers (can be changed in the settings)
+- automatically break lines to keep a width of one page (can be changed in the settings)"</string>
+    <string name="beta3" translatable="false">βetα 0.3 (25 nov. 2010)</string>
+    <string name="beta3_log" translatable="false">"- Bug fixed : crash when trying to open online files"</string>
+    <string name="beta2" translatable="false">βetα 0.2 (13 nov. 2010)</string>
+    <string name="beta2_log" translatable="false">"- Open existing files - Save and save as"</string>
+
+</resources>
\ No newline at end of file
diff --git a/qpython/src/main/res/values/id.xml b/qpython/src/main/res/values/id.xml
new file mode 100644
index 00000000..342991eb
--- /dev/null
+++ b/qpython/src/main/res/values/id.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <item type="id" name="imageview" />
+    <item type="id" name="textview" />
+    <item type="id" name="mainview" />
+    <item type="id" name="scrollview" />
+</resources>
diff --git a/qpython/src/main/res/values/ids.xml b/qpython/src/main/res/values/ids.xml
new file mode 100644
index 00000000..045e125f
--- /dev/null
+++ b/qpython/src/main/res/values/ids.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/qpython/src/main/res/values/jpush_style.xml b/qpython/src/main/res/values/jpush_style.xml
new file mode 100644
index 00000000..81dfdbb3
--- /dev/null
+++ b/qpython/src/main/res/values/jpush_style.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+    <style name="MyDialogStyle">
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowFrame">@null</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
+        <item name="android:backgroundDimEnabled">true</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/qpython/src/main/res/values/selectable_item_selector_colors.xml b/qpython/src/main/res/values/selectable_item_selector_colors.xml
new file mode 100644
index 00000000..55344e51
--- /dev/null
+++ b/qpython/src/main/res/values/selectable_item_selector_colors.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
\ No newline at end of file
diff --git a/qpython/src/main/res/values/string_program_explorer.xml b/qpython/src/main/res/values/string_program_explorer.xml
new file mode 100644
index 00000000..55344e51
--- /dev/null
+++ b/qpython/src/main/res/values/string_program_explorer.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
\ No newline at end of file
diff --git a/qpython/src/main/res/values/strings.xml b/qpython/src/main/res/values/strings.xml
new file mode 100644
index 00000000..1c38275b
--- /dev/null
+++ b/qpython/src/main/res/values/strings.xml
@@ -0,0 +1,738 @@
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="ExtraTranslation">
+    <string name="private1_version" translatable="false">1347438995.05</string>
+    <string name="private2_version" translatable="false">1347438995.05</string>
+    <string name="private3_version" translatable="false">1347438995.05</string>
+    <string name="private31_version" translatable="false">1347438791.05</string>
+    <string name="private32_version" translatable="false">1347438791.05</string>
+    <string name="private33_version" translatable="false">1347438791.05</string>
+    <string name="public_version" translatable="false">12500</string>
+    <string name="public3_version" translatable="false">1347438610.05</string>
+    <string name="notebook3_version" translatable="false">20200206.1205</string>
+    <string name="ipynb_version" translatable="false">20200207.1205</string>
+
+    <string name="privacy_html" translatable="false">https://www.qpython.org/privacy.html</string>
+    <string name="thanks_link" translatable="false">https://www.qpython.org/contributors.html</string>
+    <string name="lower_project" translatable="false">projects</string>
+    <string name="lib_manager" translatable="false">QPYPI</string>
+    <string name="qpypi_up" translatable="false">QPYPI</string>
+    <!-- ColorValue.java -->
+    <string name="colorvalue_letter_alpha" translatable="false">α</string>
+    <string name="colorvalue_letter_red" translatable="false">R</string>
+    <string name="colorvalue_letter_green" translatable="false">G</string>
+    <string name="colorvalue_letter_blue" translatable="false">B</string>
+
+    <string name="ui_feedback_mail" translatable="false">support@qpython.org</string>
+    <string name="log" translatable="false">Log</string>
+    <string name="v_version" translatable="false">v %s</string>
+    <string name="web" translatable="false">Web</string>
+    <string name="arvr" translatable="false">AR/VR</string>
+    <string name="action_from_python_three" translatable="false">from_python_three</string>
+    <string name="key_saver" translatable="false">saver</string>
+    <string name="lib_cache_folder_name" translatable="false">.lib_cache</string>
+    <string name="aipy" translatable="false">AIPy</string>
+    <string name="slash_project_node" translatable="false">/projects</string>
+    <string name="key_hide_noti" translatable="false">hide_noti</string>
+    <string name="key_hide_push" translatable="false">hide_push</string>
+    <string name="logo" translatable="false">logo</string>
+    <string name="level" translatable="false">lv %s</string>
+    <!--color string-->
+    <string name="color_red" translatable="false">#FFD2483D</string>
+    <string name="color_light_gray" translatable="false">#FF595959</string>
+    <string name="color_dark_gray" translatable="false">#FF4A4A4A</string>
+    <string name="color_yellow" translatable="false">#FFECCD00</string>
+
+    <string name="terminal">Terminal</string>
+    <string name="recent">Recent</string>
+    <string name="snippet">Snippet</string>
+    <string name="script">Script</string>
+    <string name="project">Project</string>
+
+    <string name="setting">Setting</string>
+    <string name="editor">Editor</string>
+    <string name="community">Community</string>
+    <string name="gist">Gist</string>
+
+    <string name="more">More</string>
+    <string name="qpypi">Featured</string>
+    <string name="sl4a_server">SL4A Server</string>
+    <string name="internal_space"><![CDATA[Permissions & Storage]]></string>
+    <string name="ftp_server">FTP Server</string>
+
+    <!---->
+    <string name="application_terminal">Terminal</string>
+    <string name="preferences">Preference</string>
+    <string name="new_window">Open new terminal</string>
+    <string name="close_window">Close terminal</string>
+    <string name="window_list">Terminal list</string>
+    <string name="reset">Reset Terminal</string>
+    <string name="send_email">Send mail to…</string>
+    <string name="special_keys">Special keys</string>
+    <string name="toggle_soft_keyboard">Open/Close soft keyboard</string>
+
+    <string name="reset_toast_notification">The state at present will be reset.</string>
+
+    <string name="enable_wakelock">Enable wakelock</string>
+    <string name="disable_wakelock">Disable wakelock</string>
+    <string name="enable_wifilock">Enable WIFI lock</string>
+    <string name="disable_wifilock">Disable WIFI lock</string>
+
+    <string name="edit_text">Edit text</string>
+    <string name="select_text">Select text</string>
+    <string name="copy_all">Copy all</string>
+    <string name="send_control_key">Send control key</string>
+    <string name="send_fn_key">Send Fn key</string>
+
+    <string name="window_title">Terminal %1$d</string>
+
+    <string name="process_exit_message">Session is over</string>
+
+    <!-- Preference dialog -->
+    <string name="screen_preferences">Screen</string>
+
+    <string name="title_statusbar_preference">Status bar</string>
+    <string name="summary_statusbar_preference">Show/Hide Status bar</string>
+    <string name="dialog_title_statusbar_preference">Status bar</string>
+
+    <string name="title_actionbar_preference">Action Bar</string>
+    <string name="summary_actionbar_preference">Choose Action bar\'s behavior(Android 3.0 and above)</string>
+    <string name="dialog_title_actionbar_preference">Action bar\'s behavior</string>
+
+    <string name="title_orientation_preference">Screen orientation</string>
+    <string name="summary_orientation_preference">Choose screen orientation action</string>
+    <string name="dialog_title_orientation_preference">screen orientation action</string>
+
+    <string name="text_preferences">Text</string>
+
+    <string name="title_utf8_by_default_preference">Default use UTF-8</string>
+    <string name="summary_utf8_by_default_preference">Using UTF-8 as default</string>
+
+    <string name="title_fontsize_preference">Text size</string>
+    <string name="summary_fontsize_preference">Choose text size</string>
+    <string name="dialog_title_fontsize_preference">Text size</string>
+
+    <string name="title_color_preference">Text color</string>
+    <string name="summary_color_preference">Choose text color</string>
+    <string name="dialog_title_color_preference">Text color</string>
+
+    <string name="keyboard_preferences">Keyboard</string>
+
+    <string name="title_backaction_preference">Back key behavior</string>
+    <string name="summary_backaction_preference">Choose Back key behavior</string>
+    <string name="dialog_title_backaction_preference">Back key behavior</string>
+
+    <string name="title_controlkey_preference">Ctrl key</string>
+    <string name="summary_controlkey_preference">Choose Ctrl key behavior</string>
+    <string name="dialog_title_controlkey_preference">Ctrl key</string>
+
+    <string name="title_fnkey_preference">Fn key</string>
+    <string name="summary_fnkey_preference">Choose Fn key behavior</string>
+    <string name="dialog_title_fnkey_preference">Fn key</string>
+
+    <string name="title_ime_preference">Input method</string>
+    <string name="summary_ime_preference">Choose input method</string>
+    <string name="dialog_title_ime_preference">Input method</string>
+
+    <string name="shell_preferences">Shell</string>
+    <string name="title_shell_preference">Terminal</string>
+    <string name="summary_shell_preference">Choose Shell</string>
+    <string name="dialog_title_shell_preference">Shell</string>
+
+    <string name="title_initialcommand_preference">Initial command</string>
+    <string name="summary_initialcommand_preference">Automatic performance initial command when start</string>
+    <string name="dialog_title_initialcommand_preference">Initial command</string>
+
+    <string name="title_termtype_preference">Terminal type</string>
+    <string name="summary_termtype_preference">Set Shell\'s Terminal type</string>
+    <string name="dialog_title_termtype_preference">Terminal type</string>
+
+    <string name="title_close_window_on_process_exit_preference">Close terminal when exit</string>
+    <string name="summary_close_window_on_process_exit_preference">Close terminal when exit</string>
+
+    <string name="title_verify_path_preference">verify PATH</string>
+    <string name="summary_verify_path_preference">Clear invalid PATH</string>
+
+    <string name="title_do_path_extensions_preference">Allow PATH expand</string>
+    <string name="summary_do_path_extensions_preference">Allow add command to PATH</string>
+
+    <string name="title_allow_prepend_path_preference">Allow preposition PATH</string>
+    <string name="summary_allow_prepend_path_preference">Allow override exist command in PATH</string>
+
+    <string name="title_home_path_preference">HOME Folder</string>
+    <string name="summary_home_path_preference">Use as HOME\'s writable path</string>
+
+    <string name="control_key_dialog_title">Ctrl and Fn key</string>
+    <string name="control_key_dialog_control_text">CTRLKEY Space : Control-@ (NUL)\nCTRLKEY A..Z : Control-A..Z\nCTRLKEY 5 : Control-]\nCTRLKEY 6 : Control-^\nCTRLKEY 7 : Control-_\nCTRLKEY 9 : F11\nCTRLKEY 0 : F12</string>
+    <string name="control_key_dialog_control_disabled_text">Ctrl key unset</string>
+    <string name="control_key_dialog_fn_text">FNKEY 1..9 : F1-F9\nFNKEY 0 : F10\nFNKEY W : Up\nFNKEY A : Left\nFNKEY S : Down\nFNKEY D : Right\nFNKEY P : PageUp\nFNKEY N : PageDown\nFNKEY T : Tab\nFNKEY L : | (pipe)\nFNKEY U : _ (underscore)\nFNKEY E : Control-[ (ESC)\nFNKEY X : Delete\nFNKEY I : Insert\nFNKEY H : Home\nFNKEY F : End\nFNKEY . : Control-\\\n</string>
+    <string name="control_key_dialog_fn_disabled_text">Fn key unset</string>
+
+    <string name="confirm_window_close_message">Close terminal?</string>
+
+    <string name="email_transcript_subject">Copy terminal</string>
+    <string name="feedback_email_subject">Feedback - QPython</string>
+    <string name="email_transcript_chooser_title">Feedback …</string>
+    <string name="email_transcript_no_email_activity_found">Can not find propriety App to send E-mail</string>
+
+    <string name="alt_sends_esc">Use Alt as ESC</string>
+    <string name="alt_sends_esc_summary_on">Using Alt as ESC</string>
+    <string name="alt_sends_esc_summary_off">Cancel using Alt as ESC</string>
+
+    <string name="title_mouse_tracking_preference">Send mouse event</string>
+    <string name="summary_mouse_tracking_preference">Are touch and scroll event ignored?</string>
+
+    <string name="dialog_title_script">script</string>
+    <string name="dialog_title_project">project</string>
+
+
+    <string name="title_use_keyboard_shortcuts">Use Keyboard Shortcuts</string>
+    <string name="use_keyboard_shortcuts_summary_on">Ctrl-Tab: cycle terminal, Ctrl-Shift-N: new terminal, Ctrl-Shift-V: paste.</string>
+    <string name="use_keyboard_shortcuts_summary_off">Keyboard shortcuts disabled.</string>
+    <string name="help">Help</string>
+    <string name="activity_term_here_title">Term here</string>
+    <!-- BEGIN SHORTCUT RELATED STRINGS -->
+    <!-- AndroidManifest.xml -->
+    <string name="activity_shortcut_create">"Term shortcut"</string>
+    <string name="addshortcut_button_find_command">Find command</string>
+    <string name="addshortcut_command_hint">command</string>
+    <string name="addshortcut_example_hint">--example=\""a\"</string>
+    <string name="addshortcut_navigator_title">SELECT SHORTCUT TARGET</string>
+    <string name="addshortcut_command_window_instructions">Command terminal requires full mPath, no arguments. For other commands use Arguments terminal (ex: cd /sdcard).</string>
+    <string name="addshortcut_arguments_label">Add to dictionary</string>
+    <string name="addshortcut_shortcut_label">Shortcut label\:</string>
+    <string name="addshortcut_button_text_icon">Text icon</string>
+    <string name="addshortcut_make_text_icon">MAKE TEXT ICON</string>
+    <string name="addshortcut_text_icon_instructions"></string>
+    <string name="addshortcut_title">Term shortcut</string>
+    <!-- FSNavigator.java -->
+    <string name="fsnavigator_title">FILE SELECTOR</string>
+    <string name="fsnavigator_no_external_storage">External storage not available</string>
+    <string name="fsnavigator_optional_enter_path">Or enter mPath here.</string>
+    <string name="fsnavigator_change_theme">Change theme</string>
+    <string name="colorvalue_label_lock_button_column">LOCK</string>
+    <string name="colorvalue_icon_text_entry_hint">Enter icon text</string>
+
+    <string name="help_url">https://www.qpython.org</string>
+
+    <string name="read_only">Read only</string>
+    <string name="file">Explorer</string>
+    <string name="yes">Yes</string>
+    <string name="no">No</string>
+    <string name="ok">OK</string>
+    <string name="close">close</string>
+    <string name="no_change">No change</string>
+    <string name="feedback">Feedback</string>
+    <string name="about">About</string>
+    <string name="file_not_exists">File did not exist</string>
+    <string name="enable_root">Enable root</string>
+    <string name="send">Send</string>
+    <string name="no_camera">Can not find the available camera, please check if the camera permissions is granted</string>
+    <string name="no_storage">No read storage permission</string>
+
+
+    <string name="pref_initialcommand_default_qpython">python</string>
+    <string name="qpy_app">QPY</string>
+    <string name="local_app">Local APP</string>
+    <string name="task">Task</string>
+    <string name="root_mode">Root mode</string>
+    <string name="star_it">Rate it</string>
+    <string name="disable_root">Disable</string>
+    <string name="http_qpypi_qpython_org">https://pypi.python.org/simple/</string>
+    <string name="add">add</string>
+    <string name="sl4a_running">SL4A server is running</string>
+    <string name="sl4a_un_running">SL4A server is not running</string>
+    <string name="service_toggle">Server taggle</string>
+    <string name="qpy_description">QPython is a script engine running on android devices like phone or tablet.</string>
+    <string name="warning">Warning</string>
+    <string name="reset_warning">Reset storage will lost all setting and downloaded libs, are you sure you want to reset?</string>
+    <string name="downloading">Library</string>
+    <string name="location">Location</string>
+
+
+    <!--  -->
+
+    <!-- Titles -->
+    <string name="title_untitled">untitled</string>
+    <string name="title_editor">%1$s</string>
+    <string name="title_editor_dirty">%1$s *</string>
+    <string name="title_editor_readonly">[%1$s]</string>
+
+    <string name="title_settings">Settings </string>
+
+    <!-- Config screen strings -->
+    <string name="config_cat_display">Display(Please restart the editor after changing)</string>
+    <string name="config_title_line_numbers">Show line numbers</string>
+    <string name="config_title_word_wrap">Word wrap</string>
+    <string name="config_title_font">Change text font</string>
+    <string name="config_title_text_size">Text size</string>
+    <string name="config_title_color_theme">Color theme</string>
+    <string name="config_title_scroll_fling">Fling to scroll faster</string>
+    <string name="config_gist_icon"></string>
+    <string name="config_title_gist">Show Gist button</string>
+
+    <string name="config_summary_line_numbers">Display the line number at the left of the page</string>
+    <string name="config_summary_word_wrap">Lines will break in new lines if they are too wide for the screen</string>
+    <string name="config_summary_scroll_fling">Uncheck if you have performance issues</string>
+
+    <!-- Options Menu in QEdit -->
+
+    <!-- Misc UI strings -->
+    <string name="ui_save_text">"Do you want to save your document? \nAny unsaved changes will be lost. "</string>
+    <string name="ui_save">Save</string>
+    <string name="ui_delete">Delete</string>
+    <string name="ui_no_save">"Don't save"</string>
+    <string name="ui_cancel">Cancel</string>
+    <string name="ui_hint_file_name">File name</string>
+    <string name="ui_hint_search">Search</string>
+    <string name="ui_history">History</string>
+    <string name="ui_force_read_only">Open as read only</string>
+    <string name="about_content">QEdit is a text editor for android tablets and phones, besides text edit, it can make python / HTML development on android more fun and convenient especially.</string>
+
+    <!-- Misc Strings -->
+    <string name="lorem_ipsum">"QEdit is a great script editor."</string>
+
+    <string name="file_exists">File or project exists, please rename</string>
+
+    <string name="video_src">Video {0}</string>
+    <string name="play_video">Play</string>
+    <string name="no_videos_found">No videos found in this page</string>
+    <string name="pls_install_a8_play">Please install A8 Video Player first</string>
+    <string name="download_as">Download and save as</string>
+    <string name="info_browser">QBrowser</string>
+
+    <!--  added by kyle -->
+    <string name="share">Share</string>
+    <string name="save_as_snippets">Save as snippet</string>
+    <string name="snippet_exist">Snippet exists, please change to another name.</string>
+    <string name="save_as_snippets_1">Snippets has been saved as: </string>
+    <string name="fail_to_insert">Fail to insert snippet</string>
+    <string name="fail_to_goto">Please input correct number</string>
+    <string name="max_lines_num_with_syntax_title">Auto-highlight lines</string>
+    <string name="max_lines_num_with_syntax_summary">Auto-highlight if lines less than %s</string>
+    <string name="qedit_not_support">QEdit only support to preview/execute the following file types\n.py, .sh, .lua, .html, .md.</string>
+
+    <string name="pls_install_lua">Please install the QLua to run lua script</string>
+    <string name="pls_install_qpy">Please install the QPython to run python script</string>
+    <string name="info_snippets">Snippets</string>
+
+    <string name="ui_ok">OK</string>
+    <string name="ui_contact_title">Contact</string>
+    <string name="ui_licence_title">Licence</string>
+    <string name="ui_mail">support@qpython.org</string>
+    <string name="ui_choose_mail">Open mail using &#8230; </string>
+    <string name="ui_market_url">"https://market.android.com/developer?pub=Xavier+Gouchet"</string>
+    <string name="ui_market_app_url">"https://play.google.com/store/apps/details?id=%s"</string>
+    <string name="ui_market">"Take a look at my other apps"</string>
+    <string name="ui_app_rating">"Rate this app \n Leave a feedback"</string>
+    <string name="ui_feedback">"Please feel free to contact me for any feedback, feature request or bug report. "</string>
+    <string name="ui_licence_content">"This software is provided 'as-is', without any express or implied warranty.  In no event will the author be held liable for any damages arising from the use of this software."</string>
+    <string name="ui_art_licence_title">Artistic Licence</string>
+    <string name="ui_art_licence_content">"All icons for this app were created and belong to the author of the app : QPython."</string>
+    <string name="ui_whats_new">"What's new"</string>
+    <string name="save">Save</string>
+    <string name="save_as">Save as</string>
+    <string name="open">Open</string>
+    <string name="file_name">File Name</string>
+    <string name="file_exist_hint">This file is exist, please rename.</string>
+    <string name="empty_file">Blank file</string>
+    <string name="webapp_project">WebApp</string>
+    <string name="console_app_project">ConsoleApp</string>
+    <string name="kivy_app_project">KivyApp</string>
+    <string name="pygame_app_project">PygameApp</string>
+    <string name="qsl4a_app_project">QSL4AApp</string>
+
+    <string name="confirm">Confirm</string>
+    <string name="cancel">Cancel</string>
+    <string name="new_project">New project</string>
+    <string name="error_dont_kn">Unkown error occurred.</string>
+    <string name="project_name">Project name</string>
+    <string name="jump_to">Jump to</string>
+    <string name="choose_ttf">Choose font file(.ttf)</string>
+    <string name="explorer">Explorer</string>
+    <string name="new_script">New script</string>
+    <string name="enter_name_hint">Enter script name</string>
+
+    <string name="paste">Paste</string>
+    <string name="install_with_python_s_pypi">QPYPI CLIENT</string>
+    <string name="py_pi"><![CDATA[You can manager and install Python packages from QPYPI and Python\'s PYPI]]></string>
+    <string name="download_fail">Download fail</string>
+    <string name="key_reset">reset_storage</string>
+    <string name="key_ftp_state">running_state</string>
+    <string name="key_username">username</string>
+    <string name="key_ftp_pwd">password</string>
+    <string name="key_port_num">portNum</string>
+    <string name="key_show_pwd">show_password</string>
+    <string name="key_root_dir">chrootDir</string>
+    <string name="key_stay_awake">stayAwake</string>
+    <string name="key_about">about</string>
+    <string name="dir_not_valid">The direction is not valid</string>
+    <string name="already_newest">Already newest</string>
+    <string name="share_text">QPython is a script engine running on android devices like phone or tablet, It embeds the Python interpreter, console, editor, SL4A Library for Android, which can make your android device run Python https://www.qpython.com/privacy.html</string>
+    <string name="new_folder">New Folder</string>
+    <string name="folder_name">Folder name</string>
+    <string name="untitled_folder">untitled folder</string>
+    <string name="toast_folder_exist">Operation failed! Please use a different name</string>
+    <string name="fail_open_file">Unable to open the file, the file is not exists</string>
+    <string name="run_dirty_hint">Do you want to save the change first?</string>
+    <string name="no_im_good">No, I\'m good</string>
+    <string name="convert_fail">Convert fail</string>
+    <string name="delete_file_hint">Do you want to delete this file?</string>
+    <string name="rename">Rename</string>
+    <string name="rename_fail">Rename fail</string>
+    <string name="delete_fail">Delete fail</string>
+    <string name="runtime_log">Runtime Log: %s</string>
+    <string name="fedback_mail">[Feedback]\n\n</string>
+    <string name="log_title">Runtime Log</string>
+
+    <string name="date_format">[ %s ]</string>
+    <string name="not_root_yet">This device is not rooted yet</string>
+    <string name="download_apk">Download APK?</string>
+    <string name="download_apk_hint">This operation may charge if you ain\'t in wifi state</string>
+    <string name="downloading_new_apk">Downloading new package</string>
+    <string name="checking_update">Checking update</string>
+    <string name="run_bg_title">Run on background</string>
+    <string name="scan">Scan</string>
+    <string name="read_script_from_qrcode">Read code from QRCode</string>
+
+    <string name="course">QPython Courses</string>
+    <string name="lost_connect">Lose Connect</string>
+    <string name="featured_courses">Courses</string>
+    <string name="programs">Programs</string>
+    <string name="open_gl2_is_not_supported">OpenGL2 is not supported</string>
+    <string name="unable_extract">Unable to extract python files</string>
+    <string name="get_setting_data_fail">Get setting data fail</string>
+    <string name="terminal_bg_hint">Do you want to keep terminal running on background?</string>
+    <string name="thanks">THANKS!</string>
+    <string name="extra_pypi">Set PYPI</string>
+    <string name="already_newest_current_version">Already newest, current version is </string>
+    <string name="reward">Reward</string>
+    <string name="oops_seems_like_your_net_have_some_trouble">Oops! \n Seems like your net has some trouble…</string>
+    <string name="lose_google_server">Can\'t connect to Google Play service, please check your network.</string>
+    <string name="thanks_your_support">Thanks for your support!</string>
+    <string name="under_16_status_bar_hint">The change of status bar\'s visibility will be apply after restart Terminal.</string>
+    <string name="refresh">Refresh</string>
+    <string name="reset_suc">Reset success</string>
+    <string name="reset_hint">This operation will only become effective after restart</string>
+    <string name="restart">Restart</string>
+    <string name="fail_resume_console">Fail to resume console</string>
+    <string name="failed_bind_term">Failed to bind to TermService!</string>
+    <string name="console_running">QPython Console is running</string>
+    <string name="qpy_console">QPython Console</string>
+    <string name="recommend">Recommend</string>
+    <string name="newest_course">Latest</string>
+    <string name="best_python_development_ide_non_mobile">Best Python Application on Mobile</string>
+    <string name="by_signing_in_you_agree_to_out_privacy_policy_term_of_service"><![CDATA[By signing in you agree with our <font color="#4BAC07">privacy policy & term </font>of service]]></string>
+    <string name="copy_hint">Copy to editor to run</string>
+    <string name="my_scripts">My Scripts</string>
+    <string name="my_share">My Gists</string>
+    <string name="gist_title">Title</string>
+    <string name="description">Description</string>
+    <string name="too_long_hint">This value is too long. It should have 140 characters or less.</string>
+    <string name="enter_snippet">Enter snippet name</string>
+    <string name="welcome_s">Welcome, <![CDATA[<font color="#4BAC07"><u>%s</u></font>]]></string>
+    <string name="re_format">Re <![CDATA[<font color="#ECCD00">@%1$s</font>]]>:\u0020 %2$s</string>
+    <string name="replied_format"><![CDATA[<font color="#ECCD00">@%1$s</font>]]>:\u0020 %2$s</string>
+    <string name="login"><u>Sign In</u></string>
+    <string name="auth_failed">Authentication failed.</string>
+    <string name="log_out">Sign Out</string>
+    <string name="me">Me</string>
+    <string name="grant_storage_hint">You need to grant storage permission</string>
+    <string name="lost_google_hint">Can not connect to google server, please check your internet</string>
+    <string name="upload_suc">Code upload successfully.</string>
+    <string name="upload_fail">Code could not be uploaded,</string>
+    <string name="my_program">My Program</string>
+    <string name="nothing_here_yet">Nothing here yet. :(</string>
+    <string name="sofa_hint">Do you want to be the first to from_content?</string>
+    <string name="null_comment_hint">Null from_content content…</string>
+    <string name="initial">Initial</string>
+    <string name="share_empty_hint">You need to save file before share.</string>
+    <string name="need_login">Need Sign in</string>
+    <string name="upload_login_hint">You have to Sign in before you could upload your code</string>
+    <string name="login_now">Login now</string>
+    <string name="cloud_empty_hint">You don\'t have any scripts on cloud yet</string>
+    <string name="mkdir_fail">Make direction fail.</string>
+    <string name="not_support_type_hint">Not support upload this type of file now</string>
+    <string name="conflict_hint"><Data>
+        <![CDATA[ <b>Remote file:</b>   <br/>
+
+                  <u>Last modified:</u> %s   <br/><br/>
+
+                  <b>Local file:</b><br/>
+
+                  <u>Last modified:</u> %s <br/><br/>
+        Do you want to override?]]></Data></string>
+    <string name="override_fail_hint">Override fail, please retry later</string>
+    <string name="delete_remote_suc">Delete remote file success</string>
+    <string name="delete_suc">Delete file success</string>
+    <string name="click_retry">Request timed out \nClick screen to retry</string>
+    <string name="lout">Do you want to sign out?</string>
+    <string name="log_noti">Log Notification</string>
+    <string name="app_noti">App Notifications</string>
+    <string name="override_hint">Override local file?</string>
+    <string name="file_downloaded">File downloaded</string>
+    <string name="login_error">Login error</string>
+    <string name="my_space">My Space (%d / 100 files)</string>
+    <string name="my_space_empty">My Space (— / 100 files)</string>
+    <string name="save_amp_push"><![CDATA[Save & Push]]></string>
+    <string name="shortcut_create_suc">Shortcut %s is created success</string>
+    <string name="need_grant">You need grant these permissions</string>
+    <string name="no_space">You don\'t have enough space to upload</string>
+    <string name="no_file">No file within this folder</string>
+    <string name="no_recent_file">You have not open any file recently</string>
+    <string name="cant_open">This file can not be opened.</string>
+    <string name="toolbar_showing">Project structure</string>
+    <string name="toolbar_close">Editor</string>
+    <string name="not_support_yet">Not support yet</string>
+    <string name="new_file">New file</string>
+    <string name="tools">Tools</string>
+    <string name="aipy_not_install"><![CDATA[Please <font color="#4BAC07">enable AIPY from setting</font>]]></string>
+    <string name="jupyter_not_install"><![CDATA[Please <font color="#4BAC07">install base packages</font> \n before install related Jupyter packages.]]></string>
+
+
+    <string name="update_time_hint">Update: %s</string>
+    <string name="aipy_list_empty_hint">Can\'t find any AIPy package, please locate the error by following the steps below.\n
+        1. Make sure you have installed AIPy application\n
+        2. Make sure QPython has the permission of write file\n
+        3. Try to refresh by clicking the upper right corner button\n\n
+        If that dose\'t work, feel free to contact us by Email or github
+    </string>
+    <string name="package_installed">This package already installed</string>
+    <string name="install_suc">Install success</string>
+    <string name="install_fail">Install fail, please try again later</string>
+    <string name="install_package_fail">Install package fail, please retry later</string>
+    <string name="aipy_not_release">Please Install AIPY Packages</string>
+    <string name="newest_resource">You have downloaded the newest resource</string>
+
+    <string name="jupyter_not_release">Please Install and run setup from QPyNotebook App</string>
+    <string name="aipy_not_support">AIPY does not support QPY3 yet</string>
+    <string name="jupyter_not_support">QPyNotebook do not support QPY3 yet</string>
+
+    <string name="aipy_lib_hint">You can install or upgrade AIPY App to get more features</string>
+    <string name="album">Album</string>
+    <string name="last_refresh">Last Refresh: %s</string>
+    <string name="last_log">Runtime log</string>
+    <string name="get_last_log">Check last runtime log</string>
+
+    <string name="data_saver">Data saver</string>
+    <string name="saver_on">Use local cache</string>
+    <string name="saver_off">Reload every time</string>
+    <string name="library">Library</string>
+    <string name="run">Run</string>
+
+    <string name="insert_tab">\u0009</string>
+
+    <string name="insert_if">if :\n</string>
+    <string name="insert_def">def ():\n</string>
+    <string name="insert_for">for\u0020\u0020in :\n</string>
+    <string name="insert_import">import\u0020\n</string>
+    <string name="insert_import_f">from\u0020\u0020import\u0020\n</string>
+    <string name="insert_clz">class\u0020\u0020:</string>
+    <string name="insert_ef">elif\u0020\u0020:\n</string>
+    <string name="insert_el">else:\n</string>
+    <string name="insert_ret">return\n</string>
+    <string name="insert_frm">from</string>
+
+    <string name="file_new">File</string>
+    <string name="install_py3">Install Python 3</string>
+    <string name="py2_or_3">Do you want to use Python 3 or 2 by default ?</string>
+    <string name="use_py2">Use Python 2</string>
+    <string name="use_py3">Use Python 3</string>
+    <string name="py2_now">Using Python 2 now</string>
+    <string name="py3_now">Using Python 3 now</string>
+    <string name="install_py3_first">To switch to Python 3, please download it\'s resource</string>
+    <string name="install_py2compatible_first">To switch to Python 2 Compatible, please download it\'s resource</string>
+
+    <string name="choose_py3_inter"><![CDATA[You have downloaded it, you can switch to Python 3 to use it\'s interpreter]]></string>
+    <string name="choose_py2compatible_inter"><![CDATA[You have downloaded it, you can switch to Python 2 Compatible to use it\'s interpreter]]></string>
+    <string name="install_notebook_first">To Start QPyNotebook Service, please install first</string>
+
+    <string name="choose_notebook_inter"><![CDATA[You can Start QPyNotebook Service now]]></string>
+
+    <string name="notebook_first">First run, it will extract the notebook resource</string>
+
+    <string name="py_resources">Download Python Resource</string>
+
+    <string name="aipy_install">Check to Install AIPY</string>
+    <string name="aipy_installed">AIPy is installed</string>
+    <string name="switch_py3">Switch to Python 3</string>
+    <string name="update_py3"><![CDATA[Download Py3 Resource]]></string>
+    <string name="update_py2compatible"><![CDATA[Download Py2 Compatible Resource]]></string>
+
+    <string name="switch_py2">Reset to Python 2 Standard</string>
+    <string name="switch_py2_libs">It will remove all Python 2 libraries you have installed</string>
+
+    <string name="switch_py2compatible">Reset to Python 2 Compatible</string>
+
+    <string name="py_inter">Choose Python Interpreter</string>
+    <string name="notebook_res">QPyNotebook Resource</string>
+
+    <string name="install_aipy">Enable AIPY</string>
+    <string name="notebook">QPyNotebook</string>
+    <string name="notebook_for_py">QPyNotebook for Python {0}</string>
+
+    <string name="install_notebook">Install QPyNotebook</string>
+    <string name="notebook_service">QPyNotebook Service</string>
+    <string name="notebook_service_not_ready">QPyNotebook Service is not ready, please retry</string>
+    <string name="notebook_service_restart">Do you want to reload this notebook or restart the service?</string>
+    <string name="notebook_restart">Restart</string>
+    <string name="notebook_reload">Reload</string>
+
+    <string name="notebook_open">Do you want to open it with QPyNotebook?</string>
+
+    <string name="notebook_explorer">Start QPyNotebook Service</string>
+    <string name="notebook_explorer_bg_start">It will run when QPython starts</string>
+
+    <string name="enter_history">History</string>
+    <string name="qpy_featured">QPython Featured</string>
+    <string name="history_emp">History is empty</string>
+    <string name="no_google">Can\'t login without Google service</string>
+    <string name="pip_no_net">Can\'t open pip without network</string>
+    <string name="key_py3" translatable="false">switch_py3</string>
+    <string name="key_py2" translatable="false">switch_py2</string>
+    <string name="key_py2compatible" translatable="false">switch_py2compatible</string>
+
+    <string name="key_py_inter" translatable="false">py_inter</string>
+    <string name="key_aipy" translatable="false">aipy</string>
+    <string name="key_notebook" translatable="false">notebook</string>
+    <string name="key_notebook_run" translatable="false">notebook_run</string>
+
+    <string name="key_notebook_page" translatable="false">notebook_page</string>
+
+    <string name="py3_not_install">QPY3 not install</string>
+    <string name="install_py3_hint">Confirm to download Python 3 Resource?</string>
+    <string name="install_py2compatible_hint">Confirm to download Python 2 Compatible Resource?</string>
+
+    <string name="install_notebook_hint">Install QPyNotebook</string>
+
+    <string name="open_app_market">Install with App</string>
+    <string name="download_it">Download it</string>
+    <string name="download_py">Download Python Resource</string>
+    <string name="download_progress_need_sometime">It may take some time, please check the progress from notification bar</string>
+
+    <string name="download_notebook">Download QPyNotebook Resource</string>
+
+    <string name="release_error">Packages not release</string>
+
+    <string name="open_py3_hint">Please release packages from Python 3 app first</string>
+    <string name="open_py3">Open Python 3 app</string>
+    <string name="unzip_pac_fail">Unzip packages fail</string>
+    <string name="retry_hint">Please retry</string>
+    <string name="event_login" translatable="false">LOGIN</string>
+    <string name="event_me" translatable="false">Open_Me</string>
+    <string name="event_term" translatable="false">Open_terminal</string>
+    <string name="event_editor" translatable="false">Open_editor</string>
+    <string name="event_qpypi" translatable="false">Open_QPYPI</string>
+    <string name="event_commu" translatable="false">Open_community</string>
+    <string name="event_setting" translatable="false">Open_setting</string>
+    <string name="event_file" translatable="false">Open_explorer</string>
+    <string name="event_course" translatable="false">Open_course</string>
+    <string name="event_top" translatable="false">Open_Top</string>
+    <string name="browser">QPyBrowser</string>
+    <string name="switch_py3_hint">The interpreter are using python 2 now, do you want to switch to python 3?</string>
+    <string name="goto_setting">Go to setting</string>
+    <string name="net_lagging">The net seems lagging, please wait with patience</string>
+    <string name="usage_not_init">Usage is not init, please wait with patient</string>
+    <string name="free_plan">My Space Plan : Free (10M Max)</string>
+    <string name="share_body">Share the body</string>
+    <string name="crowdfunding">Crowdfunding%d%%</string>
+    <string name="funding">Donate</string>
+    <string name="support">Support</string>
+    <string name="my">My</string>
+    <string name="course_introduction">Course Introduction</string>
+    <string name="show">Show</string>
+    <string name="course_content">Course Content</string>
+    <string name="about_the_author">About The Author</string>
+    <string name="hide">Hide</string>
+    <string name="support_count">%s person supported</string>
+    <string name="free">Learn</string>
+    <string name="explanation">Crowdfunding Description: ：\n\n\u0020\u0020Welcome to Crowdfunding QPython Premium Curriculum. QPython\'s crowdfunding encourages the creation of quality, original Python text content for your learning.</string>
+    <string name="explanation_more">\u0020\u0020Over 100 people complete the crowdfunding, the author will launch a quality beginner\'s program in less than a week. Over 500 people complete the crowdfunding, the author will launch an intermediate learning course within two weeks. When more than 2,000 people complete the crowdfunding, the author will launch an advanced learning course within three weeks. \n\n\u0020\u0020The cost of crowdfunding varies from stage to stage. For the first 100 people, you only need %1$s for the first stage. When in the medium stage you need %2$s, and %3$s for the advanced stage. If you want to participate in the learning after the crowdfunding is completed, you have to pay at least %4$s.\n\n\u0020\u0020You can participate in the crowdfunding at any stage, and after the crowdfunding you will have access to the corresponding course. You can read materials, practice programming, share programs and get a more interesting learning experience. If you are interested in this course, welcome to participate as soon as possible.</string>
+    <string name="support_explanation">Your reward is the motivation for us to continue to write good courses.</string>
+    <string name="from_content">Comment</string>
+    <string name="author">Author</string>
+    <string name="basics">Basics</string>
+    <string name="database">Database</string>
+    <string name="explore_course">Explore more courses</string>
+    <string name="featured">Featured</string>
+    <string name="other">Other</string>
+    <string name="support_us">Support Us</string>
+    <string name="thank">Thanks</string>
+    <string name="start">Start</string>
+    <string name="buy_course">Buy Course</string>
+    <string name="rmb">%s RMB</string>
+    <string name="notebook_installed">After starting QPyNotebook Service, you can browse the ipynb file from explorer</string>
+    <string name="notebook_not_started">QPyNotebook is not started</string>
+
+    <string name="notebook_py3_support">QPyNotebook only supports Python 3</string>
+    <string name="notebook_enable" translatable="false">notebook_enable</string>
+    <string name="start_learn">Start to learn</string>
+    <string name="entertainment">Entertainment</string>
+    <string name="ennable_notebook_first">Please enable QPyNotebook in setting.</string>
+    <string name="funny">Funny</string>
+    <string name="back_course">Back this course</string>
+    <string name="c_funding">Crowdfunding</string>
+
+    <string name="elementary">Primary course</string>
+    <string name="intermediate">Intermediate course</string>
+    <string name="advanced">Advanced course</string>
+    <string name="dialog_alert">Notice</string>
+    <string name="conn_error">connection error!</string>
+    <string name="create_shortcut">Create Shortcut</string>
+    <string name="run_with_params">Run with params</string>
+    <string name="open_with_editor">Edit</string>
+
+    <string name="enter_u_params">Enter your params</string>
+    <string name="params">Params</string>
+    <string name="params_emp">Params is Empty</string>
+    <string name="install_kivy_first">Please install kivy library from QPYPI first.</string>
+    <string name="login_to_comment_hint">You need to login before post comment.</string>
+    <string name="write_a_response">Write a response…</string>
+    <string name="default_text">--</string>
+    <string name="copy_to_editor_to_run">copy to editor to run</string>
+    <string name="empty_hint">Comment must be not empty</string>
+    <string name="login_first">Please login first</string>
+    <string name="reply_to">Reply to: %s</string>
+    <string name="reply_format"><![CDATA[<font color="#ECCD00">@ %1$s</font>: %2$s]]></string>
+    <string name="no_data">No data</string>
+    <string name="delete_gist_hint">Do you really want to delete this gist?</string>
+    <string name="view_code">View </string>
+    <string name="fork_code">Fork</string>
+    <string name="fork_suc">Fork Success, you can view it in [My Gist]</string>
+    <string name="post">post</string>
+    <string name="summary">Summary</string>
+    <!--ADD 265-->
+    <string name="choose_action">Choose action</string>
+    <string name="learn_course">Learn QPython with courses</string>
+    <string name="get_help">Get support</string>
+    <string name="get_support_from_community">Get support from community</string>
+    <string name="my_gists">My Gists</string>
+    <string name="my_stars">My Stars</string>
+    <string name="gist_intro">And I want to share my code to support forum</string>
+    <string name="gist_own">I will save the script to my gist repo</string>
+
+    <string name="login_successfully">Login successfully</string>
+    <string name="login_failed">Login failed</string>
+
+    <string name="qr_info">Confirm</string>
+    <string name="qr_goto">Do you want to visit this URL: </string>
+
+
+    <string name="signin_error">Error occured, please retry</string>
+    <string name="project_main_error"> Project\'s main.py does not exit</string>
+
+    <string name="key_root" translatable="false">root</string>
+    <string name="key_sl4a" translatable="false">sl4a</string>
+    <string name="key_qpypi" translatable="false">qpypi</string>
+    <string name="key_update_qpy3" translatable="false">update_py3</string>
+    <string name="key_update_qpy2compatible" translatable="false">update_py2compatible</string>
+
+    <string name="python_interpreter">Python Interpreter</string>
+    <string name="action_notebook">Notebook</string>
+
+    <string name="shell_terminal">Shell Terminal</string>
+    <string name="ip_address">My IP Adress</string>
+    <string name="ip_address_need_wifi">Please connect your wifi</string>
+
+
+    <string name="editor_override">Do you want to override?</string>
+
+</resources>
diff --git a/qpython/src/main/res/values/strings_activity_settings.xml b/qpython/src/main/res/values/strings_activity_settings.xml
new file mode 100644
index 00000000..d019240e
--- /dev/null
+++ b/qpython/src/main/res/values/strings_activity_settings.xml
@@ -0,0 +1,11 @@
+<resources>
+
+    <!-- Strings related to Settings -->
+
+    <!-- Example General settings -->
+
+    <!-- Example settings for Data & Sync -->
+
+    <!-- Example settings for Notifications -->
+
+</resources>
diff --git a/qpython/src/main/res/values/strings_plugin_manager.xml b/qpython/src/main/res/values/strings_plugin_manager.xml
new file mode 100644
index 00000000..e6dd2c9f
--- /dev/null
+++ b/qpython/src/main/res/values/strings_plugin_manager.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="toast_plugin_uninstall_complete">Plugin uninstall complete</string>
+    <string name="toast_plugin_install_complete">Plugin install complete</string>
+    <string name="toast_plugin_install_failure">Plugin install fail</string>
+    <string name="dialog_plugin_detail_positive">OK</string>
+    <string name="title_select_plugin">Select plugin</string>
+    <string name="title_plugin_manage">Plugin manager</string>
+    <string name="toast_read_permission_deny" translatable="false">Permission deny</string>
+
+    <string name="plugin_install">Install</string>
+    <string name="plugin_uninstall">UnInstall</string>
+    <string name="plugin_update">Update</string>
+    <string name="plugin_detail">Detail</string>
+
+    <string-array name="plugin_tab">
+        <item>Local plugin</item>
+        <item>Cloud plugin</item>
+    </string-array>
+</resources>
\ No newline at end of file
diff --git a/qpython/src/main/res/values/styles.xml b/qpython/src/main/res/values/styles.xml
new file mode 100644
index 00000000..0f3672b1
--- /dev/null
+++ b/qpython/src/main/res/values/styles.xml
@@ -0,0 +1,303 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+    <style name="TransparentTheme" parent="@style/Theme.AppCompat">
+
+        <item name="android:background">@android:color/transparent</item>
+        <item name="background">@android:color/transparent</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:colorBackgroundCacheHint">@android:color/transparent</item>
+        <item name="android:windowContentOverlay">@android:color/transparent</item>
+        <item name="android:windowIsTranslucent">@android:color/transparent</item>
+        <item name="android:windowAnimationStyle">@android:color/transparent</item>
+    </style>
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.NoActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="android:textColorTertiary">@color/white</item>
+        <item name="android:textColorPrimary">@color/white</item>
+        <item name="colorControlNormal">@color/white</item>
+        <item name="colorAccent">@color/colorAccent</item>
+        <item name="android:background">@color/colorPrimaryDark</item>
+        <!--<item name="android:dialogPreferenceStyle">@style/MyAlertDialogStyle</item>-->
+        <!--<item name="android:dialogTheme">@style/MyAlertDialogStyle</item>-->
+        <item name="android:colorBackground">@color/colorPrimaryDark</item>
+        <item name="android:alertDialogTheme">@style/MyDialog</item>
+        <item name="android:windowBackground">@color/colorPrimaryDark</item>
+        <item name="android:actionMenuTextColor">@color/colorAccent</item>
+        <item name="actionMenuTextColor">@color/colorAccent</item>
+        <item name="android:textAppearanceSmallPopupMenu">@style/popupMenuTextAppearanceSmall</item>
+        <item name="android:textAppearanceLargePopupMenu">@style/popupMenuTextAppearanceLarge</item>
+    </style>
+
+    <style name="SettingTheme" parent="Theme.AppCompat.NoActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+        <item name="android:textColorSecondary">#FF9B9B9B</item>
+        <item name="textColorAlertDialogListItem">#EEEEEE</item>
+    </style>
+
+    <style name="FullscreenTheme" parent="Theme.AppCompat.NoActionBar">
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowFullscreen">?android:windowNoTitle</item>
+    </style>
+
+
+    <style name="DialogAnimation">
+        <item name="android:windowEnterAnimation">@anim/slide_up</item>
+        <item name="android:windowExitAnimation">@anim/slide_down</item>
+    </style>
+
+    <style name="popupMenuTextAppearanceSmall" parent="@style/TextAppearance.AppCompat.Light.Widget.PopupMenu.Small">
+        <item name="android:textColor">@android:color/black</item>
+    </style>
+
+    <style name="popupMenuTextAppearanceLarge" parent="@style/TextAppearance.AppCompat.Light.Widget.PopupMenu.Large">
+        <item name="android:textColor">@android:color/black</item>
+    </style>
+
+
+    <style name="DefaultBlueToolbar" parent="@style/ThemeOverlay.AppCompat.Light">
+        <item name="actionOverflowMenuStyle">@style/OverflowMenuStyle</item>
+        <item name="android:itemBackground">@color/colorPrimaryDark</item>
+        <item name="android:colorBackground">@color/colorPrimaryDark</item>
+        <item name="android:textColor">@color/white</item>
+    </style>
+
+    <style name="OverflowMenuStyle" parent="Widget.AppCompat.Light.PopupMenu.Overflow">
+        <item name="overlapAnchor">false</item>
+        <item name="android:dropDownWidth">wrap_content</item>
+        <item name="android:paddingRight">5dp</item>
+        <item name="android:popupBackground">@color/white</item>
+        <item name="colorControlNormal">@color/white</item>
+    </style>
+
+    <style name="ConsoleTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <item name="android:windowFullscreen">false</item>
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowFrame">@null</item>
+        <item name="android:windowContentOverlay">@null</item>
+    </style>
+
+    <style name="toolbar_text" parent="TextAppearance.AppCompat.Widget.ActionBar.Title"/>
+    <!--<style name="WebViewTheme" parent="FinestWebViewTheme.Light">-->
+    <!--<item name="colorPrimary">@color/colorPrimary</item>-->
+    <!--<item name="colorPrimaryDark">@color/colorPrimaryDark</item>-->
+    <!--<item name="colorAccent">@color/white</item>-->
+    <!--<item name="android:textColorPrimary">@color/white</item>-->
+    <!--<item name="android:textColorSecondary">@color/white</item>-->
+    <!--<item name="windowActionModeOverlay">true</item>-->
+    <!--</style>-->
+
+
+    <!-- Base application theme. -->
+
+
+    <style name="Toolbar.Item" parent="TextAppearance.AppCompat.Widget.ActionBar.Menu">
+        <item name="android:textColor">@android:color/white</item>
+        <item name="android:textSize">15sp</item>
+    </style>
+    <!--Toolbar样式，使用方式：style="@style/Toolbar" 要改变返回按钮样式时，要配合app:theme使用-->
+    <style name="Toolbar" parent="@style/Widget.AppCompat.Light.ActionBar">
+        <item name="android:background">?attr/colorPrimary</item>
+        <item name="android:minHeight">?attr/actionBarSize</item>
+        <item name="elevation">3dp</item>
+
+        <item name="titleTextColor">#fff</item>
+        <item name="subtitleTextColor">#fff</item>
+
+        <item name="actionMenuTextColor">@android:color/white</item>
+        <item name="actionMenuTextAppearance">@style/Toolbar.Item</item>
+    </style>
+    <!--Toolbar主题，使用方式：app:theme="@style/ToolbarTheme"-->
+    <style name="ToolbarTheme" parent="ThemeOverlay.AppCompat.ActionBar">
+        <!--控件颜色，如返回按钮箭头图标的颜色-->
+        <item name="colorControlNormal">#fff</item>
+    </style>
+
+    <style name="MyEditText" parent="Theme.AppCompat.Light">
+        <item name="colorControlNormal">@color/theme_green</item>
+    </style>
+
+    <style name="Dialog" parent="BaseDialog">
+        <item name="android:windowCloseOnTouchOutside">true</item>
+    </style>
+
+    <style name="BaseDialog" parent="Theme.AppCompat.Dialog">
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowFrame">@null</item>
+        <item name="android:windowCloseOnTouchOutside">false</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
+    <style name="BottomAnim" parent="@android:style/Animation">
+        <item name="android:windowEnterAnimation">@anim/slide_in_bottom</item>
+        <item name="android:windowExitAnimation">@anim/slide_out_bottom</item>
+    </style>
+
+    <!--  透明背景  -->
+
+    <style name="setting_tv">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginTop">1dp</item>
+        <item name="android:background">#FF363636</item>
+        <item name="android:drawableRight">@drawable/ic_white_arrow_right</item>
+        <item name="android:padding">@dimen/default_margin</item>
+        <!--<item name="android:paddingTop">10dp</item>-->
+        <!--<item name="android:paddingBottom">10dp</item>-->
+        <!--<item name="android:paddingRight">@dimen/default_margin</item>-->
+        <!--<item name="android:paddingLeft">@dimen/default_margin</item>-->
+        <item name="android:gravity">center_vertical</item>
+        <item name="android:textColor">#FFF</item>
+    </style>
+
+    <style name="grid_item">
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_weight">1</item>
+        <item name="android:gravity">center</item>
+        <item name="android:orientation">vertical</item>
+    </style>
+
+    <style name="row_ll">
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_weight">1</item>
+        <item name="android:gravity">center</item>
+        <item name="android:orientation">vertical</item>
+    </style>
+
+    <style name="tab_btn">
+        <item name="android:textAllCaps">false</item>
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:padding">@dimen/default_margin</item>
+        <item name="android:layout_weight">1</item>
+        <item name="android:background">@color/colorPrimaryDark</item>
+        <item name="android:textColor">@drawable/select_green_text</item>
+    </style>
+
+    <style name="param_text">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_alignParentRight">true</item>
+        <item name="android:layout_centerVertical">true</item>
+        <item name="android:textColor">#FF888888</item>
+        <item name="android:layout_marginRight">45dp</item>
+    </style>
+
+    <style name="param_hint">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:drawableRight">@drawable/ic_white_arrow_right</item>
+        <item name="android:gravity">center_vertical</item>
+        <item name="android:textColor">#FFF</item>
+    </style>
+
+    <style name="TextTitle">
+        <item name="android:paddingTop">14dp</item>
+        <item name="android:textSize">24sp</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+
+    <style name="TextSubTitle">
+        <item name="android:paddingTop">10dp</item>
+        <item name="android:textSize">18sp</item>
+    </style>
+
+    <style name="TextContent">
+        <item name="android:paddingTop">6dp</item>
+        <item name="android:textSize">14sp</item>
+    </style>
+
+    <style name="green_btn">
+        <item name="android:layout_width">80dp</item>
+        <item name="android:layout_height">35dp</item>
+        <item name="android:background">@drawable/green_btn_bg</item>
+        <item name="android:textColor">#FFF</item>
+        <item name="android:textSize">18sp</item>
+    </style>
+
+    <style name="dialog_item">
+        <item name="android:textSize">15sp</item>
+        <item name="android:layout_marginTop">1dp</item>
+        <item name="android:padding">16dp</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:background">#FF4A4A4A</item>
+        <item name="android:textColor">#FFF</item>
+    </style>
+
+    <style name="editor_bottom_btn">
+        <item name="android:layout_width">47dp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:background">@null</item>
+        <item name="android:clickable">true</item>
+        <item name="android:padding">5dip</item>
+    </style>
+
+    <style name="editor_marks_btn">
+        <item name="android:textColor">@color/colorPrimaryDark</item>
+        <item name="android:layout_width">47dp</item>
+        <item name="android:minWidth">47dp</item>
+        <item name="android:padding">5dp</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:background">@color/transparency</item>
+        <item name="android:clickable">true</item>
+    </style>
+
+    <style name="Theme.AppCompat.Dialog">
+        <item name="android:windowBackground">@color/colorPrimaryDark</item>
+        <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
+        <item name="android:textColor">@color/white</item>
+        <item name="android:textColorSecondary">@color/colorAccent</item>
+    </style>
+
+    <style name="top_hint">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:background">@color/colorPrimaryDark</item>
+        <item name="android:padding">@dimen/default_margin</item>
+        <item name="android:textColor">#FFF</item>
+        <item name="android:textSize">15sp</item>
+    </style>
+
+    <style name="top_describe">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:background">@color/colorPrimaryDark</item>
+        <item name="android:paddingBottom">@dimen/default_margin</item>
+        <item name="android:paddingLeft">@dimen/default_margin</item>
+        <item name="android:paddingRight">@dimen/default_margin</item>
+        <item name="android:textColor">#9B9B9B</item>
+    </style>
+
+    <style name="MyDialog" parent="Theme.AppCompat.Light.Dialog.Alert">
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <!-- Used for the buttons -->
+        <item name="colorAccent">#FFF</item>
+        <!--<item name="colorPrimary">#FF4BAC07</item>-->
+        <item name="android:textColor">@color/colorAccent</item>
+        <item name="android:textColorAlertDialogListItem">#FFF</item>
+        <item name="textColorAlertDialogListItem">#FFF</item>
+        <!-- Used for the title and text -->
+        <item name="android:textColorPrimary">#FFF</item>
+        <item name="android:textColorSecondary">#FFF</item>
+        <!--<item name="android:textColorTertiary">#FF4BAC07</item>-->
+        <!-- Used for the background -->
+        <item name="android:background">@color/colorPrimary</item>
+    </style>
+
+</resources>
diff --git a/qpython/src/main/res/values/textview_attrs.xml b/qpython/src/main/res/values/textview_attrs.xml
new file mode 100644
index 00000000..8754aa13
--- /dev/null
+++ b/qpython/src/main/res/values/textview_attrs.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- The underline color and thickness for misspelled suggestion -->
+    <attr name="textAppearanceMisspelledSuggestion" format="reference" />
+    <!--  The underline color -->
+    <attr name="textUnderlineColor" format="reference|color" />
+    <!--  The underline thickness -->
+    <attr name="textUnderlineThickness" format="reference|dimension" />
+
+    <declare-styleable name="SuggestionSpan">
+        <attr name="textUnderlineColor" />
+        <attr name="textUnderlineThickness" />
+    </declare-styleable>
+
+    <!-- The underline color and thickness for easy correct suggestion -->
+    <attr name="textAppearanceEasyCorrectSuggestion" format="reference" />
+    <!-- The underline color and thickness for auto correction suggestion -->
+    <attr name="textAppearanceAutoCorrectionSuggestion" format="reference" />
+
+    <declare-styleable name="SelectionModeDrawables">
+        <attr name="actionModeSelectAllDrawable" />
+        <attr name="actionModeCutDrawable" />
+        <attr name="actionModeCopyDrawable" />
+        <attr name="actionModePasteDrawable" />
+        <attr name="actionModeFindDrawable" />
+    </declare-styleable>
+</resources>
diff --git a/qpython/src/main/res/values/textview_dimens.xml b/qpython/src/main/res/values/textview_dimens.xml
new file mode 100644
index 00000000..febee99d
--- /dev/null
+++ b/qpython/src/main/res/values/textview_dimens.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Size of the fastscroll hint letter -->
+    <!-- Width of the fastscroll thumb -->
+    <!-- Height of the fastscroll thumb -->
+</resources>
diff --git a/qpython/src/main/res/values/textview_material_dimens.xml b/qpython/src/main/res/values/textview_material_dimens.xml
new file mode 100644
index 00000000..743ecdfa
--- /dev/null
+++ b/qpython/src/main/res/values/textview_material_dimens.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+    <!-- Preference activity, vertical padding for the header list -->
+
+    <!-- Preference activity side margins -->
+    <!-- Preference activity side margins negative-->
+
+    <!-- Preference fragment padding, sides -->
+
+    <!-- Preference breadcrumbs padding, start padding -->
+
+    <!-- Preference breadcrumbs padding, end padding -->
+
+    <!-- Default height of an action bar. -->
+    <!-- Default padding of an action bar. -->
+    <!-- Vertical padding around action bar icons. -->
+    <!-- Top margin for action bar subtitles -->
+    <!-- Bottom margin for action bar subtitles -->
+
+    <!-- Elevation when button is pressed -->
+    <!-- Z translation to apply when button is pressed -->
+    <!-- Default insets (outer padding) around buttons -->
+    <!-- Default inner padding within buttons -->
+
+    <!-- Default insets (outer padding) around controls -->
+    <!-- Default inner padding within controls -->
+    <!-- Default rounded corner for controls -->
+
+</resources>
diff --git a/qpython/src/main/res/values/textview_styles.xml b/qpython/src/main/res/values/textview_styles.xml
new file mode 100644
index 00000000..d781ec5f
--- /dev/null
+++ b/qpython/src/main/res/values/textview_styles.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+</resources>
diff --git a/qpython/src/main/res/values/toasts.xml b/qpython/src/main/res/values/toasts.xml
new file mode 100644
index 00000000..53a181ad
--- /dev/null
+++ b/qpython/src/main/res/values/toasts.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="toast_recent_files_invalid">"File doesn't exist anymore, removing from recent list."</string>
+    <string name="toast_recent_files_deleted">File deleted from recent list</string>
+    <string name="toast_intent_invalid_uri">Unable to open the file, URI is invalid</string>
+    <string name="toast_intent_illegal">Unable to open the file</string>
+    <string name="toast_activity_open">Unable to load the file browser</string>
+    <string name="toast_memory_open">Unable to open the file, not enough memory</string>
+    <string name="toast_open_error">Unable to open the file (maybe the file is too big, or corrupted)</string>
+    <string name="toast_save_null">Unable to save, path is null</string>
+    <string name="toast_save_temp">Unable to save to temp file</string>
+    <string name="toast_save_delete">Unable to save (error while copying temp file to save location)</string>
+    <string name="toast_save_rename">Unable to save (error while copying temp file to save location)</string>
+    <string name="toast_save_success">File saved</string>
+    <string name="toast_folder_cant_write">"Can't use this folder cause it isn't writeable"</string>
+    <string name="toast_file_cant_read">"Can't use this file cause it isn't readable"</string>
+    <string name="toast_search_not_found">No match was found in the current file</string>
+    <string name="toast_search_eof">No more match found in the current file</string>
+    <string name="toast_search_no_input">Type a text to search in the search bar</string>
+    <string name="toast_filename_empty">The filename must not be empty</string>
+    <string name="toast_warn_no_undo">Nothing to undo anymore.</string>
+    <string name="toast_open_home_page_error">Default file not found, try setting a new one in the settings.</string>
+    <string name="toast_home_page_cant_read">"Can't open default file cause it isn't readable"</string>
+    <string name="toast_widget_select">Select a file to associate with this new widget</string>
+    <string name="toast_open_select">Select a file to open</string>
+    <string name="toast_home_page_select">Select a file to open when you launch Ted from your home screen</string>
+    <string name="toast_file_saved_auto">"The opened file was saved automatically, and will be opened at next startup"</string>
+
+
+    <!--  -->
+    <string name="toast_folder_doesnt_exist">"Can't display folder cause it doesn't exist"</string>
+    <string name="toast_folder_not_folder">Can\'t display folder cause it isn\'t a folder</string>
+    <string name="toast_folder_cant_read">"Can't display folder cause it isn't readable"</string>
+    <string name="toast_no_market">The Android Play Store is not present on this device</string>
+
+</resources>
\ No newline at end of file
diff --git a/qpython/src/main/res/xml/console_preferences.xml b/qpython/src/main/res/xml/console_preferences.xml
new file mode 100644
index 00000000..52d53766
--- /dev/null
+++ b/qpython/src/main/res/xml/console_preferences.xml
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2008 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <PreferenceCategory
+        android:title="@string/screen_preferences"
+        android:key="screen">
+
+        <ListPreference
+            android:key="statusbar"
+            android:defaultValue="@string/pref_statusbar_default"
+            android:title="@string/title_statusbar_preference"
+            android:summary="@string/summary_statusbar_preference"
+            android:entries="@array/entries_statusbar_preference"
+            android:entryValues="@array/entryvalues_statusbar_preference"
+            android:dialogTitle="@string/dialog_title_statusbar_preference" />
+
+        <ListPreference
+            android:key="actionbar"
+            android:defaultValue="@integer/pref_actionbar_default"
+            android:title="@string/title_actionbar_preference"
+            android:summary="@string/summary_actionbar_preference"
+            android:entries="@array/entries_actionbar_preference"
+            android:entryValues="@array/entryvalues_actionbar_preference"
+            android:dialogTitle="@string/dialog_title_actionbar_preference" />
+
+        <ListPreference
+            android:key="orientation"
+            android:defaultValue="@integer/pref_orientation_default"
+            android:title="@string/title_orientation_preference"
+            android:summary="@string/summary_orientation_preference"
+            android:entries="@array/entries_orientation_preference"
+            android:entryValues="@array/entryvalues_orientation_preference"
+            android:dialogTitle="@string/dialog_title_orientation_preference" />
+
+        <!--
+                <ListPreference
+                        android:key="cursorstyle"
+                        android:defaultValue="@string/pref_cursorstyle_default"
+                        android:title="@string/title_cursorstyle_preference"
+                        android:summary="@string/summary_cursorstyle_preference"
+                        android:entries="@array/entries_cursorstyle_preference"
+                        android:entryValues="@array/entryvalues_cursorstyle_preference"
+                        android:dialogTitle="@string/dialog_title_cursorstyle_preference" />
+
+                <ListPreference
+                        android:key="cursorblink"
+                        android:defaultValue="@string/pref_cursorblink_default"
+                        android:title="@string/title_cursorblink_preference"
+                        android:summary="@string/summary_cursorblink_preference"
+                        android:entries="@array/entries_cursorblink_preference"
+                        android:entryValues="@array/entryvalues_cursorblink_preference"
+                        android:dialogTitle="@string/dialog_title_cursorblink_preference" />
+        -->
+
+    </PreferenceCategory>
+
+    <PreferenceCategory android:title="@string/text_preferences">
+
+        <ListPreference
+            android:key="fontsize"
+            android:defaultValue="@string/pref_fontsize_default"
+            android:title="@string/title_fontsize_preference"
+            android:summary="@string/summary_fontsize_preference"
+            android:entries="@array/entries_fontsize_preference"
+            android:entryValues="@array/entryvalues_fontsize_preference"
+            android:dialogTitle="@string/dialog_title_fontsize_preference" />
+
+        <ListPreference
+            android:key="color"
+            android:defaultValue="@string/pref_color_default"
+            android:title="@string/title_color_preference"
+            android:summary="@string/summary_color_preference"
+            android:entries="@array/entries_color_preference"
+            android:entryValues="@array/entryvalues_color_preference"
+            android:dialogTitle="@string/dialog_title_color_preference" />
+
+        <CheckBoxPreference
+            android:key="utf8_by_default"
+            android:defaultValue="@bool/pref_utf8_by_default_default"
+            android:title="@string/title_utf8_by_default_preference"
+            android:summary="@string/summary_utf8_by_default_preference" />
+
+    </PreferenceCategory>
+
+    <PreferenceCategory android:title="@string/keyboard_preferences">
+
+        <ListPreference
+            android:key="backaction"
+            android:defaultValue="@string/pref_backaction_default"
+            android:title="@string/title_backaction_preference"
+            android:summary="@string/summary_backaction_preference"
+            android:entries="@array/entries_backaction_preference"
+            android:entryValues="@array/entryvalues_backaction_preference"
+            android:dialogTitle="@string/dialog_title_backaction_preference" />
+
+        <ListPreference
+            android:key="controlkey"
+            android:defaultValue="@string/pref_controlkey_default"
+            android:title="@string/title_controlkey_preference"
+            android:summary="@string/summary_controlkey_preference"
+            android:entries="@array/entries_controlkey_preference"
+            android:entryValues="@array/entryvalues_controlkey_preference"
+            android:dialogTitle="@string/dialog_title_controlkey_preference" />
+
+        <ListPreference
+            android:key="fnkey"
+            android:defaultValue="@string/pref_fnkey_default"
+            android:title="@string/title_fnkey_preference"
+            android:summary="@string/summary_fnkey_preference"
+            android:entries="@array/entries_fnkey_preference"
+            android:entryValues="@array/entryvalues_fnkey_preference"
+            android:dialogTitle="@string/dialog_title_fnkey_preference" />
+
+        <ListPreference
+            android:key="ime"
+            android:defaultValue="@string/pref_ime_default"
+            android:title="@string/title_ime_preference"
+            android:summary="@string/summary_ime_preference"
+            android:entries="@array/entries_ime_preference"
+            android:entryValues="@array/entryvalues_ime_preference"
+            android:dialogTitle="@string/dialog_title_ime_preference" />
+
+        <CheckBoxPreference
+            android:title="@string/alt_sends_esc"
+            android:key="alt_sends_esc"
+            android:defaultValue="@bool/pref_alt_sends_esc_default"
+            android:summaryOn="@string/alt_sends_esc_summary_on"
+            android:summaryOff="@string/alt_sends_esc_summary_off" />
+
+        <CheckBoxPreference
+            android:title="@string/title_use_keyboard_shortcuts"
+            android:key="use_keyboard_shortcuts"
+            android:defaultValue="@bool/pref_use_keyboard_shortcuts_default"
+            android:summaryOn="@string/use_keyboard_shortcuts_summary_on"
+            android:summaryOff="@string/use_keyboard_shortcuts_summary_off" />
+
+    </PreferenceCategory>
+
+    <PreferenceCategory android:title="@string/shell_preferences">
+
+        <EditTextPreference
+            android:key="shell"
+            android:defaultValue="@string/pref_shell_default"
+            android:title="@string/title_shell_preference"
+            android:summary="@string/summary_shell_preference"
+            android:dialogTitle="@string/dialog_title_shell_preference" />
+        <EditTextPreference
+            android:key="initialcommand"
+            android:defaultValue="@string/pref_initialcommand_default"
+            android:title="@string/title_initialcommand_preference"
+            android:summary="@string/summary_initialcommand_preference"
+            android:dialogTitle="@string/dialog_title_initialcommand_preference" />
+        <ListPreference
+            android:key="termtype"
+            android:defaultValue="@string/pref_termtype_default"
+            android:title="@string/title_termtype_preference"
+            android:summary="@string/summary_termtype_preference"
+            android:entries="@array/entries_termtype_preference"
+            android:entryValues="@array/entries_termtype_preference"
+            android:dialogTitle="@string/dialog_title_termtype_preference" />
+        <CheckBoxPreference
+            android:title="@string/title_mouse_tracking_preference"
+            android:key="mouse_tracking"
+            android:defaultValue="@bool/pref_mouse_tracking_default"
+            android:summary="@string/summary_mouse_tracking_preference" />
+        <CheckBoxPreference
+            android:key="close_window_on_process_exit"
+            android:defaultValue="@bool/pref_close_window_on_process_exit_default"
+            android:title="@string/title_close_window_on_process_exit_preference"
+            android:summary="@string/summary_close_window_on_process_exit_preference" />
+        <CheckBoxPreference
+            android:key="verify_path"
+            android:defaultValue="@bool/pref_verify_path_default"
+            android:title="@string/title_verify_path_preference"
+            android:summary="@string/summary_verify_path_preference" />
+        <CheckBoxPreference
+            android:key="do_path_extensions"
+            android:defaultValue="@bool/pref_do_path_extensions_default"
+            android:title="@string/title_do_path_extensions_preference"
+            android:summary="@string/summary_do_path_extensions_preference" />
+        <CheckBoxPreference
+            android:key="allow_prepend_path"
+            android:dependency="do_path_extensions"
+            android:defaultValue="@bool/pref_allow_prepend_path_default"
+            android:title="@string/title_allow_prepend_path_preference"
+            android:summary="@string/summary_allow_prepend_path_preference" />
+        <!-- the home_path default is set dynamically in Term.onResume() -->
+        <EditTextPreference
+            android:key="home_path"
+            android:title="@string/title_home_path_preference"
+            android:summary="@string/summary_home_path_preference" />
+    </PreferenceCategory>
+</PreferenceScreen>
diff --git a/qpython/src/main/res/xml/network_security_config.xml b/qpython/src/main/res/xml/network_security_config.xml
new file mode 100644
index 00000000..117f8bdf
--- /dev/null
+++ b/qpython/src/main/res/xml/network_security_config.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <domain-config cleartextTrafficPermitted="true">
+        <domain includeSubdomains="true">127.0.0.1</domain>
+        <domain includeSubdomains="true">localhost</domain>
+        <domain includeSubdomains="true">apu2.quseit.com</domain>
+        <domain includeSubdomains="true">qpy.io</domain>
+        <domain includeSubdomains="true">dl.qpy.io</domain>
+        <domain includeSubdomains="true">gist.qpy.io</domain>
+        <domain includeSubdomains="true">qpython.org</domain>
+        <domain includeSubdomains="true">gist.qpython.org</domain>
+        <domain includeSubdomains="true">edu.qpython.org</domain>
+        <domain includeSubdomains="true">www.qpython.org</domain>
+        <domain includeSubdomains="true">qpypi.qpython.org</domain>
+        <domain includeSubdomains="true">qpypi3.qpython.org</domain>
+
+    </domain-config>
+</network-security-config>
\ No newline at end of file
diff --git a/qpython/src/main/res/xml/qpython_setting.xml b/qpython/src/main/res/xml/qpython_setting.xml
new file mode 100644
index 00000000..245731f7
--- /dev/null
+++ b/qpython/src/main/res/xml/qpython_setting.xml
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    android:key="setting_page"
+    >
+    <PreferenceCategory
+        android:key="other"
+        android:title="@string/about"/>
+    <!--<Preference-->
+        <!--android:key="install_py3"-->
+        <!--android:title="@string/install_py3"/>-->
+
+    <Preference
+        android:key="course"
+        android:title="@string/course"
+        android:summary="@string/learn_course"/>
+
+
+    <Preference
+        android:key="community"
+        android:title="@string/get_help"
+        android:summary="@string/get_support_from_community"/>
+    <Preference
+        android:key="@string/key_about"
+        android:title="@string/about"
+        android:summary="About / Feedback / Contributors"/>
+
+
+    <Preference
+        android:key="ipaddress"
+        android:title="@string/ip_address"
+        android:summary=""/>
+
+    <PreferenceCategory
+        android:key="config"
+        android:title="@string/more"/>
+
+
+    <Preference
+        android:key="lastlog"
+        android:title="@string/last_log"
+        android:summary="@string/get_last_log"/>
+
+    <PreferenceScreen
+        android:key="@string/key_py_inter"
+        android:title="@string/py_inter">
+
+        <!--PreferenceCategory
+            android:key="py_inter_update"
+            android:title="@string/py_resources">
+
+            <Preference
+                android:key="@string/key_update_qpy3"
+                android:summary=""
+                android:title="@string/update_py3"/>
+
+            <Preference
+                android:key="@string/key_update_qpy2compatible"
+                android:title="@string/update_py2compatible"/>
+
+        </PreferenceCategory-->
+
+        <PreferenceCategory
+            android:key="py_inter_update"
+            android:title="@string/py_inter">
+
+            <Preference
+                android:key="@string/key_py3"
+                android:title="@string/switch_py3"/>
+
+            <Preference
+                android:key="@string/key_py2"
+                android:title="@string/switch_py2"/>
+
+
+            <!--Preference
+                android:key="@string/key_py2compatible"
+                android:summary="@string/switch_py2_libs"
+                android:title="@string/switch_py2compatible"/-->
+
+        </PreferenceCategory>
+    </PreferenceScreen>
+
+
+    <!--CheckBoxPreference
+        android:key="@string/key_aipy"
+        android:summary="@string/aipy_install"
+        android:title="@string/install_aipy"/-->
+    <PreferenceScreen
+        android:summary="@string/notebook_not_started"
+        android:key="@string/key_notebook_page"
+        android:title="@string/notebook">
+        <!--PreferenceCategory
+            android:key="notebook_update"
+            android:title="@string/notebook_res">
+            <Preference
+                android:key="@string/key_notebook"
+                android:title="@string/install_notebook"/>
+
+        </PreferenceCategory-->
+
+        <PreferenceCategory
+            android:key="notebook_update"
+            android:title="@string/notebook_service">
+
+            <CheckBoxPreference
+                android:key="@string/key_notebook_run"
+                android:summary="@string/notebook_explorer_bg_start"
+                android:title="@string/notebook_explorer"/>
+        </PreferenceCategory>
+    </PreferenceScreen>
+
+    <CheckBoxPreference
+        android:key="@string/key_root"
+        android:summaryOn="@string/enable_root"
+        android:summaryOff="@string/disable_root"
+        android:title="@string/root_mode"/>
+
+    <CheckBoxPreference
+        android:key="@string/key_sl4a"
+        android:summaryOn="@string/sl4a_running"
+        android:summaryOff="@string/sl4a_un_running"
+        android:title="@string/sl4a_server"/>
+    <!--Preference
+        android:key="@string/key_qpypi"
+        android:summary="@string/http_qpypi_qpython_org"
+        android:title="@string/extra_pypi"/-->
+    <Preference
+        android:key="@string/key_reset"
+        android:title="@string/internal_space"/>
+    <PreferenceScreen
+        android:key="ftp"
+        android:title="@string/ftp_server">
+        <!-- Arbitrary key/value pairs can be included for fragment arguments -->
+        <!--<extra-->
+        <!--android:name="someKey"-->
+        <!--android:value="somePrefValue"/>-->
+
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="@string/key_ftp_state"
+            android:summary="@string/running_summary_stopped"
+            android:title="@string/running_label"/>
+
+        <PreferenceCategory
+            android:key="config"
+            android:title="@string/config">
+            <Preference
+                android:defaultValue="@string/username_default"
+                android:key="@string/key_username"
+                android:theme="@style/MyDialog"
+                android:title="@string/username_label"/>
+            <Preference
+                android:defaultValue="@string/password_default"
+                android:inputType="textPassword"
+                android:key="@string/key_ftp_pwd"
+                android:title="@string/password_label"/>
+            <Preference
+                android:defaultValue="@string/portnumber_default"
+                android:key="@string/key_port_num"
+                android:title="@string/portnumber_label"/>
+        </PreferenceCategory>
+
+        <PreferenceCategory
+            android:key="settings"
+            android:title="@string/settings_label">
+
+            <CheckBoxPreference
+                android:defaultValue="@string/show_password_default"
+                android:key="@string/key_show_pwd"
+                android:title="@string/show_password_label"/>
+            <Preference
+                android:defaultValue="@string/chroot_default"
+                android:key="@string/key_root_dir"
+                android:title="@string/chroot_label"/>
+
+            <CheckBoxPreference
+                android:defaultValue="@string/wakelock_default"
+                android:key="@string/key_stay_awake"
+                android:title="@string/wakelock_label"/>
+            <!--<PreferenceScreen-->
+            <!--xmlns:android="http://schemas.android.com/apk/res/android"-->
+            <!--android:title="@string/advancedsettings_label">-->
+
+            <!--</PreferenceScreen>-->
+
+        </PreferenceCategory>
+    </PreferenceScreen>
+    <PreferenceCategory
+        android:key="notify"
+        android:title="Notifications">
+        <SwitchPreference
+            android:defaultValue="true"
+            android:key="@string/key_hide_noti"
+            android:title="@string/log_noti"/>
+        <SwitchPreference
+            android:defaultValue="true"
+            android:key="@string/key_hide_push"
+            android:title="@string/app_noti"/>
+    </PreferenceCategory>
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/qpython/src/main/res/xml/shortcuts.xml b/qpython/src/main/res/xml/shortcuts.xml
new file mode 100644
index 00000000..e8e30d6d
--- /dev/null
+++ b/qpython/src/main/res/xml/shortcuts.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
+    <shortcut
+        android:enabled="true"
+        android:icon="@drawable/ic_home_editor"
+        android:shortcutDisabledMessage="@string/editor"
+        android:shortcutId="editor"
+        android:shortcutLongLabel="@string/editor"
+        android:shortcutShortLabel="@string/editor">
+        <intent
+            android:action="android.intent.action.VIEW"
+            android:targetClass="org.qpython.qpy.texteditor.EditorActivity"
+            android:targetPackage="org.qpython.qpy"/>
+        <!-- If your shortcut is associated with multiple intents, include them
+             here. The last intent in the list determines what the user sees when
+             they launch this shortcut. -->
+        <!--<categories android:name="android.shortcut.conversation"/>-->
+    </shortcut>
+
+    <shortcut
+        android:enabled="true"
+        android:icon="@drawable/ic_home_terminal"
+        android:shortcutDisabledMessage="@string/application_terminal"
+        android:shortcutId="terminal"
+        android:shortcutLongLabel="@string/application_terminal"
+        android:shortcutShortLabel="@string/application_terminal">
+        <intent
+            android:action="android.intent.action.VIEW"
+            android:targetClass="org.qpython.qpy.console.TermActivity"
+            android:targetPackage="org.qpython.qpy"/>
+        <!-- If your shortcut is associated with multiple intents, include them
+             here. The last intent in the list determines what the user sees when
+             they launch this shortcut. -->
+        <!--<categories android:name="android.shortcut.conversation"/>-->
+    </shortcut>
+</shortcuts>
\ No newline at end of file
diff --git a/qpython/src/main/res/xml/ted_prefs.xml b/qpython/src/main/res/xml/ted_prefs.xml
new file mode 100644
index 00000000..33ae6370
--- /dev/null
+++ b/qpython/src/main/res/xml/ted_prefs.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+                  android:key="ted_settings"
+                  android:title="@string/title_settings">
+
+    <PreferenceCategory android:title="@string/config_cat_display">
+        <!--CheckBoxPreference
+            android:defaultValue="false"
+            android:key="show_gist"
+            android:summaryOn="@string/config_gist_icon"
+            android:title="@string/config_title_gist"/-->
+
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:key="show_line_numbers"
+            android:summaryOn="@string/config_summary_line_numbers"
+            android:title="@string/config_title_line_numbers"/>
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="auto_break_lines"
+            android:summaryOn="@string/config_summary_word_wrap"
+            android:title="@string/config_title_word_wrap"/>
+
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:key="fling_to_scroll"
+            android:summary="@string/config_summary_scroll_fling"
+            android:title="@string/config_title_scroll_fling"/>
+
+        <Preference
+            android:key="select_font"
+            android:title="@string/config_title_font"/>
+
+        <ListPreference
+            android:defaultValue="0"
+            android:entries="@array/color_theme_names"
+            android:entryValues="@array/color_theme_values"
+            android:key="color_theme"
+            android:title="@string/config_title_color_theme"/>
+        <ListPreference
+            android:defaultValue="14"
+            android:entries="@array/text_size_names"
+            android:entryValues="@array/text_size_values"
+            android:key="text_size"
+            android:title="@string/config_title_text_size"/>
+
+        <!--ListPreference
+            android:defaultValue="300"
+            android:entries="@array/max_lines_num_with_syntax_values"
+            android:entryValues="@array/max_lines_num_with_syntax_values"
+            android:key="max_lines_num_with_syntax"
+            android:summary="@string/max_lines_num_with_syntax_summary"
+            android:title="@string/max_lines_num_with_syntax_title"/-->
+    </PreferenceCategory>
+</PreferenceScreen>
diff --git a/qpython/src/oh/AndroidManifest.xml b/qpython/src/oh/AndroidManifest.xml
new file mode 100644
index 00000000..4a0dc7d5
--- /dev/null
+++ b/qpython/src/oh/AndroidManifest.xml
@@ -0,0 +1,408 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:tools="http://schemas.android.com/tools"
+          package="org.qpython.qpy">
+
+    <uses-feature
+        android:name="android.hardware.touchscreen"
+        android:required="false"/>
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.CAMERA"/>
+    <uses-permission android:name="android.permission.FLASHLIGHT"/>
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
+    <uses-permission android:name="com.android.vending.BILLING"/>
+    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
+    <uses-permission android:name="com.android.launcher.permission.UNINSTALL_SHORTCUT" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_MEDIA_STORAGE" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+    <uses-permission android:name="android.permission.NFC" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.ACCESS_NOTIFICATION_POLICY" />
+    <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES"/>
+    <uses-permission android:name="net.dinglisch.android.tasker.PERMISSION_RUN_TASKS" />
+    <!-- privacy sensitive permissions -->
+    <uses-permission android:name="android.permission.ACCESS_SUPERUSER" />
+    <!--uses-permission android:name="android.permission.READ_SMS"/>
+    <uses-permission android:name="android.permission.SEND_SMS" />
+    <uses-permission android:name="android.permission.RECEIVE_SMS"/>
+    <uses-permission android:name="android.permission.WRITE_SMS"/-->
+    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+    <uses-permission android:name="android.permission.CALL_PHONE"/>
+    <!--uses-permission android:name="android.permission.READ_CALL_LOG"/>
+    <uses-permission android:name="android.permission.PROCESS_OUTGOING_CALLS"/-->
+    <uses-permission android:name="android.permission.READ_CONTACTS"/>
+    <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
+    <!--uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/-->
+
+    <uses-feature android:name="android.hardware.microphone" android:required="false"/>
+    <uses-feature android:name="android.hardware.telephony" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.flash" android:required="false"/>
+    <uses-feature android:name="android.hardware.screen.landscape" android:required="false"/>
+    <uses-feature android:name="android.hardware.wifi" android:required="false"/>
+    <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
+    <uses-feature android:name="android.hardware.location.gps" android:required="false"/>
+    <uses-feature android:name="android.hardware.location.network" android:required="false"/>
+    <uses-feature android:name="android.hardware.bluetooth" android:required="false"/>
+
+    <uses-feature android:glEsVersion="0x00020000" android:required="false"/>
+
+    <application
+        android:networkSecurityConfig="@xml/network_security_config"
+        android:name="org.qpython.qpy.main.app.App"
+        android:allowBackup="true"
+        android:hardwareAccelerated="true"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:largeHeap="true"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
+        <uses-library android:name="org.apache.http.legacy" android:required="false"/>
+
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_icon"
+            android:resource="@drawable/img_home_logo"/>
+
+        <service android:name=".main.service.QPyService"/>
+        <service android:name="org.qpython.qsl4a.QPyScriptService"/>
+        <service android:name=".main.service.FTPServerService"/>
+        <activity
+            android:name=".main.activity.SignInActivity"
+            android:launchMode="singleTask"/>
+        <activity
+            android:name="org.renpy.android.PythonSDLActivity"
+            android:hardwareAccelerated="true"
+            android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|fontScale|uiMode|orientation"
+            android:launchMode="singleTask"
+            android:process=":python"
+            android:screenOrientation="user"
+            android:theme="@style/AppTheme"
+            android:windowSoftInputMode="stateAlwaysHidden">
+        </activity>
+
+        <activity
+            android:name="org.qpython.qpylib.MPyApi"
+            android:exported="true"
+            android:theme="@style/Theme.AppCompat"/>
+
+        <service
+            android:name="org.qpython.qpylib.MPyService"
+            android:exported="true"
+            tools:ignore="ExportedService"/>
+
+        <activity
+            android:name=".main.activity.SplashActivity"
+            android:theme="@style/FullscreenTheme"
+            >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name="org.qpython.qpy.main.activity.HomeMainActivity"
+            android:launchMode="singleTask">
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcuts"/>
+        </activity>
+
+        <activity
+            android:name="org.qpython.qpy.main.activity.QWebViewActivity"
+            android:label="@string/browser">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW"/>
+
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE"/>
+
+                <data android:mimeType="text/plain"/>
+                <data android:mimeType="image/*"/>
+                <data
+                    android:host="course"
+                    android:path="/"
+                    android:scheme="qpython"/>
+            </intent-filter>
+
+            <!-- Used to handle Chrome then menu then share.-->
+            <intent-filter>
+                <action android:name="android.intent.action.SEND"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <data android:mimeType="text/plain"/>
+                <data android:mimeType="image/*"/>
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".main.activity.CourseActivity"
+            android:configChanges="orientation|screenSize"/>
+        <activity android:name=".main.activity.CourseIndexActivity"/>
+        <activity android:name=".main.activity.GistEditActivity"/>
+        <activity android:name=".main.activity.CodeDetailActivity"/>
+        <activity android:name=".main.activity.CodeShareActivity"/>
+        <activity android:name=".main.activity.UserActivity"/>
+        <activity
+            android:name="org.qpython.qpy.main.activity.SettingActivity"
+            android:theme="@style/AppTheme"/>
+        <activity
+            android:name="org.qpython.qpy.console.TermActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:theme="@style/AppTheme"/>
+        <activity
+            android:name=".main.activity.LogActivity"
+            android:theme="@style/AppTheme"/>
+        <activity
+            android:name=".texteditor.EditorActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:exported="true"
+            android:label="@string/editor">
+            <intent-filter>
+                <!--<action android:name="android.intent.action.SEND"/>-->
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:mimeType="text/*"/>
+                <data android:scheme="file"/>
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="content"/>
+                <data android:host="*"/>
+                <data android:mimeType="*/*"/>
+                <data android:pathPattern=".*\\.txt"/>
+                <data android:pathPattern=".*\\.html"/>
+                <data android:pathPattern=".*\\.css"/>
+                <data android:pathPattern=".*\\.js"/>
+                <data android:pathPattern=".*\\.md"/>
+                <data android:pathPattern=".*\\.php"/>
+                <data android:pathPattern=".*\\.py"/>
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name="org.qpython.qpy.texteditor.TedLocalActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
+        <activity
+            android:name="org.qpython.qpy.texteditor.TedSettingsActivity"
+            android:theme="@style/SettingTheme"
+            android:windowSoftInputMode="stateHidden"/>
+        <activity
+            android:name="org.qpython.qpy.texteditor.TedFontActivity"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
+
+        <activity
+            android:name=".main.activity.LibActivity"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar">
+            <intent-filter>
+                <action android:name="org.qpython.qpy.OPEN_AIPY_FRAGMENT"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name=".main.activity.AboutActivity"/>
+
+        <activity
+            android:name=".main.activity.AppListActivity"
+            android:exported="true"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar">
+        </activity>
+        <activity
+            android:name="org.swiftp.gui.ServerPreferenceActivity"
+            android:label="Preferences"/>
+        <activity android:name=".texteditor.MFTPSettingActivity"/>
+        <activity android:name=".main.activity.PurchaseActivity"/>
+
+        <activity-alias
+            android:name="TermInternal"
+            android:exported="false"
+            android:targetActivity="org.qpython.qpy.console.TermActivity"
+            android:theme="@style/ConsoleTheme">
+            <intent-filter>
+                <action android:name="jackpal.androidterm.private.OPEN_NEW_WINDOW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="jackpal.androidterm.private.SWITCH_WINDOW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity-alias>
+        <activity
+            android:name="org.qpython.qpy.console.RemoteInterface"
+            android:excludeFromRecents="true"
+            android:theme="@style/ConsoleTheme">
+            <intent-filter>
+                <action android:name="jackpal.androidterm.OPEN_NEW_WINDOW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+        <activity-alias
+            android:name="TermHere"
+            android:exported="true"
+            android:label="@string/activity_term_here_title"
+            android:targetActivity="org.qpython.qpy.console.RemoteInterface"
+            android:theme="@style/ConsoleTheme">
+        </activity-alias>
+
+        <activity
+            android:name="org.qpython.qsl4a.qsl4a.activity.FutureActivity"
+            android:label="QSL4A FutureActivity"
+            android:theme="@style/AppTheme">
+            <intent-filter>
+                <action android:name="android.nfc.action.NDEF_DISCOVERED"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <data android:mimeType="application/com.hipipal.qpy.nfc"/>
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name="org.qpython.qpy.console.RunScript"
+            android:excludeFromRecents="true"
+            android:permission="jackpal.androidterm.permission.RUN_SCRIPT"
+            android:theme="@style/ConsoleTheme">
+            <intent-filter>
+                <action android:name="jackpal.androidterm.RUN_SCRIPT"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="org.qpython.qpy.console.RunShortcut"
+            android:excludeFromRecents="true"
+            android:theme="@style/ConsoleTheme">
+            <intent-filter>
+                <action android:name="jackpal.androidterm.RUN_SHORTCUT"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="org.qpython.qpy.console.TermPreferences"
+            android:label="@string/preferences"
+            android:theme="@style/ConsoleTheme"/>
+        <activity
+            android:name="org.qpython.qpy.console.WindowList"
+            android:label="@string/window_list"
+            android:theme="@style/ConsoleTheme"/>
+        <activity
+            android:name="org.qpython.qpy.console.shortcuts.AddShortcut"
+            android:configChanges="orientation|keyboard|keyboardHidden"
+            android:label="@string/activity_shortcut_create"
+            android:launchMode="singleTop"
+            android:theme="@style/Theme.AppCompat">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.CREATE_SHORTCUT"/>
+            </intent-filter>
+            <intent-filter>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <data android:mimeType="text/*"/>
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="org.qpython.qpy.console.shortcuts.FSNavigator"
+            android:configChanges="orientation|keyboardHidden"
+            android:exported="true"
+            android:label="@string/addshortcut_button_find_command"
+            android:launchMode="singleTop"
+            android:theme="@style/ConsoleTheme">
+            <intent-filter>
+                <action android:name="android.intent.action.PICK"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.GET_CONTENT"/>
+
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.OPENABLE"/>
+
+                <data android:mimeType="*/*"/>
+            </intent-filter>
+        </activity>
+
+        <activity android:name="org.qpython.qpy.plugin.activity.PluginManagerActivity"/>
+        <activity android:name="org.qpython.qpy.plugin.activity.LocalPluginInstallActivity"/>
+
+        <!--zxing-->
+        <activity android:name="org.qpython.qpy.main.activity.QrCodeActivity"/>
+        <activity
+            android:name=".main.activity.GistActivity"
+            android:configChanges="orientation"
+            android:launchMode="singleTask"/>
+        <activity
+            android:name=".main.activity.GistDetailActivity"
+            android:configChanges="orientation"/>
+        <activity
+            android:name=".main.activity.MyGistActivity"
+            android:configChanges="orientation"/>
+        <!--SERVICE-->
+        <service android:name="org.qpython.qpy.console.TermService"
+                 tools:ignore="ExportedService">
+            <intent-filter>
+                <action android:name="jackpal.androidterm.action.START_TERM.v1"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </service>
+
+        <activity android:name=".main.activity.CourseIndexFundingActivity"/>
+        <activity android:name=".main.activity.FundingPurchaseActivity"/>
+        <activity
+            android:name=".main.activity.NotebookActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:launchMode="singleTask"
+            android:windowSoftInputMode="adjustResize"
+            android:exported="true">
+            <intent-filter >
+                <action android:name="android.intent.action.VIEW"/>
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".main.activity.NotebookListActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"/>
+
+        <!--友盟-->
+        <meta-data
+            android:name="UMENG_APPKEY"
+            android:value="5a24fdea8f4a9d34b00000b5"/>
+        <meta-data
+            android:name="UMENG_CHANNEL"
+            android:value="QPython"/>
+
+        <!--微信-->
+        <!--activity
+            android:name="com.hipipal.qpyplus.wxapi.WXEntryActivity"
+            android:exported="true"
+            android:label="@string/app_name"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
+        <activity
+            android:name="com.hipipal.qpyplus.wxapi.WXPayEntryActivity"
+            android:exported="true"
+            android:label="@string/app_name"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar"/-->
+
+    </application>
+
+    <meta-data
+        android:name="com.sec.android.support.multiwindow"
+        android:value="true"/>
+
+</manifest>
diff --git a/qpython/src/oh/java/org/qpython/qpy/main/activity/BaseActivity.java b/qpython/src/oh/java/org/qpython/qpy/main/activity/BaseActivity.java
new file mode 100644
index 00000000..9c3765d4
--- /dev/null
+++ b/qpython/src/oh/java/org/qpython/qpy/main/activity/BaseActivity.java
@@ -0,0 +1,235 @@
+package org.qpython.qpy.main.activity;
+
+import android.content.ActivityNotFoundException;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Environment;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.app.ActivityCompat;
+import android.support.v4.content.ContextCompat;
+import android.support.v4.util.ArrayMap;
+import android.support.v7.app.AppCompatActivity;
+import android.text.TextUtils;
+import android.widget.Toast;
+
+import com.quseit.util.NAction;
+import com.quseit.util.NUtil;
+import com.umeng.analytics.MobclickAgent;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.console.ShellTermSession;
+import org.qpython.qpy.console.util.TermSettings;
+import org.qpython.qpy.main.server.gist.TokenManager;
+import org.renpy.android.ResourceManager;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Map;
+
+
+public class BaseActivity extends AppCompatActivity {
+    // QPython interfaces
+    private static final int SCRIPT_CONSOLE_CODE = 1237;
+    private static final int PID_INIT_VALUE      = -1;
+    private static final int DEFAULT_BUFFER_SIZE = 8192;
+    private static final int LOG_NOTIFICATION_ID = (int) System.currentTimeMillis();
+    private ArrayList<String> mArguments = new ArrayList<>();
+    private InputStream  mIn;
+    private OutputStream mOut;
+    private Map<Integer, PermissionAction> mActionMap = new ArrayMap<>();
+    private TermSettings     mSettings;
+    private ShellTermSession session;
+
+    private boolean permissionGrant = true;
+
+    protected static ShellTermSession createTermSession(Context context, TermSettings settings, String initialCommand, String path) {
+        ShellTermSession session = null;
+        try {
+            session = new ShellTermSession(context, settings, initialCommand, path);
+            session.setProcessExitMessage(context.getString(R.string.process_exit_message));
+
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        return session;
+    }
+
+    protected void toast(String content) {
+        Toast.makeText(this, content, Toast.LENGTH_SHORT).show();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        MobclickAgent.onPageStart(this.getLocalClassName());
+        MobclickAgent.onResume(this);
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        MobclickAgent.setDebugMode(true);
+        MobclickAgent.openActivityDurationTrack(false);
+        MobclickAgent.setScenarioType(this, MobclickAgent.EScenarioType.E_UM_NORMAL);
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        MobclickAgent.onPageEnd(this.getLocalClassName());
+        MobclickAgent.onPause(this);
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        PermissionAction action = mActionMap.get(requestCode);
+        if (action != null) {
+            if (grantResults.length > 0 && (grantResults[0] == PackageManager.PERMISSION_GRANTED)) {
+                action.onGrant();
+            } else {
+                action.onDeny();
+            }
+
+        }
+        mActionMap.remove(action);
+    }
+
+
+    public final void checkPermissionDo(String[] permissions, PermissionAction action) {
+        if (Build.VERSION.SDK_INT >= 23) {
+            boolean granted = true;
+            for (String permission : permissions) {
+                int checkPermission = ContextCompat.checkSelfPermission(this, permission);
+                granted = checkPermission == PackageManager.PERMISSION_GRANTED;
+            }
+            if (!granted) {
+                int code = permissions.hashCode() & 0xffff;
+                mActionMap.put(code, action);
+                ActivityCompat.requestPermissions(this, permissions, code);
+            } else {
+                action.onGrant();
+            }
+        } else {
+            action.onGrant();
+        }
+    }
+
+
+    // feedback
+    public void onFeedback(String feedback) {
+
+        String app = getString(R.string.app_name);
+        int ver = NUtil.getVersinoCode(getApplicationContext());
+        String subject = MessageFormat.format(getString(com.quseit.android.R.string.feeback_email_title), app, ver, Build.PRODUCT);
+
+        String lastError = "";
+        String code = NAction.getCode(getApplicationContext());
+        File log = new File(Environment.getExternalStorageDirectory() + "/" + code + "_last_err.log");
+        if (log.exists()) {
+            lastError = com.quseit.util.FileHelper.getFileContents(log.getAbsolutePath());
+        }
+
+        String body = MessageFormat.format(getString(R.string.feedback_email_body), Build.PRODUCT,
+                Build.VERSION.RELEASE, Build.VERSION.SDK, lastError, feedback);
+
+        Intent intent = new Intent(Intent.ACTION_SENDTO, Uri.parse("mailto:" + getString(R.string.ui_feedback_mail)));
+
+        intent.putExtra(Intent.EXTRA_SUBJECT, subject);
+        intent.putExtra(Intent.EXTRA_TEXT, session == null ? body : session.getTranscriptText().trim());
+        try {
+            startActivity(Intent.createChooser(intent,
+                    getString(R.string.email_transcript_chooser_title)));
+        } catch (ActivityNotFoundException e) {
+            Toast.makeText(this,
+                    R.string.email_transcript_no_email_activity_found,
+                    Toast.LENGTH_LONG)
+                    .show();
+        }
+    }
+
+    protected boolean checkExpired(final String resource, String filesDir, String tag) {
+        ResourceManager resourceManager = new ResourceManager(this);
+
+        String data_version = resourceManager.getString(resource + "_version");
+        String disk_version = "0";
+
+        // If no version, no unpacking is necessary.
+        if (data_version == null) {
+            return false;
+        }
+
+        // Check the current disk version, if any.
+        String disk_version_fn = filesDir + "/lib/" + tag + "_" + resource + ".version";
+
+        try {
+            byte buf[] = new byte[64];
+            InputStream is = new FileInputStream(disk_version_fn);
+            int len = is.read(buf);
+            disk_version = new String(buf, 0, len);
+            is.close();
+        } catch (Exception e) {
+
+            disk_version = "0";
+            //Mint.logException(e);
+
+        }
+
+        //LogUtil.d(TAG, "data_version:"+Math.round(Double.parseDouble(data_version))+"-disk_version:"+Math.round(Double.parseDouble(disk_version))+"-RET:"+(int)(Double.parseDouble(data_version)-Double.parseDouble(disk_version)));
+        if ((int) (Double.parseDouble(data_version) - Double.parseDouble(disk_version)) > 0 || disk_version.equals("0")) {
+            try {
+                FileOutputStream os = new FileOutputStream(disk_version_fn);
+                try {
+                    os.write(data_version.getBytes());
+                    os.close();
+
+                } catch (IOException e) {
+                    e.printStackTrace();
+                    //Mint.logException(e);
+
+                }
+
+            } catch (FileNotFoundException e) {
+                e.printStackTrace();
+                //Mint.logException(e);
+
+            }
+
+
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public interface PermissionAction {
+        void onGrant();
+
+        void onDeny();
+    }
+
+    public void ifLogin(Login afterLogin) {
+        if (!TextUtils.isEmpty(TokenManager.getToken())) {
+            afterLogin.process();
+        } else {
+            Toast.makeText(this, R.string.login_first, Toast.LENGTH_SHORT).show();
+        }
+    }
+
+    public interface Login {
+        void process();
+    }
+
+}
diff --git a/qpython/src/oh/java/org/qpython/qpy/main/activity/FundingPurchaseActivity.java b/qpython/src/oh/java/org/qpython/qpy/main/activity/FundingPurchaseActivity.java
new file mode 100644
index 00000000..afd953e4
--- /dev/null
+++ b/qpython/src/oh/java/org/qpython/qpy/main/activity/FundingPurchaseActivity.java
@@ -0,0 +1,107 @@
+package org.qpython.qpy.main.activity;
+
+import android.content.Context;
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.Toast;
+
+//import com.hipipal.qpyplus.wxapi.PaymentStatus;
+//import com.hipipal.qpyplus.wxapi.WXAPIManager;
+//import com.hipipal.qpyplus.wxapi.WeixinPay;
+import com.quseit.util.VeDate;
+
+import org.greenrobot.eventbus.Subscribe;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ActivityFundingPurchaseBinding;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.utils.UpdateHelper;
+
+import rx.Observer;
+
+/**
+ * Created by Hmei
+ * 1/30/18.
+ */
+
+public class FundingPurchaseActivity extends PayActivity {
+    private static final String FUNDING_COUNT = "fundingCount";
+    private ActivityFundingPurchaseBinding binding;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_funding_purchase);
+        initView();
+        String[] count = getResources().getStringArray(R.array.funding_count_divider);
+        String[] prices = getResources().getStringArray(R.array.wechat_funding_price);
+        String price = null;
+        int fundingCount = getIntent().getIntExtra(FUNDING_COUNT, 0);
+        for (int i = 0; i < count.length; i++) {
+            if ((Integer.parseInt(count[i]) - fundingCount) > 0) {
+                price = prices[i];
+                break;
+            }
+        }
+        if (TextUtils.isEmpty(price)) price = prices[prices.length - 1];
+        binding.price.setText(getString(R.string.rmb, price));
+        String finalPrice = price;
+//        binding.price.setOnClickListener(v -> payUtil.purchase(finalPrice, getIntent().getStringExtra(ARTICLE_ID), new Observer<WeixinPay>() {
+//            @Override
+//            public void onCompleted() {
+//                binding.pb.setVisibility(View.GONE);
+//                // 统计赞赏数据
+//                JSONObject jsonObject = new JSONObject();
+//                try {
+//                    jsonObject.put("type", finalPrice);
+//                    jsonObject.put("time", VeDate.getStringDateHourAsInt());
+//                    int percent = getIntent().getIntExtra(FUNDING_COUNT, 0);
+//                    String[] fundingCount = getResources().getStringArray(R.array.funding_count_divider);
+//                    jsonObject.put("crowdfunding",
+//                            percent > (Integer.parseInt(fundingCount[1]) / Integer.parseInt(fundingCount[2])) ? 3 :
+//                                    percent > (Integer.parseInt(fundingCount[0]) / Integer.parseInt(fundingCount[1])) ? 2 : 1);//0 非众筹/ 1: 0-100 /2: 100-500/3 500-2000
+//                    jsonObject.put("articleId", getIntent().getStringExtra(ARTICLE_ID));
+//                    if (App.getUser() != null) {
+//                        jsonObject.put("account", App.getUser().getEmail());
+//                    }
+//                } catch (JSONException e) {
+//                    e.printStackTrace();
+//                }
+//                UpdateHelper.submitIAPLog(FundingPurchaseActivity.this, mOrderNo, App.getGson().toJson(jsonObject));
+//            }
+//
+//            @Override
+//            public void onError(Throwable e) {
+//                Toast.makeText(FundingPurchaseActivity.this, R.string.conn_error, Toast.LENGTH_SHORT).show();
+//                binding.pb.setVisibility(View.GONE);
+//            }
+//
+//            @Override
+//            public void onNext(WeixinPay weixinPay) {
+//                WXAPIManager.wxPayReq(weixinPay);
+//                mOrderNo = weixinPay.out_trade_no;
+//            }
+//        }));
+    }
+
+    public static void startSupport(Context context, String articleId, int fundingPercent) {
+        Intent starter = new Intent(context, FundingPurchaseActivity.class);
+        starter.putExtra(ARTICLE_ID, articleId);
+        starter.putExtra(FUNDING_COUNT, fundingPercent);
+        context.startActivity(starter);
+    }
+
+    private void initView() {
+        setSupportActionBar(binding.lt.toolbar);
+        binding.lt.toolbar.setNavigationIcon(R.drawable.ic_back);
+        binding.lt.toolbar.setNavigationOnClickListener(v -> finish());
+        setTitle(R.string.reward);
+        binding.tvThanks.setVisibility(View.VISIBLE);
+        binding.price.setVisibility(View.VISIBLE);
+    }
+}
diff --git a/qpython/src/oh/java/org/qpython/qpy/main/activity/PayActivity.java b/qpython/src/oh/java/org/qpython/qpy/main/activity/PayActivity.java
new file mode 100644
index 00000000..89e16879
--- /dev/null
+++ b/qpython/src/oh/java/org/qpython/qpy/main/activity/PayActivity.java
@@ -0,0 +1,72 @@
+package org.qpython.qpy.main.activity;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+import android.widget.Toast;
+
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.qpython.qpy.R;
+import org.qpython.qpy.main.service.PayUtil;
+
+import rx.Observer;
+
+/**
+ * Created by Hmei
+ * 1/31/18.
+ */
+
+public class PayActivity extends AppCompatActivity {
+    protected static final String ARTICLE_ID      = "article_id";
+    protected String mOrderNo;
+    protected PayUtil payUtil;
+
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        payUtil = new PayUtil(this);
+        EventBus.getDefault().register(this);
+    }
+
+    @Subscribe
+    public void onPayResp(String msg) {
+//        if (msg.equals(PaymentStatus.SUCCESS)) {
+//            payUtil.checkOrderStatus(mOrderNo,new Observer<PaymentStatus>() {
+//                @Override
+//                public void onCompleted() {
+//
+//                }
+//
+//                @Override
+//                public void onError(Throwable e) {
+//                    e.printStackTrace();
+//                    if (findViewById(R.id.pb) != null)
+//                        findViewById(R.id.pb).setVisibility(View.GONE);
+//                    Toast.makeText(PayActivity.this, "支付失败！", Toast.LENGTH_SHORT).show();
+//                }
+//
+//                @Override
+//                public void onNext(PaymentStatus paymentStatus) {
+//                    if (paymentStatus.isSuccess()) {
+//                        if (findViewById(R.id.pb) != null)
+//                            findViewById(R.id.pb).setVisibility(View.GONE);
+//                        Toast.makeText(PayActivity.this, "感谢您的支持！", Toast.LENGTH_SHORT).show();
+//                        finish();
+//                    } else {
+//                        payUtil.checkOrderStatus(mOrderNo,this);
+//                    }
+//                }
+//            });
+//        }
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        EventBus.getDefault().unregister(this);
+    }
+}
diff --git a/qpython/src/oh/java/org/qpython/qpy/main/activity/PurchaseActivity.java b/qpython/src/oh/java/org/qpython/qpy/main/activity/PurchaseActivity.java
new file mode 100644
index 00000000..8520aa06
--- /dev/null
+++ b/qpython/src/oh/java/org/qpython/qpy/main/activity/PurchaseActivity.java
@@ -0,0 +1,149 @@
+package org.qpython.qpy.main.activity;
+
+import android.content.Context;
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.GridLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+//import com.hipipal.qpyplus.wxapi.PaymentStatus;
+//import com.hipipal.qpyplus.wxapi.WXAPIManager;
+//import com.hipipal.qpyplus.wxapi.WeixinPay;
+import com.quseit.util.ImageUtil;
+import com.quseit.util.VeDate;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ActivityPurchaseBinding;
+import org.qpython.qpy.databinding.ItemPriceBinding;
+import org.qpython.qpy.main.adapter.MyViewHolder;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.User;
+import org.qpython.qpy.main.service.PayUtil;
+import org.qpython.qpy.main.widget.GridSpace;
+import org.qpython.qpy.utils.UpdateHelper;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import rx.Observer;
+import rx.Subscription;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+/**
+ * Weixin purchase activity
+ * Created by Hmei on 2017-07-19.
+ */
+
+public class PurchaseActivity extends PayActivity {
+    private static String[] prices = new String[]{"6", "12", "18", "24", "30", "36"};
+
+    private ActivityPurchaseBinding binding;
+    private String                  articleId;
+
+    public static void start(Context context, String articleId) {
+        Intent starter = new Intent(context, PurchaseActivity.class);
+        starter.putExtra(ARTICLE_ID, articleId);
+        context.startActivity(starter);
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_purchase);
+        articleId = getIntent().getStringExtra(ARTICLE_ID);
+        initView();
+        getPrices();
+    }
+
+    private void initView() {
+        setSupportActionBar(binding.lt.toolbar);
+        binding.lt.toolbar.setNavigationIcon(R.drawable.ic_back);
+        binding.lt.toolbar.setNavigationOnClickListener(v -> finish());
+        setTitle(R.string.reward);
+    }
+
+    private void getPrices() {
+        invalidateData();
+        GridSpace gridSpace = new GridSpace(2, (int) ImageUtil.dp2px(16), false);
+        binding.list.setLayoutManager(new GridLayoutManager(PurchaseActivity.this, 2));
+        binding.list.addItemDecoration(gridSpace);
+        binding.list.setAdapter(new ListAdapter(prices));
+    }
+
+    private void invalidateData() {
+        binding.tvThanks.setVisibility(View.VISIBLE);
+        binding.list.setVisibility(View.VISIBLE);
+        binding.noData.llRoot.setVisibility(View.GONE);
+    }
+
+    private class ListAdapter extends RecyclerView.Adapter<MyViewHolder<ItemPriceBinding>> {
+        String[] dataList;
+
+        ListAdapter(String[] dataList) {
+            this.dataList = dataList;
+        }
+
+        @Override
+        public MyViewHolder<ItemPriceBinding> onCreateViewHolder(ViewGroup parent, int viewType) {
+            ItemPriceBinding binding = DataBindingUtil.inflate(LayoutInflater.from(PurchaseActivity.this), R.layout.item_price, parent, false);
+            MyViewHolder<ItemPriceBinding> holder = new MyViewHolder<>(binding.getRoot());
+            holder.setBinding(binding);
+            return holder;
+        }
+
+        @Override
+        public void onBindViewHolder(MyViewHolder<ItemPriceBinding> holder, int position) {
+            ItemPriceBinding itemBinding = holder.getBinding();
+            itemBinding.tvPrices.setText(dataList[position]);
+//            itemBinding.tvPrices.setOnClickListener(v -> payUtil.purchase(dataList[position], articleId, new Observer<WeixinPay>() {
+//                @Override
+//                public void onCompleted() {
+//                    binding.pb.setVisibility(View.GONE);
+//                    JSONObject jsonObject = new JSONObject();
+//                    try {
+//                        jsonObject.put("type", dataList[position]);
+//                        jsonObject.put("time", VeDate.getStringDateHourAsInt());
+//                        jsonObject.put("crowdfunding",0);//0 非众筹/ 1: 0-100 /2: 100-500/3 500-2000
+//                        jsonObject.put("articleId", articleId);
+//                        if (App.getUser() != null) {
+//                            jsonObject.put("account", App.getUser().getEmail());
+//                        }
+//                    } catch (JSONException e) {
+//                        e.printStackTrace();
+//                    }
+//                    UpdateHelper.submitIAPLog(PurchaseActivity.this, mOrderNo, App.getGson().toJson
+//                            (jsonObject));
+//                }
+//
+//                @Override
+//                public void onError(Throwable e) {
+//                    e.printStackTrace();
+//                    Toast.makeText(PurchaseActivity.this, "connection error!", Toast.LENGTH_SHORT).show();
+//                    binding.pb.setVisibility(View.GONE);
+//                }
+//
+//                @Override
+//                public void onNext(WeixinPay weixinPay) {
+//                    WXAPIManager.wxPayReq(weixinPay);
+//                    mOrderNo = weixinPay.out_trade_no;
+//                }
+//            }));
+        }
+
+        @Override
+        public int getItemCount() {
+            return dataList.length;
+        }
+    }
+}
diff --git a/qpython/src/oh/java/org/qpython/qpy/main/activity/SignInActivity.java b/qpython/src/oh/java/org/qpython/qpy/main/activity/SignInActivity.java
new file mode 100644
index 00000000..fe4bc7b8
--- /dev/null
+++ b/qpython/src/oh/java/org/qpython/qpy/main/activity/SignInActivity.java
@@ -0,0 +1,95 @@
+package org.qpython.qpy.main.activity;
+
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+import android.text.Html;
+import android.util.Log;
+import android.view.View;
+import android.widget.Toast;
+
+//import com.hipipal.qpyplus.wxapi.WXAPIManager;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ActivitySignInBinding;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.User;
+import org.qpython.qpy.main.server.gist.loginScreen.LoginControler;
+import org.qpython.qpy.main.server.gist.loginScreen.LoginView;
+
+/**
+ * SignIn
+ * Created by Hmei on 2017-08-04.
+ */
+
+public class SignInActivity extends AppCompatActivity implements LoginView{
+    private static final int RC_SIGN_IN = 54503;
+
+    private ActivitySignInBinding binding;
+    private LoginControler        mLoginControler;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_sign_in);
+        binding.textView3.setText(Html.fromHtml(getString(R.string.by_signing_in_you_agree_to_out_privacy_policy_term_of_service)));
+        initListener();
+        EventBus.getDefault().register(this);
+        mLoginControler = new LoginControler(this);
+    }
+
+    private void initListener() {
+        binding.textView3.setOnClickListener(v -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.privacy_html)))));
+        binding.button2.setOnClickListener(v -> signIn());
+        binding.button3.setOnClickListener(v -> finish());
+    }
+
+    @Subscribe
+    public void loginFail(String result) {
+        Toast.makeText(this, R.string.login_failed, Toast.LENGTH_SHORT).show();
+    }
+
+    @Subscribe
+    public void loginSuccess(User user) {
+        Log.d("SignInActivity", "loginSuccess");
+
+    }
+
+    private void signIn() {
+
+//        WXAPIManager.wxLogin();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        EventBus.getDefault().unregister(this);
+        mLoginControler.onDestroy();
+    }
+
+    @Override
+    public void showLoading() {
+        binding.progressBar2.setVisibility(View.VISIBLE);
+    }
+
+    @Override
+    public void hideLoading() {
+        binding.progressBar2.setVisibility(View.GONE);
+    }
+
+    @Override
+    public void showToast(String msg) {
+        Toast.makeText(this, msg, Toast.LENGTH_SHORT).show();
+    }
+
+    @Override
+    public void loginSuccess() {
+        setResult(RESULT_OK);
+        finish();
+    }
+}
diff --git a/qpython/src/oh/java/org/qpython/qpy/main/activity/UserActivity.java b/qpython/src/oh/java/org/qpython/qpy/main/activity/UserActivity.java
new file mode 100644
index 00000000..38bc570f
--- /dev/null
+++ b/qpython/src/oh/java/org/qpython/qpy/main/activity/UserActivity.java
@@ -0,0 +1,78 @@
+package org.qpython.qpy.main.activity;
+
+import android.content.Context;
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.app.AppCompatActivity;
+import android.widget.Toast;
+
+import com.quseit.util.ImageDownLoader;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.codeshare.CONSTANT;
+import org.qpython.qpy.codeshare.ShareCodeUtil;
+import org.qpython.qpy.databinding.ActivityUserBinding;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.CONF;
+
+import java.io.File;
+
+public class UserActivity extends AppCompatActivity {
+    ActivityUserBinding binding;
+
+    public static void start(Context context) {
+        Intent starter = new Intent(context, UserActivity.class);
+        context.startActivity(starter);
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_user);
+        setSupportActionBar(binding.toolbar);
+        setTitle(getString(R.string.me));
+        binding.toolbar.setNavigationIcon(R.drawable.ic_back);
+        binding.toolbar.setNavigationOnClickListener(v -> finish());
+
+        ImageDownLoader.setImageFromUrl(this, binding.avatar, App.getUser().getAvatarUrl());
+        binding.name.setText(App.getUser().getNick());
+//        binding.email.setText(App.getUser().getEmail());
+
+        if (ShareCodeUtil.getInstance().getUsage() == -1) {
+            Toast.makeText(App.getContext(), "usage not init", Toast.LENGTH_SHORT).show();
+            ShareCodeUtil.getInstance().initUsage();
+        } else {
+            binding.usage.setText(getString(R.string.my_space, ShareCodeUtil.getInstance().getUsage()));
+        }
+        binding.logout.setOnClickListener(v -> logout());
+
+        initListener();
+    }
+
+    private void initListener() {
+        binding.myShareLayout.setOnClickListener(v -> MyGistActivity.startMyShare(this));
+    }
+
+    private void logout() {
+        new AlertDialog.Builder(this, R.style.MyDialog)
+                .setTitle(R.string.lout)
+                .setPositiveButton(R.string.yes, (dialog, which) -> {
+                    App.setUser(null);
+                    getPreferences(MODE_PRIVATE).edit().putBoolean(CONSTANT.IS_UPLOAD_INIT, false)
+                            .putString(CONSTANT.CLOUDED_MAP, "")
+                            .apply();
+                    finish();
+                })
+                .setNegativeButton(R.string.no, null)
+                .create()
+                .show();
+
+        File cloud_cache = new File(CONF.CLOUD_MAP_CACHE_PATH);
+        if (cloud_cache.exists()) {
+            cloud_cache.delete();
+        }
+    }
+}
\ No newline at end of file
diff --git a/qpython/src/oh/java/org/qpython/qpy/main/app/AppInit.java b/qpython/src/oh/java/org/qpython/qpy/main/app/AppInit.java
new file mode 100644
index 00000000..812871d8
--- /dev/null
+++ b/qpython/src/oh/java/org/qpython/qpy/main/app/AppInit.java
@@ -0,0 +1,25 @@
+package org.qpython.qpy.main.app;
+
+import android.content.Context;
+import android.util.Log;
+
+import org.qpython.qpy.BuildConfig;
+import org.qpython.qpy.codeshare.ShareCodeUtil;
+//import com.hipipal.qpyplus.wxapi.WXAPIManager;
+
+/**
+ * 文 件 名: AppInit
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/8 15:13
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class AppInit {
+
+    public static void init(Context context){
+        //wx
+//        WXAPIManager.init(context);
+        ShareCodeUtil.getInstance();
+    }
+}
diff --git a/qpython/src/oh/java/org/qpython/qpy/main/fragment/ExplorerFragment.java b/qpython/src/oh/java/org/qpython/qpy/main/fragment/ExplorerFragment.java
new file mode 100644
index 00000000..a5836685
--- /dev/null
+++ b/qpython/src/oh/java/org/qpython/qpy/main/fragment/ExplorerFragment.java
@@ -0,0 +1,449 @@
+package org.qpython.qpy.main.fragment;
+
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.graphics.Color;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Environment;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.widget.LinearLayoutManager;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+import com.quseit.util.FileHelper;
+import com.quseit.util.ImageUtil;
+import com.yanzhenjie.recyclerview.swipe.SwipeMenuCreator;
+import com.yanzhenjie.recyclerview.swipe.SwipeMenuItem;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.codeshare.ShareCodeUtil;
+import org.qpython.qpy.codeshare.pojo.CloudFile;
+import org.qpython.qpy.databinding.FragmentExplorerBinding;
+import org.qpython.qpy.main.activity.NotebookActivity;
+import org.qpython.qpy.main.activity.SignInActivity;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.CONF;
+import org.qpython.qpy.main.event.ShareCodeCallback;
+import org.qpython.qpy.texteditor.EditorActivity;
+import org.qpython.qpy.texteditor.TedLocalActivity;
+import org.qpython.qpy.texteditor.common.CommonEnums;
+import org.qpython.qpy.texteditor.common.RecentFiles;
+import org.qpython.qpy.texteditor.ui.adapter.FolderAdapter;
+import org.qpython.qpy.texteditor.ui.adapter.bean.FolderBean;
+import org.qpython.qpy.texteditor.ui.view.EnterDialog;
+import org.qpython.qpy.texteditor.widget.crouton.Crouton;
+import org.qpython.qpy.texteditor.widget.crouton.Style;
+import org.qpython.qpy.utils.FileUtils;
+import org.qpython.qpy.utils.NotebookUtil;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static com.quseit.util.FolderUtils.sortTypeByName;
+
+
+public class ExplorerFragment extends Fragment {
+    private static final int REQUEST_SAVE_AS   = 107;
+    private static final int REQUEST_HOME_PAGE = 109;
+    private static final int REQUEST_RECENT    = 111;
+    private static final int LOGIN_REQUEST     = 2741;
+
+    private static final String TYPE = "type";
+
+    private int WIDTH = (int) ImageUtil.dp2px(60);
+
+    private FragmentExplorerBinding binding;
+    private List<FolderBean>        folderList;
+    private FolderAdapter           adapter;
+    private Map<String, Boolean> cloudedMap = new HashMap<>();
+
+    private boolean openable = true; // 是否可打开文件
+
+    private int    type;
+    private String curPath;
+
+    public static ExplorerFragment newInstance(int type) {
+        ExplorerFragment myFragment = new ExplorerFragment();
+
+        Bundle args = new Bundle();
+        args.putInt(TYPE, type);
+        myFragment.setArguments(args);
+
+        return myFragment;
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_explorer, null);
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        binding = DataBindingUtil.bind(view);
+        type = getArguments().getInt(TYPE);
+        initView();
+        initListener();
+        initCloud();
+        switch (type) {
+            case REQUEST_RECENT:
+                binding.rlPath.setVisibility(View.GONE);
+                break;
+            case REQUEST_SAVE_AS:
+                binding.ivNewFolder.setVisibility(View.VISIBLE);
+                break;
+            case REQUEST_HOME_PAGE:
+                binding.ivNewFolder.setVisibility(View.VISIBLE);
+                break;
+        }
+    }
+
+    private void initView() {
+        SwipeMenuCreator swipeMenuCreator = (leftMenu, rightMenu, viewType) -> {
+//            SwipeMenuItem uploadItem = new SwipeMenuItem(getContext())
+//                    .setBackgroundColor(Color.parseColor("#FF4798F3"))
+//                    .setImage(R.drawable.ic_cloud_upload)
+//                    .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+//                    .setWidth(WIDTH);
+
+            SwipeMenuItem renameItem = new SwipeMenuItem(getContext())
+                    .setBackgroundColor(Color.parseColor("#FF4BAC07"))
+                    .setImage(R.drawable.ic_file_rename)
+                    .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+                    .setWidth(WIDTH);
+
+            SwipeMenuItem deleteItem = new SwipeMenuItem(getContext())
+                    .setBackgroundColor(Color.parseColor("#FFD14136"))
+                    .setImage(R.drawable.ic_editor_filetree_close)
+                    .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+                    .setWidth(WIDTH);
+
+            switch (type) {
+                case REQUEST_RECENT:
+                    rightMenu.addMenuItem(deleteItem);
+                    break;
+                case REQUEST_SAVE_AS:
+                    rightMenu.addMenuItem(deleteItem);
+                    break;
+                case REQUEST_HOME_PAGE:
+                    //rightMenu.addMenuItem(uploadItem);
+                    rightMenu.addMenuItem(renameItem);
+                    rightMenu.addMenuItem(deleteItem);
+                    break;
+            }
+        };
+
+        folderList = new ArrayList<>();
+        adapter = new FolderAdapter(folderList, getArguments().getInt(TYPE) == REQUEST_RECENT);
+        adapter.setCloudMap(cloudedMap);
+        binding.swipeList.setLayoutManager(new LinearLayoutManager(getContext()));
+        binding.swipeList.setSwipeMenuCreator(swipeMenuCreator);
+        openDir(CONF.ABSOLUTE_PATH);
+    }
+
+    private void initListener() {
+        binding.ivNewFolder.setOnClickListener(v -> doNewDir());
+        binding.prevFolder.setOnClickListener(v -> {
+            String parentPath = new File(curPath).getParent();
+
+            if (parentPath.length()>=Environment.getExternalStorageDirectory().getAbsolutePath().length()) {
+                openDir(parentPath);
+            }
+        });
+        binding.swipeList.setSwipeMenuItemClickListener(menuBridge -> {
+            binding.swipeList.smoothCloseMenu();
+            switch (menuBridge.getPosition()) {
+                case 0:
+                    renameFile(menuBridge.getAdapterPosition());
+                    break;
+                case 1:
+                    deleteFile(menuBridge.getAdapterPosition());
+                    break;
+            }
+        });
+        adapter.setClickListener(new FolderAdapter.Click() {
+            @Override
+            public void onItemClick(int position) {
+                FolderBean item = folderList.get(position);
+                if (item.getType().equals(CommonEnums.FileType.FILE)) {
+                    if (!openable) {
+                        Toast.makeText(getActivity(), R.string.cant_open, Toast.LENGTH_SHORT).show();
+                        return;
+                    }
+                    //判断文件类型
+                    int lastDot = item.getName().lastIndexOf(".");
+                    if (lastDot != -1) {
+                        String ext = item.getName().substring(lastDot + 1);
+                        openFile(item.getFile(), ext);
+                    }
+                } else {
+                    openDir(item.getPath());
+                }
+            }
+
+            @Override
+            public void onLongClick(int position) {
+                binding.swipeList.smoothOpenRightMenu(position);
+            }
+        });
+
+        binding.swipeList.setAdapter(adapter);
+    }
+
+    private void gotoSetting() {
+        org.qpython.qpy.main.activity.SettingActivity.startActivity(getActivity());
+    }
+    private void openFile(File file, String ext) {
+        List<String> textExts = Arrays.asList(getContext().getResources().getStringArray(R.array.text_ext));
+        if (textExts.contains(ext)) {
+            EditorActivity.start(getContext(), Uri.fromFile(file));
+        } else if (ext.equals("ipynb")) {
+            boolean notebookenable = NotebookUtil.isNotebookEnable(getActivity());
+            if (notebookenable) {
+                NotebookActivity.start(getActivity(), file.getAbsolutePath(), false);
+            } else {
+
+                new AlertDialog.Builder(getActivity(),R.style.MyDialog)
+                        .setTitle(R.string.dialog_alert)
+                        .setMessage(getString(R.string.ennable_notebook_first))
+                        .setNegativeButton(R.string.cancel, (dialog1, which) -> dialog1.dismiss())
+                        .setPositiveButton(R.string.ok, (dialog1, which) -> gotoSetting())
+                        .create()
+                        .show();
+
+                //Toast.makeText(getActivity(), R.string.ennable_notebook_first, Toast.LENGTH_SHORT).show();
+            }
+        } else {
+            FileUtils.openFile(getContext(), file);
+        }
+    }
+
+    private void uploadFile(int adapterPosition) {
+        File file = folderList.get(adapterPosition).getFile();
+
+        // only support type in <R.array.support_file_ext>
+        String ext = "";
+        if (file.getName().lastIndexOf(".") > 0) {
+            ext = file.getName().substring(file.getName().lastIndexOf(".") + 1);
+        }
+        boolean isSupport = false;
+        if (!file.isDirectory()) {
+            for (String s : getResources().getStringArray(R.array.support_file_ext)) {
+                if (s.equals(ext)) {
+                    isSupport = true;
+                    break;
+                }
+            }
+        } else {
+            isSupport = true;
+        }
+
+        if (!isSupport) {
+            Toast.makeText(getContext(), R.string.not_support_type_hint, Toast.LENGTH_SHORT).show();
+            return;
+        }
+
+        // only available for already login user
+        if (App.getUser() == null) {
+            new AlertDialog.Builder(getActivity(), R.style.MyDialog)
+                    .setTitle(R.string.need_login)
+                    .setMessage(R.string.upload_login_hint)
+                    .setNegativeButton(R.string.no, null)
+                    .setPositiveButton(getString(R.string.login_now), (dialog, which) ->
+                            startActivityForResult(new Intent(getActivity(), SignInActivity.class), LOGIN_REQUEST)
+                    )
+                    .create()
+                    .show();
+            return;
+        }
+
+        // upload
+
+        File folder = folderList.get(adapterPosition).getFile();
+        folderList.get(adapterPosition).setUploading(true);
+        adapter.notifyItemChanged(adapterPosition);
+        if (folder.isDirectory()) {
+            //ShareCodeUtil.getInstance().uploadFolder(folder, callback, 0);
+        } else {
+            //ShareCodeUtil.getInstance().uploadFile(folder, callback);
+        }
+    }
+
+    private void renameFile(int adapterPosition) {
+        new EnterDialog(getContext())
+            .setTitle(getString(R.string.rename))
+            .setConfirmListener(name -> {
+                File oldFile = folderList.get(adapterPosition).getFile();
+                File newFile = new File(oldFile.getParent(), name);
+                boolean renameSuc = oldFile.renameTo(newFile);
+                if (renameSuc) {
+                    folderList.set(adapterPosition, new FolderBean(newFile));
+                    adapter.notifyItemChanged(adapterPosition);
+                    return true;
+                } else {
+                    Toast.makeText(getActivity(), R.string.rename_fail, Toast.LENGTH_SHORT).show();
+                    return false;
+                }
+            })
+            .setText(folderList.get(adapterPosition).getName())
+            .show();
+    }
+
+    private void deleteFile(int adapterPosition) {
+        switch (type) {
+            case REQUEST_RECENT:
+                RecentFiles.removePath(folderList.get(adapterPosition).getPath());
+                folderList.remove(adapterPosition);
+                adapter.notifyDataSetChanged();
+                break;
+            case REQUEST_HOME_PAGE:
+            case REQUEST_SAVE_AS:
+                AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.MyDialog);
+                builder.setTitle(R.string.warning)
+                        .setMessage(R.string.delete_file_hint)
+                        .setNegativeButton(R.string.no, null)
+                        .setPositiveButton(R.string.yes, (dialog, which) -> {
+                            FileHelper.clearDir(folderList.get(adapterPosition).getFile().getAbsolutePath(), 0, true);
+                            folderList.remove(adapterPosition);
+                            adapter.notifyItemRemoved(adapterPosition);
+                            adapter.notifyDataSetChanged();
+                        })
+                        .show();
+                break;
+        }
+    }
+
+    private void openDir(String dirPath) {
+        if (type == REQUEST_RECENT) {
+            folderList.clear();
+            for (String path : RecentFiles.getRecentFiles()) {
+                folderList.add(new FolderBean(new File(path)));
+            }
+
+            if (folderList.size() == 0) {
+                binding.emptyHint.setVisibility(View.VISIBLE);
+            } else {
+                binding.emptyHint.setVisibility(View.GONE);
+                adapter.notifyDataSetChanged();
+            }
+        } else {
+            File dir = new File(dirPath);
+            if (dir.exists()) {
+                File[] files = dir.listFiles();
+                if (files != null) {
+                    Arrays.sort(files, sortTypeByName);
+                    folderList.clear();
+                    for (File file : files) {
+                        //if (!file.getName().startsWith(".")) {
+                        folderList.add(new FolderBean(file));
+                        //}
+                    }
+                    adapter.notifyDataSetChanged();
+                    binding.tvPath.setText(dirPath);
+                    curPath = dirPath;
+                    adapter.notifyDataSetChanged();
+
+                }
+            } else {
+                Toast.makeText(getContext(), R.string.file_not_exists, Toast.LENGTH_SHORT).show();
+            }
+        }
+    }
+
+    private void doNewDir() {
+        new EnterDialog(getContext())
+                .setTitle(getString(R.string.new_folder))
+                .setHint(getString(R.string.folder_name))
+                .setConfirmListener(name -> {
+                    File dirN = new File(curPath, name.equals("") ? getString(R.string.untitled_folder) : name);
+                    if (dirN.exists()) {
+                        Crouton.makeText(getActivity(), getString(R.string.toast_folder_exist), Style.ALERT).show();
+                        return false;
+                    } else {
+                        if (dirN.mkdirs()) {
+                            openDir(curPath + "/" + name);
+                        } else {
+                            Toast.makeText(getContext(), R.string.mkdir_fail, Toast.LENGTH_SHORT).show();
+                        }
+                        return true;
+                    }
+                })
+                .show();
+    }
+
+    public void backToPrev() {
+
+        String qpyDir = Environment.getExternalStorageDirectory().getAbsolutePath()+"/qpython";
+
+        if (curPath == null || qpyDir.equals(curPath) || Environment.getExternalStorageDirectory().getAbsolutePath().equals(curPath)) {
+            getActivity().finish();
+        } else {
+            String parentPath = new File(curPath).getParent();
+            openDir(parentPath);
+        }
+    }
+
+    private void updateClouded(File file) {
+        cloudedMap.put(file.getAbsolutePath(), true);
+        if (file.isDirectory()) {
+            for (File file1 : file.listFiles()) {
+                if (file1.isDirectory()) {
+                    updateClouded(file1);
+                } else {
+                    cloudedMap.put(file.getAbsolutePath(), true);
+                }
+            }
+        }
+    }
+
+    public String getCurPath() {
+        return curPath;
+    }
+
+    private void initCloud() {
+        if (App.getUser() == null) {
+            return;
+        }
+        //获取云端脚本
+
+    }
+
+    private void savePath(String path) {
+        String[] paths = path.split("/");
+        StringBuffer realPath = new StringBuffer(CONF.ABSOLUTE_PATH);
+        for (String p : paths) {
+            if (!TextUtils.isEmpty(p)) {
+                realPath.append("/");
+                realPath.append(p);
+                if (!p.equals("projects") && !p.equals("scripts") && !cloudedMap.keySet().contains(realPath.toString()))
+                    cloudedMap.put(realPath.toString(), true);
+            }
+        }
+    }
+
+    public void deleteCloudedMap(String absolutePath) {
+        if (cloudedMap.containsKey(absolutePath)) {
+            cloudedMap.remove(absolutePath);
+            adapter.notifyDataSetChanged();
+        }
+    }
+
+    public void updateCloudedFiles(Map<String, Boolean> map) {
+        if (map != null) {
+            cloudedMap.putAll(map);
+        }
+        adapter.notifyDataSetChanged();
+    }
+}
+// GIT TEST
\ No newline at end of file
diff --git a/qpython/src/oh/java/org/qpython/qpy/main/fragment/MyProjectFragment.java b/qpython/src/oh/java/org/qpython/qpy/main/fragment/MyProjectFragment.java
new file mode 100644
index 00000000..ddeda639
--- /dev/null
+++ b/qpython/src/oh/java/org/qpython/qpy/main/fragment/MyProjectFragment.java
@@ -0,0 +1,277 @@
+package org.qpython.qpy.main.fragment;
+
+import android.content.SharedPreferences;
+import android.databinding.DataBindingUtil;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.widget.LinearLayoutManager;
+import android.text.Html;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+import com.google.gson.reflect.TypeToken;
+import com.quseit.util.DateTimeHelper;
+import com.quseit.util.ImageUtil;
+import com.yanzhenjie.recyclerview.swipe.SwipeMenuCreator;
+import com.yanzhenjie.recyclerview.swipe.SwipeMenuItem;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.codeshare.ShareCodeUtil;
+import org.qpython.qpy.codeshare.pojo.CloudFile;
+import org.qpython.qpy.databinding.FragmentRefreshRvBinding;
+import org.qpython.qpy.main.adapter.CloudScriptAdapter;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.CONF;
+import org.qpython.qpy.main.event.ShareCodeCallback;
+import org.qpython.qpy.texteditor.TedLocalActivity;
+import org.qpython.qpysdk.QPyConstants;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import rx.Observable;
+import rx.android.schedulers.AndroidSchedulers;
+
+import static android.content.Context.MODE_PRIVATE;
+import static org.qpython.qpy.codeshare.CONSTANT.CLOUDED_MAP;
+import static org.qpython.qpy.codeshare.CONSTANT.IS_UPLOAD_INIT;
+
+public class MyProjectFragment extends Fragment {
+    private int WIDTH = (int) ImageUtil.dp2px(60);
+    private FragmentRefreshRvBinding binding;
+    private CloudScriptAdapter adapter;
+    private List<CloudFile> scriptList = new ArrayList<>();
+    private boolean isSaverOn;
+    public boolean isLoading;
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        binding = DataBindingUtil.bind(LayoutInflater.from(getContext()).inflate(R.layout.fragment_refresh_rv, null));
+        return binding.getRoot();
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        scriptList = new ArrayList<>();
+        adapter = new CloudScriptAdapter(scriptList);
+        isSaverOn = PreferenceManager.getDefaultSharedPreferences(getContext()).getBoolean(getString(R.string.key_saver), true);
+        initView();
+        initListener();
+        retry(!isSaverOn);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (adapter != null) {
+            adapter.notifyDataSetChanged();
+        }
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        locatedCloud(scriptList);
+    }
+
+    public void retry(boolean forceRefresh) {
+        if (scriptList != null && adapter != null) {
+            scriptList.clear();
+            adapter.notifyDataSetChanged();
+        }
+        startProgressBar();
+        isLoading = true;
+        // TODO: 2017/12/4 获取云端脚本
+
+    }
+
+    public void notifyDataSetChange(){
+        if (adapter!=null){
+            adapter.notifyDataSetChanged();
+        }
+    }
+
+    /**
+     * 保存云端文件目录到本地
+     */
+    private void locatedCloud(List<CloudFile> cloudFiles) {
+        if (cloudFiles.size() > 0) {
+            HashMap<String, Boolean> clouded = new HashMap<>();
+            for (CloudFile cloudFile : cloudFiles) {
+                if (cloudFile.getPath().contains("/projects/")) {
+                    clouded.put(CONF.ABSOLUTE_PATH + "/projects/" + cloudFile.getProjectName(), true);
+                }
+                clouded.put(CONF.ABSOLUTE_PATH + cloudFile.getPath(), true);
+            }
+            SharedPreferences sp = getActivity().getPreferences(MODE_PRIVATE);
+            Type type = new TypeToken<HashMap<String, Boolean>>() {
+            }.getType();
+            sp.edit().putBoolean(IS_UPLOAD_INIT, true)
+                    .putString(CLOUDED_MAP, App.getGson().toJson(clouded, type)).apply();
+        }
+    }
+
+    private void startProgressBar() {
+        binding.progressBar.setVisibility(View.VISIBLE);
+        binding.netError.setVisibility(View.GONE);
+        Observable.just(null)
+                .delay(5, TimeUnit.SECONDS)
+                .observeOn(AndroidSchedulers.mainThread())
+                .doOnNext(o -> showNetErrorText())
+                .subscribe();
+    }
+
+    private void showEmpty() {
+        if (binding.progressBar.getVisibility() == View.VISIBLE) {
+            binding.progressBar.setVisibility(View.GONE);
+            binding.netError.setText(R.string.cloud_empty_hint);
+            binding.netError.setVisibility(View.VISIBLE);
+        }
+    }
+
+    private void showNetErrorText() {
+        if (binding.progressBar.getVisibility() == View.VISIBLE) {
+            binding.progressBar.setVisibility(View.GONE);
+            binding.netError.setText(R.string.net_lagging);
+            binding.netError.setVisibility(View.VISIBLE);
+        }
+    }
+
+    private void initView() {
+        SwipeMenuCreator swipeMenuCreator = (leftMenu, rightMenu, viewType) -> {
+            SwipeMenuItem deleteItem = new SwipeMenuItem(getContext())
+                    .setBackgroundColor(Color.parseColor("#FFD14136"))
+                    .setImage(R.drawable.ic_editor_filetree_close)
+                    .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+                    .setWidth(WIDTH);
+
+            SwipeMenuItem downloadItem = new SwipeMenuItem(getContext())
+                    .setBackgroundColor(Color.parseColor("#FF4798F3"))
+                    .setImage(R.drawable.ic_cloud_download)
+                    .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+                    .setWidth(WIDTH);
+            rightMenu.addMenuItem(downloadItem);
+            rightMenu.addMenuItem(deleteItem);
+        };
+        binding.swipeList.setLayoutManager(new LinearLayoutManager(getContext()));
+        binding.swipeList.setSwipeMenuCreator(swipeMenuCreator);
+    }
+
+    private void initListener() {
+        binding.netError.setOnClickListener(v -> retry(true));
+        binding.swipeList.setSwipeMenuItemClickListener(menuBridge -> {
+            menuBridge.closeMenu();
+            switch (menuBridge.getPosition()) {
+                case 0:
+                    CloudFile cloudFile = scriptList.get(menuBridge.getAdapterPosition());
+                    String path;
+                    path = QPyConstants.ABSOLUTE_PATH + cloudFile.getPath();
+                    File file = new File(path);
+                    if (file.exists()) {
+//                        new AlertDialog.Builder(getContext(), R.style.MyDialog)
+//                                .setTitle(R.string.override_hint)
+//                                .setMessage(Html.fromHtml(getString(R.string.conflict_hint,
+//                                        cloudFile.getUploadTime(),
+//                                        DateTimeHelper.AGO_FULL_DATE_FORMATTER.format(new Date(file.lastModified())))))
+//                                .setNegativeButton(R.string.no, null)
+//                                .setPositiveButton(R.string.yes, (dialog, which) -> writeFile(file, cloudFile, menuBridge.getAdapterPosition()))
+//                                .create()
+//                                .show();
+                    } else {
+                        //create file
+                        File dir = new File(path.substring(0, path.lastIndexOf("/")));
+                        if (!dir.exists()) {
+                            dir.mkdirs();
+                        }
+                        try {
+                            file.createNewFile();
+                        } catch (IOException e) {
+                            e.printStackTrace();
+                        }
+                        writeFile(file, cloudFile, menuBridge.getAdapterPosition());
+                    }
+                    break;
+                case 1:
+                    // delete
+                    scriptList.get(menuBridge.getAdapterPosition()).setUploading(true);
+                    adapter.notifyItemChanged(menuBridge.getAdapterPosition());
+                    // TODO: 2017/12/4 删除上传的脚本文件
+//                    ShareCodeUtil.getInstance().deleteUploadScript(scriptList.get(menuBridge.getAdapterPosition()), new LeancloudStorage.SaveFileCallback() {
+//                        @Override
+//                        public void onSuccess(int code) {
+//                            Toast.makeText(getContext(), R.string.delete_remote_suc, Toast.LENGTH_SHORT).show();
+//                            adapter.notifyItemRemoved(menuBridge.getAdapterPosition());
+//                            ((TedLocalActivity) getActivity()).deleteCloudFile(scriptList.get(menuBridge.getAdapterPosition()).getAbsolutePath());
+//                            scriptList.remove(menuBridge.getAdapterPosition());
+//                        }
+//
+//                        @Override
+//                        public void onFail(String msg) {
+//                            Toast.makeText(getContext(), "删除出错", Toast.LENGTH_SHORT).show();
+//                        }
+//                    });
+                    break;
+            }
+        });
+        adapter.setCallback((position) -> binding.swipeList.smoothOpenRightMenu(position));
+        binding.swipeList.setAdapter(adapter);
+    }
+
+    private void writeFile(File file, CloudFile cloudFile, int adapterPosition) {
+        cloudFile.setUploading(true);
+        adapter.notifyDataSetChanged();
+//        ShareCodeUtil.getInstance().downloadFile(cloudFile.getFileObject().getFileId(), new LeancloudStorage.DownloadCallback() {
+//            @Override
+//            public void onSuccess(String content) {
+//                try {
+//                    FileWriter writer = new FileWriter(file, false);
+//                    writer.write(content);
+//                    writer.close();
+//                } catch (IOException e) {
+//                    e.printStackTrace();
+//                    cloudFile.setUploading(false);
+//                    adapter.notifyDataSetChanged();
+//                    Toast.makeText(getContext(), R.string.override_fail_hint, Toast.LENGTH_SHORT).show();
+//                }
+//                Toast.makeText(getContext(), R.string.file_downloaded, Toast.LENGTH_SHORT).show();
+//                cloudFile.setUploading(false);
+//                adapter.notifyItemChanged(adapterPosition);
+//            }
+//
+//            @Override
+//            public void onFail(String msg) {
+//
+//            }
+//
+//            @Override
+//            public void onProgress(int progress) {
+//
+//            }
+//        });
+    }
+
+    public void needRefresh(boolean isNewUpload) {
+        if (binding == null) {
+            // not init yet
+            return;
+        }
+        if (isNewUpload) {
+            retry(!isSaverOn);
+        }
+    }
+}
diff --git a/qpython/src/oh/java/org/qpython/qpy/main/service/PayUtil.java b/qpython/src/oh/java/org/qpython/qpy/main/service/PayUtil.java
new file mode 100644
index 00000000..273081a3
--- /dev/null
+++ b/qpython/src/oh/java/org/qpython/qpy/main/service/PayUtil.java
@@ -0,0 +1,96 @@
+package org.qpython.qpy.main.service;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.view.View;
+import android.widget.Toast;
+
+//import com.hipipal.qpyplus.wxapi.PaymentStatus;
+//import com.hipipal.qpyplus.wxapi.WXAPIManager;
+//import com.hipipal.qpyplus.wxapi.WeixinPay;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.main.activity.PayActivity;
+import org.qpython.qpy.main.activity.SignInActivity;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.User;
+import org.qpython.qpy.main.server.MySubscriber;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import rx.Observable;
+import rx.Observer;
+import rx.Subscription;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+/**
+ * Created by Hmei
+ * 1/31/18.
+ */
+
+public class PayUtil {
+    private static final String             GET_ORDER_URL   = "https://api.wegox.net/create_order";
+    public static final  String             CHECK_ORDER_URL = "https://api.wegox.net/check_order";
+    private              List<Subscription> mSubscriptions  = new ArrayList<>();
+
+    private int checkCount = 0;
+    private Activity context;
+
+    public PayUtil(Activity context) {
+        this.context = context;
+    }
+
+    public void initIAP(PayCallback callback) {
+        callback.doAfterConn();
+    }
+
+    /**
+     * 赞赏
+     */
+//    public void purchase(String price, String articleId, Observer<WeixinPay> callback) {
+//        User user = App.getUser();
+//        if (user == null) {
+//            context.startActivity(new Intent(context, SignInActivity.class));
+//            return;
+//        }
+//        String userName = user.getUserName();
+//        String userId = user.getUserId();
+//        WXAPIManager.getWXService().requestPay(GET_ORDER_URL, price, userName, userId, articleId)
+//                .subscribeOn(Schedulers.io())
+//                .subscribeOn(AndroidSchedulers.mainThread())
+//                .observeOn(AndroidSchedulers.mainThread())
+//                .subscribe(callback);
+//    }
+
+    /**
+     * 查询订单
+     */
+//    public void checkOrderStatus(String mOrderNo, Observer<PaymentStatus> callback) {
+//        checkCount++;
+//        if (checkCount < 31) {
+//            Subscription subscription = WXAPIManager.getWXService().checkStatus(CHECK_ORDER_URL, mOrderNo)
+//                    .subscribeOn(Schedulers.io())
+//                    .observeOn(AndroidSchedulers.mainThread())
+//                    .subscribe(callback);
+//            mSubscriptions.add(subscription);
+//        } else {
+//            if (context.findViewById(R.id.pb) != null)
+//                context.findViewById(R.id.pb).setVisibility(View.GONE);
+//            Toast.makeText(context, "支付失败！", Toast.LENGTH_SHORT).show();
+//        }
+//    }
+
+    public void unbindPayService() {
+        for (Subscription subscription : mSubscriptions) {
+            if (subscription != null && subscription.isUnsubscribed()) {
+                subscription.unsubscribe();
+            }
+        }
+    }
+
+    public interface PayCallback {
+        void doAfterConn();
+    }
+}
diff --git a/qpython/src/oh/java/org/qpython/qpy/sharecode/ShareCodeUtil.java b/qpython/src/oh/java/org/qpython/qpy/sharecode/ShareCodeUtil.java
new file mode 100644
index 00000000..4e2aabaa
--- /dev/null
+++ b/qpython/src/oh/java/org/qpython/qpy/sharecode/ShareCodeUtil.java
@@ -0,0 +1,137 @@
+package org.qpython.qpy.codeshare;
+
+import android.app.Activity;
+import android.content.SharedPreferences;
+import android.os.Handler;
+import android.preference.PreferenceManager;
+import android.widget.Toast;
+
+import com.google.gson.reflect.TypeToken;
+import com.quseit.util.ACache;
+import com.quseit.util.FileHelper;
+import com.quseit.util.NetStateUtil;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.codeshare.pojo.CloudFile;
+import org.qpython.qpy.codeshare.pojo.Gist;
+
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.event.ShareCodeCallback;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+
+import static org.qpython.qpy.main.server.CacheKey.CLOUD_FILE;
+
+/**
+ * FireBase database util
+ * Created by Hmei on 2017-08-10.
+ */
+
+public class ShareCodeUtil {
+
+    public static final String USAGE = "usage";
+    public static final String PROJECT = "project";
+    public static final String SCRIPT = "script";
+    public static final String PROJECT_PATH = "/projects/";
+    public static final String SCRIPTS_PATH = "/scripts/";
+
+    private static final int MAX_FILE = 100;
+
+    private SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(App.getContext());
+    private int currentFileCount = -1;
+    private Handler mHandler = new Handler(App.getContext().getMainLooper());
+
+    private ShareCodeUtil() {
+        if (App.getUser() != null) {
+            initUsage();
+        }
+    }
+
+    public static ShareCodeUtil getInstance() {
+        return ShareCodeHolder.INSTANCE;
+    }
+
+    /**
+     * 上传文件夹
+     */
+
+    /**
+     * 管理文件内存
+     */
+    private List<CloudFile> getCacheFile() {
+        String content = ACache.get(App.getContext()).getAsString(CLOUD_FILE);
+        List<CloudFile> cloudFiles = App.getGson().fromJson(content, new TypeToken<List<CloudFile>>() {
+        }.getType());
+        return cloudFiles == null ? new ArrayList<>() : cloudFiles;
+    }
+
+    private void saveCacheFile(List<CloudFile> cloudFiles) {
+        ACache.get(App.getContext()).put(CLOUD_FILE, App.getGson().toJson(cloudFiles));
+    }
+
+    private void saveCacheFile(CloudFile cloudFile) {
+        List<CloudFile> list = getCacheFile();
+        if (!list.contains(cloudFile)) {
+            list.add(cloudFile);
+        }
+        saveCacheFile(list);
+    }
+
+    private void deleteCacheFile(CloudFile cloudFile) {
+        List<CloudFile> list = getCacheFile();
+        if (list.contains(cloudFile)) {
+            list.remove(cloudFile);
+        }
+        saveCacheFile(list);
+    }
+
+    private void clearCacheFile() {
+        ACache.get(App.getContext()).put(CLOUD_FILE, "");
+    }
+
+    /**
+     * 初始化用户文件空间
+     */
+    public void initUsage() {
+        // TODO
+    }
+
+    public int changeUsage(int change) {
+        currentFileCount += change;
+        sharedPreferences.edit().putInt(USAGE, currentFileCount).apply();
+        return currentFileCount;
+    }
+
+    public int getUsage() {
+        return currentFileCount;
+    }
+
+    private boolean hasSpace(int waiting) {
+        if (currentFileCount < 0) {
+            Toast.makeText(App.getContext(), "usage not init", Toast.LENGTH_SHORT).show();
+            return false;
+        } else {
+            return currentFileCount + waiting < MAX_FILE;
+        }
+    }
+
+    public interface CommentCallback {
+        void commentBean(Gist.CommentBean comment);
+    }
+
+    private static class ShareCodeHolder {
+        private static final ShareCodeUtil INSTANCE = new ShareCodeUtil();
+    }
+
+
+    private boolean isConnect() {
+        if (!NetStateUtil.isConnected(App.getContext())) {
+            Toast.makeText(App.getContext(), "connection error!", Toast.LENGTH_SHORT).show();
+            return false;
+        }
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/qpython/src/oh/java/org/qpython/qpy/sharecode/pojo/CloudFile.java b/qpython/src/oh/java/org/qpython/qpy/sharecode/pojo/CloudFile.java
new file mode 100644
index 00000000..f6a44ea8
--- /dev/null
+++ b/qpython/src/oh/java/org/qpython/qpy/sharecode/pojo/CloudFile.java
@@ -0,0 +1,85 @@
+package org.qpython.qpy.codeshare.pojo;
+
+
+import org.qpython.qpysdk.QPyConstants;
+
+import java.io.Serializable;
+
+import static org.qpython.qpy.codeshare.ShareCodeUtil.PROJECT;
+import static org.qpython.qpy.codeshare.ShareCodeUtil.PROJECT_PATH;
+import static org.qpython.qpy.codeshare.ShareCodeUtil.SCRIPT;
+import static org.qpython.qpy.codeshare.ShareCodeUtil.SCRIPTS_PATH;
+
+public class CloudFile implements Serializable {
+    private String projectName;
+    private String path;
+    private String uploadTime;
+    private String name;
+    private String content;
+    private String key;
+    private boolean uploading;
+
+    public String getPath() {
+        return path;
+    }
+
+    public void setPath(String path) {
+        this.path = path;
+    }
+
+    public String getUploadTime() {
+        return uploadTime;
+    }
+
+    public void setUploadTime(String uploadTime) {
+        this.uploadTime = uploadTime;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public long getContentSize() {
+        return content.length();
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public boolean isUploading() {
+        return uploading;
+    }
+
+    public void setUploading(boolean uploading) {
+        this.uploading = uploading;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getAbsolutePath() {
+        return QPyConstants.ABSOLUTE_PATH + getPath();
+    }
+}
diff --git a/qpython/src/oh/java/org/qpython/qpy/texteditor/TedLocalActivity.java b/qpython/src/oh/java/org/qpython/qpy/texteditor/TedLocalActivity.java
new file mode 100644
index 00000000..f0b132f1
--- /dev/null
+++ b/qpython/src/oh/java/org/qpython/qpy/texteditor/TedLocalActivity.java
@@ -0,0 +1,321 @@
+package org.qpython.qpy.texteditor;
+
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Configuration;
+import android.databinding.DataBindingUtil;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.app.AppCompatActivity;
+import android.text.InputType;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.Toast;
+
+import com.google.gson.reflect.TypeToken;
+import com.quseit.util.FileHelper;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.codeshare.pojo.CloudFile;
+import org.qpython.qpy.databinding.ActivityLocalBinding;
+import org.qpython.qpy.main.activity.SignInActivity;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.CONF;
+import org.qpython.qpy.main.fragment.ExplorerFragment;
+import org.qpython.qpy.main.fragment.LocalFragment;
+import org.qpython.qpy.main.fragment.MyProjectFragment;
+import org.qpython.qpy.texteditor.ui.view.EnterDialog;
+import org.qpython.qpy.utils.NotebookUtil;
+import org.qpython.qpysdk.QPyConstants;
+
+import java.io.File;
+import java.lang.reflect.Type;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class TedLocalActivity extends AppCompatActivity {
+    public static final  int REQUEST_SAVE_AS    = 107;
+    public static final  int REQUEST_OPEN       = 108;
+    public static final  int REQUEST_HOME_PAGE  = 109;
+    public static final  int REQUEST_RECENT     = 111;
+    private static final int LOGIN_REQUEST_CODE = 4806;
+
+    private static final String EXTRA_REQUEST_CODE = "request_code";
+    private static final String FRAGMENT_EXPLORER  = "explorer";
+    private static final String FRAGMENT_CLOUD     = "cloud";
+    private static final String EXTRA_REQUEST_FN = "request_fn";
+
+    private ActivityLocalBinding binding;
+
+    private Fragment          firstPageFragment;
+    private MyProjectFragment myProjectFragment;
+
+    private boolean isExplorer  = true;
+    private boolean isNewUpload = false;
+    private String defaultFileName = "";
+
+    public static void start(Context context, int type) {
+        Intent starter = new Intent(context, TedLocalActivity.class);
+        starter.putExtra(EXTRA_REQUEST_CODE, type);
+        context.startActivity(starter);
+    }
+
+    public static void start(Activity context, int type, int requestCode,  String filename) {
+        Intent starter = new Intent(context, TedLocalActivity.class);
+        starter.putExtra(EXTRA_REQUEST_CODE, type);
+        starter.putExtra(EXTRA_REQUEST_FN, filename);
+
+        context.startActivityForResult(starter, requestCode);
+    }
+
+    public void finishForGetPath(String path) {
+        Intent intent = new Intent();
+        intent.putExtra("path", path);
+        setResult(Activity.RESULT_OK, intent);
+        finish();
+    }
+
+    public void finishForOpen(String path, boolean isProj) {
+        Intent intent = new Intent();
+        intent.putExtra("path", path);
+        intent.putExtra("isProj", isProj);
+        setResult(Activity.RESULT_OK, intent);
+        finish();
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_local);
+        setSupportActionBar(binding.toolbar);
+        int type = getIntent().getIntExtra(EXTRA_REQUEST_CODE, REQUEST_HOME_PAGE);
+        initView();
+        initListener();
+        switch (type) {
+            case REQUEST_RECENT:
+                setTitle(R.string.recent);
+                binding.switchBtn.setVisibility(View.GONE);
+                firstPageFragment = ExplorerFragment.newInstance(type);
+                break;
+            case REQUEST_OPEN:
+                setTitle(R.string.open);
+                binding.switchBtn.setVisibility(View.GONE);
+                binding.explore.setVisibility(View.VISIBLE);
+                firstPageFragment = new LocalFragment();
+                break;
+            case REQUEST_SAVE_AS:
+                setTitle(R.string.save_as);
+                binding.vsSave.getRoot().setVisibility(View.VISIBLE);
+                initSaveListener();
+                String fn = getIntent().getStringExtra(EXTRA_REQUEST_FN);
+                if (fn!=null) {
+                    binding.vsSave.etName.setText(fn);
+                }
+
+                binding.switchBtn.setVisibility(View.GONE);
+                firstPageFragment = ExplorerFragment.newInstance(type);
+                break;
+            case REQUEST_HOME_PAGE:
+                setTitle(R.string.explorer);
+                firstPageFragment = ExplorerFragment.newInstance(type);
+                break;
+        }
+
+        getSupportFragmentManager().beginTransaction()
+                .add(R.id.container, firstPageFragment, FRAGMENT_EXPLORER)
+                .commit();
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+    }
+
+    private void initView() {
+        binding.toolbar.setNavigationIcon(R.drawable.ic_back);
+        binding.toolbar.setNavigationOnClickListener(v -> finish());
+        if (binding.switchBtn.getVisibility() == View.VISIBLE) {
+            myProjectFragment = new MyProjectFragment();
+        }
+    }
+
+    private void initListener() {
+        binding.switchBtn.setOnClickListener(v -> {
+            if (isExplorer) {
+                if (App.getUser() == null) {
+                    startActivityForResult(new Intent(this, SignInActivity.class), LOGIN_REQUEST_CODE);
+                    return;
+                }
+                binding.switchBtn.setImageResource(R.drawable.ic_folder_open);
+                binding.refresh.setVisibility(View.VISIBLE);
+                if (getSupportFragmentManager().findFragmentByTag(FRAGMENT_CLOUD) == null) {
+                    getSupportFragmentManager().beginTransaction().add(R.id.container, myProjectFragment, FRAGMENT_CLOUD).commit();
+                    getSupportFragmentManager().beginTransaction().hide(firstPageFragment).commit();
+                } else {
+                    getSupportFragmentManager().beginTransaction()
+                            .hide(firstPageFragment)
+                            .show(myProjectFragment)
+                            .commit();
+                }
+                myProjectFragment.needRefresh(isNewUpload);
+                isNewUpload = false;
+                if (!myProjectFragment.isLoading) {
+                    myProjectFragment.notifyDataSetChange();
+                }
+            } else {
+                binding.switchBtn.setImageResource(R.drawable.ic_cloud_list);
+                binding.refresh.setVisibility(View.GONE);
+                getSupportFragmentManager().beginTransaction()
+                        .hide(myProjectFragment)
+                        .show(firstPageFragment)
+                        .commit();
+            }
+            isExplorer = !isExplorer;
+        });
+
+        binding.refresh.setOnClickListener(v -> myProjectFragment.retry(true));
+
+        binding.explore.setOnClickListener(v -> {
+            start(this, REQUEST_HOME_PAGE);
+            finish();
+        });
+    }
+
+    public void doSave(String fn) {
+        if (fn.length() == 0) {
+            Toast.makeText(getApplicationContext(), R.string.toast_filename_empty, Toast.LENGTH_SHORT).show();
+        } else {
+            String filename = ((ExplorerFragment) firstPageFragment).getCurPath() + "/" + fn;
+            final File f = new File(filename);
+            if (f.exists()) {
+                AlertDialog.Builder builder = new AlertDialog.Builder(this, R.style.MyDialog);
+                builder.setTitle(R.string.confirm)
+                        .setMessage(R.string.editor_override)
+                        .setPositiveButton(R.string.yes, (dialog, which) -> {
+                            setSaveResult(f.getAbsolutePath());
+
+                        })
+                        .setNegativeButton(R.string.cancel, ((dialog, which) -> nothing()))
+                        .show();
+
+
+                //Toast.makeText(this, R.string.file_exist_hint, Toast.LENGTH_SHORT).show();
+            } else {
+                setSaveResult(f.getAbsolutePath());
+            }
+        }
+    }
+    private void nothing() {
+
+
+    }
+
+    protected boolean setSaveResult(String filepath) {
+        File f = new File(filepath);
+        if (f.getParentFile().canWrite()) {
+            finishForGetPath(filepath);
+        } else {
+            Toast.makeText(getApplicationContext(), R.string.toast_folder_cant_write, Toast.LENGTH_SHORT).show();
+        }
+        return true;
+    }
+
+    private void initSaveListener() {
+        binding.vsSave.btnSave.setOnClickListener(v -> doSave(binding.vsSave.etName.getText().toString()));
+        binding.vsSave.etName.setOnTouchListener((v, event) -> {
+            final int DRAWABLE_RIGHT = 2;
+            switch (event.getAction()) {
+                case MotionEvent.ACTION_DOWN:
+                    Drawable deleteText = ((EditText) v).getCompoundDrawables()[DRAWABLE_RIGHT];
+                    if (deleteText != null) {
+                        if (event.getRawX() >= (v.getRight() - deleteText.getBounds().width())) {
+                            ((EditText) v).setText("");
+                            return true;
+                        }
+                    }
+                    break;
+                case MotionEvent.ACTION_UP:
+                    v.performClick();
+                    break;
+                default:
+                    break;
+            }
+            return false;
+        });
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (resultCode == RESULT_OK) {
+            switch (requestCode) {
+                case LOGIN_REQUEST_CODE:
+                    binding.switchBtn.setImageResource(R.drawable.ic_folder_open);
+                    if (getSupportFragmentManager().findFragmentByTag(FRAGMENT_CLOUD) == null) {
+                        getSupportFragmentManager().beginTransaction().add(R.id.container, myProjectFragment, FRAGMENT_CLOUD).commit();
+                        getSupportFragmentManager().beginTransaction().hide(firstPageFragment).commit();
+                    } else {
+                        getSupportFragmentManager().beginTransaction()
+                                .hide(firstPageFragment)
+                                .show(myProjectFragment)
+                                .commit();
+                    }
+                    isExplorer = !isExplorer;
+                    break;
+            }
+        }
+    }
+
+    @Override
+    public void onBackPressed() {
+        if (firstPageFragment.isVisible() && firstPageFragment instanceof ExplorerFragment) {
+            ((ExplorerFragment) firstPageFragment).backToPrev();
+        } else {
+            super.onBackPressed();
+        }
+    }
+
+//    public void deleteCloudFile(String path) {
+//        if (firstPageFragment instanceof ExplorerFragment) {
+//            ((ExplorerFragment) firstPageFragment).deleteCloudedMap(path);
+//        }
+//    }
+//
+//    public void updateCloudFiles(List<CloudFile> cloudFiles) {
+//        Map<String, Boolean> map = new HashMap<>();
+//        for (CloudFile cloudFile : cloudFiles) {
+//            if (cloudFile.getPath().contains("/projects/")) {
+//                map.put(QPyConstants.ABSOLUTE_PATH + "/projects/" + cloudFile.getProjectName(), true);
+//            }
+//            map.put(QPyConstants.ABSOLUTE_PATH + cloudFile.getPath(), true);
+//        }
+//        ((ExplorerFragment) firstPageFragment).updateCloudedFiles(map);
+//    }
+//
+//    public void setNewUpload() {
+//        isNewUpload = true;
+//    }
+//
+//    /**
+//     * 保存云端文件目录到本地
+//     */
+//    public void locatedCloud(List<CloudFile> cloudFiles) {
+//        if (cloudFiles.size() > 0) {
+//            Type type = new TypeToken<List<CloudFile>>() {
+//            }.getType();
+//            FileHelper.writeToFile(CONF.CLOUD_MAP_CACHE_PATH, App.getGson().toJson(cloudFiles, type));
+//        }
+//    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        NotebookUtil.killServer();
+    }
+}
diff --git a/qpython/src/oh/res/drawable-xxhdpi/ic_login.png b/qpython/src/oh/res/drawable-xxhdpi/ic_login.png
new file mode 100644
index 00000000..d45ba05f
Binary files /dev/null and b/qpython/src/oh/res/drawable-xxhdpi/ic_login.png differ
diff --git a/qpython/src/oh/res/layout/activity_local.xml b/qpython/src/oh/res/layout/activity_local.xml
new file mode 100644
index 00000000..4a03abe2
--- /dev/null
+++ b/qpython/src/oh/res/layout/activity_local.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <LinearLayout
+        android:id="@+id/gd_action_bar_host"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:background="@color/colorPrimaryDark"
+        android:orientation="vertical">
+
+        <android.support.design.widget.AppBarLayout
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize">
+
+            <android.support.v7.widget.Toolbar
+                android:id="@+id/toolbar"
+                style="@style/Toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:background="#FF4A4A4A"
+                android:elevation="2dp"
+                app:popupTheme="@style/DefaultBlueToolbar"
+                app:theme="@style/ToolbarTheme">
+
+                <ImageButton
+                    android:id="@+id/switch_btn"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end"
+                    android:background="@null"
+                    android:padding="10dp"
+                    android:src="@drawable/ic_cloud_list"
+                    android:visibility="gone"/>
+
+                <ImageButton
+                    android:id="@+id/refresh"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end"
+                    android:layout_marginEnd="30dp"
+                    android:layout_marginRight="30dp"
+                    android:background="@color/transparency"
+                    android:src="@drawable/ic_library_reinstall"
+                    android:visibility="gone"/>
+
+                <Button
+                    android:id="@+id/explore"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end"
+                    android:textColor="#FFF"
+                    android:background="@color/transparency"
+                    android:text="@string/explorer"
+                    android:visibility="gone"/>
+            </android.support.v7.widget.Toolbar>
+        </android.support.design.widget.AppBarLayout>
+
+        <RelativeLayout
+            xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/colorPrimaryDark">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+                <FrameLayout
+                    android:id="@+id/container"
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="9"/>
+
+                <include
+                    android:id="@+id/vs_save"
+                    layout="@layout/view_stub_save_prompt"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"/>
+            </LinearLayout>
+        </RelativeLayout>
+    </LinearLayout>
+
+
+</layout>
\ No newline at end of file
diff --git a/qpython/src/oh/res/values-zh-rCN/strings.xml b/qpython/src/oh/res/values-zh-rCN/strings.xml
new file mode 100644
index 00000000..5d429fa5
--- /dev/null
+++ b/qpython/src/oh/res/values-zh-rCN/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="sign_in_with_google">使用微信登录</string>
+    <string name="app_name">QPython OH</string>
+</resources>
\ No newline at end of file
diff --git a/qpython/src/oh/res/values-zh-rTW/strings.xml b/qpython/src/oh/res/values-zh-rTW/strings.xml
new file mode 100644
index 00000000..014a5c4a
--- /dev/null
+++ b/qpython/src/oh/res/values-zh-rTW/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="sign_in_with_google">使用微信登錄</string>
+    <string name="app_name">Qpython L</string>
+</resources>
\ No newline at end of file
diff --git a/qpython/src/oh/res/values/strings.xml b/qpython/src/oh/res/values/strings.xml
new file mode 100644
index 00000000..591ba63c
--- /dev/null
+++ b/qpython/src/oh/res/values/strings.xml
@@ -0,0 +1,4 @@
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="ExtraTranslation">
+    <string name="sign_in_with_google">Sign in with Wechat</string>
+    <string name="app_name">QPython OH</string>
+</resources>
diff --git a/qpython/src/ol/AndroidManifest.xml b/qpython/src/ol/AndroidManifest.xml
new file mode 100644
index 00000000..de317662
--- /dev/null
+++ b/qpython/src/ol/AndroidManifest.xml
@@ -0,0 +1,402 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:tools="http://schemas.android.com/tools"
+          package="org.qpython.qpy">
+
+    <uses-feature
+        android:name="android.hardware.touchscreen"
+        android:required="false"/>
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.CAMERA"/>
+    <uses-permission android:name="android.permission.FLASHLIGHT"/>
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
+    <uses-permission android:name="com.android.vending.BILLING"/>
+    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
+    <uses-permission android:name="com.android.launcher.permission.UNINSTALL_SHORTCUT" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_MEDIA_STORAGE" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+    <uses-permission android:name="android.permission.NFC" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.ACCESS_NOTIFICATION_POLICY" />
+    <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES"/>
+    <uses-permission android:name="net.dinglisch.android.tasker.PERMISSION_RUN_TASKS" />
+    <!-- privacy sensitive permissions -->
+    <uses-permission android:name="android.permission.ACCESS_SUPERUSER" />
+    <!--uses-permission android:name="android.permission.READ_SMS"/>
+    <uses-permission android:name="android.permission.SEND_SMS" />
+    <uses-permission android:name="android.permission.RECEIVE_SMS"/>
+    <uses-permission android:name="android.permission.WRITE_SMS"/-->
+    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+    <uses-permission android:name="android.permission.CALL_PHONE"/>
+    <!--uses-permission android:name="android.permission.READ_CALL_LOG"/>
+    <uses-permission android:name="android.permission.PROCESS_OUTGOING_CALLS"/-->
+    <uses-permission android:name="android.permission.READ_CONTACTS"/>
+    <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
+    <!--uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/-->
+
+    <uses-feature android:name="android.hardware.microphone" android:required="false"/>
+    <uses-feature android:name="android.hardware.telephony" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.flash" android:required="false"/>
+    <uses-feature android:name="android.hardware.screen.landscape" android:required="false"/>
+    <uses-feature android:name="android.hardware.wifi" android:required="false"/>
+    <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
+    <uses-feature android:name="android.hardware.location.gps" android:required="false"/>
+    <uses-feature android:name="android.hardware.location.network" android:required="false"/>
+    <uses-feature android:name="android.hardware.bluetooth" android:required="false"/>
+
+    <uses-feature android:glEsVersion="0x00020000" android:required="false"/>
+
+    <application
+        android:networkSecurityConfig="@xml/network_security_config"
+        android:name="org.qpython.qpy.main.app.App"
+        android:allowBackup="true"
+        android:hardwareAccelerated="true"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:largeHeap="true"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
+        <uses-library android:name="org.apache.http.legacy" android:required="false"/>
+
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_icon"
+            android:resource="@drawable/img_home_logo"/>
+
+        <service android:name=".main.service.QPyService"/>
+        <service android:name="org.qpython.qsl4a.QPyScriptService"/>
+        <service android:name=".main.service.FTPServerService"/>
+        <activity
+            android:name=".main.activity.SignInActivity"
+            android:launchMode="singleTask"/>
+        <activity
+            android:name="org.renpy.android.PythonSDLActivity"
+            android:hardwareAccelerated="true"
+            android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|fontScale|uiMode|orientation"
+            android:launchMode="singleTask"
+            android:process=":python"
+            android:screenOrientation="user"
+            android:theme="@style/AppTheme"
+            android:windowSoftInputMode="stateAlwaysHidden">
+        </activity>
+
+        <activity
+            android:name="org.qpython.qpylib.MPyApi"
+            android:exported="true"
+            android:theme="@style/Theme.AppCompat"/>
+
+        <service
+            android:name="org.qpython.qpylib.MPyService"
+            android:exported="true"
+            tools:ignore="ExportedService"/>
+
+        <activity
+            android:name=".main.activity.SplashActivity"
+            android:theme="@style/FullscreenTheme"
+            >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name="org.qpython.qpy.main.activity.HomeMainActivity"
+            android:launchMode="singleTask">
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcuts"/>
+        </activity>
+
+        <activity
+            android:name="org.qpython.qpy.main.activity.QWebViewActivity"
+            android:label="@string/browser">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW"/>
+
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE"/>
+
+                <data android:mimeType="text/plain"/>
+                <data android:mimeType="image/*"/>
+                <data
+                    android:host="course"
+                    android:path="/"
+                    android:scheme="qpython"/>
+            </intent-filter>
+
+            <!-- Used to handle Chrome then menu then share.-->
+            <intent-filter>
+                <action android:name="android.intent.action.SEND"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <data android:mimeType="text/plain"/>
+                <data android:mimeType="image/*"/>
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".main.activity.CourseActivity"
+            android:configChanges="orientation|screenSize"/>
+        <activity android:name=".main.activity.CourseIndexActivity"/>
+        <activity android:name=".main.activity.GistEditActivity"/>
+        <activity android:name=".main.activity.CodeDetailActivity"/>
+        <activity android:name=".main.activity.CodeShareActivity"/>
+        <activity android:name=".main.activity.UserActivity"/>
+        <activity
+            android:name="org.qpython.qpy.main.activity.SettingActivity"
+            android:theme="@style/AppTheme"/>
+        <activity
+            android:name="org.qpython.qpy.console.TermActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:theme="@style/AppTheme"/>
+        <activity
+            android:name=".main.activity.LogActivity"
+            android:theme="@style/AppTheme"/>
+        <activity
+            android:name=".texteditor.EditorActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:exported="true"
+            android:label="@string/editor">
+            <intent-filter>
+                <!--<action android:name="android.intent.action.SEND"/>-->
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:mimeType="text/*"/>
+                <data android:scheme="file"/>
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="content"/>
+                <data android:host="*"/>
+                <data android:mimeType="*/*"/>
+                <data android:pathPattern=".*\\.txt"/>
+                <data android:pathPattern=".*\\.html"/>
+                <data android:pathPattern=".*\\.css"/>
+                <data android:pathPattern=".*\\.js"/>
+                <data android:pathPattern=".*\\.md"/>
+                <data android:pathPattern=".*\\.php"/>
+                <data android:pathPattern=".*\\.py"/>
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name="org.qpython.qpy.texteditor.TedLocalActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
+        <activity
+            android:name="org.qpython.qpy.texteditor.TedSettingsActivity"
+            android:theme="@style/SettingTheme"
+            android:windowSoftInputMode="stateHidden"/>
+        <activity
+            android:name="org.qpython.qpy.texteditor.TedFontActivity"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
+
+        <activity
+            android:name=".main.activity.LibActivity"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar">
+            <intent-filter>
+                <action android:name="org.qpython.qpy.OPEN_AIPY_FRAGMENT"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name=".main.activity.AboutActivity"/>
+
+        <activity
+            android:name=".main.activity.AppListActivity"
+            android:exported="true"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar">
+        </activity>
+        <activity
+            android:name="org.swiftp.gui.ServerPreferenceActivity"
+            android:label="Preferences"/>
+        <activity android:name=".texteditor.MFTPSettingActivity"/>
+        <activity android:name=".main.activity.PurchaseActivity"/>
+
+        <activity-alias
+            android:name="TermInternal"
+            android:exported="false"
+            android:targetActivity="org.qpython.qpy.console.TermActivity"
+            android:theme="@style/ConsoleTheme">
+            <intent-filter>
+                <action android:name="jackpal.androidterm.private.OPEN_NEW_WINDOW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="jackpal.androidterm.private.SWITCH_WINDOW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity-alias>
+        <activity
+            android:name="org.qpython.qpy.console.RemoteInterface"
+            android:excludeFromRecents="true"
+            android:theme="@style/ConsoleTheme">
+            <intent-filter>
+                <action android:name="jackpal.androidterm.OPEN_NEW_WINDOW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+        <activity-alias
+            android:name="TermHere"
+            android:exported="true"
+            android:label="@string/activity_term_here_title"
+            android:targetActivity="org.qpython.qpy.console.RemoteInterface"
+            android:theme="@style/ConsoleTheme">
+        </activity-alias>
+
+        <activity
+            android:name="org.qpython.qsl4a.qsl4a.activity.FutureActivity"
+            android:label="QSL4A FutureActivity"
+            android:theme="@style/AppTheme">
+            <intent-filter>
+                <action android:name="android.nfc.action.NDEF_DISCOVERED"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <data android:mimeType="application/com.hipipal.qpy.nfc"/>
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name="org.qpython.qpy.console.RunScript"
+            android:excludeFromRecents="true"
+            android:permission="jackpal.androidterm.permission.RUN_SCRIPT"
+            android:theme="@style/ConsoleTheme">
+            <intent-filter>
+                <action android:name="jackpal.androidterm.RUN_SCRIPT"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="org.qpython.qpy.console.RunShortcut"
+            android:excludeFromRecents="true"
+            android:theme="@style/ConsoleTheme">
+            <intent-filter>
+                <action android:name="jackpal.androidterm.RUN_SHORTCUT"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="org.qpython.qpy.console.TermPreferences"
+            android:label="@string/preferences"
+            android:theme="@style/ConsoleTheme"/>
+        <activity
+            android:name="org.qpython.qpy.console.WindowList"
+            android:label="@string/window_list"
+            android:theme="@style/ConsoleTheme"/>
+        <activity
+            android:name="org.qpython.qpy.console.shortcuts.AddShortcut"
+            android:configChanges="orientation|keyboard|keyboardHidden"
+            android:label="@string/activity_shortcut_create"
+            android:launchMode="singleTop"
+            android:theme="@style/Theme.AppCompat">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.CREATE_SHORTCUT"/>
+            </intent-filter>
+            <intent-filter>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <data android:mimeType="text/*"/>
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="org.qpython.qpy.console.shortcuts.FSNavigator"
+            android:configChanges="orientation|keyboardHidden"
+            android:exported="true"
+            android:label="@string/addshortcut_button_find_command"
+            android:launchMode="singleTop"
+            android:theme="@style/ConsoleTheme">
+            <intent-filter>
+                <action android:name="android.intent.action.PICK"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.GET_CONTENT"/>
+
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.OPENABLE"/>
+
+                <data android:mimeType="*/*"/>
+            </intent-filter>
+        </activity>
+
+        <activity android:name="org.qpython.qpy.plugin.activity.PluginManagerActivity"/>
+        <activity android:name="org.qpython.qpy.plugin.activity.LocalPluginInstallActivity"/>
+
+        <!--zxing-->
+        <activity android:name="org.qpython.qpy.main.activity.QrCodeActivity"/>
+        <activity
+            android:name=".main.activity.GistActivity"
+            android:configChanges="orientation"
+            android:launchMode="singleTask"/>
+        <activity
+            android:name=".main.activity.GistDetailActivity"
+            android:configChanges="orientation"/>
+        <activity
+            android:name=".main.activity.MyGistActivity"
+            android:configChanges="orientation"/>
+        <!--SERVICE-->
+        <service android:name="org.qpython.qpy.console.TermService"
+                 tools:ignore="ExportedService">
+            <intent-filter>
+                <action android:name="jackpal.androidterm.action.START_TERM.v1"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </service>
+
+        <activity android:name=".main.activity.CourseIndexFundingActivity"/>
+        <activity android:name=".main.activity.FundingPurchaseActivity"/>
+        <activity
+            android:name=".main.activity.NotebookActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:launchMode="singleTask"
+            android:windowSoftInputMode="adjustResize"
+            android:exported="true">
+            <intent-filter >
+                <action android:name="android.intent.action.VIEW"/>
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".main.activity.NotebookListActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"/>
+
+        <service
+            android:name=".main.service.MyFirebaseMessagingService"
+            tools:ignore="ExportedService">
+            <intent-filter>
+                <action android:name="com.google.firebase.MESSAGING_EVENT"/>
+            </intent-filter>
+        </service>
+        <service
+            android:name=".main.service.MyFirebaseInstanceIDService"
+            tools:ignore="ExportedService">
+            <intent-filter>
+                <action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
+            </intent-filter>
+        </service>
+    </application>
+
+    <meta-data
+        android:name="com.sec.android.support.multiwindow"
+        android:value="true"/>
+
+</manifest>
\ No newline at end of file
diff --git a/qpython/src/ol/java/org/qpython/qpy/codeshare/ShareCodeUtil.java b/qpython/src/ol/java/org/qpython/qpy/codeshare/ShareCodeUtil.java
new file mode 100644
index 00000000..3841e9a9
--- /dev/null
+++ b/qpython/src/ol/java/org/qpython/qpy/codeshare/ShareCodeUtil.java
@@ -0,0 +1,743 @@
+package org.qpython.qpy.codeshare;
+
+import android.app.Activity;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+import android.util.Log;
+import android.widget.Toast;
+
+import com.google.firebase.database.DataSnapshot;
+import com.google.firebase.database.DatabaseError;
+import com.google.firebase.database.DatabaseReference;
+import com.google.firebase.database.FirebaseDatabase;
+import com.google.firebase.database.ValueEventListener;
+import com.google.gson.reflect.TypeToken;
+import com.quseit.util.ACache;
+import com.quseit.util.FileHelper;
+import com.quseit.util.NetStateUtil;
+
+import org.json.JSONObject;
+import org.qpython.qpy.R;
+import org.qpython.qpy.codeshare.pojo.BookmarkerList;
+import org.qpython.qpy.codeshare.pojo.CloudFile;
+import org.qpython.qpy.codeshare.pojo.Gist;
+import org.qpython.qpy.codeshare.pojo.GistBase;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.CONF;
+import org.qpython.qpy.texteditor.common.TextFileUtils;
+import org.qpython.qpysdk.utils.DateTimeHelper;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import rx.Observable;
+import rx.functions.Action1;
+
+import static org.qpython.qpy.codeshare.CONSTANT.DOT_REPLACE;
+import static org.qpython.qpy.codeshare.CONSTANT.SLASH_REPLACE;
+import static org.qpython.qpy.main.server.CacheKey.CLOUD_FILE;
+
+/**
+ * FireBase database util
+ * Created by Hmei on 2017-08-10.
+ */
+
+public class ShareCodeUtil {
+    private static final boolean CLEAR = false;
+
+    private static final String CLOUD        = "cloud";
+    private static final String GIST         = "gist";
+    private static final String USER         = "user";
+    private static final String BASE         = "base";
+    private static final String GIST_LIST    = "gist_list";
+    private static final String HISTORY      = "history";
+    private static final String COMMENT      = "comment";
+    private static final String BOOKMARK     = "bookmark";
+    private static final String COMMIT       = "commit";
+    private static final String INDEX        = "index";
+    private static final String USAGE        = "usage";
+    private static final String PROJECT      = "project";
+    private static final String SCRIPT       = "script";
+    private static final String OTHER        = "other";
+    private static final String PROJECT_PATH = "/projects/";
+    private static final String SCRIPTS_PATH = "/scripts/";
+
+    private static final int MAX_FILE = 100;
+
+    private DatabaseReference reference;
+    private String            email;
+    private String            userName;
+    private String            avatarUrl;
+
+    private SharedPreferences sharedPreferences;
+    private int currentFileCount = -1;
+
+    private ShareCodeUtil() {
+        reference = FirebaseDatabase.getInstance().getReference();
+        if (App.getUser() != null) {
+            email = App.getUser().getEmail().replace(".", "_");
+            userName = App.getUser().getUserName();
+            avatarUrl = App.getUser().getAvatarUrl();
+            sharedPreferences = PreferenceManager.getDefaultSharedPreferences(App.getContext());
+            initUsage(null);
+        } else {
+            email = "";
+            userName = "";
+            avatarUrl = "";
+        }
+        //LogUtil.d("ShareCodeUtil", "ShareCodeUtil:"+App.getUser().getEmail());
+
+        Log.d("ShareCodeUtil", "ShareCodeUtil:"+email);
+    }
+
+    public static ShareCodeUtil getInstance() {
+        return ShareCodeHolder.INSTANCE;
+    }
+
+    @SuppressWarnings({"DEBUG_ONLY"})
+    public void clearAll() {
+        if (CLEAR) {
+            reference.child(CLOUD).child(email).removeValue(
+                    (databaseError, databaseReference) ->
+                            Toast.makeText(App.getContext(), "Clear", Toast.LENGTH_SHORT).show());
+        }
+    }
+
+    public void createScriptGist(String title, String desc, String msg, String content, DatabaseReference.CompletionListener listener) {
+        String date = DateTimeHelper.getDate();
+        // Add to all gist repo
+        Gist gist = new Gist();
+        gist.setTitle(title);
+        gist.setAuthor(userName);
+        gist.setAvatar(avatarUrl);
+        gist.setDescribe(desc);
+        gist.setDate(date);
+        DatabaseReference path = reference.child(GIST).child(SCRIPT).push();// gist/script/<gist_id>
+        String gistId = path.getKey();
+        path.setValue(gist, listener);
+        commitGist(gistId, msg, content, null, null);
+
+        // Add to user repo
+        GistBase baseGist = new GistBase();
+        baseGist.setAuthor(userName);
+        baseGist.setAvatar(avatarUrl);
+        baseGist.setDate(date);
+        baseGist.setTitle(title);
+        reference.child(USER).child(email).child(GIST_LIST).child(SCRIPT).child(gistId).setValue(baseGist);// user/<email>/gist_list/script/<gist_id>
+
+        // Add to base repo
+        reference.child(BASE).child(SCRIPT).child(gistId).setValue(baseGist); // base/script/<gist_id>
+    }
+
+    public void createProjectGist(String projectName, String desc, String msg, List<String> paths, DatabaseReference.CompletionListener completionListener) {
+        for (String path : paths) {
+            File file = new File(path);
+            String code = TextFileUtils.readTextFile(file);
+            String fileName = file.getName().replace(".", DOT_REPLACE);
+
+            String date = DateTimeHelper.getDate();
+            // Add to all gist repo
+            Gist gist = new Gist();
+            gist.setTitle(fileName);
+            gist.setAuthor(userName);
+            gist.setAvatar(avatarUrl);
+            gist.setDescribe(desc);
+            gist.setDate(date);
+            DatabaseReference subReference = reference.child(GIST).child(PROJECT);// gist/script/<gist_id>
+            String gistId = subReference.getKey();
+            subReference.child(gistId).child(projectName).child(fileName).setValue(gist, completionListener);// gist/project/<gist_id>/<projectName>/<fileName>
+            commitGist(gistId, msg, code, projectName, fileName);
+
+            // Add to user repo
+            GistBase baseGist = new GistBase();
+            baseGist.setAuthor(userName);
+            baseGist.setAuthor(avatarUrl);
+            baseGist.setDate(date);
+            baseGist.setTitle(fileName);
+            // user/<email>/gist_list/project/<gist_id>/<projectName>/<fileName>
+            reference.child(USER).child(email).child(GIST_LIST).child(PROJECT).child(gistId).child(projectName).child(fileName).setValue(baseGist);
+
+            // Add to base repo
+            // base/project/<gist_id>/<projectName>/<fileName>
+            reference.child(BASE).child(PROJECT).child(gistId).child(projectName).child(fileName).setValue(baseGist);
+        }
+    }
+
+    public void commitGist(String gistId, String msg, String content, String projName, String fileName) {
+        Gist.HistoryBean historyBean = new Gist.HistoryBean();
+        historyBean.setData(DateTimeHelper.getDate());
+        historyBean.setMassage(msg);
+        historyBean.setContent(content);
+        if (projName != null) {
+            DatabaseReference subRe = reference.child(GIST).child(PROJECT).child(gistId).child(projName).child(fileName).child(HISTORY).push();
+            String historyId = subRe.getKey();
+            subRe.child(historyId).setValue(historyBean); // gist/<gist_id>/history/<historyId>}
+        } else {
+            DatabaseReference subRe = reference.child(GIST).child(SCRIPT).child(gistId).child(HISTORY).push();
+            String historyId = subRe.getKey();
+            subRe.child(historyId).setValue(historyBean); // gist/<gist_id>/history/<historyId>}
+            reference.child(GIST).child(SCRIPT).child(gistId).child("lastCommitCode").setValue(content);
+        }
+    }
+
+    public void sendComment(String gistId, String comment, boolean isProj, CommentCallback callback) {
+        sendComment(gistId, "", comment, "", isProj, callback);
+    }
+
+    /**
+     * @param comment   评论
+     * @param reComment 被回复的评论
+     */
+    public void sendComment(String gistId, String to, String comment, String reComment, boolean isProj, CommentCallback callback) {
+        Gist.CommentBean commentBean = new Gist.CommentBean();
+        commentBean.setFrom_content(comment);
+        commentBean.setData(DateTimeHelper.getDate());
+        commentBean.setFrom(userName);
+        commentBean.setAvatar(avatarUrl);
+        commentBean.setRe(to);
+        commentBean.setRe_content(reComment);
+        callback.commentBean(commentBean);
+        DatabaseReference subRe = reference.child(GIST).child(isProj ? PROJECT : SCRIPT).child(gistId).child(COMMENT).push();
+        String commentId = subRe.getKey();
+        subRe.child(commentId).setValue(commentBean);
+    }
+
+    public void bookmark(String gistId) {
+        reference.child(GIST).child(gistId).child(BOOKMARK).child(email).setValue(userName);
+        reference.child(USER).child(email).child(BOOKMARK).child(gistId).setValue(true);
+    }
+
+    public void cancelBookmark(String gistId) {
+        reference.child(GIST).child(gistId).child(BOOKMARK).child(email).removeValue();
+        reference.child(USER).child(email).child(BOOKMARK).child(gistId).removeValue();
+    }
+
+    public void getBaseScriptGistList(Action1<List<GistBase>> callback) {
+        reference.child(BASE).child(SCRIPT).addListenerForSingleValueEvent(new SimpleValueEventListener() {
+            @Override
+            public void onDataGet(HashMap value) {
+                List<GistBase> dataList = new ArrayList<>();
+                for (Object key : value.keySet()) {
+                    GistBase gistBase = App.getGson().fromJson(new JSONObject((Map) value.get(key)).toString(), GistBase.class);
+                    gistBase.setId((String) key);
+                    dataList.add(gistBase);
+                }
+                Observable.just(dataList)
+                        .subscribe(callback);
+            }
+        });
+    }
+
+    public void getBaseProjectGistList(Action1<List<GistBase>> callback) {
+        reference.child(BASE).child(PROJECT).addListenerForSingleValueEvent(new SimpleValueEventListener() {
+            @Override
+            public void onDataGet(HashMap value) {
+                List<GistBase> dataList = new ArrayList<>();
+                for (Object key : value.keySet()) {
+                    GistBase gistBase = App.getGson().fromJson(new JSONObject((Map) value.get(key)).toString(), GistBase.class);
+                    gistBase.setId((String) key);
+                    dataList.add(gistBase);
+                }
+                Observable.just(dataList)
+                        .subscribe(callback);
+            }
+        });
+    }
+
+    public void getGistDetail(String gistId, boolean isProj, Action1<Gist> callback) {
+        reference.child(GIST).child(isProj ? PROJECT : SCRIPT).child(gistId).addListenerForSingleValueEvent(new SimpleValueEventListener() {
+            @Override
+            public void onDataGet(HashMap value) {
+                JSONObject jsonObject = new JSONObject(value);
+                Gist gist = App.getGson().fromJson(String.valueOf(jsonObject), Gist.class);
+
+                HashMap historyMap = (HashMap) value.get(HISTORY);
+                if (historyMap != null) {
+                    List<Gist.HistoryBean> historyList = new ArrayList<>();
+                    for (Object historyKey : historyMap.keySet()) {
+                        Gist.HistoryBean historyBean = App.getGson().fromJson(String.valueOf(new JSONObject((Map) historyMap.get(historyKey))), Gist.HistoryBean.class);
+                        historyBean.setHistoryId((String) historyKey);
+                        historyList.add(historyBean);
+                    }
+                    gist.setHistory(historyList);
+                }
+
+                HashMap commentMap = (HashMap) value.get(COMMENT);
+                if (commentMap != null) {
+                    List<Gist.CommentBean> commentList = new ArrayList<>();
+                    for (Object commentKey : commentMap.keySet()) {
+                        Gist.CommentBean commentBean = App.getGson().fromJson(String.valueOf(new JSONObject((Map) commentMap.get(commentKey))), Gist.CommentBean.class);
+                        commentBean.setId((String) commentKey);
+                        commentList.add(commentBean);
+                    }
+                    gist.setComment(commentList);
+                }
+
+                HashMap bookmarkMap = (HashMap) value.get(BOOKMARK);
+                if (bookmarkMap != null) {
+                    List<Gist.BookmarkerBean> bookmarkerList = new ArrayList<>();
+                    for (Object bookmarkKey : bookmarkMap.keySet()) {
+                        Gist.BookmarkerBean bookmarkerBean = App.getGson().fromJson(String.valueOf(new JSONObject((Map) bookmarkMap.get(bookmarkKey))), Gist.BookmarkerBean.class);
+                        bookmarkerBean.setId((String) bookmarkKey);
+                        bookmarkerList.add(bookmarkerBean);
+                    }
+                    gist.setBookmarker(bookmarkerList);
+                }
+                Observable.just(gist)
+                        .subscribe(callback);
+            }
+        });
+    }
+
+    // TODO: 2017-08-14 Need to fix
+    public void getMyGistList(Action1<List<GistBase>> callback) {
+        reference.child(USER).child(GIST_LIST).addListenerForSingleValueEvent(new ValueEventListener() {
+            @Override
+            public void onDataChange(DataSnapshot dataSnapshot) {
+                HashMap object = (HashMap) dataSnapshot.getValue();
+                List<GistBase> userGist = new ArrayList<>();
+                if (object == null) {
+                    return;
+                }
+                for (Object key : object.keySet()) {
+                    userGist.add(App.getGson().fromJson(new JSONObject((Map) object.get(key)).toString(), GistBase.class));
+                }
+                Observable.just(userGist)
+                        .subscribe(callback);
+            }
+
+            @Override
+            public void onCancelled(DatabaseError databaseError) {
+
+            }
+        });
+    }
+
+    public void getMyBookmarkList(Action1<List<BookmarkerList>> callback) {
+        reference.child(USER).child(BOOKMARK).addListenerForSingleValueEvent(new ValueEventListener() {
+            @Override
+            public void onDataChange(DataSnapshot dataSnapshot) {
+                HashMap object = (HashMap) dataSnapshot.getValue();
+                List<BookmarkerList> userGist = new ArrayList<>();
+                if (object == null) {
+                    return;
+                }
+                for (Object key : object.keySet()) {
+                    userGist.add(App.getGson().fromJson(new JSONObject((Map) object.get(key)).toString(), BookmarkerList.class));
+                }
+                Observable.just(userGist)
+                        .subscribe(callback);
+            }
+
+            @Override
+            public void onCancelled(DatabaseError databaseError) {
+
+            }
+        });
+    }
+
+    public void getGistCommentList(String gistId, Action1<List<Gist.CommentBean>> callback) {
+        reference.child(GIST).child(gistId).child(COMMENT).addListenerForSingleValueEvent(new ValueEventListener() {
+            @Override
+            public void onDataChange(DataSnapshot dataSnapshot) {
+                HashMap object = (HashMap) dataSnapshot.getValue();
+                List<Gist.CommentBean> commentList = new ArrayList<>();
+                if (object == null) {
+                    return;
+                }
+                for (Object key : object.keySet()) {
+                    commentList.add(App.getGson().fromJson(new JSONObject((Map) object.get(key)).toString(), Gist.CommentBean.class));
+                }
+                Observable.just(commentList)
+                        .subscribe(callback);
+            }
+
+            @Override
+            public void onCancelled(DatabaseError databaseError) {
+
+            }
+        });
+    }
+
+    public boolean uploadFolder(String path, DatabaseReference.CompletionListener completionListener, int[] size) {
+        File folder = new File(path);
+        // 获取该文件夹下符合后缀文件及非隐藏文件
+
+        if (!folder.isDirectory()) {
+            return false;
+        }
+        List<File> files = FileHelper.filterExt(folder, App.getContext().getResources().getStringArray(R.array.support_file_ext), size[0]);
+        if (files.size() == 0) {
+            Toast.makeText(App.getContext(), R.string.no_file, Toast.LENGTH_SHORT).show();
+            return false;
+        }
+
+        if (!hasSpace(files.size())) {
+            return false;
+        }
+
+        for (File file : files) {
+            uploadFile(file.getAbsolutePath(), completionListener);
+        }
+
+//        // 如果在project目录下
+//        if ("projects".equals(folder.getName())) {
+//            DatabaseReference projNode = reference.child(CLOUD).child(email).child(PROJECT).child(folder.getName().replace(".", DOT_REPLACE));
+//            for (int i = 0; i < files.size(); i++) {
+//                String date = DateTimeHelper.AGO_FULL_DATE_FORMATTER.format(new Date(files.get(i).lastModified()));
+//                String subPath = files.get(i).getAbsolutePath();
+//                String subKey = subPath.substring(subPath.indexOf(folder.getName()) + folder.getName().length(), subPath.length()).replace(".", DOT_REPLACE).replace("/", SLASH_REPLACE);
+//                if (i == files.size() - 1) {
+//                    projNode.child(subKey)
+//                            .child(date)
+//                            .setValue(TextFileUtils.readTextFile(files.get(i)), completionListener);
+//                } else {
+//                    projNode.child(subKey)
+//                            .child(date)
+//                            .setValue(TextFileUtils.readTextFile(files.get(i)));
+//                }
+//                reference.child(CLOUD)
+//                        .child(email)
+//                        .child(INDEX)
+//                        .child(PROJECT)
+//                        .child(folder.getName().replace(".", DOT_REPLACE) + subKey)
+//                        .setValue(date);
+//            }
+//        } else if ("scripts".equals(folder.getName())) {
+//            // 上传整个scripts文件夹
+//            for (int i = 0; i < files.size(); i++) {
+//                String abs_path = files.get(i).getAbsolutePath();
+//                String key = abs_path
+//                        .substring(abs_path.indexOf(SCRIPTS_PATH) + SCRIPTS_PATH.length())
+//                        .replace(".", DOT_REPLACE)
+//                        .replace("/", SLASH_REPLACE);
+//                DatabaseReference content = reference.child(CLOUD)
+//                        .child(email)
+//                        .child(SCRIPT)
+//                        .child(key)
+//                        .child(DateTimeHelper.AGO_FULL_DATE_FORMATTER.format(new Date(files.get(i).lastModified())));
+//                if (i == files.size() - 1) {
+//                    content.setValue(TextFileUtils.readTextFile(files.get(i)), completionListener);
+//                } else {
+//                    content.setValue(TextFileUtils.readTextFile(files.get(i)));
+//                }
+//
+//                reference.child(CLOUD)
+//                        .child(email)
+//                        .child(INDEX)
+//                        .child(SCRIPT)
+//                        .child(key)
+//                        .setValue(DateTimeHelper.AGO_FULL_DATE_FORMATTER.format(new Date(files.get(i).lastModified())));
+//            }
+//        } else {
+//            // 普通文件夹
+//            int fileListSize = files.size();
+//            for (File file : files) {
+//                fileListSize--;
+//                final String rootNode = "/qpython/";
+//                String node = file.getAbsolutePath().substring(path.indexOf(rootNode) + rootNode.length());
+//                DatabaseReference child =
+//                        reference
+//                                .child(CLOUD)
+//                                .child(email)/*.child(folder.getName().replace(".", DOT_REPLACE))*/
+//                                .child(OTHER)
+//                                .child(node.replace(".", DOT_REPLACE).replace("/", SLASH_REPLACE))
+//                                .child(DateTimeHelper.getDate());
+//                if (fileListSize == 0) {
+//                    child.setValue(TextFileUtils.readTextFile(file), completionListener);
+//                } else {
+//                    child.setValue(TextFileUtils.readTextFile(file));
+//                }
+//
+//                reference.child(CLOUD)
+//                        .child(email)
+//                        .child(INDEX)
+//                        .child(OTHER)
+//                        .child(node.replace(".", DOT_REPLACE).replace("/", SLASH_REPLACE))
+//                        .setValue(DateTimeHelper.getDate());
+//            }
+//        }
+        return true;
+    }
+
+    public boolean uploadFile(String path, DatabaseReference.CompletionListener completionListener) {
+        File file = new File(path);
+
+        if (!hasSpace(1)) {
+            return false;
+        }
+
+        if (path.contains(PROJECT_PATH)) {
+            String subPath = path.substring(path.indexOf(PROJECT_PATH) + PROJECT_PATH.length());
+            String projName = subPath.split("/")[0];
+            reference.child(CLOUD)
+                    .child(email)
+                    .child(PROJECT)
+                    .child(projName)
+                    .child(subPath.replace(".", DOT_REPLACE).replace("/", SLASH_REPLACE).replace(projName, ""))
+                    .child(DateTimeHelper.AGO_FULL_DATE_FORMATTER.format(new Date(file.lastModified())))
+                    .setValue(TextFileUtils.readTextFile(file), completionListener);
+
+            reference.child(CLOUD)
+                    .child(email)
+                    .child(INDEX)
+                    .child(PROJECT)
+                    .child(subPath.replace(".", DOT_REPLACE).replace("/", SLASH_REPLACE))
+                    .setValue(DateTimeHelper.AGO_FULL_DATE_FORMATTER.format(new Date(file.lastModified())));
+        } else if (path.contains(SCRIPTS_PATH)) {
+            reference.child(CLOUD)
+                    .child(email)
+                    .child(SCRIPT)
+                    .child(file.getName().replace(".", DOT_REPLACE))
+                    .child(DateTimeHelper.AGO_FULL_DATE_FORMATTER.format(new Date(file.lastModified())))
+                    .setValue(TextFileUtils.readTextFile(file), completionListener);
+
+            reference.child(CLOUD)
+                    .child(email)
+                    .child(INDEX)
+                    .child(SCRIPT)
+                    .child(file.getName().replace(".", DOT_REPLACE))
+                    .setValue(DateTimeHelper.AGO_FULL_DATE_FORMATTER.format(new Date(file.lastModified())));
+        } else {
+            final String rootNode = "/qpython/";
+            String uploadKey = path.substring(path.indexOf(rootNode) + rootNode.length());
+            reference.child(CLOUD)
+                    .child(email)
+                    .child(OTHER)
+                    .child(uploadKey.replace(".", DOT_REPLACE).replace("/", SLASH_REPLACE))
+                    .child(DateTimeHelper.getDate())
+                    .setValue(TextFileUtils.readTextFile(file), completionListener);
+
+            reference.child(CLOUD)
+                    .child(email)
+                    .child(INDEX)
+                    .child(OTHER)
+                    .child(uploadKey.replace(".", DOT_REPLACE).replace("/", SLASH_REPLACE))
+                    .setValue(DateTimeHelper.getDate());
+        }
+        return true;
+    }
+
+    public void getUploadedScripts(boolean forceRefresh, Activity context, Action1<List<CloudFile>> callback) {
+        if (CLEAR) {
+            return;
+        }
+        String content = FileHelper.getFileContents(CONF.CLOUD_MAP_CACHE_PATH);
+        List<CloudFile> cloudFiles = content == null ? null : App.getGson().fromJson(content, new TypeToken<List<CloudFile>>() {
+        }.getType());
+        if (cloudFiles != null && !forceRefresh) {
+            Observable.just(cloudFiles)
+                    .subscribe(callback);
+        } else {
+            email = App.getUser()!=null?App.getUser().getEmail().replace(".","_"):"";
+            if (email.equals("")) {
+                Toast.makeText(context, "Waiting the firebase to initializ...",Toast.LENGTH_SHORT).show();
+
+            } else {
+                reference.child(CLOUD).child(email).child(INDEX).addListenerForSingleValueEvent(new ValueEventListener() {
+                    @Override
+                    public void onDataChange(DataSnapshot dataSnapshot) {
+                        HashMap<String, Object> value = (HashMap<String, Object>) dataSnapshot.getValue();
+                        if (value == null) {
+                            resetUsage(0);
+                            Observable.just(new ArrayList<CloudFile>())
+                                    .subscribe(callback);
+                            return;
+                        }
+                        List<CloudFile> cloudFiles = new ArrayList<>();
+                        for (String node : value.keySet()) {
+                            switch (node) {
+                                case SCRIPT:
+                                    HashMap<String, Object> script;
+                                    script = (HashMap<String, Object>) value.get(SCRIPT);
+                                    for (String o : script.keySet()) {
+                                        CloudFile cloudFile = new CloudFile();
+                                        cloudFile.setName(o);
+                                        cloudFile.setKey(SCRIPT + "/" + o);
+                                        cloudFile.setPath(SCRIPTS_PATH);
+                                        cloudFile.setUploadTime((String) script.get(o));
+                                        cloudFiles.add(cloudFile);
+                                    }
+                                    break;
+                                case PROJECT:
+                                    HashMap<String, Object> project = (HashMap<String, Object>) value.get(PROJECT);
+                                    for (String s : project.keySet()) {
+                                        CloudFile cloudFile = new CloudFile();
+                                        cloudFile.setKey(PROJECT + "/" + s);
+                                        String[] nodes = s.split(SLASH_REPLACE);
+                                        cloudFile.setName(nodes[nodes.length - 1]);
+                                        cloudFile.setProjectName(nodes[0]);
+                                        cloudFile.setPath(s.replace(nodes[0], ""));
+                                        cloudFile.setUploadTime((String) project.get(s));
+                                        cloudFiles.add(cloudFile);
+                                    }
+                                    break;
+                                default:
+                                    HashMap<String, Object> other = (HashMap<String, Object>) value.get(OTHER);
+                                    for (String s : other.keySet()) {
+                                        CloudFile cloudFile = new CloudFile();
+                                        cloudFile.setPath(s);
+                                        cloudFile.setKey(OTHER + "/" + s);
+                                        String[] nodes = s.split(SLASH_REPLACE);
+                                        boolean index = false;
+                                        for (String node1 : nodes) {
+                                            if (index) {
+                                                cloudFile.setProjectName(node1);
+                                                break;
+                                            } else if (node1.equals("projects3")) {
+                                                index = true;
+                                            }
+                                        }
+                                        cloudFile.setName(nodes[nodes.length - 1]);
+                                        cloudFile.setUploadTime((String) other.get(s));
+                                        cloudFiles.add(cloudFile);
+                                    }
+                                    break;
+                            }
+                        }
+                        resetUsage(cloudFiles.size());
+                        Observable.just(cloudFiles)
+                                .subscribe(callback);
+                        ACache.get(context).put(CLOUD_FILE, App.getGson().toJson(cloudFiles));
+
+                    }
+
+                    @Override
+                    public void onCancelled(DatabaseError databaseError) {
+
+                    }
+                });
+            }
+        }
+    }
+
+    public void getFileContent(String path, Action1<String> callback) {
+        reference.child(CLOUD)
+                .child(email)
+                .child(path)
+                .addListenerForSingleValueEvent(new ValueEventListener() {
+                    @Override
+                    public void onDataChange(DataSnapshot dataSnapshot) {
+                        HashMap<String, String> dateContent = (HashMap<String, String>) dataSnapshot.getValue();
+                        String latest = "";
+                        for (String s : dateContent.keySet()) {
+                            latest = DateTimeHelper.isLater(s, latest) ? s : latest;
+                        }
+
+                        Observable.just(dateContent.get(latest))
+                                .subscribe(callback);
+                    }
+
+                    @Override
+                    public void onCancelled(DatabaseError databaseError) {
+
+                    }
+                });
+    }
+
+    public void deleteUploadScript(CloudFile cloudFile, DatabaseReference.CompletionListener listener) {
+        reference.child(CLOUD)
+                .child(email)
+                .child(cloudFile.getKey())
+                .removeValue(listener);
+        reference.child(CLOUD)
+                .child(email)
+                .child(INDEX)
+                .child(cloudFile.getKey())
+                .removeValue();
+        changeUsage(-1);
+    }
+
+    public void initUsage(Action1<Integer> callback) {
+        if (CLEAR) {
+            return;
+        }
+        if (currentFileCount == -1) {
+            if (NetStateUtil.isConnected(App.getContext())) {
+                reference.child(CLOUD)
+                        .child(email)
+                        .child(USAGE)
+                        .addListenerForSingleValueEvent(new ValueEventListener() {
+                            @Override
+                            public void onDataChange(DataSnapshot dataSnapshot) {
+                                if (dataSnapshot.getValue() != null) {
+                                    currentFileCount = ((Long) dataSnapshot.getValue()).intValue();
+                                } else {
+                                    currentFileCount = 0;
+                                }
+                                if (callback != null) {
+                                    Observable.just(currentFileCount)
+                                            .subscribe(callback);
+                                }
+                            }
+
+                            @Override
+                            public void onCancelled(DatabaseError databaseError) {
+
+                            }
+                        });
+            }
+        } else {
+            callback.call(currentFileCount);
+        }
+    }
+
+    public int changeUsage(int change) {
+        currentFileCount += change;
+        reference.child(CLOUD)
+                .child(email)
+                .child(USAGE)
+                .setValue(currentFileCount);
+        return currentFileCount;
+    }
+
+    public void resetUsage(int value) {
+        currentFileCount = value;
+        reference.child(CLOUD)
+                .child(email)
+                .child(USAGE)
+                .setValue(currentFileCount);
+    }
+
+    private boolean hasSpace(int waiting) {
+        if (currentFileCount < 0) {
+            Toast.makeText(App.getContext(), R.string.usage_not_init, Toast.LENGTH_SHORT).show();
+            return false;
+        } else if (currentFileCount + waiting > MAX_FILE) {
+            Toast.makeText(App.getContext(), R.string.no_space, Toast.LENGTH_SHORT).show();
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+    public interface CommentCallback {
+        void commentBean(Gist.CommentBean comment);
+    }
+
+    private static class ShareCodeHolder {
+        private static final ShareCodeUtil INSTANCE = new ShareCodeUtil();
+    }
+
+    abstract class SimpleValueEventListener implements ValueEventListener {
+        @Override
+        public void onDataChange(DataSnapshot dataSnapshot) {
+            HashMap<String, Object> object = (HashMap<String, Object>) dataSnapshot.getValue();
+            if (object == null) {
+                return;
+            }
+            onDataGet(object);
+        }
+
+        @Override
+        public void onCancelled(DatabaseError databaseError) {
+
+        }
+
+        public abstract void onDataGet(HashMap<String, Object> value);
+    }
+}
\ No newline at end of file
diff --git a/qpython/src/ol/java/org/qpython/qpy/codeshare/pojo/CloudFile.java b/qpython/src/ol/java/org/qpython/qpy/codeshare/pojo/CloudFile.java
new file mode 100644
index 00000000..09a9471c
--- /dev/null
+++ b/qpython/src/ol/java/org/qpython/qpy/codeshare/pojo/CloudFile.java
@@ -0,0 +1,97 @@
+package org.qpython.qpy.codeshare.pojo;
+
+
+import org.qpython.qpy.codeshare.CONSTANT;
+import org.qpython.qpysdk.QPyConstants;
+
+import java.io.Serializable;
+
+public class CloudFile implements Serializable {
+    private String  projectName;
+    private String  path;
+    private String  uploadTime;
+    private String  name;
+    private String  content;
+    private String  key;
+    private boolean uploading;
+
+    public String getPath() {
+        if (projectName == null) {
+            if (path.contains("scripts3")) {
+                return "/" + path.replace(CONSTANT.SLASH_REPLACE, "/").replace(CONSTANT.DOT_REPLACE, ".");
+            } else if (path.contains("scripts")) {
+                return path.replace(CONSTANT.SLASH_REPLACE, "/") + getName();
+            } else {
+                return "/" + path.replace(CONSTANT.SLASH_REPLACE, "/").replace(CONSTANT.DOT_REPLACE, ".");
+            }
+        } else {
+            String projNode = path.contains("projects3") ? "projects3/" : "projects/";
+            return "/" + projNode + getProjectName() + path
+                    .replace(CONSTANT.SLASH_REPLACE, "/")
+                    .replace(CONSTANT.DOT_REPLACE, ".")
+                    .replace(projNode, "")
+                    .replace(getProjectName(), "");
+        }
+    }
+
+    public void setPath(String path) {
+        this.path = path;
+    }
+
+    public String getUploadTime() {
+        return uploadTime;
+    }
+
+    public void setUploadTime(String uploadTime) {
+        this.uploadTime = uploadTime;
+    }
+
+    public String getName() {
+        return name.replace(CONSTANT.DOT_REPLACE, ".");
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public long getContentSize() {
+        return content == null ? 0 : content.length();
+    }
+
+    public String getProjectName() {
+        return projectName == null ? null : projectName.
+                replace(CONSTANT.SLASH_REPLACE, "/").replace(CONSTANT.DOT_REPLACE, ".");
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public boolean isUploading() {
+        return uploading;
+    }
+
+    public void setUploading(boolean uploading) {
+        this.uploading = uploading;
+    }
+
+    public String getKey() {
+        return key == null ? getName().replace(".", CONSTANT.DOT_REPLACE) : key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getAbsolutePath() {
+        return QPyConstants.ABSOLUTE_PATH + getPath();
+    }
+}
diff --git a/qpython/src/ol/java/org/qpython/qpy/main/PayActivity.java b/qpython/src/ol/java/org/qpython/qpy/main/PayActivity.java
new file mode 100644
index 00000000..c1a7b8d2
--- /dev/null
+++ b/qpython/src/ol/java/org/qpython/qpy/main/PayActivity.java
@@ -0,0 +1,188 @@
+package org.qpython.qpy.main;
+
+import android.app.PendingIntent;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentSender;
+import android.content.ServiceConnection;
+import android.os.Bundle;
+import android.os.IBinder;
+import android.os.RemoteException;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.GridLayoutManager;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.Toast;
+
+import com.android.vending.billing.IInAppBillingService;
+import com.quseit.util.ImageUtil;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.qpython.qpy.R;
+import org.qpython.qpy.main.activity.PurchaseActivity;
+import org.qpython.qpy.main.server.MySubscriber;
+import org.qpython.qpy.main.widget.GridSpace;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import rx.Observable;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+/**
+ * Created by Hmei
+ * 1/30/18.
+ */
+
+public class PayActivity extends AppCompatActivity {
+    public static final int BUY_REQUEST_CODE = 2333;
+    private IInAppBillingService   mService;
+    private ServiceConnection      mServiceConn;
+    private ArrayList<String>      skuList;
+    private MySubscriber<String[]> callback;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+
+    void initIAB(ArrayList<String> skuList, MySubscriber<String[]> callback) {
+        this.skuList = skuList;
+        this.callback = callback;
+        mServiceConn = new ServiceConnection() {
+            @Override
+            public void onServiceDisconnected(ComponentName name) {
+                mService = null;
+            }
+
+            @Override
+            public void onServiceConnected(ComponentName name,
+                                           IBinder service) {
+                mService = IInAppBillingService.Stub.asInterface(service);
+                getPrices(skuList, callback);
+            }
+        };
+
+        Intent serviceIntent = new Intent("com.android.vending.billing.InAppBillingService.BIND");
+        serviceIntent.setPackage("com.android.vending");
+        bindService(serviceIntent, mServiceConn, Context.BIND_AUTO_CREATE);
+    }
+
+    /**
+     * 从Google服务器获取不同国家价格表并显示
+     */
+    private void getPrices(ArrayList<String> skuList, MySubscriber<String[]> callback) {
+        if (mService == null) {
+            Toast.makeText(this, R.string.lose_google_server, Toast.LENGTH_SHORT).show();
+            if (findViewById(R.id.pb) != null) findViewById(R.id.pb).setVisibility(View.GONE);
+            return;
+        }
+//        ArrayList<String> skuList;
+//        if (!isCrowdFunding) {
+//            skuList = new ArrayList<>(Arrays.asList(getResources().getStringArray(R.array.sku)));
+//        } else {
+//            skuList = new ArrayList<>(Arrays.asList(getResources().getStringArray(R.array.crowdfunding)));
+//            int index = (int) (getIntent().getIntExtra(PERCENT, 0) / 100.00 * 4);
+//            String sku = skuList.get(index);
+//            skuList.clear();
+//            skuList.add(sku);
+//        }
+        Bundle querySkus = new Bundle();
+        querySkus.putStringArrayList("ITEM_ID_LIST", skuList);
+        try {
+            Observable.just(mService.getSkuDetails(3, getPackageName(), "inapp", querySkus))
+                    .map(bundle -> {
+                                ArrayList<String> responseList = bundle.getStringArrayList("DETAILS_LIST");
+                                if (responseList == null) {
+                                    return null;
+                                }
+                                String[] prices = new String[responseList.size()];
+                                for (int i = 0; i < responseList.size(); i++) {
+                                    JSONObject object;
+                                    try {
+                                        object = new JSONObject(responseList.get(i));
+                                        String price = object.getString("price");
+                                        prices[i] = price;
+                                    } catch (JSONException e) {
+                                        e.printStackTrace();
+                                    }
+                                }
+                                Arrays.sort(prices, (o1, o2) -> Integer.parseInt(o1.replaceAll("[^0-9]", "")) - Integer.parseInt(o2.replaceAll("[^0-9]", "")));
+                                return prices;
+                            }
+                    )
+                    .subscribeOn(Schedulers.newThread())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe(callback
+//                            new MySubscriber<String[]>() {
+//                        @Override
+//                        public void onNext(String[] o) {
+//                            super.onNext(o);
+//                            if (o == null) {
+//                                return;
+//                            }
+//                            invalidateData();
+//                            GridSpace gridSpace = new GridSpace(2, (int) ImageUtil.dp2px(16), false);
+//                            binding.list.setLayoutManager(new GridLayoutManager(PurchaseActivity.this, 2));
+//                            binding.list.addItemDecoration(gridSpace);
+//                            binding.list.setAdapter(new PurchaseActivity.ListAdapter(o));
+//                        }
+//                    }
+                    );
+        } catch (RemoteException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void purchase(String sku) {
+//        String[] skus;
+//        if (isCrowdFunding) {
+//            skus = getResources().getStringArray(R.array.crowdfunding);
+//        } else {
+//            skus = getResources().getStringArray(R.array.sku);
+//        }
+        try {
+            if (mService == null) {
+                Toast.makeText(this, R.string.lose_google_server, Toast.LENGTH_SHORT).show();
+                return;
+            }
+            Bundle buyIntentBundle = mService.getBuyIntent(3, getPackageName(),
+                    sku, "inapp", "bGoa+V7g/yqDXvKRqq+JTFn4uQZbPiQJo4pf9RzJ");
+            switch (buyIntentBundle.getInt("RESPONSE_CODE")) {
+                case 0:
+                    //BILLING_RESPONSE_RESULT_OK
+                    PendingIntent pendingIntent = buyIntentBundle.getParcelable("BUY_INTENT");
+                    startIntentSenderForResult(pendingIntent.getIntentSender(),
+                            BUY_REQUEST_CODE, new Intent(), 0, 0, 0);
+                    break;
+
+            }
+        } catch (RemoteException | IntentSender.SendIntentException | NullPointerException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == R.id.refresh_menu) {
+            if (findViewById(R.id.pb) != null) findViewById(R.id.pb).setVisibility(View.VISIBLE);
+            getPrices(skuList, callback);
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        if (mService != null) {
+            unbindService(mServiceConn);
+        }
+    }
+
+}
diff --git a/qpython/src/ol/java/org/qpython/qpy/main/activity/BaseActivity.java b/qpython/src/ol/java/org/qpython/qpy/main/activity/BaseActivity.java
new file mode 100644
index 00000000..d3e259f8
--- /dev/null
+++ b/qpython/src/ol/java/org/qpython/qpy/main/activity/BaseActivity.java
@@ -0,0 +1,301 @@
+package org.qpython.qpy.main.activity;
+
+import android.content.ActivityNotFoundException;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.content.res.Configuration;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Environment;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.app.ActivityCompat;
+import android.support.v4.content.ContextCompat;
+import android.support.v4.util.ArrayMap;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.app.AppCompatActivity;
+import android.widget.ArrayAdapter;
+import android.widget.Toast;
+import android.text.TextUtils;
+
+import com.quseit.util.NAction;
+import com.quseit.util.NUtil;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.console.ShellTermSession;
+import org.qpython.qpy.console.util.TermSettings;
+import org.renpy.android.ResourceManager;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.qpython.qpy.main.server.gist.TokenManager;
+
+public class BaseActivity extends AppCompatActivity {
+    // QPython interfaces
+    private static final int SCRIPT_CONSOLE_CODE = 1237;
+    private static final int PID_INIT_VALUE = -1;
+    private static final int DEFAULT_BUFFER_SIZE = 8192;
+    private static final int LOG_NOTIFICATION_ID = (int) System.currentTimeMillis();
+
+
+    //private FirebaseAnalytics mFirebaseAnalytics;
+    private ArrayList<String> mArguments = new ArrayList<>();
+    private InputStream mIn;
+    private OutputStream mOut;
+    private Map<Integer, PermissionAction> mActionMap = new ArrayMap<>();
+    private TermSettings mSettings;
+    private ShellTermSession session;
+
+    private boolean permissionGrant = true;
+
+    protected static ShellTermSession createTermSession(Context context, TermSettings settings, String initialCommand, String path) {
+        ShellTermSession session = null;
+        try {
+            session = new ShellTermSession(context, settings, initialCommand, path);
+            session.setProcessExitMessage(context.getString(R.string.process_exit_message));
+
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        return session;
+    }
+
+    protected void toast(String content) {
+        Toast.makeText(this, content, Toast.LENGTH_SHORT).show();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        //mFirebaseAnalytics = FirebaseAnalytics.getInstance(this);
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        PermissionAction action = mActionMap.get(requestCode);
+        if (action != null) {
+            if (grantResults.length > 0 && (grantResults[0] == PackageManager.PERMISSION_GRANTED)) {
+                action.onGrant();
+            } else {
+                action.onDeny();
+            }
+
+        }
+        mActionMap.remove(action);
+    }
+
+    public final void checkPermissionDo(String[] permissions, PermissionAction action) {
+        if (Build.VERSION.SDK_INT >= 23) {
+            boolean granted = true;
+            for (String permission : permissions) {
+                int checkPermission = ContextCompat.checkSelfPermission(this, permission);
+                granted = checkPermission == PackageManager.PERMISSION_GRANTED;
+            }
+            if (!granted) {
+                int code = permissions.hashCode() & 0xffff;
+                mActionMap.put(code, action);
+                ActivityCompat.requestPermissions(this, permissions, code);
+            } else {
+                action.onGrant();
+            }
+        } else {
+            action.onGrant();
+        }
+    }
+
+
+    // feedback
+    public void onFeedback(String feedback) {
+        String app = getString(R.string.app_name);
+        int ver = NUtil.getVersinoCode(getApplicationContext());
+        String subject = MessageFormat.format(getString(com.quseit.android.R.string.feeback_email_title), app, ver, Build.PRODUCT);
+
+        String lastError = "";
+        String code = NAction.getCode(getApplicationContext());
+        File log = new File(Environment.getExternalStorageDirectory() + "/" + code + "_last_err.log");
+        if (log.exists()) {
+            lastError = com.quseit.util.FileHelper.getFileContents(log.getAbsolutePath());
+        }
+
+        String body = feedback.isEmpty() ? feedback : MessageFormat.format(getString(R.string.feedback_email_body), Build.PRODUCT,
+                Build.VERSION.RELEASE, Build.VERSION.SDK, lastError, feedback);
+
+
+        Intent twitterIntent = getPackageManager().getLaunchIntentForPackage("com.twitter.android");
+        if (twitterIntent != null) {
+            List<String> list = new ArrayList<>();
+            list.add("Feedback with Twitter");
+            list.add("Feedback with Email");
+            new AlertDialog.Builder(this)
+                    .setTitle(R.string.feedback)
+                    .setNegativeButton(R.string.close, (dialog, which) -> dialog.dismiss())
+                    .setAdapter(new ArrayAdapter<>(this, R.layout.dialog_feedback, list), (dialog, which) -> {
+                        if (which == 0) {
+                            twitter(body);
+                        } else {
+                            email(subject, body);
+                        }
+                    })
+                    .show();
+        } else {
+            email(subject, body);
+        }
+    }
+
+    private void email(String subject, String body) {
+        Intent intent = new Intent(Intent.ACTION_SENDTO, Uri.parse("mailto:" + getString(R.string.ui_feedback_mail)));
+
+        intent.putExtra(Intent.EXTRA_SUBJECT, subject);
+        intent.putExtra(Intent.EXTRA_TEXT, session == null ? body : session.getTranscriptText().trim());
+        try {
+            startActivity(Intent.createChooser(intent,
+                    getString(R.string.email_transcript_chooser_title)));
+        } catch (ActivityNotFoundException e) {
+            Toast.makeText(this,
+                    R.string.email_transcript_no_email_activity_found,
+                    Toast.LENGTH_LONG)
+                    .show();
+        }
+    }
+
+    private void twitter(String message) {
+        Intent tweetIntent = new Intent(Intent.ACTION_SEND);
+        if (message.isEmpty()){
+            tweetIntent.putExtra(Intent.EXTRA_TEXT, "@qpython,");
+        }else {
+            tweetIntent.putExtra(Intent.EXTRA_TEXT, "@qpython\n" + message);
+        }
+        tweetIntent.setType("text/plain");
+
+        PackageManager packManager = getPackageManager();
+        List<ResolveInfo> resolvedInfoList = packManager.queryIntentActivities(tweetIntent, PackageManager.MATCH_DEFAULT_ONLY);
+
+        boolean resolved = false;
+        for (ResolveInfo resolveInfo : resolvedInfoList) {
+            if (resolveInfo.activityInfo.packageName.startsWith("com.twitter.android")) {
+                tweetIntent.setClassName(
+                        resolveInfo.activityInfo.packageName,
+                        resolveInfo.activityInfo.name);
+                resolved = true;
+                break;
+            }
+        }
+        if (resolved) {
+            startActivity(tweetIntent);
+        } else {
+            Intent i = new Intent();
+            i.putExtra(Intent.EXTRA_TEXT, message);
+            i.setAction(Intent.ACTION_VIEW);
+            i.setData(Uri.parse("https://twitter.com/intent/tweet?text=" + urlEncode(message)));
+            startActivity(i);
+            Toast.makeText(this, "Twitter app isn't found", Toast.LENGTH_LONG).show();
+        }
+    }
+
+    private String urlEncode(String s) {
+        try {
+            return URLEncoder.encode(s, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+            return "";
+        }
+    }
+
+    protected boolean checkExpired(final String resource, String filesDir, String tag) {
+        ResourceManager resourceManager = new ResourceManager(this);
+
+        String data_version = resourceManager.getString(resource + "_version");
+        String disk_version = "0";
+
+        // If no version, no unpacking is necessary.
+        if (data_version == null) {
+            return false;
+        }
+
+        // Check the current disk version, if any.
+        String disk_version_fn = filesDir + "/" + tag + "_" + resource + ".version";
+
+        try {
+            byte buf[] = new byte[64];
+            InputStream is = new FileInputStream(disk_version_fn);
+            int len = is.read(buf);
+            disk_version = new String(buf, 0, len);
+            is.close();
+        } catch (Exception e) {
+
+            disk_version = "0";
+
+        }
+
+        if (!NUtil.isNumeric(disk_version)) {
+            disk_version = "0";
+
+        }
+
+        if ((int) (Double.parseDouble(data_version) - Double.parseDouble(disk_version)) > 0 || disk_version.equals("0")) {
+            try {
+                FileOutputStream os = new FileOutputStream(disk_version_fn);
+                try {
+                    os.write(data_version.getBytes());
+                    os.close();
+
+                } catch (IOException e) {
+                    e.printStackTrace();
+                    //Mint.logException(e);
+
+                }
+
+            } catch (FileNotFoundException e) {
+                e.printStackTrace();
+                //Mint.logException(e);
+
+            }
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public interface PermissionAction {
+        void onGrant();
+
+        void onDeny();
+    }
+
+    public void ifLogin(Login afterLogin) {
+        if (!TextUtils.isEmpty(TokenManager.getToken())) {
+            afterLogin.process();
+        } else {
+            Toast.makeText(this, R.string.login_first, Toast.LENGTH_SHORT).show();
+        }
+    }
+    public interface Login {
+        void process();
+    }
+}
\ No newline at end of file
diff --git a/qpython/src/ol/java/org/qpython/qpy/main/activity/FundingPurchaseActivity.java b/qpython/src/ol/java/org/qpython/qpy/main/activity/FundingPurchaseActivity.java
new file mode 100644
index 00000000..6e6cf10a
--- /dev/null
+++ b/qpython/src/ol/java/org/qpython/qpy/main/activity/FundingPurchaseActivity.java
@@ -0,0 +1,143 @@
+package org.qpython.qpy.main.activity;
+
+import android.content.Context;
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.view.Menu;
+import android.view.View;
+import android.widget.Toast;
+
+import com.quseit.util.VeDate;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ActivityFundingPurchaseBinding;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.server.MySubscriber;
+import org.qpython.qpy.main.server.model.GooglePurchaseModel;
+import org.qpython.qpy.utils.UpdateHelper;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+/**
+ * Created by Hmei
+ * 1/30/18.
+ */
+
+public class FundingPurchaseActivity extends PayActivity {
+    private static final String ARTICLE_ID    = "article_id";
+    private static final String FUNDING_COUNT = "fundingCount";
+    //    private final String[] prices = get
+    private ActivityFundingPurchaseBinding binding;
+    private String                         sku;
+
+    public static void startSupport(Context context, String articleId, int fundingPercent) {
+        Intent starter = new Intent(context, FundingPurchaseActivity.class);
+        starter.putExtra(ARTICLE_ID, articleId);
+        starter.putExtra(FUNDING_COUNT, fundingPercent);
+        context.startActivity(starter);
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_funding_purchase);
+        binding.pb.setVisibility(View.VISIBLE);
+        initView();
+        initPrice();
+        initListener();
+    }
+
+    private void initView() {
+        setSupportActionBar(binding.lt.toolbar);
+        binding.lt.toolbar.setNavigationIcon(R.drawable.ic_back);
+        binding.lt.toolbar.setNavigationOnClickListener(v -> finish());
+        setTitle(R.string.reward);
+    }
+
+    private void initPrice() {
+        String[] skus = getResources().getStringArray(R.array.crowdfunding);
+        int fundingCount = getIntent().getIntExtra(FUNDING_COUNT, 0);
+        if (fundingCount < 100) {
+            sku = skus[0];
+        } else if (fundingCount < 500) {
+            sku = skus[1];
+        } else if (fundingCount < 2000) {
+            sku = skus[2];
+        } else {
+            sku = skus[3];
+        }
+        ArrayList<String> skuList = new ArrayList<>();
+        skuList.add(sku);
+        initIAB(skuList, new MySubscriber<String[]>() {
+            @Override
+            public void onNext(String[] o) {
+                super.onNext(o);
+                if (o == null) {
+                    return;
+                }
+                invalidateData(true);
+                binding.price.setText(o[0]);
+            }
+        });
+    }
+
+    private void initListener() {
+        binding.price.setOnClickListener(v -> payUtil.purchase(sku));
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.refresh_menu, menu);
+        return true;
+    }
+
+    private void invalidateData(boolean showData) {
+        binding.price.setVisibility(showData ? View.VISIBLE : View.GONE);
+        binding.tvThanks.setVisibility(showData ? View.VISIBLE : View.GONE);
+        binding.noData.llRoot.setVisibility(showData ? View.GONE : View.VISIBLE);
+        binding.pb.setVisibility(View.GONE);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == BUY_REQUEST_CODE) {
+            if (resultCode == RESULT_OK) {
+                GooglePurchaseModel model = App.getGson().fromJson(data.getStringExtra("INAPP_PURCHASE_DATA"), GooglePurchaseModel.class);
+                if (model == null) {
+                    return;
+                }
+                switch (model.getProductId()) {
+                    default:
+                        Toast.makeText(this, R.string.thanks_your_support, Toast.LENGTH_SHORT).show();
+                        break;
+                }
+                // 统计赞赏数据
+                JSONObject jsonObject = new JSONObject();
+                try {
+                    jsonObject.put("type", model.getProductId());
+                    jsonObject.put("time", VeDate.getStringDateHourAsInt());
+                    int percent = getIntent().getIntExtra(FUNDING_COUNT, 0);
+                    String[] fundingCount = getResources().getStringArray(R.array.funding_count_divider);
+                    jsonObject.put("crowdfunding",
+                            percent > (Integer.parseInt(fundingCount[1]) / Integer.parseInt(fundingCount[2])) ? 3 :
+                                    percent > (Integer.parseInt(fundingCount[0]) / Integer.parseInt(fundingCount[1])) ? 2 : 1);//0 非众筹/ 1: 0-100 /2: 100-500/3 500-2000
+                    jsonObject.put("articleId", getIntent().getStringExtra(ARTICLE_ID));
+                    if (App.getUser() != null) {
+                        jsonObject.put("account", App.getUser().getEmail());
+                    }
+                } catch (JSONException e) {
+                    e.printStackTrace();
+                }
+                UpdateHelper.submitIAPLog(this, model.getOrderId(), App.getGson().toJson(jsonObject));
+                payUtil.digestPurchase(model.getPurchaseToken());
+                finish();
+            }
+        }
+    }
+}
diff --git a/qpython/src/ol/java/org/qpython/qpy/main/activity/PayActivity.java b/qpython/src/ol/java/org/qpython/qpy/main/activity/PayActivity.java
new file mode 100644
index 00000000..c637254e
--- /dev/null
+++ b/qpython/src/ol/java/org/qpython/qpy/main/activity/PayActivity.java
@@ -0,0 +1,54 @@
+package org.qpython.qpy.main.activity;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+import android.view.MenuItem;
+import android.view.View;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.main.server.MySubscriber;
+import org.qpython.qpy.main.service.PayUtil;
+
+import java.util.ArrayList;
+
+/**
+ * Created by Hmei
+ * 1/30/18.
+ */
+
+public class PayActivity extends AppCompatActivity {
+    public static final int BUY_REQUEST_CODE = 2333;
+    private ArrayList<String>      skuList;
+    private MySubscriber<String[]> callback;
+    protected PayUtil payUtil;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        payUtil = new PayUtil(this);
+    }
+
+    protected void initIAB(ArrayList<String> skuList, MySubscriber<String[]> callback) {
+        this.skuList = skuList;
+        this.callback = callback;
+        payUtil.initIAP(() -> payUtil.getPrices(skuList,callback));
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == R.id.refresh_menu) {
+            if (findViewById(R.id.pb) != null) findViewById(R.id.pb).setVisibility(View.VISIBLE);
+            payUtil.getPrices(skuList, callback);
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        payUtil.unbindPayService();
+    }
+
+}
diff --git a/qpython/src/ol/java/org/qpython/qpy/main/activity/PurchaseActivity.java b/qpython/src/ol/java/org/qpython/qpy/main/activity/PurchaseActivity.java
new file mode 100644
index 00000000..74335cc2
--- /dev/null
+++ b/qpython/src/ol/java/org/qpython/qpy/main/activity/PurchaseActivity.java
@@ -0,0 +1,158 @@
+package org.qpython.qpy.main.activity;
+
+import android.content.Context;
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.GridLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+import com.quseit.util.ImageUtil;
+import com.quseit.util.VeDate;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ActivityPurchaseBinding;
+import org.qpython.qpy.databinding.ItemPriceBinding;
+import org.qpython.qpy.main.adapter.MyViewHolder;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.server.MySubscriber;
+import org.qpython.qpy.main.server.model.GooglePurchaseModel;
+import org.qpython.qpy.main.widget.GridSpace;
+import org.qpython.qpy.utils.UpdateHelper;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+/**
+ * Google purchase activity
+ * Created by Hmei on 2017-07-19.
+ */
+
+public class PurchaseActivity extends PayActivity {
+
+    private static final String ARTICLE_ID = "article_id";
+
+    private ActivityPurchaseBinding binding;
+    private ArrayList<String>       skus;
+
+    public static void start(Context context, String articleId) {
+        Intent starter = new Intent(context, PurchaseActivity.class);
+        starter.putExtra(ARTICLE_ID, articleId);
+        context.startActivity(starter);
+    }
+
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_purchase);
+        skus = new ArrayList<>(Arrays.asList(getResources().getStringArray(R.array.sku)));
+
+        initIAB(skus, new MySubscriber<String[]>() {
+            @Override
+            public void onNext(String[] o) {
+                super.onNext(o);
+                if (o == null) {
+                    return;
+                }
+                invalidateData();
+                GridSpace gridSpace = new GridSpace(2, (int) ImageUtil.dp2px(16), false);
+                binding.list.setLayoutManager(new GridLayoutManager(PurchaseActivity.this, 2));
+                binding.list.addItemDecoration(gridSpace);
+                binding.list.setAdapter(new PurchaseActivity.ListAdapter(o));
+            }
+        });
+
+        initView();
+    }
+
+    private void initView() {
+        setSupportActionBar(binding.lt.toolbar);
+        binding.lt.toolbar.setNavigationIcon(R.drawable.ic_back);
+        binding.lt.toolbar.setNavigationOnClickListener(v -> finish());
+        setTitle(R.string.reward);
+    }
+
+    private void invalidateData() {
+        binding.tvThanks.setVisibility(View.VISIBLE);
+        binding.list.setVisibility(View.VISIBLE);
+        binding.noData.llRoot.setVisibility(View.GONE);
+    }
+
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.refresh_menu, menu);
+        return true;
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == BUY_REQUEST_CODE) {
+            if (resultCode == RESULT_OK) {
+                GooglePurchaseModel model = App.getGson().fromJson(data.getStringExtra("INAPP_PURCHASE_DATA"), GooglePurchaseModel.class);
+                if (model == null) {
+                    return;
+                }
+                switch (model.getProductId()) {
+                    default:
+                        Toast.makeText(this, R.string.thanks_your_support, Toast.LENGTH_SHORT).show();
+                        break;
+                }
+                // 统计赞赏数据
+                JSONObject jsonObject = new JSONObject();
+                try {
+                    jsonObject.put("type", model.getProductId());
+                    jsonObject.put("time", VeDate.getStringDateHourAsInt());
+                    jsonObject.put("crowdfunding", 0);//0 非众筹/ 1: 0-100 /2: 100-500/3 500-2000
+                    jsonObject.put("articleId", getIntent().getStringExtra(ARTICLE_ID));
+                    if (App.getUser() != null) {
+                        jsonObject.put("account", App.getUser().getEmail());
+                    }
+                } catch (JSONException e) {
+                    e.printStackTrace();
+                }
+                UpdateHelper.submitIAPLog(this, model.getOrderId(), App.getGson().toJson(jsonObject));
+                payUtil.digestPurchase(model.getPurchaseToken());
+                finish();
+            }
+        }
+    }
+
+    private class ListAdapter extends RecyclerView.Adapter<MyViewHolder<ItemPriceBinding>> {
+        String[] dataList;
+
+        ListAdapter(String[] dataList) {
+            this.dataList = dataList;
+        }
+
+        @Override
+        public MyViewHolder<ItemPriceBinding> onCreateViewHolder(ViewGroup parent, int viewType) {
+            ItemPriceBinding binding = DataBindingUtil.inflate(LayoutInflater.from(PurchaseActivity.this), R.layout.item_price, parent, false);
+            MyViewHolder<ItemPriceBinding> holder = new MyViewHolder<>(binding.getRoot());
+            holder.setBinding(binding);
+            return holder;
+        }
+
+        @Override
+        public void onBindViewHolder(MyViewHolder<ItemPriceBinding> holder, int position) {
+            ItemPriceBinding binding = holder.getBinding();
+            binding.tvPrices.setText(dataList[position]);
+            binding.tvPrices.setOnClickListener(v -> payUtil.purchase(skus.get(position)));
+        }
+
+        @Override
+        public int getItemCount() {
+            return dataList.length;
+        }
+    }
+}
diff --git a/qpython/src/ol/java/org/qpython/qpy/main/activity/SignInActivity.java b/qpython/src/ol/java/org/qpython/qpy/main/activity/SignInActivity.java
new file mode 100644
index 00000000..b5fc5d2c
--- /dev/null
+++ b/qpython/src/ol/java/org/qpython/qpy/main/activity/SignInActivity.java
@@ -0,0 +1,184 @@
+package org.qpython.qpy.main.activity;
+
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+import android.text.Html;
+import android.util.Log;
+import android.view.View;
+import android.widget.Toast;
+
+import com.google.android.gms.auth.api.Auth;
+import com.google.android.gms.auth.api.signin.GoogleSignInAccount;
+import com.google.android.gms.auth.api.signin.GoogleSignInOptions;
+import com.google.android.gms.auth.api.signin.GoogleSignInResult;
+import com.google.android.gms.common.ConnectionResult;
+import com.google.android.gms.common.api.GoogleApiClient;
+import com.google.firebase.auth.AuthCredential;
+import com.google.firebase.auth.FirebaseAuth;
+import com.google.firebase.auth.FirebaseUser;
+import com.google.firebase.auth.GoogleAuthProvider;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ActivitySignInBinding;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.CONF;
+import org.qpython.qpy.main.app.User;
+import org.qpython.qpy.main.server.gist.loginScreen.LoginControler;
+import org.qpython.qpy.main.server.gist.loginScreen.LoginView;
+
+/**
+ * SignIn
+ * Created by Hmei on 2017-08-04.
+ */
+
+public class SignInActivity extends AppCompatActivity implements GoogleApiClient.OnConnectionFailedListener ,LoginView{
+    private static final int RC_SIGN_IN = 54503;
+
+    private GoogleApiClient mGoogleApiClient;
+    private ActivitySignInBinding binding;
+    private FirebaseAuth mAuth;
+
+    private LoginControler mLoginControler;
+
+    {
+        mAuth = FirebaseAuth.getInstance();
+        FirebaseUser currentUser = mAuth.getCurrentUser();
+        initUserInfo(currentUser);
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_sign_in);
+        binding.textView3.setText(Html.fromHtml(getString(R.string.by_signing_in_you_agree_to_out_privacy_policy_term_of_service)));
+        GoogleSignInOptions gso = new GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)
+                .requestIdToken(CONF.GOOGLE_ID_TOKEN)
+                .requestEmail()
+                .build();
+
+        mGoogleApiClient = new GoogleApiClient.Builder(this)
+                .enableAutoManage(this, this)
+                .addApi(Auth.GOOGLE_SIGN_IN_API, gso)
+                .addOnConnectionFailedListener(connectionResult -> showToast(getString(R.string.lost_google_hint)))
+                .build();
+        initListener();
+
+        mLoginControler = new LoginControler(this);
+    }
+
+    private void initListener() {
+        binding.textView3.setOnClickListener(v -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.privacy_html)))));
+        binding.button2.setOnClickListener(v -> signIn());
+        binding.button3.setOnClickListener(v -> finish());
+    }
+
+    private void signIn() {
+        Intent signInIntent = Auth.GoogleSignInApi.getSignInIntent(mGoogleApiClient);
+        startActivityForResult(signInIntent, RC_SIGN_IN);
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        // Result returned from launching the Intent from GoogleSignInApi.getSignInIntent(...);
+        if (requestCode == RC_SIGN_IN) {
+            GoogleSignInResult result = Auth.GoogleSignInApi.getSignInResultFromIntent(data);
+            if (result.isSuccess()) {
+                GoogleSignInAccount account = result.getSignInAccount();
+                firebaseAuthWithGoogle(account);
+            } else {
+                Log.e("LOGIN", result.getStatus().toString());
+                try {
+                    String msg = result.getStatus().getStatusMessage().trim();
+                    showToast(getString(R.string.login_error) + (msg.equals("") ? "" : ": ") + msg);
+                    initUserInfo(null);
+                } catch (NullPointerException ignore) {
+                    showToast(getString(R.string.no_google));
+                }
+            }
+        }
+    }
+
+    private void firebaseAuthWithGoogle(GoogleSignInAccount acct) {
+        showLoading();
+        AuthCredential credential = GoogleAuthProvider.getCredential(acct.getIdToken(), "45:FD:60:98:01:9A:37:D9:84:03:06:36:02:F6:85:2C:A2:1F:B8:67");
+        mAuth.signInWithCredential(credential)
+                .addOnCompleteListener(this, task -> {
+                    if (task.isSuccessful()) {
+                        FirebaseUser user = mAuth.getCurrentUser();
+                        initUserInfo(user);
+                    } else {
+                        showToast(getString(R.string.auth_failed));
+                        initUserInfo(null);
+                        hideLoading();
+                    }
+                });
+    }
+
+    private void initUserInfo(FirebaseUser currentUser) {
+        if (currentUser == null) {
+            App.setUser(null);
+            return;
+        }
+        Log.d("SingInActivity", "NICK:"+currentUser.getDisplayName()+"-UN:"+currentUser.getEmail());
+        User user = new User();
+        user.setUserId(currentUser.getUid());
+        user.setAvatarUrl(currentUser.getPhotoUrl() == null ? "" : currentUser.getPhotoUrl().toString());
+        user.setEmail(currentUser.getEmail());
+        user.setUserName(currentUser.getEmail());
+        user.setNick(currentUser.getDisplayName());
+        App.setUser(user);
+        if (mLoginControler!=null) {
+            mLoginControler.login(user);
+        } else {
+            Toast.makeText(this, R.string.signin_error, Toast.LENGTH_SHORT).show();
+        }
+    }
+
+    @Override
+    public void onConnectionFailed(@NonNull ConnectionResult connectionResult) {
+        initUserInfo(null);
+    }
+
+    @Override
+    public void showLoading() {
+        binding.progressBar2.setVisibility(View.VISIBLE);
+    }
+
+    @Override
+    public void hideLoading() {
+        binding.progressBar2.setVisibility(View.GONE);
+    }
+
+    @Override
+    public void showToast(String msg) {
+        Toast.makeText(SignInActivity.this, msg, Toast.LENGTH_SHORT)
+                .show();
+    }
+
+    @Override
+    public void loginSuccess() {
+        Log.d("SignInActivity", "loginSuccess");
+//        setResult(RESULT_OK);
+//        this.finish();
+
+        setResult(RESULT_OK);
+        binding.progressBar2.setVisibility(View.GONE);
+        showToast("login successfully");
+        finish();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        if (mLoginControler!=null) {
+
+            mLoginControler.onDestroy();
+        }
+    }
+}
\ No newline at end of file
diff --git a/qpython/src/ol/java/org/qpython/qpy/main/activity/UserActivity.java b/qpython/src/ol/java/org/qpython/qpy/main/activity/UserActivity.java
new file mode 100644
index 00000000..b142018e
--- /dev/null
+++ b/qpython/src/ol/java/org/qpython/qpy/main/activity/UserActivity.java
@@ -0,0 +1,76 @@
+package org.qpython.qpy.main.activity;
+
+import android.content.Context;
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+
+import com.google.firebase.auth.FirebaseAuth;
+import com.quseit.util.ImageDownLoader;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.codeshare.CONSTANT;
+import org.qpython.qpy.codeshare.ShareCodeUtil;
+import org.qpython.qpy.databinding.ActivityUserBinding;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.CONF;
+
+import java.io.File;
+
+public class UserActivity extends AppCompatActivity {
+    ActivityUserBinding binding;
+
+    public static void start(Context context) {
+        Intent starter = new Intent(context, UserActivity.class);
+        context.startActivity(starter);
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_user);
+        setSupportActionBar(binding.toolbar);
+        setTitle(getString(R.string.me));
+        binding.toolbar.setNavigationIcon(R.drawable.ic_back);
+        binding.toolbar.setNavigationOnClickListener(v -> finish());
+
+        ImageDownLoader.setImageFromUrl(this, binding.avatar, App.getUser().getAvatarUrl());
+        binding.name.setText(App.getUser().getNick());
+        //binding.email.setText(App.getUser().getEmail());
+
+        binding.usage.setText(R.string.my_space_empty);
+        binding.logout.setOnClickListener(v -> logout());
+        binding.myShareLayout.setOnClickListener(v -> MyGistActivity.startMyShare(UserActivity.this));
+        setUsage();
+    }
+
+    private void setUsage() {
+        ShareCodeUtil.getInstance().initUsage(integer ->
+                binding.usage.setText(getString(R.string.my_space, integer == null ? 0 : integer)));
+    }
+
+    private void logout() {
+        new AlertDialog.Builder(this, R.style.MyDialog)
+                .setTitle(R.string.lout)
+                .setPositiveButton(R.string.yes, (dialog, which) -> {
+                    FirebaseAuth.getInstance().signOut();
+                    App.setUser(null);
+                    getPreferences(MODE_PRIVATE).edit().putBoolean(CONSTANT.IS_UPLOAD_INIT, false)
+                            .putString(CONSTANT.CLOUDED_MAP, "")
+                            .apply();
+                    File cloud_cache = new File(CONF.CLOUD_MAP_CACHE_PATH);
+                    if (cloud_cache.exists()) {
+                        cloud_cache.delete();
+                    }
+                    finish();
+                })
+                .setNegativeButton(R.string.no, null)
+                .create()
+                .show();
+
+    }
+}
\ No newline at end of file
diff --git a/qpython/src/ol/java/org/qpython/qpy/main/app/AppInit.java b/qpython/src/ol/java/org/qpython/qpy/main/app/AppInit.java
new file mode 100644
index 00000000..76cc52ab
--- /dev/null
+++ b/qpython/src/ol/java/org/qpython/qpy/main/app/AppInit.java
@@ -0,0 +1,37 @@
+package org.qpython.qpy.main.app;
+
+import android.content.Context;
+import android.util.Log;
+
+import com.google.firebase.FirebaseApp;
+import com.google.firebase.iid.FirebaseInstanceId;
+import com.quseit.config.BASE_CONF;
+
+import org.qpython.qpy.codeshare.ShareCodeUtil;
+
+/**
+ * 文 件 名: AppInit
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/8 15:13
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class AppInit {
+
+    public static void init(Context context){
+
+        FirebaseApp.initializeApp(context);
+        if (BASE_CONF.DEBUG) {
+            try {
+                FirebaseInstanceId xx = FirebaseInstanceId.getInstance();
+                if (xx != null) {
+                    Log.e("Firebase", xx.getToken());
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        ShareCodeUtil.getInstance();
+    }
+}
diff --git a/qpython/src/ol/java/org/qpython/qpy/main/fragment/ExplorerFragment.java b/qpython/src/ol/java/org/qpython/qpy/main/fragment/ExplorerFragment.java
new file mode 100644
index 00000000..6705c248
--- /dev/null
+++ b/qpython/src/ol/java/org/qpython/qpy/main/fragment/ExplorerFragment.java
@@ -0,0 +1,503 @@
+package org.qpython.qpy.main.fragment;
+
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.graphics.Color;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Environment;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.widget.LinearLayoutManager;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+import com.google.firebase.database.DatabaseReference;
+import com.quseit.util.FileHelper;
+import com.quseit.util.ImageUtil;
+import com.yanzhenjie.recyclerview.swipe.SwipeMenuCreator;
+import com.yanzhenjie.recyclerview.swipe.SwipeMenuItem;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.codeshare.ShareCodeUtil;
+import org.qpython.qpy.codeshare.pojo.CloudFile;
+import org.qpython.qpy.databinding.FragmentExplorerBinding;
+import org.qpython.qpy.main.activity.NotebookActivity;
+import org.qpython.qpy.main.activity.SettingActivity;
+import org.qpython.qpy.main.activity.SignInActivity;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.CONF;
+import org.qpython.qpy.texteditor.EditorActivity;
+import org.qpython.qpy.texteditor.TedLocalActivity;
+import org.qpython.qpy.texteditor.common.CommonEnums;
+import org.qpython.qpy.texteditor.common.RecentFiles;
+import org.qpython.qpy.texteditor.ui.adapter.FolderAdapter;
+import org.qpython.qpy.texteditor.ui.adapter.bean.FolderBean;
+import org.qpython.qpy.texteditor.ui.view.EnterDialog;
+import org.qpython.qpy.texteditor.widget.crouton.Crouton;
+import org.qpython.qpy.texteditor.widget.crouton.Style;
+import org.qpython.qpy.utils.FileUtils;
+import org.qpython.qpy.utils.NotebookUtil;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static com.quseit.util.FolderUtils.sortTypeByName;
+
+public class ExplorerFragment extends Fragment {
+    private static final int REQUEST_SAVE_AS   = 107;
+    private static final int REQUEST_HOME_PAGE = 109;
+    private static final int REQUEST_RECENT    = 111;
+    private static final int LOGIN_REQUEST     = 2741;
+
+    private static final String TYPE = "type";
+
+    private int WIDTH = (int) ImageUtil.dp2px(60);
+
+    private FragmentExplorerBinding binding;
+    private List<FolderBean>        folderList;
+    private FolderAdapter           adapter;
+    private Map<String, Boolean> cloudedMap = new HashMap<>();
+
+    private boolean openable = true; // 是否可打开文件
+    private boolean uploadable;
+
+    private int    type;
+    private String curPath;
+
+    public static ExplorerFragment newInstance(int type) {
+        ExplorerFragment myFragment = new ExplorerFragment();
+
+        Bundle args = new Bundle();
+        args.putInt(TYPE, type);
+        myFragment.setArguments(args);
+
+        return myFragment;
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_explorer, null);
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        binding = DataBindingUtil.bind(view);
+        type = getArguments().getInt(TYPE);
+        initView();
+        initListener();
+        initCloud();
+        switch (type) {
+            case REQUEST_RECENT:
+                binding.rlPath.setVisibility(View.GONE);
+                uploadable = false;
+                break;
+            case REQUEST_SAVE_AS:
+                binding.ivNewFolder.setVisibility(View.VISIBLE);
+                uploadable = false;
+                break;
+            case REQUEST_HOME_PAGE:
+                binding.ivNewFolder.setVisibility(View.VISIBLE);
+                uploadable = true;
+                break;
+        }
+    }
+
+    private void initView() {
+        SwipeMenuCreator swipeMenuCreator = (leftMenu, rightMenu, viewType) -> {
+//            SwipeMenuItem uploadItem = new SwipeMenuItem(getContext())
+//                    .setBackgroundColor(Color.parseColor("#FF4798F3"))
+//                    .setImage(R.drawable.ic_cloud_upload)
+//                    .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+//                    .setWidth(WIDTH);
+
+            SwipeMenuItem renameItem = new SwipeMenuItem(getContext())
+                    .setBackgroundColor(Color.parseColor("#FF4BAC07"))
+                    .setImage(R.drawable.ic_file_rename)
+                    .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+                    .setWidth(WIDTH);
+
+            SwipeMenuItem deleteItem = new SwipeMenuItem(getContext())
+                    .setBackgroundColor(Color.parseColor("#FFD14136"))
+                    .setImage(R.drawable.ic_editor_filetree_close)
+                    .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+                    .setWidth(WIDTH);
+
+            switch (type) {
+                case REQUEST_RECENT:
+                    rightMenu.addMenuItem(deleteItem);
+                    break;
+                case REQUEST_SAVE_AS:
+                    rightMenu.addMenuItem(deleteItem);
+                    break;
+                case REQUEST_HOME_PAGE:
+                    //rightMenu.addMenuItem(uploadItem);
+                    rightMenu.addMenuItem(renameItem);
+                    rightMenu.addMenuItem(deleteItem);
+                    break;
+            }
+        };
+
+        folderList = new ArrayList<>();
+        adapter = new FolderAdapter(folderList, getArguments().getInt(TYPE) == REQUEST_RECENT);
+        adapter.setCloudMap(cloudedMap);
+        binding.swipeList.setLayoutManager(new LinearLayoutManager(getContext()));
+        binding.swipeList.setSwipeMenuCreator(swipeMenuCreator);
+        openDir(CONF.ABSOLUTE_PATH);
+    }
+
+    private void initListener() {
+        binding.ivNewFolder.setOnClickListener(v -> doNewDir());
+        binding.prevFolder.setOnClickListener(v -> {
+            try {
+                //采用Environment来获取sdcard路径
+                String parentPath = new File(curPath).getParent();
+
+                if (parentPath.length()>=Environment.getExternalStorageDirectory().getAbsolutePath().length()) {
+                    openDir(parentPath);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        });
+        binding.swipeList.setSwipeMenuItemClickListener(menuBridge -> {
+            binding.swipeList.smoothCloseMenu();
+            switch (menuBridge.getPosition()) {
+                case 0:
+//                    if (uploadable) {
+//                        uploadFile(menuBridge.getAdapterPosition());
+//                    } else {
+//                        deleteFile(menuBridge.getAdapterPosition());
+//                    }
+//                    break;
+//                case 1:
+                    renameFile(menuBridge.getAdapterPosition());
+                    break;
+                case 1:
+                    deleteFile(menuBridge.getAdapterPosition());
+                    break;
+            }
+        });
+        adapter.setClickListener(new FolderAdapter.Click() {
+            @Override
+            public void onItemClick(int position) {
+                FolderBean item = folderList.get(position);
+                if (item.getType().equals(CommonEnums.FileType.FILE)) {
+                    if (!openable) {
+                        Toast.makeText(getActivity(), R.string.cant_open, Toast.LENGTH_SHORT).show();
+                        return;
+                    }
+                    //判断文件类型
+                    int lastDot = item.getName().lastIndexOf(".");
+                    if (lastDot != -1) {
+                        String ext = item.getName().substring(lastDot + 1);
+                        openFile(item.getFile(), ext);
+                    }
+                } else {
+                    openDir(item.getPath());
+                }
+            }
+
+            @Override
+            public void onLongClick(int position) {
+                binding.swipeList.smoothOpenRightMenu(position);
+            }
+        });
+
+        binding.swipeList.setAdapter(adapter);
+    }
+
+    private void gotoSetting() {
+        SettingActivity.startActivity(getActivity());
+    }
+    private void openFile(File file, String ext) {
+        List<String> textExts = Arrays.asList(getContext().getResources().getStringArray(R.array.text_ext));
+        if (textExts.contains(ext)) {
+            EditorActivity.start(getContext(), Uri.fromFile(file));
+        } else if (ext.equals("ipynb")) {
+            boolean notebookenable = NotebookUtil.isNotebookEnable(getActivity());
+            if (notebookenable) {
+                NotebookActivity.start(getActivity(), file.getAbsolutePath(), false);
+            } else {
+
+                new AlertDialog.Builder(getActivity(),R.style.MyDialog)
+                        .setTitle(R.string.dialog_alert)
+                        .setMessage(getString(R.string.ennable_notebook_first))
+                        .setNegativeButton(R.string.cancel, (dialog1, which) -> dialog1.dismiss())
+                        .setPositiveButton(R.string.ok, (dialog1, which) -> gotoSetting())
+                        .create()
+                        .show();
+
+                //Toast.makeText(getActivity(), R.string.ennable_notebook_first, Toast.LENGTH_SHORT).show();
+            }
+        } else {
+            FileUtils.openFile(getContext(), file);
+        }
+    }
+
+    private void uploadFile(int adapterPosition) {
+        File file = folderList.get(adapterPosition).getFile();
+
+        // only support type in <R.array.support_file_ext>
+        String ext = "";
+        if (file.getName().lastIndexOf(".") > 0) {
+            ext = file.getName().substring(file.getName().lastIndexOf(".") + 1);
+        }
+        boolean isSupport = false;
+        if (!file.isDirectory()) {
+            for (String s : getResources().getStringArray(R.array.support_file_ext)) {
+                if (s.equals(ext)) {
+                    isSupport = true;
+                    break;
+                }
+            }
+        } else {
+            isSupport = true;
+        }
+
+        if (!isSupport) {
+            Toast.makeText(getContext(), R.string.not_support_type_hint, Toast.LENGTH_SHORT).show();
+            return;
+        }
+
+        // only available for already login user
+        if (App.getUser() == null) {
+            new AlertDialog.Builder(getActivity(), R.style.MyDialog)
+                    .setTitle(R.string.need_login)
+                    .setMessage(R.string.upload_login_hint)
+                    .setNegativeButton(R.string.no, null)
+                    .setPositiveButton(getString(R.string.login_now), (dialog, which) ->
+                            startActivityForResult(new Intent(getActivity(), SignInActivity.class), LOGIN_REQUEST)
+                    )
+                    .create()
+                    .show();
+            return;
+        }
+
+        // upload
+        folderList.get(adapterPosition).setUploading(true);
+        adapter.notifyItemChanged(adapterPosition);
+        int[] size = {1};
+        DatabaseReference.CompletionListener listener = ((databaseError, databaseReference) -> {
+            if (databaseError == null) {
+//                updateClouded(folderList.get(adapterPosition).getFile());
+//                adapter.setUploadFile(adapterPosition);
+//                ((TedLocalActivity) getActivity()).setNewUpload();
+//                Toast.makeText(getActivity(), R.string.upload_suc, Toast.LENGTH_SHORT).show();
+//                ShareCodeUtil.getInstance().changeUsage(size[0]);
+            } else {
+                Toast.makeText(getActivity(), databaseError.getMessage(), Toast.LENGTH_SHORT).show();
+            }
+            folderList.get(adapterPosition).setUploading(false);
+            adapter.notifyDataSetChanged();
+        });
+        if (folderList.get(adapterPosition).getFile().isDirectory()) {
+            // 如果上传整个projects目录，则将该目录下项目分开上传
+            if (folderList.get(adapterPosition).getName().contains("projects")) {
+                File[] files = folderList.get(adapterPosition).getFile().listFiles();
+                for (int i = 0; i < files.length; i++) {
+                    if (!ShareCodeUtil.getInstance().uploadFolder(files[i].getPath(), i == 0 ? null : listener, size)) {
+                        folderList.get(adapterPosition).setUploading(false);
+                        adapter.notifyDataSetChanged();
+                    }
+                }
+            } else {
+                if (!ShareCodeUtil.getInstance().uploadFolder(folderList.get(adapterPosition).getPath(), listener, size)) {
+                    folderList.get(adapterPosition).setUploading(false);
+                    adapter.notifyDataSetChanged();
+                }
+            }
+        } else {
+            if (!ShareCodeUtil.getInstance().uploadFile(folderList.get(adapterPosition).getPath(), listener)) {
+                folderList.get(adapterPosition).setUploading(false);
+                adapter.notifyDataSetChanged();
+            }
+        }
+    }
+
+    private void renameFile(int adapterPosition) {
+        new EnterDialog(getContext())
+                .setTitle(getString(R.string.rename))
+                .setConfirmListener(name -> {
+                    File oldFile = folderList.get(adapterPosition).getFile();
+                    File newFile = new File(oldFile.getParent(), name);
+                    boolean renameSuc = oldFile.renameTo(newFile);
+                    if (renameSuc) {
+                        folderList.set(adapterPosition, new FolderBean(newFile));
+                        adapter.notifyItemChanged(adapterPosition);
+                        return true;
+                    } else {
+                        Toast.makeText(getActivity(), R.string.rename_fail, Toast.LENGTH_SHORT).show();
+                        return false;
+                    }
+                })
+                .setText(folderList.get(adapterPosition).getName())
+                .show();
+    }
+
+    private void deleteFile(int adapterPosition) {
+        switch (type) {
+            case REQUEST_RECENT:
+                RecentFiles.removePath(folderList.get(adapterPosition).getPath());
+                folderList.remove(adapterPosition);
+                adapter.notifyDataSetChanged();
+                break;
+            case REQUEST_HOME_PAGE:
+            case REQUEST_SAVE_AS:
+                AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.MyDialog);
+                builder.setTitle(R.string.warning)
+                        .setMessage(R.string.delete_file_hint)
+                        .setNegativeButton(R.string.no, null)
+                        .setPositiveButton(R.string.yes, (dialog, which) -> {
+                            String dir = folderList.get(adapterPosition).getFile().getParent();
+                            FileHelper.clearDir(folderList.get(adapterPosition).getFile().getAbsolutePath(), 0, true);
+                            openDir(dir);
+
+//                            folderList.remove(adapterPosition);
+//                            adapter.notifyItemRemoved(adapterPosition);
+                        })
+                        .show();
+                break;
+        }
+    }
+
+    private void openDir(String dirPath) {
+        if (type == REQUEST_RECENT) {
+            folderList.clear();
+            for (String path : RecentFiles.getRecentFiles()) {
+                folderList.add(new FolderBean(new File(path)));
+            }
+
+            if (folderList.size() == 0) {
+                binding.emptyHint.setVisibility(View.VISIBLE);
+            } else {
+                binding.emptyHint.setVisibility(View.GONE);
+                adapter.notifyDataSetChanged();
+            }
+        } else {
+            binding.tvPath.setText(dirPath);
+            curPath = dirPath;
+            File dir = new File(dirPath);
+            if (dir.exists()) {
+                File[] files = dir.listFiles();
+                if (files != null) {
+                    Arrays.sort(files, sortTypeByName);
+                    folderList.clear();
+                    adapter.notifyDataSetChanged();
+                    for (File file : files) {
+                        if (!dir.getName().equals(CONF.BASE_PATH)) {
+                            if (!file.getName().startsWith(".")) {
+                                folderList.add(new FolderBean(file));
+                            }
+
+                        } else {
+                            folderList.add(new FolderBean(file));
+
+                        }
+
+                    }
+                    adapter.notifyDataSetChanged();
+                }
+            } else {
+                Toast.makeText(getContext(), R.string.file_not_exists, Toast.LENGTH_SHORT).show();
+            }
+        }
+    }
+
+    private void doNewDir() {
+        new EnterDialog(getContext())
+                .setTitle(getString(R.string.new_folder))
+                .setHint(getString(R.string.folder_name))
+                .setConfirmListener(name -> {
+                    File dirN = new File(curPath, name.equals("") ? getString(R.string.untitled_folder) : name);
+                    if (dirN.exists()) {
+                        Crouton.makeText(getActivity(), getString(R.string.toast_folder_exist), Style.ALERT).show();
+                        return false;
+                    } else {
+                        if (dirN.mkdirs()) {
+                            openDir(curPath + "/" + name);
+                        } else {
+                            Toast.makeText(getContext(), R.string.mkdir_fail, Toast.LENGTH_SHORT).show();
+                        }
+                        return true;
+                    }
+                })
+                .show();
+    }
+
+    public void backToPrev() {
+        Log.d("ExplorerFragment", "backToPrev:"+curPath);
+        String qpyDir = Environment.getExternalStorageDirectory().getAbsolutePath()+"/qpython";
+        if (curPath == null || qpyDir.equals(curPath) || Environment.getExternalStorageDirectory().getAbsolutePath().equals(curPath)) {
+            getActivity().finish();
+        } else {
+            String parentPath = new File(curPath).getParent();
+            if (!TextUtils.isEmpty(parentPath)) openDir(parentPath);
+        }
+    }
+
+    private void updateClouded(File file) {
+        if (file.getParent().contains("projects")) {
+            String parent = file.getParent() + "/";
+            String subPath = file.getPath().substring(file.getPath().indexOf(parent) + parent.length());
+            String projName = subPath.contains("/") ? subPath.substring(0, subPath.indexOf("/")) : "/" + subPath;
+            cloudedMap.put(CONF.ABSOLUTE_PATH + projName, true);
+        }
+        if (file.isDirectory()) {
+            for (File file1 : FileHelper.filterExt(file, getResources().getStringArray(R.array.support_file_ext))) {
+                cloudedMap.put(file1.getPath(), true);
+            }
+        } else {
+            cloudedMap.put(file.getPath(), true);
+        }
+    }
+
+    public String getCurPath() {
+        return curPath;
+    }
+
+    private void initCloud() {
+        if (App.getUser() == null) {
+            return;
+        }
+        ShareCodeUtil.getInstance().getUploadedScripts(false, getActivity(), cloudFiles -> {
+            if (cloudFiles == null || cloudFiles.size() == 0) {
+                return;
+            }
+            for (CloudFile cloudFile : cloudFiles) {
+                if (cloudFile.getPath().contains("/projects")) {
+                    String projNode = cloudFile.getPath().contains("/projects3/") ? "/projects3/" : "/projects/";
+                    cloudedMap.put(CONF.ABSOLUTE_PATH + projNode + cloudFile.getProjectName(), true);
+                }
+                cloudedMap.put(CONF.ABSOLUTE_PATH + cloudFile.getPath(), true);
+            }
+            adapter.setCloudMap(cloudedMap);
+            adapter.notifyDataSetChanged();
+        });
+    }
+
+    public void deleteCloudedMap(String absolutePath) {
+        if (cloudedMap.containsKey(absolutePath)) {
+            cloudedMap.remove(absolutePath);
+            adapter.notifyDataSetChanged();
+        }
+    }
+
+    public void updateCloudedFiles(Map<String, Boolean> map) {
+        if (map != null) {
+            cloudedMap.putAll(map);
+        }
+        adapter.notifyDataSetChanged();
+    }
+}
diff --git a/qpython/src/ol/java/org/qpython/qpy/main/fragment/MyProjectFragment.java b/qpython/src/ol/java/org/qpython/qpy/main/fragment/MyProjectFragment.java
new file mode 100644
index 00000000..1b52cf26
--- /dev/null
+++ b/qpython/src/ol/java/org/qpython/qpy/main/fragment/MyProjectFragment.java
@@ -0,0 +1,256 @@
+package org.qpython.qpy.main.fragment;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.databinding.DataBindingUtil;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.widget.LinearLayoutManager;
+import android.text.Html;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+import com.quseit.util.DateTimeHelper;
+import com.quseit.util.ImageUtil;
+import com.yanzhenjie.recyclerview.swipe.SwipeMenuCreator;
+import com.yanzhenjie.recyclerview.swipe.SwipeMenuItem;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.codeshare.CONSTANT;
+import org.qpython.qpy.codeshare.ShareCodeUtil;
+import org.qpython.qpy.codeshare.pojo.CloudFile;
+import org.qpython.qpy.databinding.FragmentRefreshRvBinding;
+import org.qpython.qpy.main.adapter.CloudScriptAdapter;
+import org.qpython.qpy.texteditor.TedLocalActivity;
+import org.qpython.qpysdk.QPyConstants;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import rx.Observable;
+import rx.android.schedulers.AndroidSchedulers;
+
+public class MyProjectFragment extends Fragment {
+    private int WIDTH = (int) ImageUtil.dp2px(60);
+    private FragmentRefreshRvBinding binding;
+    private CloudScriptAdapter adapter;
+    private List<CloudFile> scriptList = new ArrayList<>();
+    private TedLocalActivity activity;
+
+    public boolean isLoading;
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        binding = DataBindingUtil.bind(LayoutInflater.from(getContext()).inflate(R.layout.fragment_refresh_rv, null));
+        return binding.getRoot();
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        scriptList = new ArrayList<>();
+        adapter = new CloudScriptAdapter(scriptList);
+        ShareCodeUtil.getInstance().clearAll();
+        initView();
+        initListener();
+        retry(true);
+    }
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        activity = (TedLocalActivity) context;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (adapter != null) {
+            adapter.notifyDataSetChanged();
+        }
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+//        activity.locatedCloud(scriptList);
+    }
+
+    public void retry(boolean forceRefresh) {
+        if (scriptList != null && adapter != null) {
+            scriptList.clear();
+            adapter.notifyDataSetChanged();
+        }
+        startProgressBar();
+        isLoading = true;
+        ShareCodeUtil.getInstance().getUploadedScripts(forceRefresh, getActivity(), cloudFiles -> {
+            isLoading = false;
+            if (cloudFiles == null || cloudFiles.size() == 0) {
+                showEmpty();
+                return;
+            }
+//            ((TedLocalActivity) getActivity()).updateCloudFiles(cloudFiles);
+            scriptList.clear();
+            scriptList.addAll(cloudFiles);
+            adapter.notifyDataSetChanged();
+            binding.progressBar.setVisibility(View.GONE);
+            binding.netError.setVisibility(View.GONE);
+        });
+    }
+
+    public void notifyDataSetChange() {
+        if (adapter != null) adapter.notifyDataSetChanged();
+    }
+
+    private void startProgressBar() {
+        binding.progressBar.setVisibility(View.VISIBLE);
+        binding.netError.setVisibility(View.GONE);
+        Observable.just(null)
+                .delay(5, TimeUnit.SECONDS)
+                .observeOn(AndroidSchedulers.mainThread())
+                .doOnNext(o -> showNetErrorText())
+                .subscribe();
+    }
+
+    private void showEmpty() {
+        if (binding.progressBar.getVisibility() == View.VISIBLE) {
+            binding.progressBar.setVisibility(View.GONE);
+            binding.netError.setText(R.string.cloud_empty_hint);
+            binding.netError.setVisibility(View.VISIBLE);
+        }
+    }
+
+    private void showNetErrorText() {
+        if (binding.progressBar.getVisibility() == View.VISIBLE) {
+            binding.progressBar.setVisibility(View.GONE);
+            binding.netError.setText(R.string.net_lagging);
+            binding.netError.setVisibility(View.VISIBLE);
+        }
+    }
+
+    private void initView() {
+        SwipeMenuCreator swipeMenuCreator = (leftMenu, rightMenu, viewType) -> {
+            SwipeMenuItem deleteItem = new SwipeMenuItem(getContext())
+                    .setBackgroundColor(Color.parseColor("#FFD14136"))
+                    .setImage(R.drawable.ic_editor_filetree_close)
+                    .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+                    .setWidth(WIDTH);
+
+            SwipeMenuItem downloadItem = new SwipeMenuItem(getContext())
+                    .setBackgroundColor(Color.parseColor("#FF4798F3"))
+                    .setImage(R.drawable.ic_cloud_download)
+                    .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+                    .setWidth(WIDTH);
+            rightMenu.addMenuItem(downloadItem);
+            rightMenu.addMenuItem(deleteItem);
+        };
+        binding.swipeList.setLayoutManager(new LinearLayoutManager(getContext()));
+        binding.swipeList.setSwipeMenuCreator(swipeMenuCreator);
+    }
+
+    @SuppressLint("StringFormatMatches")
+    private void initListener() {
+        binding.netError.setOnClickListener(v -> retry(true));
+        binding.swipeList.setSwipeMenuItemClickListener(menuBridge -> {
+            menuBridge.closeMenu();
+            switch (menuBridge.getPosition()) {
+                case 0:
+                    // download
+                    CloudFile cloudFile = scriptList.get(menuBridge.getAdapterPosition());
+                    cloudFile.setUploading(true);
+                    adapter.notifyItemChanged(menuBridge.getAdapterPosition());
+                    String path;
+                    path = QPyConstants.ABSOLUTE_PATH + cloudFile.getPath();
+                    File file = new File(path);
+                    if (file.exists()) {
+                        new AlertDialog.Builder(getContext(), R.style.MyDialog)
+                                .setTitle(R.string.override_hint)
+                                .setMessage(Html.fromHtml(getString(R.string.conflict_hint,
+                                        cloudFile.getUploadTime(),
+                                        DateTimeHelper.AGO_FULL_DATE_FORMATTER.format(new Date(file.lastModified())))))
+                                .setNegativeButton(R.string.no, (dialog, which) ->{
+                                    cloudFile.setUploading(false);
+                                    adapter.notifyItemChanged(menuBridge.getAdapterPosition());
+                                })
+                                .setPositiveButton(R.string.yes,
+                                        (dialog, which) ->
+                                                getRemoteContentNWrite(cloudFile, path, menuBridge.getAdapterPosition()))
+                                .create()
+                                .show();
+                    } else {
+                        getRemoteContentNWrite(cloudFile, path, menuBridge.getAdapterPosition());
+                    }
+                    break;
+                case 1:
+                    // delete
+                    scriptList.get(menuBridge.getAdapterPosition()).setUploading(true);
+                    adapter.notifyItemChanged(menuBridge.getAdapterPosition());
+                    ShareCodeUtil.getInstance().deleteUploadScript(scriptList.get(menuBridge.getAdapterPosition()), (databaseError, databaseReference) -> {
+//                        if (databaseError == null && getContext() != null) {
+//                            Toast.makeText(getContext(), R.string.delete_remote_suc, Toast.LENGTH_SHORT).show();
+//                            adapter.notifyItemRemoved(menuBridge.getAdapterPosition());
+//                            ((TedLocalActivity) getActivity()).deleteCloudFile(scriptList.get(menuBridge.getAdapterPosition()).getAbsolutePath());
+//                            scriptList.remove(menuBridge.getAdapterPosition());
+//                            if (scriptList.size() == 0) {
+//                                binding.netError.setText(R.string.cloud_empty_hint);
+//                                binding.netError.setVisibility(View.VISIBLE);
+//                            } else {
+//                                binding.netError.setVisibility(View.INVISIBLE);
+//                            }
+//                        } else {
+//                            Toast.makeText(getContext(), databaseError.getMessage(), Toast.LENGTH_SHORT).show();
+//                        }
+                    });
+                    break;
+            }
+        });
+        adapter.setCallback((position) -> binding.swipeList.smoothOpenRightMenu(position));
+        binding.swipeList.setAdapter(adapter);
+    }
+
+    private void getRemoteContentNWrite(CloudFile cloudFile, String path, int position) {
+        String key = cloudFile.getKey();
+        if (cloudFile.getProjectName() != null && !cloudFile.getKey().contains("projects3")) {
+            key = key.replace(cloudFile.getProjectName() + CONSTANT.SLASH_REPLACE, cloudFile.getProjectName() + "/" + CONSTANT.SLASH_REPLACE);
+        }
+        ShareCodeUtil.getInstance().getFileContent(key, content -> {
+            writeFile(path, content, position);
+            scriptList.get(position).setUploading(false);
+            adapter.notifyItemChanged(position);
+        });
+    }
+
+    private void writeFile(String path, String content, int adapterPosition) {
+        try {
+            FileWriter writer = new FileWriter(new File(path), false);
+            writer.write(content);
+            writer.close();
+            Toast.makeText(getContext(), R.string.file_downloaded, Toast.LENGTH_SHORT).show();
+            adapter.notifyItemChanged(adapterPosition);
+        } catch (IOException e) {
+            e.printStackTrace();
+            Toast.makeText(getContext(), R.string.override_fail_hint, Toast.LENGTH_SHORT).show();
+        }
+    }
+
+    public void needRefresh(boolean isNewUpload) {
+        if (binding == null) {
+            // not init yet
+            return;
+        }
+        if (isNewUpload) {
+            retry(true);
+        }
+    }
+}
diff --git a/qpython/src/ol/java/org/qpython/qpy/main/receiver/LeancloudReceiver.java b/qpython/src/ol/java/org/qpython/qpy/main/receiver/LeancloudReceiver.java
new file mode 100644
index 00000000..6f12375e
--- /dev/null
+++ b/qpython/src/ol/java/org/qpython/qpy/main/receiver/LeancloudReceiver.java
@@ -0,0 +1,18 @@
+package org.qpython.qpy.main.receiver;
+
+import android.annotation.SuppressLint;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+/**
+ * 处理leancloud的消息推送
+ */
+public class LeancloudReceiver extends BroadcastReceiver {
+
+    @SuppressLint("UnsafeProtectedBroadcastReceiver")
+    @Override
+    public void onReceive(Context context, Intent intent) {
+
+    }
+}
\ No newline at end of file
diff --git a/qpython/src/ol/java/org/qpython/qpy/main/service/MyFirebaseInstanceIDService.java b/qpython/src/ol/java/org/qpython/qpy/main/service/MyFirebaseInstanceIDService.java
new file mode 100644
index 00000000..362c2336
--- /dev/null
+++ b/qpython/src/ol/java/org/qpython/qpy/main/service/MyFirebaseInstanceIDService.java
@@ -0,0 +1,15 @@
+package org.qpython.qpy.main.service;
+
+import com.google.firebase.iid.FirebaseInstanceId;
+import com.google.firebase.iid.FirebaseInstanceIdService;
+
+/**
+ * Created by Hmei on 2017-06-29.
+ */
+
+public class MyFirebaseInstanceIDService extends FirebaseInstanceIdService {
+    @Override
+    public void onTokenRefresh() {
+        String refreshedToken = FirebaseInstanceId.getInstance().getToken();
+    }
+}
diff --git a/qpython/src/ol/java/org/qpython/qpy/main/service/MyFirebaseMessagingService.java b/qpython/src/ol/java/org/qpython/qpy/main/service/MyFirebaseMessagingService.java
new file mode 100644
index 00000000..9f333943
--- /dev/null
+++ b/qpython/src/ol/java/org/qpython/qpy/main/service/MyFirebaseMessagingService.java
@@ -0,0 +1,88 @@
+package org.qpython.qpy.main.service;
+
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.net.Uri;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+
+import com.google.firebase.messaging.FirebaseMessagingService;
+import com.google.firebase.messaging.RemoteMessage;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.qpython.qpy.R;
+import org.qpython.qpy.main.activity.QWebViewActivity;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.CONF;
+import org.qpython.qpy.main.receiver.NotificationBean;
+
+import java.util.Map;
+
+
+public class MyFirebaseMessagingService extends FirebaseMessagingService {
+    private static final int LOG_NOTIFICATION_ID = (int) System.currentTimeMillis();
+
+    private boolean handled = false;
+
+    @Override
+    public void onMessageReceived(RemoteMessage remoteMessage) {
+        super.onMessageReceived(remoteMessage);
+        Map<String, String> data = remoteMessage.getData();
+        String json = App.getGson().toJson(data);
+        NotificationBean bean = App.getGson().fromJson(json, NotificationBean.class);
+        if (!bean.isForce()&&!PreferenceManager.getDefaultSharedPreferences(this).getBoolean(getString(R.string.key_hide_push), true)) {
+            return;
+        }
+        Intent intent;
+        if (bean.getType().equals("ext")) {
+            intent = new Intent(Intent.ACTION_VIEW, Uri.parse(bean.getLink()));
+        } else {
+            intent = new Intent(App.getContext(), QWebViewActivity.class);
+            intent.putExtra(QWebViewActivity.TITLE, bean.getTitle());
+            intent.putExtra("url", bean.getLink());
+        }
+
+        PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_ONE_SHOT);
+
+        Notification.Builder builder = new Notification.Builder(this)
+                .setSmallIcon(R.drawable.img_home_logo)
+                .setContentTitle(getString(R.string.app_name))
+                .setContentText(bean.getMsg())
+                .setContentIntent(pendingIntent)
+                .setAutoCancel(true);
+
+        Notification notification;
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN) {
+            notification = builder.build();
+        } else {
+            notification = builder.getNotification();
+        }
+        NotificationManager mNotifyMgr = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
+        mNotifyMgr.notify(LOG_NOTIFICATION_ID, notification);
+        handled = true;
+    }
+
+ /*   @Override
+    public void handleIntent(Intent intent) {
+        super.handleIntent(intent);
+        if (handled) {
+            return;
+        }
+        Bundle bundle = intent.getExtras();
+        JSONObject extras = new JSONObject();
+        try {
+            for (String s : bundle.keySet()) {
+                extras.put(s, bundle.get(s));
+            }
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        SharedPreferences.Editor editor = getSharedPreferences(CONF.NOTIFICATION_SP_NAME, MODE_PRIVATE).edit();
+        editor.putString(CONF.NOTIFICATION_SP_OBJ, extras.toString());
+        editor.apply();
+    }*/
+}
\ No newline at end of file
diff --git a/qpython/src/ol/java/org/qpython/qpy/main/service/PayUtil.java b/qpython/src/ol/java/org/qpython/qpy/main/service/PayUtil.java
new file mode 100644
index 00000000..8b88e8cc
--- /dev/null
+++ b/qpython/src/ol/java/org/qpython/qpy/main/service/PayUtil.java
@@ -0,0 +1,150 @@
+package org.qpython.qpy.main.service;
+
+import android.app.Activity;
+import android.app.PendingIntent;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentSender;
+import android.content.ServiceConnection;
+import android.os.Bundle;
+import android.os.IBinder;
+import android.os.RemoteException;
+import android.view.View;
+import android.widget.Toast;
+
+import com.android.vending.billing.IInAppBillingService;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.qpython.qpy.R;
+import org.qpython.qpy.main.server.MySubscriber;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+import rx.Observable;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+/**
+ * Created by Hmei
+ * 1/31/18.
+ */
+
+public class PayUtil {
+    private static final int BUY_REQUEST_CODE = 2333;
+    private IInAppBillingService mService;
+    private ServiceConnection    mServiceConn;
+    private Activity             context;
+
+    public PayUtil(Activity context) {
+        this.context = context;
+    }
+
+    public void initIAP(PayCallback callback) {
+        mServiceConn = new ServiceConnection() {
+            @Override
+            public void onServiceDisconnected(ComponentName name) {
+                mService = null;
+            }
+
+            @Override
+            public void onServiceConnected(ComponentName name,
+                                           IBinder service) {
+                mService = IInAppBillingService.Stub.asInterface(service);
+                if (callback != null) callback.doAfterConn();
+            }
+        };
+        Intent serviceIntent = new Intent("com.android.vending.billing.InAppBillingService.BIND");
+        serviceIntent.setPackage("com.android.vending");
+        context.bindService(serviceIntent, mServiceConn, Context.BIND_AUTO_CREATE);
+    }
+
+    /**
+     * 从Google服务器获取不同国家价格表并显示
+     */
+    public void getPrices(ArrayList<String> skuList, MySubscriber<String[]> callback) {
+        if (mService == null) {
+            Toast.makeText(context, R.string.lose_google_server, Toast.LENGTH_SHORT).show();
+            if (context.findViewById(R.id.pb) != null)
+                context.findViewById(R.id.pb).setVisibility(View.GONE);
+            return;
+        }
+        Bundle querySkus = new Bundle();
+        querySkus.putStringArrayList("ITEM_ID_LIST", skuList);
+        try {
+            Observable.just(mService.getSkuDetails(3, context.getPackageName(), "inapp", querySkus))
+                    .map(bundle -> {
+                                ArrayList<String> responseList = bundle.getStringArrayList("DETAILS_LIST");
+                                if (responseList == null) {
+                                    return null;
+                                }
+                                String[] prices = new String[responseList.size()];
+                                for (int i = 0; i < responseList.size(); i++) {
+                                    JSONObject object;
+                                    try {
+                                        object = new JSONObject(responseList.get(i));
+                                        String price = object.getString("price");
+                                        prices[i] = price;
+                                    } catch (JSONException e) {
+                                        e.printStackTrace();
+                                    }
+                                }
+                                Arrays.sort(prices, (o1, o2) -> Integer.parseInt(o1.replaceAll("[^0-9]", "")) - Integer.parseInt(o2.replaceAll("[^0-9]", "")));
+                                return prices;
+                            }
+                    )
+                    .subscribeOn(Schedulers.newThread())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe(callback);
+        } catch (RemoteException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void digestPurchase(String purchaseToken) {
+        // 消耗购买，使能重复赞赏同一金额
+        try {
+            Observable.just(mService.consumePurchase(3, context.getPackageName(), purchaseToken))
+                    .subscribeOn(Schedulers.newThread())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe();
+        } catch (RemoteException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void purchase(String sku) {
+        try {
+            if (mService == null) {
+                Toast.makeText(context, R.string.lose_google_server, Toast.LENGTH_SHORT).show();
+                return;
+            }
+            Bundle buyIntentBundle = mService.getBuyIntent(3, context.getPackageName(),
+                    sku, "inapp", "bGoa+V7g/yqDXvKRqq+JTFn4uQZbPiQJo4pf9RzJ");
+            switch (buyIntentBundle.getInt("RESPONSE_CODE")) {
+                case 0:
+                    //BILLING_RESPONSE_RESULT_OK
+                    PendingIntent pendingIntent = buyIntentBundle.getParcelable("BUY_INTENT");
+                    context.startIntentSenderForResult(pendingIntent.getIntentSender(),
+                            BUY_REQUEST_CODE, new Intent(), 0, 0, 0);
+                    break;
+
+            }
+        } catch (RemoteException | IntentSender.SendIntentException | NullPointerException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void unbindPayService() {
+        if (mService != null) {
+            context.unbindService(mServiceConn);
+        }
+    }
+
+    public interface PayCallback {
+        void doAfterConn();
+    }
+
+}
diff --git a/qpython/src/ol/java/org/qpython/qpy/texteditor/TedLocalActivity.java b/qpython/src/ol/java/org/qpython/qpy/texteditor/TedLocalActivity.java
new file mode 100644
index 00000000..466f0c8a
--- /dev/null
+++ b/qpython/src/ol/java/org/qpython/qpy/texteditor/TedLocalActivity.java
@@ -0,0 +1,308 @@
+package org.qpython.qpy.texteditor;
+
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Configuration;
+import android.databinding.DataBindingUtil;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v7.app.AppCompatActivity;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.Toast;
+
+import com.google.gson.reflect.TypeToken;
+import com.quseit.util.FileHelper;
+import com.quseit.util.NAction;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.codeshare.pojo.CloudFile;
+import org.qpython.qpy.databinding.ActivityLocalBinding;
+import org.qpython.qpy.main.activity.SignInActivity;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.CONF;
+import org.qpython.qpy.main.fragment.ExplorerFragment;
+import org.qpython.qpy.main.fragment.LocalFragment;
+import org.qpython.qpy.main.fragment.MyProjectFragment;
+import org.qpython.qpy.utils.NotebookUtil;
+import org.qpython.qpysdk.QPyConstants;
+
+import java.io.File;
+import java.lang.reflect.Type;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class TedLocalActivity extends AppCompatActivity {
+    public static final  int REQUEST_SAVE_AS    = 107;
+    public static final  int REQUEST_OPEN       = 108;
+    public static final  int REQUEST_HOME_PAGE  = 109;
+    public static final  int REQUEST_RECENT     = 111;
+    private static final int LOGIN_REQUEST_CODE = 4806;
+
+    private static final String EXTRA_REQUEST_CODE = "request_code";
+    private static final String EXTRA_REQUEST_FN = "request_fn";
+
+    private static final String FRAGMENT_EXPLORER  = "explorer";
+    private static final String FRAGMENT_CLOUD     = "cloud";
+
+    private ActivityLocalBinding binding;
+
+    private Fragment firstPageFragment;
+    private MyProjectFragment myProjectFragment;
+
+    private boolean isExplorer  = true;
+    private boolean isNewUpload = false;
+    //private String defaultFileName = "";
+
+    public static void start(Context context, int type) {
+        Intent starter = new Intent(context, TedLocalActivity.class);
+        starter.putExtra(EXTRA_REQUEST_CODE, type);
+        context.startActivity(starter);
+    }
+
+    public static void start(Activity context, int type, int requestCode, String filename) {
+        Intent starter = new Intent(context, TedLocalActivity.class);
+        starter.putExtra(EXTRA_REQUEST_CODE, type);
+        starter.putExtra(EXTRA_REQUEST_FN, filename);
+
+        context.startActivityForResult(starter, requestCode);
+    }
+
+    public void finishForGetPath(String path) {
+        Intent intent = new Intent();
+        intent.putExtra("path", path);
+        setResult(Activity.RESULT_OK, intent);
+        finish();
+    }
+
+    public void finishForOpen(String path, boolean isProj) {
+        Intent intent = new Intent();
+        intent.putExtra("path", path);
+        intent.putExtra("isProj", isProj);
+        setResult(Activity.RESULT_OK, intent);
+        finish();
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_local);
+        setSupportActionBar(binding.toolbar);
+        int type = getIntent().getIntExtra(EXTRA_REQUEST_CODE, REQUEST_HOME_PAGE);
+
+        initView();
+        initListener();
+        switch (type) {
+            case REQUEST_RECENT:
+                setTitle(R.string.recent);
+                binding.switchBtn.setVisibility(View.GONE);
+                firstPageFragment = ExplorerFragment.newInstance(type);
+                break;
+            case REQUEST_OPEN:
+                setTitle(R.string.open);
+                binding.switchBtn.setVisibility(View.GONE);
+                binding.explore.setVisibility(View.VISIBLE);
+                firstPageFragment = new LocalFragment();
+                break;
+            case REQUEST_SAVE_AS:
+                setTitle(R.string.save_as);
+                binding.vsSave.getRoot().setVisibility(View.VISIBLE);
+                initSaveListener();
+
+                String fn = getIntent().getStringExtra(EXTRA_REQUEST_FN);
+                if (fn!=null) {
+                    binding.vsSave.etName.setText(fn);
+                }
+                binding.switchBtn.setVisibility(View.GONE);
+                firstPageFragment = ExplorerFragment.newInstance(type);
+                break;
+            case REQUEST_HOME_PAGE:
+                setTitle(R.string.explorer);
+                firstPageFragment = ExplorerFragment.newInstance(type);
+                break;
+        }
+
+        getSupportFragmentManager().beginTransaction()
+                .add(R.id.container, firstPageFragment, FRAGMENT_EXPLORER)
+                .commit();
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+    }
+
+    private void initView() {
+        binding.toolbar.setNavigationIcon(R.drawable.ic_back);
+        binding.toolbar.setNavigationOnClickListener(v -> finish());
+        if (binding.switchBtn.getVisibility() == View.VISIBLE) {
+            myProjectFragment = new MyProjectFragment();
+        }
+    }
+
+    private void initListener() {
+        binding.switchBtn.setOnClickListener(v -> {
+            if (isExplorer) {
+                if (App.getUser() == null) {
+                    startActivityForResult(new Intent(this, SignInActivity.class), LOGIN_REQUEST_CODE);
+                    return;
+                }
+                binding.switchBtn.setImageResource(R.drawable.ic_folder_open);
+                binding.refresh.setVisibility(View.VISIBLE);
+                if (getSupportFragmentManager().findFragmentByTag(FRAGMENT_CLOUD) == null) {
+                    getSupportFragmentManager().beginTransaction().add(R.id.container, myProjectFragment, FRAGMENT_CLOUD).commit();
+                    getSupportFragmentManager().beginTransaction().hide(firstPageFragment).commit();
+                } else {
+                    getSupportFragmentManager().beginTransaction()
+                            .hide(firstPageFragment)
+                            .show(myProjectFragment)
+                            .commit();
+                }
+                myProjectFragment.needRefresh(isNewUpload);
+                isNewUpload = false;
+                if (!myProjectFragment.isLoading) {
+                    myProjectFragment.notifyDataSetChange();
+                }
+            } else {
+                binding.switchBtn.setImageResource(R.drawable.ic_cloud_list);
+                binding.refresh.setVisibility(View.GONE);
+                getSupportFragmentManager().beginTransaction()
+                        .hide(myProjectFragment)
+                        .show(firstPageFragment)
+                        .commit();
+            }
+            isExplorer = !isExplorer;
+        });
+
+        binding.refresh.setOnClickListener(v -> myProjectFragment.retry(true));
+
+        binding.explore.setOnClickListener(v -> {
+            start(this, REQUEST_HOME_PAGE);
+            finish();
+        });
+    }
+
+    public void doSave(String fn) {
+        if (fn.length() == 0) {
+            Toast.makeText(getApplicationContext(), R.string.toast_filename_empty, Toast.LENGTH_SHORT).show();
+        } else {
+            String filename = ((ExplorerFragment) firstPageFragment).getCurPath() + "/" + fn;
+            final File f = new File(filename);
+            if (f.exists()) {
+                Toast.makeText(this, R.string.file_exist_hint, Toast.LENGTH_SHORT).show();
+            } else {
+                setSaveResult(f.getAbsolutePath());
+            }
+        }
+    }
+
+    protected boolean setSaveResult(String filepath) {
+        File f = new File(filepath);
+        if (f.getParentFile().canWrite()) {
+            finishForGetPath(filepath);
+        } else {
+            Toast.makeText(getApplicationContext(), R.string.toast_folder_cant_write, Toast.LENGTH_SHORT).show();
+        }
+        return true;
+    }
+
+    private void initSaveListener() {
+        binding.vsSave.btnSave.setOnClickListener(v -> doSave(binding.vsSave.etName.getText().toString()));
+        binding.vsSave.etName.setOnTouchListener((v, event) -> {
+            final int DRAWABLE_RIGHT = 2;
+            switch (event.getAction()) {
+                case MotionEvent.ACTION_DOWN:
+                    Drawable deleteText = ((EditText) v).getCompoundDrawables()[DRAWABLE_RIGHT];
+                    if (deleteText != null) {
+                        if (event.getRawX() >= (v.getRight() - deleteText.getBounds().width())) {
+                            ((EditText) v).setText("");
+                            return true;
+                        }
+                    }
+                    break;
+                case MotionEvent.ACTION_UP:
+                    v.performClick();
+                    break;
+                default:
+                    break;
+            }
+            return false;
+        });
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (resultCode == RESULT_OK) {
+            switch (requestCode) {
+                case LOGIN_REQUEST_CODE:
+                    binding.switchBtn.setImageResource(R.drawable.ic_folder_open);
+                    if (getSupportFragmentManager().findFragmentByTag(FRAGMENT_CLOUD) == null) {
+                        getSupportFragmentManager().beginTransaction().add(R.id.container, myProjectFragment, FRAGMENT_CLOUD).commit();
+                        getSupportFragmentManager().beginTransaction().hide(firstPageFragment).commit();
+                    } else {
+                        getSupportFragmentManager().beginTransaction()
+                                .hide(firstPageFragment)
+                                .show(myProjectFragment)
+                                .commit();
+                    }
+                    isExplorer = !isExplorer;
+                    break;
+            }
+        }
+    }
+
+    @Override
+    public void onBackPressed() {
+        if (firstPageFragment.isVisible() && firstPageFragment instanceof ExplorerFragment) {
+            ((ExplorerFragment) firstPageFragment).backToPrev();
+        } else {
+            super.onBackPressed();
+        }
+    }
+
+//    public void deleteCloudFile(String path) {
+//        if (firstPageFragment instanceof ExplorerFragment) {
+//            ((ExplorerFragment) firstPageFragment).deleteCloudedMap(path);
+//        }
+//    }
+//
+//    public void updateCloudFiles(List<CloudFile> cloudFiles) {
+//        Map<String, Boolean> map = new HashMap<>();
+//        boolean isQPy3 = NAction.isQPy3(getBaseContext());
+//        String tag = isQPy3?"/projects3/":"/projects/";
+//        for (CloudFile cloudFile : cloudFiles) {
+//            if (cloudFile.getPath().contains(tag)) {
+//                map.put(QPyConstants.ABSOLUTE_PATH + tag + cloudFile.getProjectName(), true);
+//            }
+//            map.put(QPyConstants.ABSOLUTE_PATH + cloudFile.getPath(), true);
+//        }
+//        ((ExplorerFragment) firstPageFragment).updateCloudedFiles(map);
+//    }
+//
+//    public void setNewUpload() {
+//        isNewUpload = true;
+//    }
+
+    /**
+     * 保存云端文件目录到本地
+     */
+//    public void locatedCloud(List<CloudFile> cloudFiles) {
+//        if (cloudFiles.size() > 0) {
+//            Type type = new TypeToken<List<CloudFile>>() {
+//            }.getType();
+//            FileHelper.writeToFile(CONF.CLOUD_MAP_CACHE_PATH, App.getGson().toJson(cloudFiles, type));
+//        }
+//    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        NotebookUtil.killServer();
+    }
+}
diff --git a/qpython/src/ol/res/layout/activity_local.xml b/qpython/src/ol/res/layout/activity_local.xml
new file mode 100644
index 00000000..abdcb0aa
--- /dev/null
+++ b/qpython/src/ol/res/layout/activity_local.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <LinearLayout
+        android:id="@+id/gd_action_bar_host"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:background="@color/colorPrimaryDark"
+        android:orientation="vertical">
+
+        <android.support.design.widget.AppBarLayout
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize">
+
+            <android.support.v7.widget.Toolbar
+                android:id="@+id/toolbar"
+                style="@style/Toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:background="#FF4A4A4A"
+                android:elevation="2dp"
+                app:popupTheme="@style/DefaultBlueToolbar"
+                app:theme="@style/ToolbarTheme">
+
+                <ImageButton
+                    android:id="@+id/switch_btn"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end"
+                    android:background="@null"
+                    android:padding="10dp"
+                    android:src="@drawable/ic_cloud_list"
+                    android:visibility="gone"/>
+
+                <ImageButton
+                    android:id="@+id/refresh"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end"
+                    android:visibility="gone"
+                    android:layout_marginEnd="30dp"
+                    android:layout_marginRight="30dp"
+                    android:background="@color/transparency"
+                    android:src="@drawable/ic_library_reinstall"/>
+
+                <Button
+                    android:id="@+id/explore"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end"
+                    android:textColor="#FFF"
+                    android:background="@color/transparency"
+                    android:text="@string/explorer"
+                    android:visibility="gone"/>
+            </android.support.v7.widget.Toolbar>
+        </android.support.design.widget.AppBarLayout>
+
+        <RelativeLayout
+            xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/colorPrimaryDark">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+                <FrameLayout
+                    android:id="@+id/container"
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="9"/>
+
+                <include
+                    android:id="@+id/vs_save"
+                    layout="@layout/view_stub_save_prompt"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"/>
+            </LinearLayout>
+        </RelativeLayout>
+    </LinearLayout>
+
+
+</layout>
\ No newline at end of file
diff --git a/qpython/src/ol/res/values-zh-rCN/strings.xml b/qpython/src/ol/res/values-zh-rCN/strings.xml
new file mode 100644
index 00000000..513c3f8e
--- /dev/null
+++ b/qpython/src/ol/res/values-zh-rCN/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="sign_in_with_google">使用谷歌登录</string>
+    <string name="app_name">QPython OL</string>
+</resources>
diff --git a/qpython/src/ol/res/values/strings.xml b/qpython/src/ol/res/values/strings.xml
new file mode 100644
index 00000000..1d40e7b6
--- /dev/null
+++ b/qpython/src/ol/res/values/strings.xml
@@ -0,0 +1,4 @@
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="ExtraTranslation">
+    <string name="sign_in_with_google">Sign in with Google</string>
+    <string name="app_name">QPython OL</string>
+</resources>
diff --git a/qpython/src/op/AndroidManifest.xml b/qpython/src/op/AndroidManifest.xml
new file mode 100644
index 00000000..af9d90a7
--- /dev/null
+++ b/qpython/src/op/AndroidManifest.xml
@@ -0,0 +1,408 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:tools="http://schemas.android.com/tools"
+          package="org.qpython.qpy">
+
+    <uses-feature
+        android:name="android.hardware.touchscreen"
+        android:required="false"/>
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.CAMERA"/>
+    <uses-permission android:name="android.permission.FLASHLIGHT"/>
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
+    <uses-permission android:name="com.android.vending.BILLING"/>
+    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
+    <uses-permission android:name="com.android.launcher.permission.UNINSTALL_SHORTCUT" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_MEDIA_STORAGE" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+    <uses-permission android:name="android.permission.NFC" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.ACCESS_NOTIFICATION_POLICY" />
+    <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES"/>
+    <uses-permission android:name="net.dinglisch.android.tasker.PERMISSION_RUN_TASKS" />
+    <!-- privacy sensitive permissions -->
+    <uses-permission android:name="android.permission.ACCESS_SUPERUSER" />
+    <uses-permission android:name="android.permission.READ_SMS"/>
+    <uses-permission android:name="android.permission.SEND_SMS" />
+    <uses-permission android:name="android.permission.RECEIVE_SMS"/>
+    <uses-permission android:name="android.permission.WRITE_SMS"/>
+    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+    <uses-permission android:name="android.permission.CALL_PHONE"/>
+    <uses-permission android:name="android.permission.READ_CALL_LOG"/>
+    <uses-permission android:name="android.permission.PROCESS_OUTGOING_CALLS"/>
+    <uses-permission android:name="android.permission.READ_CONTACTS"/>
+    <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+
+    <uses-feature android:name="android.hardware.microphone" android:required="false"/>
+    <uses-feature android:name="android.hardware.telephony" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.flash" android:required="false"/>
+    <uses-feature android:name="android.hardware.screen.landscape" android:required="false"/>
+    <uses-feature android:name="android.hardware.wifi" android:required="false"/>
+    <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
+    <uses-feature android:name="android.hardware.location.gps" android:required="false"/>
+    <uses-feature android:name="android.hardware.location.network" android:required="false"/>
+    <uses-feature android:name="android.hardware.bluetooth" android:required="false"/>
+
+    <uses-feature android:glEsVersion="0x00020000" android:required="false"/>
+
+    <application
+        android:networkSecurityConfig="@xml/network_security_config"
+        android:name="org.qpython.qpy.main.app.App"
+        android:allowBackup="true"
+        android:hardwareAccelerated="true"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:largeHeap="true"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
+        <uses-library android:name="org.apache.http.legacy" android:required="false"/>
+
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_icon"
+            android:resource="@drawable/img_home_logo"/>
+
+        <service android:name=".main.service.QPyService"/>
+        <service android:name="org.qpython.qsl4a.QPyScriptService"/>
+        <service android:name=".main.service.FTPServerService"/>
+        <activity
+            android:name=".main.activity.SignInActivity"
+            android:launchMode="singleTask"/>
+        <activity
+            android:name="org.renpy.android.PythonSDLActivity"
+            android:hardwareAccelerated="true"
+            android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|fontScale|uiMode|orientation"
+            android:launchMode="singleTask"
+            android:process=":python"
+            android:screenOrientation="user"
+            android:theme="@style/AppTheme"
+            android:windowSoftInputMode="stateAlwaysHidden">
+        </activity>
+
+        <activity
+            android:name="org.qpython.qpylib.MPyApi"
+            android:exported="true"
+            android:theme="@style/Theme.AppCompat"/>
+
+        <service
+            android:name="org.qpython.qpylib.MPyService"
+            android:exported="true"
+            tools:ignore="ExportedService"/>
+
+        <activity
+            android:name=".main.activity.SplashActivity"
+            android:theme="@style/FullscreenTheme"
+            >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name="org.qpython.qpy.main.activity.HomeMainActivity"
+            android:launchMode="singleTask">
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcuts"/>
+        </activity>
+
+        <activity
+            android:name="org.qpython.qpy.main.activity.QWebViewActivity"
+            android:label="@string/browser">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW"/>
+
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE"/>
+
+                <data android:mimeType="text/plain"/>
+                <data android:mimeType="image/*"/>
+                <data
+                    android:host="course"
+                    android:path="/"
+                    android:scheme="qpython"/>
+            </intent-filter>
+
+            <!-- Used to handle Chrome then menu then share.-->
+            <intent-filter>
+                <action android:name="android.intent.action.SEND"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <data android:mimeType="text/plain"/>
+                <data android:mimeType="image/*"/>
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".main.activity.CourseActivity"
+            android:configChanges="orientation|screenSize"/>
+        <activity android:name=".main.activity.CourseIndexActivity"/>
+        <activity android:name=".main.activity.GistEditActivity"/>
+        <activity android:name=".main.activity.CodeDetailActivity"/>
+        <activity android:name=".main.activity.CodeShareActivity"/>
+        <activity android:name=".main.activity.UserActivity"/>
+        <activity
+            android:name="org.qpython.qpy.main.activity.SettingActivity"
+            android:theme="@style/AppTheme"/>
+        <activity
+            android:name="org.qpython.qpy.console.TermActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:theme="@style/AppTheme"/>
+        <activity
+            android:name=".main.activity.LogActivity"
+            android:theme="@style/AppTheme"/>
+        <activity
+            android:name=".texteditor.EditorActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:exported="true"
+            android:label="@string/editor">
+            <intent-filter>
+                <!--<action android:name="android.intent.action.SEND"/>-->
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:mimeType="text/*"/>
+                <data android:scheme="file"/>
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="content"/>
+                <data android:host="*"/>
+                <data android:mimeType="*/*"/>
+                <data android:pathPattern=".*\\.txt"/>
+                <data android:pathPattern=".*\\.html"/>
+                <data android:pathPattern=".*\\.css"/>
+                <data android:pathPattern=".*\\.js"/>
+                <data android:pathPattern=".*\\.md"/>
+                <data android:pathPattern=".*\\.php"/>
+                <data android:pathPattern=".*\\.py"/>
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name="org.qpython.qpy.texteditor.TedLocalActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
+        <activity
+            android:name="org.qpython.qpy.texteditor.TedSettingsActivity"
+            android:theme="@style/SettingTheme"
+            android:windowSoftInputMode="stateHidden"/>
+        <activity
+            android:name="org.qpython.qpy.texteditor.TedFontActivity"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
+
+        <activity
+            android:name=".main.activity.LibActivity"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar">
+            <intent-filter>
+                <action android:name="org.qpython.qpy.OPEN_AIPY_FRAGMENT"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name=".main.activity.AboutActivity"/>
+
+        <activity
+            android:name=".main.activity.AppListActivity"
+            android:exported="true"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar">
+        </activity>
+        <activity
+            android:name="org.swiftp.gui.ServerPreferenceActivity"
+            android:label="Preferences"/>
+        <activity android:name=".texteditor.MFTPSettingActivity"/>
+        <activity android:name=".main.activity.PurchaseActivity"/>
+
+        <activity-alias
+            android:name="TermInternal"
+            android:exported="false"
+            android:targetActivity="org.qpython.qpy.console.TermActivity"
+            android:theme="@style/ConsoleTheme">
+            <intent-filter>
+                <action android:name="jackpal.androidterm.private.OPEN_NEW_WINDOW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="jackpal.androidterm.private.SWITCH_WINDOW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity-alias>
+        <activity
+            android:name="org.qpython.qpy.console.RemoteInterface"
+            android:excludeFromRecents="true"
+            android:theme="@style/ConsoleTheme">
+            <intent-filter>
+                <action android:name="jackpal.androidterm.OPEN_NEW_WINDOW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+        <activity-alias
+            android:name="TermHere"
+            android:exported="true"
+            android:label="@string/activity_term_here_title"
+            android:targetActivity="org.qpython.qpy.console.RemoteInterface"
+            android:theme="@style/ConsoleTheme">
+        </activity-alias>
+
+        <activity
+            android:name="org.qpython.qsl4a.qsl4a.activity.FutureActivity"
+            android:label="QSL4A FutureActivity"
+            android:theme="@style/AppTheme">
+            <intent-filter>
+                <action android:name="android.nfc.action.NDEF_DISCOVERED"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <data android:mimeType="application/com.hipipal.qpy.nfc"/>
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name="org.qpython.qpy.console.RunScript"
+            android:excludeFromRecents="true"
+            android:permission="jackpal.androidterm.permission.RUN_SCRIPT"
+            android:theme="@style/ConsoleTheme">
+            <intent-filter>
+                <action android:name="jackpal.androidterm.RUN_SCRIPT"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="org.qpython.qpy.console.RunShortcut"
+            android:excludeFromRecents="true"
+            android:theme="@style/ConsoleTheme">
+            <intent-filter>
+                <action android:name="jackpal.androidterm.RUN_SHORTCUT"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="org.qpython.qpy.console.TermPreferences"
+            android:label="@string/preferences"
+            android:theme="@style/ConsoleTheme"/>
+        <activity
+            android:name="org.qpython.qpy.console.WindowList"
+            android:label="@string/window_list"
+            android:theme="@style/ConsoleTheme"/>
+        <activity
+            android:name="org.qpython.qpy.console.shortcuts.AddShortcut"
+            android:configChanges="orientation|keyboard|keyboardHidden"
+            android:label="@string/activity_shortcut_create"
+            android:launchMode="singleTop"
+            android:theme="@style/Theme.AppCompat">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.CREATE_SHORTCUT"/>
+            </intent-filter>
+            <intent-filter>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <data android:mimeType="text/*"/>
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="org.qpython.qpy.console.shortcuts.FSNavigator"
+            android:configChanges="orientation|keyboardHidden"
+            android:exported="true"
+            android:label="@string/addshortcut_button_find_command"
+            android:launchMode="singleTop"
+            android:theme="@style/ConsoleTheme">
+            <intent-filter>
+                <action android:name="android.intent.action.PICK"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.GET_CONTENT"/>
+
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.OPENABLE"/>
+
+                <data android:mimeType="*/*"/>
+            </intent-filter>
+        </activity>
+
+        <activity android:name="org.qpython.qpy.plugin.activity.PluginManagerActivity"/>
+        <activity android:name="org.qpython.qpy.plugin.activity.LocalPluginInstallActivity"/>
+
+        <!--zxing-->
+        <activity android:name="org.qpython.qpy.main.activity.QrCodeActivity"/>
+        <activity
+            android:name=".main.activity.GistActivity"
+            android:configChanges="orientation"
+            android:launchMode="singleTask"/>
+        <activity
+            android:name=".main.activity.GistDetailActivity"
+            android:configChanges="orientation"/>
+        <activity
+            android:name=".main.activity.MyGistActivity"
+            android:configChanges="orientation"/>
+        <!--SERVICE-->
+        <service android:name="org.qpython.qpy.console.TermService"
+                 tools:ignore="ExportedService">
+            <intent-filter>
+                <action android:name="jackpal.androidterm.action.START_TERM.v1"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </service>
+
+        <activity android:name=".main.activity.CourseIndexFundingActivity"/>
+        <activity android:name=".main.activity.FundingPurchaseActivity"/>
+        <activity
+            android:name=".main.activity.NotebookActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:launchMode="singleTask"
+            android:windowSoftInputMode="adjustResize"
+            android:exported="true">
+            <intent-filter >
+                <action android:name="android.intent.action.VIEW"/>
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".main.activity.NotebookListActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"/>
+
+        <!--友盟-->
+        <meta-data
+            android:name="UMENG_APPKEY"
+            android:value="5a24fdea8f4a9d34b00000b5"/>
+        <meta-data
+            android:name="UMENG_CHANNEL"
+            android:value="QPython"/>
+
+        <!--微信-->
+        <!--activity
+            android:name="com.hipipal.qpyplus.wxapi.WXEntryActivity"
+            android:exported="true"
+            android:label="@string/app_name"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
+        <activity
+            android:name="com.hipipal.qpyplus.wxapi.WXPayEntryActivity"
+            android:exported="true"
+            android:label="@string/app_name"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar"/-->
+
+    </application>
+
+    <meta-data
+        android:name="com.sec.android.support.multiwindow"
+        android:value="true"/>
+
+</manifest>
diff --git a/qpython/src/op/java/org/qpython/qpy/main/activity/BaseActivity.java b/qpython/src/op/java/org/qpython/qpy/main/activity/BaseActivity.java
new file mode 100644
index 00000000..9c3765d4
--- /dev/null
+++ b/qpython/src/op/java/org/qpython/qpy/main/activity/BaseActivity.java
@@ -0,0 +1,235 @@
+package org.qpython.qpy.main.activity;
+
+import android.content.ActivityNotFoundException;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Environment;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.app.ActivityCompat;
+import android.support.v4.content.ContextCompat;
+import android.support.v4.util.ArrayMap;
+import android.support.v7.app.AppCompatActivity;
+import android.text.TextUtils;
+import android.widget.Toast;
+
+import com.quseit.util.NAction;
+import com.quseit.util.NUtil;
+import com.umeng.analytics.MobclickAgent;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.console.ShellTermSession;
+import org.qpython.qpy.console.util.TermSettings;
+import org.qpython.qpy.main.server.gist.TokenManager;
+import org.renpy.android.ResourceManager;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Map;
+
+
+public class BaseActivity extends AppCompatActivity {
+    // QPython interfaces
+    private static final int SCRIPT_CONSOLE_CODE = 1237;
+    private static final int PID_INIT_VALUE      = -1;
+    private static final int DEFAULT_BUFFER_SIZE = 8192;
+    private static final int LOG_NOTIFICATION_ID = (int) System.currentTimeMillis();
+    private ArrayList<String> mArguments = new ArrayList<>();
+    private InputStream  mIn;
+    private OutputStream mOut;
+    private Map<Integer, PermissionAction> mActionMap = new ArrayMap<>();
+    private TermSettings     mSettings;
+    private ShellTermSession session;
+
+    private boolean permissionGrant = true;
+
+    protected static ShellTermSession createTermSession(Context context, TermSettings settings, String initialCommand, String path) {
+        ShellTermSession session = null;
+        try {
+            session = new ShellTermSession(context, settings, initialCommand, path);
+            session.setProcessExitMessage(context.getString(R.string.process_exit_message));
+
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        return session;
+    }
+
+    protected void toast(String content) {
+        Toast.makeText(this, content, Toast.LENGTH_SHORT).show();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        MobclickAgent.onPageStart(this.getLocalClassName());
+        MobclickAgent.onResume(this);
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        MobclickAgent.setDebugMode(true);
+        MobclickAgent.openActivityDurationTrack(false);
+        MobclickAgent.setScenarioType(this, MobclickAgent.EScenarioType.E_UM_NORMAL);
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        MobclickAgent.onPageEnd(this.getLocalClassName());
+        MobclickAgent.onPause(this);
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        PermissionAction action = mActionMap.get(requestCode);
+        if (action != null) {
+            if (grantResults.length > 0 && (grantResults[0] == PackageManager.PERMISSION_GRANTED)) {
+                action.onGrant();
+            } else {
+                action.onDeny();
+            }
+
+        }
+        mActionMap.remove(action);
+    }
+
+
+    public final void checkPermissionDo(String[] permissions, PermissionAction action) {
+        if (Build.VERSION.SDK_INT >= 23) {
+            boolean granted = true;
+            for (String permission : permissions) {
+                int checkPermission = ContextCompat.checkSelfPermission(this, permission);
+                granted = checkPermission == PackageManager.PERMISSION_GRANTED;
+            }
+            if (!granted) {
+                int code = permissions.hashCode() & 0xffff;
+                mActionMap.put(code, action);
+                ActivityCompat.requestPermissions(this, permissions, code);
+            } else {
+                action.onGrant();
+            }
+        } else {
+            action.onGrant();
+        }
+    }
+
+
+    // feedback
+    public void onFeedback(String feedback) {
+
+        String app = getString(R.string.app_name);
+        int ver = NUtil.getVersinoCode(getApplicationContext());
+        String subject = MessageFormat.format(getString(com.quseit.android.R.string.feeback_email_title), app, ver, Build.PRODUCT);
+
+        String lastError = "";
+        String code = NAction.getCode(getApplicationContext());
+        File log = new File(Environment.getExternalStorageDirectory() + "/" + code + "_last_err.log");
+        if (log.exists()) {
+            lastError = com.quseit.util.FileHelper.getFileContents(log.getAbsolutePath());
+        }
+
+        String body = MessageFormat.format(getString(R.string.feedback_email_body), Build.PRODUCT,
+                Build.VERSION.RELEASE, Build.VERSION.SDK, lastError, feedback);
+
+        Intent intent = new Intent(Intent.ACTION_SENDTO, Uri.parse("mailto:" + getString(R.string.ui_feedback_mail)));
+
+        intent.putExtra(Intent.EXTRA_SUBJECT, subject);
+        intent.putExtra(Intent.EXTRA_TEXT, session == null ? body : session.getTranscriptText().trim());
+        try {
+            startActivity(Intent.createChooser(intent,
+                    getString(R.string.email_transcript_chooser_title)));
+        } catch (ActivityNotFoundException e) {
+            Toast.makeText(this,
+                    R.string.email_transcript_no_email_activity_found,
+                    Toast.LENGTH_LONG)
+                    .show();
+        }
+    }
+
+    protected boolean checkExpired(final String resource, String filesDir, String tag) {
+        ResourceManager resourceManager = new ResourceManager(this);
+
+        String data_version = resourceManager.getString(resource + "_version");
+        String disk_version = "0";
+
+        // If no version, no unpacking is necessary.
+        if (data_version == null) {
+            return false;
+        }
+
+        // Check the current disk version, if any.
+        String disk_version_fn = filesDir + "/lib/" + tag + "_" + resource + ".version";
+
+        try {
+            byte buf[] = new byte[64];
+            InputStream is = new FileInputStream(disk_version_fn);
+            int len = is.read(buf);
+            disk_version = new String(buf, 0, len);
+            is.close();
+        } catch (Exception e) {
+
+            disk_version = "0";
+            //Mint.logException(e);
+
+        }
+
+        //LogUtil.d(TAG, "data_version:"+Math.round(Double.parseDouble(data_version))+"-disk_version:"+Math.round(Double.parseDouble(disk_version))+"-RET:"+(int)(Double.parseDouble(data_version)-Double.parseDouble(disk_version)));
+        if ((int) (Double.parseDouble(data_version) - Double.parseDouble(disk_version)) > 0 || disk_version.equals("0")) {
+            try {
+                FileOutputStream os = new FileOutputStream(disk_version_fn);
+                try {
+                    os.write(data_version.getBytes());
+                    os.close();
+
+                } catch (IOException e) {
+                    e.printStackTrace();
+                    //Mint.logException(e);
+
+                }
+
+            } catch (FileNotFoundException e) {
+                e.printStackTrace();
+                //Mint.logException(e);
+
+            }
+
+
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public interface PermissionAction {
+        void onGrant();
+
+        void onDeny();
+    }
+
+    public void ifLogin(Login afterLogin) {
+        if (!TextUtils.isEmpty(TokenManager.getToken())) {
+            afterLogin.process();
+        } else {
+            Toast.makeText(this, R.string.login_first, Toast.LENGTH_SHORT).show();
+        }
+    }
+
+    public interface Login {
+        void process();
+    }
+
+}
diff --git a/qpython/src/op/java/org/qpython/qpy/main/activity/FundingPurchaseActivity.java b/qpython/src/op/java/org/qpython/qpy/main/activity/FundingPurchaseActivity.java
new file mode 100644
index 00000000..afd953e4
--- /dev/null
+++ b/qpython/src/op/java/org/qpython/qpy/main/activity/FundingPurchaseActivity.java
@@ -0,0 +1,107 @@
+package org.qpython.qpy.main.activity;
+
+import android.content.Context;
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.Toast;
+
+//import com.hipipal.qpyplus.wxapi.PaymentStatus;
+//import com.hipipal.qpyplus.wxapi.WXAPIManager;
+//import com.hipipal.qpyplus.wxapi.WeixinPay;
+import com.quseit.util.VeDate;
+
+import org.greenrobot.eventbus.Subscribe;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ActivityFundingPurchaseBinding;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.utils.UpdateHelper;
+
+import rx.Observer;
+
+/**
+ * Created by Hmei
+ * 1/30/18.
+ */
+
+public class FundingPurchaseActivity extends PayActivity {
+    private static final String FUNDING_COUNT = "fundingCount";
+    private ActivityFundingPurchaseBinding binding;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_funding_purchase);
+        initView();
+        String[] count = getResources().getStringArray(R.array.funding_count_divider);
+        String[] prices = getResources().getStringArray(R.array.wechat_funding_price);
+        String price = null;
+        int fundingCount = getIntent().getIntExtra(FUNDING_COUNT, 0);
+        for (int i = 0; i < count.length; i++) {
+            if ((Integer.parseInt(count[i]) - fundingCount) > 0) {
+                price = prices[i];
+                break;
+            }
+        }
+        if (TextUtils.isEmpty(price)) price = prices[prices.length - 1];
+        binding.price.setText(getString(R.string.rmb, price));
+        String finalPrice = price;
+//        binding.price.setOnClickListener(v -> payUtil.purchase(finalPrice, getIntent().getStringExtra(ARTICLE_ID), new Observer<WeixinPay>() {
+//            @Override
+//            public void onCompleted() {
+//                binding.pb.setVisibility(View.GONE);
+//                // 统计赞赏数据
+//                JSONObject jsonObject = new JSONObject();
+//                try {
+//                    jsonObject.put("type", finalPrice);
+//                    jsonObject.put("time", VeDate.getStringDateHourAsInt());
+//                    int percent = getIntent().getIntExtra(FUNDING_COUNT, 0);
+//                    String[] fundingCount = getResources().getStringArray(R.array.funding_count_divider);
+//                    jsonObject.put("crowdfunding",
+//                            percent > (Integer.parseInt(fundingCount[1]) / Integer.parseInt(fundingCount[2])) ? 3 :
+//                                    percent > (Integer.parseInt(fundingCount[0]) / Integer.parseInt(fundingCount[1])) ? 2 : 1);//0 非众筹/ 1: 0-100 /2: 100-500/3 500-2000
+//                    jsonObject.put("articleId", getIntent().getStringExtra(ARTICLE_ID));
+//                    if (App.getUser() != null) {
+//                        jsonObject.put("account", App.getUser().getEmail());
+//                    }
+//                } catch (JSONException e) {
+//                    e.printStackTrace();
+//                }
+//                UpdateHelper.submitIAPLog(FundingPurchaseActivity.this, mOrderNo, App.getGson().toJson(jsonObject));
+//            }
+//
+//            @Override
+//            public void onError(Throwable e) {
+//                Toast.makeText(FundingPurchaseActivity.this, R.string.conn_error, Toast.LENGTH_SHORT).show();
+//                binding.pb.setVisibility(View.GONE);
+//            }
+//
+//            @Override
+//            public void onNext(WeixinPay weixinPay) {
+//                WXAPIManager.wxPayReq(weixinPay);
+//                mOrderNo = weixinPay.out_trade_no;
+//            }
+//        }));
+    }
+
+    public static void startSupport(Context context, String articleId, int fundingPercent) {
+        Intent starter = new Intent(context, FundingPurchaseActivity.class);
+        starter.putExtra(ARTICLE_ID, articleId);
+        starter.putExtra(FUNDING_COUNT, fundingPercent);
+        context.startActivity(starter);
+    }
+
+    private void initView() {
+        setSupportActionBar(binding.lt.toolbar);
+        binding.lt.toolbar.setNavigationIcon(R.drawable.ic_back);
+        binding.lt.toolbar.setNavigationOnClickListener(v -> finish());
+        setTitle(R.string.reward);
+        binding.tvThanks.setVisibility(View.VISIBLE);
+        binding.price.setVisibility(View.VISIBLE);
+    }
+}
diff --git a/qpython/src/op/java/org/qpython/qpy/main/activity/PayActivity.java b/qpython/src/op/java/org/qpython/qpy/main/activity/PayActivity.java
new file mode 100644
index 00000000..89e16879
--- /dev/null
+++ b/qpython/src/op/java/org/qpython/qpy/main/activity/PayActivity.java
@@ -0,0 +1,72 @@
+package org.qpython.qpy.main.activity;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+import android.widget.Toast;
+
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.qpython.qpy.R;
+import org.qpython.qpy.main.service.PayUtil;
+
+import rx.Observer;
+
+/**
+ * Created by Hmei
+ * 1/31/18.
+ */
+
+public class PayActivity extends AppCompatActivity {
+    protected static final String ARTICLE_ID      = "article_id";
+    protected String mOrderNo;
+    protected PayUtil payUtil;
+
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        payUtil = new PayUtil(this);
+        EventBus.getDefault().register(this);
+    }
+
+    @Subscribe
+    public void onPayResp(String msg) {
+//        if (msg.equals(PaymentStatus.SUCCESS)) {
+//            payUtil.checkOrderStatus(mOrderNo,new Observer<PaymentStatus>() {
+//                @Override
+//                public void onCompleted() {
+//
+//                }
+//
+//                @Override
+//                public void onError(Throwable e) {
+//                    e.printStackTrace();
+//                    if (findViewById(R.id.pb) != null)
+//                        findViewById(R.id.pb).setVisibility(View.GONE);
+//                    Toast.makeText(PayActivity.this, "支付失败！", Toast.LENGTH_SHORT).show();
+//                }
+//
+//                @Override
+//                public void onNext(PaymentStatus paymentStatus) {
+//                    if (paymentStatus.isSuccess()) {
+//                        if (findViewById(R.id.pb) != null)
+//                            findViewById(R.id.pb).setVisibility(View.GONE);
+//                        Toast.makeText(PayActivity.this, "感谢您的支持！", Toast.LENGTH_SHORT).show();
+//                        finish();
+//                    } else {
+//                        payUtil.checkOrderStatus(mOrderNo,this);
+//                    }
+//                }
+//            });
+//        }
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        EventBus.getDefault().unregister(this);
+    }
+}
diff --git a/qpython/src/op/java/org/qpython/qpy/main/activity/PurchaseActivity.java b/qpython/src/op/java/org/qpython/qpy/main/activity/PurchaseActivity.java
new file mode 100644
index 00000000..8520aa06
--- /dev/null
+++ b/qpython/src/op/java/org/qpython/qpy/main/activity/PurchaseActivity.java
@@ -0,0 +1,149 @@
+package org.qpython.qpy.main.activity;
+
+import android.content.Context;
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.GridLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+//import com.hipipal.qpyplus.wxapi.PaymentStatus;
+//import com.hipipal.qpyplus.wxapi.WXAPIManager;
+//import com.hipipal.qpyplus.wxapi.WeixinPay;
+import com.quseit.util.ImageUtil;
+import com.quseit.util.VeDate;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ActivityPurchaseBinding;
+import org.qpython.qpy.databinding.ItemPriceBinding;
+import org.qpython.qpy.main.adapter.MyViewHolder;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.User;
+import org.qpython.qpy.main.service.PayUtil;
+import org.qpython.qpy.main.widget.GridSpace;
+import org.qpython.qpy.utils.UpdateHelper;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import rx.Observer;
+import rx.Subscription;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+/**
+ * Weixin purchase activity
+ * Created by Hmei on 2017-07-19.
+ */
+
+public class PurchaseActivity extends PayActivity {
+    private static String[] prices = new String[]{"6", "12", "18", "24", "30", "36"};
+
+    private ActivityPurchaseBinding binding;
+    private String                  articleId;
+
+    public static void start(Context context, String articleId) {
+        Intent starter = new Intent(context, PurchaseActivity.class);
+        starter.putExtra(ARTICLE_ID, articleId);
+        context.startActivity(starter);
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_purchase);
+        articleId = getIntent().getStringExtra(ARTICLE_ID);
+        initView();
+        getPrices();
+    }
+
+    private void initView() {
+        setSupportActionBar(binding.lt.toolbar);
+        binding.lt.toolbar.setNavigationIcon(R.drawable.ic_back);
+        binding.lt.toolbar.setNavigationOnClickListener(v -> finish());
+        setTitle(R.string.reward);
+    }
+
+    private void getPrices() {
+        invalidateData();
+        GridSpace gridSpace = new GridSpace(2, (int) ImageUtil.dp2px(16), false);
+        binding.list.setLayoutManager(new GridLayoutManager(PurchaseActivity.this, 2));
+        binding.list.addItemDecoration(gridSpace);
+        binding.list.setAdapter(new ListAdapter(prices));
+    }
+
+    private void invalidateData() {
+        binding.tvThanks.setVisibility(View.VISIBLE);
+        binding.list.setVisibility(View.VISIBLE);
+        binding.noData.llRoot.setVisibility(View.GONE);
+    }
+
+    private class ListAdapter extends RecyclerView.Adapter<MyViewHolder<ItemPriceBinding>> {
+        String[] dataList;
+
+        ListAdapter(String[] dataList) {
+            this.dataList = dataList;
+        }
+
+        @Override
+        public MyViewHolder<ItemPriceBinding> onCreateViewHolder(ViewGroup parent, int viewType) {
+            ItemPriceBinding binding = DataBindingUtil.inflate(LayoutInflater.from(PurchaseActivity.this), R.layout.item_price, parent, false);
+            MyViewHolder<ItemPriceBinding> holder = new MyViewHolder<>(binding.getRoot());
+            holder.setBinding(binding);
+            return holder;
+        }
+
+        @Override
+        public void onBindViewHolder(MyViewHolder<ItemPriceBinding> holder, int position) {
+            ItemPriceBinding itemBinding = holder.getBinding();
+            itemBinding.tvPrices.setText(dataList[position]);
+//            itemBinding.tvPrices.setOnClickListener(v -> payUtil.purchase(dataList[position], articleId, new Observer<WeixinPay>() {
+//                @Override
+//                public void onCompleted() {
+//                    binding.pb.setVisibility(View.GONE);
+//                    JSONObject jsonObject = new JSONObject();
+//                    try {
+//                        jsonObject.put("type", dataList[position]);
+//                        jsonObject.put("time", VeDate.getStringDateHourAsInt());
+//                        jsonObject.put("crowdfunding",0);//0 非众筹/ 1: 0-100 /2: 100-500/3 500-2000
+//                        jsonObject.put("articleId", articleId);
+//                        if (App.getUser() != null) {
+//                            jsonObject.put("account", App.getUser().getEmail());
+//                        }
+//                    } catch (JSONException e) {
+//                        e.printStackTrace();
+//                    }
+//                    UpdateHelper.submitIAPLog(PurchaseActivity.this, mOrderNo, App.getGson().toJson
+//                            (jsonObject));
+//                }
+//
+//                @Override
+//                public void onError(Throwable e) {
+//                    e.printStackTrace();
+//                    Toast.makeText(PurchaseActivity.this, "connection error!", Toast.LENGTH_SHORT).show();
+//                    binding.pb.setVisibility(View.GONE);
+//                }
+//
+//                @Override
+//                public void onNext(WeixinPay weixinPay) {
+//                    WXAPIManager.wxPayReq(weixinPay);
+//                    mOrderNo = weixinPay.out_trade_no;
+//                }
+//            }));
+        }
+
+        @Override
+        public int getItemCount() {
+            return dataList.length;
+        }
+    }
+}
diff --git a/qpython/src/op/java/org/qpython/qpy/main/activity/SignInActivity.java b/qpython/src/op/java/org/qpython/qpy/main/activity/SignInActivity.java
new file mode 100644
index 00000000..fe4bc7b8
--- /dev/null
+++ b/qpython/src/op/java/org/qpython/qpy/main/activity/SignInActivity.java
@@ -0,0 +1,95 @@
+package org.qpython.qpy.main.activity;
+
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+import android.text.Html;
+import android.util.Log;
+import android.view.View;
+import android.widget.Toast;
+
+//import com.hipipal.qpyplus.wxapi.WXAPIManager;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ActivitySignInBinding;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.User;
+import org.qpython.qpy.main.server.gist.loginScreen.LoginControler;
+import org.qpython.qpy.main.server.gist.loginScreen.LoginView;
+
+/**
+ * SignIn
+ * Created by Hmei on 2017-08-04.
+ */
+
+public class SignInActivity extends AppCompatActivity implements LoginView{
+    private static final int RC_SIGN_IN = 54503;
+
+    private ActivitySignInBinding binding;
+    private LoginControler        mLoginControler;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_sign_in);
+        binding.textView3.setText(Html.fromHtml(getString(R.string.by_signing_in_you_agree_to_out_privacy_policy_term_of_service)));
+        initListener();
+        EventBus.getDefault().register(this);
+        mLoginControler = new LoginControler(this);
+    }
+
+    private void initListener() {
+        binding.textView3.setOnClickListener(v -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.privacy_html)))));
+        binding.button2.setOnClickListener(v -> signIn());
+        binding.button3.setOnClickListener(v -> finish());
+    }
+
+    @Subscribe
+    public void loginFail(String result) {
+        Toast.makeText(this, R.string.login_failed, Toast.LENGTH_SHORT).show();
+    }
+
+    @Subscribe
+    public void loginSuccess(User user) {
+        Log.d("SignInActivity", "loginSuccess");
+
+    }
+
+    private void signIn() {
+
+//        WXAPIManager.wxLogin();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        EventBus.getDefault().unregister(this);
+        mLoginControler.onDestroy();
+    }
+
+    @Override
+    public void showLoading() {
+        binding.progressBar2.setVisibility(View.VISIBLE);
+    }
+
+    @Override
+    public void hideLoading() {
+        binding.progressBar2.setVisibility(View.GONE);
+    }
+
+    @Override
+    public void showToast(String msg) {
+        Toast.makeText(this, msg, Toast.LENGTH_SHORT).show();
+    }
+
+    @Override
+    public void loginSuccess() {
+        setResult(RESULT_OK);
+        finish();
+    }
+}
diff --git a/qpython/src/op/java/org/qpython/qpy/main/activity/UserActivity.java b/qpython/src/op/java/org/qpython/qpy/main/activity/UserActivity.java
new file mode 100644
index 00000000..38bc570f
--- /dev/null
+++ b/qpython/src/op/java/org/qpython/qpy/main/activity/UserActivity.java
@@ -0,0 +1,78 @@
+package org.qpython.qpy.main.activity;
+
+import android.content.Context;
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.app.AppCompatActivity;
+import android.widget.Toast;
+
+import com.quseit.util.ImageDownLoader;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.codeshare.CONSTANT;
+import org.qpython.qpy.codeshare.ShareCodeUtil;
+import org.qpython.qpy.databinding.ActivityUserBinding;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.CONF;
+
+import java.io.File;
+
+public class UserActivity extends AppCompatActivity {
+    ActivityUserBinding binding;
+
+    public static void start(Context context) {
+        Intent starter = new Intent(context, UserActivity.class);
+        context.startActivity(starter);
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_user);
+        setSupportActionBar(binding.toolbar);
+        setTitle(getString(R.string.me));
+        binding.toolbar.setNavigationIcon(R.drawable.ic_back);
+        binding.toolbar.setNavigationOnClickListener(v -> finish());
+
+        ImageDownLoader.setImageFromUrl(this, binding.avatar, App.getUser().getAvatarUrl());
+        binding.name.setText(App.getUser().getNick());
+//        binding.email.setText(App.getUser().getEmail());
+
+        if (ShareCodeUtil.getInstance().getUsage() == -1) {
+            Toast.makeText(App.getContext(), "usage not init", Toast.LENGTH_SHORT).show();
+            ShareCodeUtil.getInstance().initUsage();
+        } else {
+            binding.usage.setText(getString(R.string.my_space, ShareCodeUtil.getInstance().getUsage()));
+        }
+        binding.logout.setOnClickListener(v -> logout());
+
+        initListener();
+    }
+
+    private void initListener() {
+        binding.myShareLayout.setOnClickListener(v -> MyGistActivity.startMyShare(this));
+    }
+
+    private void logout() {
+        new AlertDialog.Builder(this, R.style.MyDialog)
+                .setTitle(R.string.lout)
+                .setPositiveButton(R.string.yes, (dialog, which) -> {
+                    App.setUser(null);
+                    getPreferences(MODE_PRIVATE).edit().putBoolean(CONSTANT.IS_UPLOAD_INIT, false)
+                            .putString(CONSTANT.CLOUDED_MAP, "")
+                            .apply();
+                    finish();
+                })
+                .setNegativeButton(R.string.no, null)
+                .create()
+                .show();
+
+        File cloud_cache = new File(CONF.CLOUD_MAP_CACHE_PATH);
+        if (cloud_cache.exists()) {
+            cloud_cache.delete();
+        }
+    }
+}
\ No newline at end of file
diff --git a/qpython/src/op/java/org/qpython/qpy/main/app/AppInit.java b/qpython/src/op/java/org/qpython/qpy/main/app/AppInit.java
new file mode 100644
index 00000000..812871d8
--- /dev/null
+++ b/qpython/src/op/java/org/qpython/qpy/main/app/AppInit.java
@@ -0,0 +1,25 @@
+package org.qpython.qpy.main.app;
+
+import android.content.Context;
+import android.util.Log;
+
+import org.qpython.qpy.BuildConfig;
+import org.qpython.qpy.codeshare.ShareCodeUtil;
+//import com.hipipal.qpyplus.wxapi.WXAPIManager;
+
+/**
+ * 文 件 名: AppInit
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/8 15:13
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class AppInit {
+
+    public static void init(Context context){
+        //wx
+//        WXAPIManager.init(context);
+        ShareCodeUtil.getInstance();
+    }
+}
diff --git a/qpython/src/op/java/org/qpython/qpy/main/fragment/ExplorerFragment.java b/qpython/src/op/java/org/qpython/qpy/main/fragment/ExplorerFragment.java
new file mode 100644
index 00000000..a5836685
--- /dev/null
+++ b/qpython/src/op/java/org/qpython/qpy/main/fragment/ExplorerFragment.java
@@ -0,0 +1,449 @@
+package org.qpython.qpy.main.fragment;
+
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.graphics.Color;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Environment;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.widget.LinearLayoutManager;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+import com.quseit.util.FileHelper;
+import com.quseit.util.ImageUtil;
+import com.yanzhenjie.recyclerview.swipe.SwipeMenuCreator;
+import com.yanzhenjie.recyclerview.swipe.SwipeMenuItem;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.codeshare.ShareCodeUtil;
+import org.qpython.qpy.codeshare.pojo.CloudFile;
+import org.qpython.qpy.databinding.FragmentExplorerBinding;
+import org.qpython.qpy.main.activity.NotebookActivity;
+import org.qpython.qpy.main.activity.SignInActivity;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.CONF;
+import org.qpython.qpy.main.event.ShareCodeCallback;
+import org.qpython.qpy.texteditor.EditorActivity;
+import org.qpython.qpy.texteditor.TedLocalActivity;
+import org.qpython.qpy.texteditor.common.CommonEnums;
+import org.qpython.qpy.texteditor.common.RecentFiles;
+import org.qpython.qpy.texteditor.ui.adapter.FolderAdapter;
+import org.qpython.qpy.texteditor.ui.adapter.bean.FolderBean;
+import org.qpython.qpy.texteditor.ui.view.EnterDialog;
+import org.qpython.qpy.texteditor.widget.crouton.Crouton;
+import org.qpython.qpy.texteditor.widget.crouton.Style;
+import org.qpython.qpy.utils.FileUtils;
+import org.qpython.qpy.utils.NotebookUtil;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static com.quseit.util.FolderUtils.sortTypeByName;
+
+
+public class ExplorerFragment extends Fragment {
+    private static final int REQUEST_SAVE_AS   = 107;
+    private static final int REQUEST_HOME_PAGE = 109;
+    private static final int REQUEST_RECENT    = 111;
+    private static final int LOGIN_REQUEST     = 2741;
+
+    private static final String TYPE = "type";
+
+    private int WIDTH = (int) ImageUtil.dp2px(60);
+
+    private FragmentExplorerBinding binding;
+    private List<FolderBean>        folderList;
+    private FolderAdapter           adapter;
+    private Map<String, Boolean> cloudedMap = new HashMap<>();
+
+    private boolean openable = true; // 是否可打开文件
+
+    private int    type;
+    private String curPath;
+
+    public static ExplorerFragment newInstance(int type) {
+        ExplorerFragment myFragment = new ExplorerFragment();
+
+        Bundle args = new Bundle();
+        args.putInt(TYPE, type);
+        myFragment.setArguments(args);
+
+        return myFragment;
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_explorer, null);
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        binding = DataBindingUtil.bind(view);
+        type = getArguments().getInt(TYPE);
+        initView();
+        initListener();
+        initCloud();
+        switch (type) {
+            case REQUEST_RECENT:
+                binding.rlPath.setVisibility(View.GONE);
+                break;
+            case REQUEST_SAVE_AS:
+                binding.ivNewFolder.setVisibility(View.VISIBLE);
+                break;
+            case REQUEST_HOME_PAGE:
+                binding.ivNewFolder.setVisibility(View.VISIBLE);
+                break;
+        }
+    }
+
+    private void initView() {
+        SwipeMenuCreator swipeMenuCreator = (leftMenu, rightMenu, viewType) -> {
+//            SwipeMenuItem uploadItem = new SwipeMenuItem(getContext())
+//                    .setBackgroundColor(Color.parseColor("#FF4798F3"))
+//                    .setImage(R.drawable.ic_cloud_upload)
+//                    .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+//                    .setWidth(WIDTH);
+
+            SwipeMenuItem renameItem = new SwipeMenuItem(getContext())
+                    .setBackgroundColor(Color.parseColor("#FF4BAC07"))
+                    .setImage(R.drawable.ic_file_rename)
+                    .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+                    .setWidth(WIDTH);
+
+            SwipeMenuItem deleteItem = new SwipeMenuItem(getContext())
+                    .setBackgroundColor(Color.parseColor("#FFD14136"))
+                    .setImage(R.drawable.ic_editor_filetree_close)
+                    .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+                    .setWidth(WIDTH);
+
+            switch (type) {
+                case REQUEST_RECENT:
+                    rightMenu.addMenuItem(deleteItem);
+                    break;
+                case REQUEST_SAVE_AS:
+                    rightMenu.addMenuItem(deleteItem);
+                    break;
+                case REQUEST_HOME_PAGE:
+                    //rightMenu.addMenuItem(uploadItem);
+                    rightMenu.addMenuItem(renameItem);
+                    rightMenu.addMenuItem(deleteItem);
+                    break;
+            }
+        };
+
+        folderList = new ArrayList<>();
+        adapter = new FolderAdapter(folderList, getArguments().getInt(TYPE) == REQUEST_RECENT);
+        adapter.setCloudMap(cloudedMap);
+        binding.swipeList.setLayoutManager(new LinearLayoutManager(getContext()));
+        binding.swipeList.setSwipeMenuCreator(swipeMenuCreator);
+        openDir(CONF.ABSOLUTE_PATH);
+    }
+
+    private void initListener() {
+        binding.ivNewFolder.setOnClickListener(v -> doNewDir());
+        binding.prevFolder.setOnClickListener(v -> {
+            String parentPath = new File(curPath).getParent();
+
+            if (parentPath.length()>=Environment.getExternalStorageDirectory().getAbsolutePath().length()) {
+                openDir(parentPath);
+            }
+        });
+        binding.swipeList.setSwipeMenuItemClickListener(menuBridge -> {
+            binding.swipeList.smoothCloseMenu();
+            switch (menuBridge.getPosition()) {
+                case 0:
+                    renameFile(menuBridge.getAdapterPosition());
+                    break;
+                case 1:
+                    deleteFile(menuBridge.getAdapterPosition());
+                    break;
+            }
+        });
+        adapter.setClickListener(new FolderAdapter.Click() {
+            @Override
+            public void onItemClick(int position) {
+                FolderBean item = folderList.get(position);
+                if (item.getType().equals(CommonEnums.FileType.FILE)) {
+                    if (!openable) {
+                        Toast.makeText(getActivity(), R.string.cant_open, Toast.LENGTH_SHORT).show();
+                        return;
+                    }
+                    //判断文件类型
+                    int lastDot = item.getName().lastIndexOf(".");
+                    if (lastDot != -1) {
+                        String ext = item.getName().substring(lastDot + 1);
+                        openFile(item.getFile(), ext);
+                    }
+                } else {
+                    openDir(item.getPath());
+                }
+            }
+
+            @Override
+            public void onLongClick(int position) {
+                binding.swipeList.smoothOpenRightMenu(position);
+            }
+        });
+
+        binding.swipeList.setAdapter(adapter);
+    }
+
+    private void gotoSetting() {
+        org.qpython.qpy.main.activity.SettingActivity.startActivity(getActivity());
+    }
+    private void openFile(File file, String ext) {
+        List<String> textExts = Arrays.asList(getContext().getResources().getStringArray(R.array.text_ext));
+        if (textExts.contains(ext)) {
+            EditorActivity.start(getContext(), Uri.fromFile(file));
+        } else if (ext.equals("ipynb")) {
+            boolean notebookenable = NotebookUtil.isNotebookEnable(getActivity());
+            if (notebookenable) {
+                NotebookActivity.start(getActivity(), file.getAbsolutePath(), false);
+            } else {
+
+                new AlertDialog.Builder(getActivity(),R.style.MyDialog)
+                        .setTitle(R.string.dialog_alert)
+                        .setMessage(getString(R.string.ennable_notebook_first))
+                        .setNegativeButton(R.string.cancel, (dialog1, which) -> dialog1.dismiss())
+                        .setPositiveButton(R.string.ok, (dialog1, which) -> gotoSetting())
+                        .create()
+                        .show();
+
+                //Toast.makeText(getActivity(), R.string.ennable_notebook_first, Toast.LENGTH_SHORT).show();
+            }
+        } else {
+            FileUtils.openFile(getContext(), file);
+        }
+    }
+
+    private void uploadFile(int adapterPosition) {
+        File file = folderList.get(adapterPosition).getFile();
+
+        // only support type in <R.array.support_file_ext>
+        String ext = "";
+        if (file.getName().lastIndexOf(".") > 0) {
+            ext = file.getName().substring(file.getName().lastIndexOf(".") + 1);
+        }
+        boolean isSupport = false;
+        if (!file.isDirectory()) {
+            for (String s : getResources().getStringArray(R.array.support_file_ext)) {
+                if (s.equals(ext)) {
+                    isSupport = true;
+                    break;
+                }
+            }
+        } else {
+            isSupport = true;
+        }
+
+        if (!isSupport) {
+            Toast.makeText(getContext(), R.string.not_support_type_hint, Toast.LENGTH_SHORT).show();
+            return;
+        }
+
+        // only available for already login user
+        if (App.getUser() == null) {
+            new AlertDialog.Builder(getActivity(), R.style.MyDialog)
+                    .setTitle(R.string.need_login)
+                    .setMessage(R.string.upload_login_hint)
+                    .setNegativeButton(R.string.no, null)
+                    .setPositiveButton(getString(R.string.login_now), (dialog, which) ->
+                            startActivityForResult(new Intent(getActivity(), SignInActivity.class), LOGIN_REQUEST)
+                    )
+                    .create()
+                    .show();
+            return;
+        }
+
+        // upload
+
+        File folder = folderList.get(adapterPosition).getFile();
+        folderList.get(adapterPosition).setUploading(true);
+        adapter.notifyItemChanged(adapterPosition);
+        if (folder.isDirectory()) {
+            //ShareCodeUtil.getInstance().uploadFolder(folder, callback, 0);
+        } else {
+            //ShareCodeUtil.getInstance().uploadFile(folder, callback);
+        }
+    }
+
+    private void renameFile(int adapterPosition) {
+        new EnterDialog(getContext())
+            .setTitle(getString(R.string.rename))
+            .setConfirmListener(name -> {
+                File oldFile = folderList.get(adapterPosition).getFile();
+                File newFile = new File(oldFile.getParent(), name);
+                boolean renameSuc = oldFile.renameTo(newFile);
+                if (renameSuc) {
+                    folderList.set(adapterPosition, new FolderBean(newFile));
+                    adapter.notifyItemChanged(adapterPosition);
+                    return true;
+                } else {
+                    Toast.makeText(getActivity(), R.string.rename_fail, Toast.LENGTH_SHORT).show();
+                    return false;
+                }
+            })
+            .setText(folderList.get(adapterPosition).getName())
+            .show();
+    }
+
+    private void deleteFile(int adapterPosition) {
+        switch (type) {
+            case REQUEST_RECENT:
+                RecentFiles.removePath(folderList.get(adapterPosition).getPath());
+                folderList.remove(adapterPosition);
+                adapter.notifyDataSetChanged();
+                break;
+            case REQUEST_HOME_PAGE:
+            case REQUEST_SAVE_AS:
+                AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.MyDialog);
+                builder.setTitle(R.string.warning)
+                        .setMessage(R.string.delete_file_hint)
+                        .setNegativeButton(R.string.no, null)
+                        .setPositiveButton(R.string.yes, (dialog, which) -> {
+                            FileHelper.clearDir(folderList.get(adapterPosition).getFile().getAbsolutePath(), 0, true);
+                            folderList.remove(adapterPosition);
+                            adapter.notifyItemRemoved(adapterPosition);
+                            adapter.notifyDataSetChanged();
+                        })
+                        .show();
+                break;
+        }
+    }
+
+    private void openDir(String dirPath) {
+        if (type == REQUEST_RECENT) {
+            folderList.clear();
+            for (String path : RecentFiles.getRecentFiles()) {
+                folderList.add(new FolderBean(new File(path)));
+            }
+
+            if (folderList.size() == 0) {
+                binding.emptyHint.setVisibility(View.VISIBLE);
+            } else {
+                binding.emptyHint.setVisibility(View.GONE);
+                adapter.notifyDataSetChanged();
+            }
+        } else {
+            File dir = new File(dirPath);
+            if (dir.exists()) {
+                File[] files = dir.listFiles();
+                if (files != null) {
+                    Arrays.sort(files, sortTypeByName);
+                    folderList.clear();
+                    for (File file : files) {
+                        //if (!file.getName().startsWith(".")) {
+                        folderList.add(new FolderBean(file));
+                        //}
+                    }
+                    adapter.notifyDataSetChanged();
+                    binding.tvPath.setText(dirPath);
+                    curPath = dirPath;
+                    adapter.notifyDataSetChanged();
+
+                }
+            } else {
+                Toast.makeText(getContext(), R.string.file_not_exists, Toast.LENGTH_SHORT).show();
+            }
+        }
+    }
+
+    private void doNewDir() {
+        new EnterDialog(getContext())
+                .setTitle(getString(R.string.new_folder))
+                .setHint(getString(R.string.folder_name))
+                .setConfirmListener(name -> {
+                    File dirN = new File(curPath, name.equals("") ? getString(R.string.untitled_folder) : name);
+                    if (dirN.exists()) {
+                        Crouton.makeText(getActivity(), getString(R.string.toast_folder_exist), Style.ALERT).show();
+                        return false;
+                    } else {
+                        if (dirN.mkdirs()) {
+                            openDir(curPath + "/" + name);
+                        } else {
+                            Toast.makeText(getContext(), R.string.mkdir_fail, Toast.LENGTH_SHORT).show();
+                        }
+                        return true;
+                    }
+                })
+                .show();
+    }
+
+    public void backToPrev() {
+
+        String qpyDir = Environment.getExternalStorageDirectory().getAbsolutePath()+"/qpython";
+
+        if (curPath == null || qpyDir.equals(curPath) || Environment.getExternalStorageDirectory().getAbsolutePath().equals(curPath)) {
+            getActivity().finish();
+        } else {
+            String parentPath = new File(curPath).getParent();
+            openDir(parentPath);
+        }
+    }
+
+    private void updateClouded(File file) {
+        cloudedMap.put(file.getAbsolutePath(), true);
+        if (file.isDirectory()) {
+            for (File file1 : file.listFiles()) {
+                if (file1.isDirectory()) {
+                    updateClouded(file1);
+                } else {
+                    cloudedMap.put(file.getAbsolutePath(), true);
+                }
+            }
+        }
+    }
+
+    public String getCurPath() {
+        return curPath;
+    }
+
+    private void initCloud() {
+        if (App.getUser() == null) {
+            return;
+        }
+        //获取云端脚本
+
+    }
+
+    private void savePath(String path) {
+        String[] paths = path.split("/");
+        StringBuffer realPath = new StringBuffer(CONF.ABSOLUTE_PATH);
+        for (String p : paths) {
+            if (!TextUtils.isEmpty(p)) {
+                realPath.append("/");
+                realPath.append(p);
+                if (!p.equals("projects") && !p.equals("scripts") && !cloudedMap.keySet().contains(realPath.toString()))
+                    cloudedMap.put(realPath.toString(), true);
+            }
+        }
+    }
+
+    public void deleteCloudedMap(String absolutePath) {
+        if (cloudedMap.containsKey(absolutePath)) {
+            cloudedMap.remove(absolutePath);
+            adapter.notifyDataSetChanged();
+        }
+    }
+
+    public void updateCloudedFiles(Map<String, Boolean> map) {
+        if (map != null) {
+            cloudedMap.putAll(map);
+        }
+        adapter.notifyDataSetChanged();
+    }
+}
+// GIT TEST
\ No newline at end of file
diff --git a/qpython/src/op/java/org/qpython/qpy/main/fragment/MyProjectFragment.java b/qpython/src/op/java/org/qpython/qpy/main/fragment/MyProjectFragment.java
new file mode 100644
index 00000000..ddeda639
--- /dev/null
+++ b/qpython/src/op/java/org/qpython/qpy/main/fragment/MyProjectFragment.java
@@ -0,0 +1,277 @@
+package org.qpython.qpy.main.fragment;
+
+import android.content.SharedPreferences;
+import android.databinding.DataBindingUtil;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.widget.LinearLayoutManager;
+import android.text.Html;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+import com.google.gson.reflect.TypeToken;
+import com.quseit.util.DateTimeHelper;
+import com.quseit.util.ImageUtil;
+import com.yanzhenjie.recyclerview.swipe.SwipeMenuCreator;
+import com.yanzhenjie.recyclerview.swipe.SwipeMenuItem;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.codeshare.ShareCodeUtil;
+import org.qpython.qpy.codeshare.pojo.CloudFile;
+import org.qpython.qpy.databinding.FragmentRefreshRvBinding;
+import org.qpython.qpy.main.adapter.CloudScriptAdapter;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.CONF;
+import org.qpython.qpy.main.event.ShareCodeCallback;
+import org.qpython.qpy.texteditor.TedLocalActivity;
+import org.qpython.qpysdk.QPyConstants;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import rx.Observable;
+import rx.android.schedulers.AndroidSchedulers;
+
+import static android.content.Context.MODE_PRIVATE;
+import static org.qpython.qpy.codeshare.CONSTANT.CLOUDED_MAP;
+import static org.qpython.qpy.codeshare.CONSTANT.IS_UPLOAD_INIT;
+
+public class MyProjectFragment extends Fragment {
+    private int WIDTH = (int) ImageUtil.dp2px(60);
+    private FragmentRefreshRvBinding binding;
+    private CloudScriptAdapter adapter;
+    private List<CloudFile> scriptList = new ArrayList<>();
+    private boolean isSaverOn;
+    public boolean isLoading;
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        binding = DataBindingUtil.bind(LayoutInflater.from(getContext()).inflate(R.layout.fragment_refresh_rv, null));
+        return binding.getRoot();
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        scriptList = new ArrayList<>();
+        adapter = new CloudScriptAdapter(scriptList);
+        isSaverOn = PreferenceManager.getDefaultSharedPreferences(getContext()).getBoolean(getString(R.string.key_saver), true);
+        initView();
+        initListener();
+        retry(!isSaverOn);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (adapter != null) {
+            adapter.notifyDataSetChanged();
+        }
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        locatedCloud(scriptList);
+    }
+
+    public void retry(boolean forceRefresh) {
+        if (scriptList != null && adapter != null) {
+            scriptList.clear();
+            adapter.notifyDataSetChanged();
+        }
+        startProgressBar();
+        isLoading = true;
+        // TODO: 2017/12/4 获取云端脚本
+
+    }
+
+    public void notifyDataSetChange(){
+        if (adapter!=null){
+            adapter.notifyDataSetChanged();
+        }
+    }
+
+    /**
+     * 保存云端文件目录到本地
+     */
+    private void locatedCloud(List<CloudFile> cloudFiles) {
+        if (cloudFiles.size() > 0) {
+            HashMap<String, Boolean> clouded = new HashMap<>();
+            for (CloudFile cloudFile : cloudFiles) {
+                if (cloudFile.getPath().contains("/projects/")) {
+                    clouded.put(CONF.ABSOLUTE_PATH + "/projects/" + cloudFile.getProjectName(), true);
+                }
+                clouded.put(CONF.ABSOLUTE_PATH + cloudFile.getPath(), true);
+            }
+            SharedPreferences sp = getActivity().getPreferences(MODE_PRIVATE);
+            Type type = new TypeToken<HashMap<String, Boolean>>() {
+            }.getType();
+            sp.edit().putBoolean(IS_UPLOAD_INIT, true)
+                    .putString(CLOUDED_MAP, App.getGson().toJson(clouded, type)).apply();
+        }
+    }
+
+    private void startProgressBar() {
+        binding.progressBar.setVisibility(View.VISIBLE);
+        binding.netError.setVisibility(View.GONE);
+        Observable.just(null)
+                .delay(5, TimeUnit.SECONDS)
+                .observeOn(AndroidSchedulers.mainThread())
+                .doOnNext(o -> showNetErrorText())
+                .subscribe();
+    }
+
+    private void showEmpty() {
+        if (binding.progressBar.getVisibility() == View.VISIBLE) {
+            binding.progressBar.setVisibility(View.GONE);
+            binding.netError.setText(R.string.cloud_empty_hint);
+            binding.netError.setVisibility(View.VISIBLE);
+        }
+    }
+
+    private void showNetErrorText() {
+        if (binding.progressBar.getVisibility() == View.VISIBLE) {
+            binding.progressBar.setVisibility(View.GONE);
+            binding.netError.setText(R.string.net_lagging);
+            binding.netError.setVisibility(View.VISIBLE);
+        }
+    }
+
+    private void initView() {
+        SwipeMenuCreator swipeMenuCreator = (leftMenu, rightMenu, viewType) -> {
+            SwipeMenuItem deleteItem = new SwipeMenuItem(getContext())
+                    .setBackgroundColor(Color.parseColor("#FFD14136"))
+                    .setImage(R.drawable.ic_editor_filetree_close)
+                    .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+                    .setWidth(WIDTH);
+
+            SwipeMenuItem downloadItem = new SwipeMenuItem(getContext())
+                    .setBackgroundColor(Color.parseColor("#FF4798F3"))
+                    .setImage(R.drawable.ic_cloud_download)
+                    .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+                    .setWidth(WIDTH);
+            rightMenu.addMenuItem(downloadItem);
+            rightMenu.addMenuItem(deleteItem);
+        };
+        binding.swipeList.setLayoutManager(new LinearLayoutManager(getContext()));
+        binding.swipeList.setSwipeMenuCreator(swipeMenuCreator);
+    }
+
+    private void initListener() {
+        binding.netError.setOnClickListener(v -> retry(true));
+        binding.swipeList.setSwipeMenuItemClickListener(menuBridge -> {
+            menuBridge.closeMenu();
+            switch (menuBridge.getPosition()) {
+                case 0:
+                    CloudFile cloudFile = scriptList.get(menuBridge.getAdapterPosition());
+                    String path;
+                    path = QPyConstants.ABSOLUTE_PATH + cloudFile.getPath();
+                    File file = new File(path);
+                    if (file.exists()) {
+//                        new AlertDialog.Builder(getContext(), R.style.MyDialog)
+//                                .setTitle(R.string.override_hint)
+//                                .setMessage(Html.fromHtml(getString(R.string.conflict_hint,
+//                                        cloudFile.getUploadTime(),
+//                                        DateTimeHelper.AGO_FULL_DATE_FORMATTER.format(new Date(file.lastModified())))))
+//                                .setNegativeButton(R.string.no, null)
+//                                .setPositiveButton(R.string.yes, (dialog, which) -> writeFile(file, cloudFile, menuBridge.getAdapterPosition()))
+//                                .create()
+//                                .show();
+                    } else {
+                        //create file
+                        File dir = new File(path.substring(0, path.lastIndexOf("/")));
+                        if (!dir.exists()) {
+                            dir.mkdirs();
+                        }
+                        try {
+                            file.createNewFile();
+                        } catch (IOException e) {
+                            e.printStackTrace();
+                        }
+                        writeFile(file, cloudFile, menuBridge.getAdapterPosition());
+                    }
+                    break;
+                case 1:
+                    // delete
+                    scriptList.get(menuBridge.getAdapterPosition()).setUploading(true);
+                    adapter.notifyItemChanged(menuBridge.getAdapterPosition());
+                    // TODO: 2017/12/4 删除上传的脚本文件
+//                    ShareCodeUtil.getInstance().deleteUploadScript(scriptList.get(menuBridge.getAdapterPosition()), new LeancloudStorage.SaveFileCallback() {
+//                        @Override
+//                        public void onSuccess(int code) {
+//                            Toast.makeText(getContext(), R.string.delete_remote_suc, Toast.LENGTH_SHORT).show();
+//                            adapter.notifyItemRemoved(menuBridge.getAdapterPosition());
+//                            ((TedLocalActivity) getActivity()).deleteCloudFile(scriptList.get(menuBridge.getAdapterPosition()).getAbsolutePath());
+//                            scriptList.remove(menuBridge.getAdapterPosition());
+//                        }
+//
+//                        @Override
+//                        public void onFail(String msg) {
+//                            Toast.makeText(getContext(), "删除出错", Toast.LENGTH_SHORT).show();
+//                        }
+//                    });
+                    break;
+            }
+        });
+        adapter.setCallback((position) -> binding.swipeList.smoothOpenRightMenu(position));
+        binding.swipeList.setAdapter(adapter);
+    }
+
+    private void writeFile(File file, CloudFile cloudFile, int adapterPosition) {
+        cloudFile.setUploading(true);
+        adapter.notifyDataSetChanged();
+//        ShareCodeUtil.getInstance().downloadFile(cloudFile.getFileObject().getFileId(), new LeancloudStorage.DownloadCallback() {
+//            @Override
+//            public void onSuccess(String content) {
+//                try {
+//                    FileWriter writer = new FileWriter(file, false);
+//                    writer.write(content);
+//                    writer.close();
+//                } catch (IOException e) {
+//                    e.printStackTrace();
+//                    cloudFile.setUploading(false);
+//                    adapter.notifyDataSetChanged();
+//                    Toast.makeText(getContext(), R.string.override_fail_hint, Toast.LENGTH_SHORT).show();
+//                }
+//                Toast.makeText(getContext(), R.string.file_downloaded, Toast.LENGTH_SHORT).show();
+//                cloudFile.setUploading(false);
+//                adapter.notifyItemChanged(adapterPosition);
+//            }
+//
+//            @Override
+//            public void onFail(String msg) {
+//
+//            }
+//
+//            @Override
+//            public void onProgress(int progress) {
+//
+//            }
+//        });
+    }
+
+    public void needRefresh(boolean isNewUpload) {
+        if (binding == null) {
+            // not init yet
+            return;
+        }
+        if (isNewUpload) {
+            retry(!isSaverOn);
+        }
+    }
+}
diff --git a/qpython/src/op/java/org/qpython/qpy/main/service/PayUtil.java b/qpython/src/op/java/org/qpython/qpy/main/service/PayUtil.java
new file mode 100644
index 00000000..273081a3
--- /dev/null
+++ b/qpython/src/op/java/org/qpython/qpy/main/service/PayUtil.java
@@ -0,0 +1,96 @@
+package org.qpython.qpy.main.service;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.view.View;
+import android.widget.Toast;
+
+//import com.hipipal.qpyplus.wxapi.PaymentStatus;
+//import com.hipipal.qpyplus.wxapi.WXAPIManager;
+//import com.hipipal.qpyplus.wxapi.WeixinPay;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.main.activity.PayActivity;
+import org.qpython.qpy.main.activity.SignInActivity;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.User;
+import org.qpython.qpy.main.server.MySubscriber;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import rx.Observable;
+import rx.Observer;
+import rx.Subscription;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+/**
+ * Created by Hmei
+ * 1/31/18.
+ */
+
+public class PayUtil {
+    private static final String             GET_ORDER_URL   = "https://api.wegox.net/create_order";
+    public static final  String             CHECK_ORDER_URL = "https://api.wegox.net/check_order";
+    private              List<Subscription> mSubscriptions  = new ArrayList<>();
+
+    private int checkCount = 0;
+    private Activity context;
+
+    public PayUtil(Activity context) {
+        this.context = context;
+    }
+
+    public void initIAP(PayCallback callback) {
+        callback.doAfterConn();
+    }
+
+    /**
+     * 赞赏
+     */
+//    public void purchase(String price, String articleId, Observer<WeixinPay> callback) {
+//        User user = App.getUser();
+//        if (user == null) {
+//            context.startActivity(new Intent(context, SignInActivity.class));
+//            return;
+//        }
+//        String userName = user.getUserName();
+//        String userId = user.getUserId();
+//        WXAPIManager.getWXService().requestPay(GET_ORDER_URL, price, userName, userId, articleId)
+//                .subscribeOn(Schedulers.io())
+//                .subscribeOn(AndroidSchedulers.mainThread())
+//                .observeOn(AndroidSchedulers.mainThread())
+//                .subscribe(callback);
+//    }
+
+    /**
+     * 查询订单
+     */
+//    public void checkOrderStatus(String mOrderNo, Observer<PaymentStatus> callback) {
+//        checkCount++;
+//        if (checkCount < 31) {
+//            Subscription subscription = WXAPIManager.getWXService().checkStatus(CHECK_ORDER_URL, mOrderNo)
+//                    .subscribeOn(Schedulers.io())
+//                    .observeOn(AndroidSchedulers.mainThread())
+//                    .subscribe(callback);
+//            mSubscriptions.add(subscription);
+//        } else {
+//            if (context.findViewById(R.id.pb) != null)
+//                context.findViewById(R.id.pb).setVisibility(View.GONE);
+//            Toast.makeText(context, "支付失败！", Toast.LENGTH_SHORT).show();
+//        }
+//    }
+
+    public void unbindPayService() {
+        for (Subscription subscription : mSubscriptions) {
+            if (subscription != null && subscription.isUnsubscribed()) {
+                subscription.unsubscribe();
+            }
+        }
+    }
+
+    public interface PayCallback {
+        void doAfterConn();
+    }
+}
diff --git a/qpython/src/op/java/org/qpython/qpy/sharecode/ShareCodeUtil.java b/qpython/src/op/java/org/qpython/qpy/sharecode/ShareCodeUtil.java
new file mode 100644
index 00000000..4e2aabaa
--- /dev/null
+++ b/qpython/src/op/java/org/qpython/qpy/sharecode/ShareCodeUtil.java
@@ -0,0 +1,137 @@
+package org.qpython.qpy.codeshare;
+
+import android.app.Activity;
+import android.content.SharedPreferences;
+import android.os.Handler;
+import android.preference.PreferenceManager;
+import android.widget.Toast;
+
+import com.google.gson.reflect.TypeToken;
+import com.quseit.util.ACache;
+import com.quseit.util.FileHelper;
+import com.quseit.util.NetStateUtil;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.codeshare.pojo.CloudFile;
+import org.qpython.qpy.codeshare.pojo.Gist;
+
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.event.ShareCodeCallback;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+
+import static org.qpython.qpy.main.server.CacheKey.CLOUD_FILE;
+
+/**
+ * FireBase database util
+ * Created by Hmei on 2017-08-10.
+ */
+
+public class ShareCodeUtil {
+
+    public static final String USAGE = "usage";
+    public static final String PROJECT = "project";
+    public static final String SCRIPT = "script";
+    public static final String PROJECT_PATH = "/projects/";
+    public static final String SCRIPTS_PATH = "/scripts/";
+
+    private static final int MAX_FILE = 100;
+
+    private SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(App.getContext());
+    private int currentFileCount = -1;
+    private Handler mHandler = new Handler(App.getContext().getMainLooper());
+
+    private ShareCodeUtil() {
+        if (App.getUser() != null) {
+            initUsage();
+        }
+    }
+
+    public static ShareCodeUtil getInstance() {
+        return ShareCodeHolder.INSTANCE;
+    }
+
+    /**
+     * 上传文件夹
+     */
+
+    /**
+     * 管理文件内存
+     */
+    private List<CloudFile> getCacheFile() {
+        String content = ACache.get(App.getContext()).getAsString(CLOUD_FILE);
+        List<CloudFile> cloudFiles = App.getGson().fromJson(content, new TypeToken<List<CloudFile>>() {
+        }.getType());
+        return cloudFiles == null ? new ArrayList<>() : cloudFiles;
+    }
+
+    private void saveCacheFile(List<CloudFile> cloudFiles) {
+        ACache.get(App.getContext()).put(CLOUD_FILE, App.getGson().toJson(cloudFiles));
+    }
+
+    private void saveCacheFile(CloudFile cloudFile) {
+        List<CloudFile> list = getCacheFile();
+        if (!list.contains(cloudFile)) {
+            list.add(cloudFile);
+        }
+        saveCacheFile(list);
+    }
+
+    private void deleteCacheFile(CloudFile cloudFile) {
+        List<CloudFile> list = getCacheFile();
+        if (list.contains(cloudFile)) {
+            list.remove(cloudFile);
+        }
+        saveCacheFile(list);
+    }
+
+    private void clearCacheFile() {
+        ACache.get(App.getContext()).put(CLOUD_FILE, "");
+    }
+
+    /**
+     * 初始化用户文件空间
+     */
+    public void initUsage() {
+        // TODO
+    }
+
+    public int changeUsage(int change) {
+        currentFileCount += change;
+        sharedPreferences.edit().putInt(USAGE, currentFileCount).apply();
+        return currentFileCount;
+    }
+
+    public int getUsage() {
+        return currentFileCount;
+    }
+
+    private boolean hasSpace(int waiting) {
+        if (currentFileCount < 0) {
+            Toast.makeText(App.getContext(), "usage not init", Toast.LENGTH_SHORT).show();
+            return false;
+        } else {
+            return currentFileCount + waiting < MAX_FILE;
+        }
+    }
+
+    public interface CommentCallback {
+        void commentBean(Gist.CommentBean comment);
+    }
+
+    private static class ShareCodeHolder {
+        private static final ShareCodeUtil INSTANCE = new ShareCodeUtil();
+    }
+
+
+    private boolean isConnect() {
+        if (!NetStateUtil.isConnected(App.getContext())) {
+            Toast.makeText(App.getContext(), "connection error!", Toast.LENGTH_SHORT).show();
+            return false;
+        }
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/qpython/src/op/java/org/qpython/qpy/sharecode/pojo/CloudFile.java b/qpython/src/op/java/org/qpython/qpy/sharecode/pojo/CloudFile.java
new file mode 100644
index 00000000..f6a44ea8
--- /dev/null
+++ b/qpython/src/op/java/org/qpython/qpy/sharecode/pojo/CloudFile.java
@@ -0,0 +1,85 @@
+package org.qpython.qpy.codeshare.pojo;
+
+
+import org.qpython.qpysdk.QPyConstants;
+
+import java.io.Serializable;
+
+import static org.qpython.qpy.codeshare.ShareCodeUtil.PROJECT;
+import static org.qpython.qpy.codeshare.ShareCodeUtil.PROJECT_PATH;
+import static org.qpython.qpy.codeshare.ShareCodeUtil.SCRIPT;
+import static org.qpython.qpy.codeshare.ShareCodeUtil.SCRIPTS_PATH;
+
+public class CloudFile implements Serializable {
+    private String projectName;
+    private String path;
+    private String uploadTime;
+    private String name;
+    private String content;
+    private String key;
+    private boolean uploading;
+
+    public String getPath() {
+        return path;
+    }
+
+    public void setPath(String path) {
+        this.path = path;
+    }
+
+    public String getUploadTime() {
+        return uploadTime;
+    }
+
+    public void setUploadTime(String uploadTime) {
+        this.uploadTime = uploadTime;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public long getContentSize() {
+        return content.length();
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public boolean isUploading() {
+        return uploading;
+    }
+
+    public void setUploading(boolean uploading) {
+        this.uploading = uploading;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getAbsolutePath() {
+        return QPyConstants.ABSOLUTE_PATH + getPath();
+    }
+}
diff --git a/qpython/src/op/java/org/qpython/qpy/texteditor/TedLocalActivity.java b/qpython/src/op/java/org/qpython/qpy/texteditor/TedLocalActivity.java
new file mode 100644
index 00000000..f0b132f1
--- /dev/null
+++ b/qpython/src/op/java/org/qpython/qpy/texteditor/TedLocalActivity.java
@@ -0,0 +1,321 @@
+package org.qpython.qpy.texteditor;
+
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Configuration;
+import android.databinding.DataBindingUtil;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.app.AppCompatActivity;
+import android.text.InputType;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.Toast;
+
+import com.google.gson.reflect.TypeToken;
+import com.quseit.util.FileHelper;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.codeshare.pojo.CloudFile;
+import org.qpython.qpy.databinding.ActivityLocalBinding;
+import org.qpython.qpy.main.activity.SignInActivity;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.CONF;
+import org.qpython.qpy.main.fragment.ExplorerFragment;
+import org.qpython.qpy.main.fragment.LocalFragment;
+import org.qpython.qpy.main.fragment.MyProjectFragment;
+import org.qpython.qpy.texteditor.ui.view.EnterDialog;
+import org.qpython.qpy.utils.NotebookUtil;
+import org.qpython.qpysdk.QPyConstants;
+
+import java.io.File;
+import java.lang.reflect.Type;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class TedLocalActivity extends AppCompatActivity {
+    public static final  int REQUEST_SAVE_AS    = 107;
+    public static final  int REQUEST_OPEN       = 108;
+    public static final  int REQUEST_HOME_PAGE  = 109;
+    public static final  int REQUEST_RECENT     = 111;
+    private static final int LOGIN_REQUEST_CODE = 4806;
+
+    private static final String EXTRA_REQUEST_CODE = "request_code";
+    private static final String FRAGMENT_EXPLORER  = "explorer";
+    private static final String FRAGMENT_CLOUD     = "cloud";
+    private static final String EXTRA_REQUEST_FN = "request_fn";
+
+    private ActivityLocalBinding binding;
+
+    private Fragment          firstPageFragment;
+    private MyProjectFragment myProjectFragment;
+
+    private boolean isExplorer  = true;
+    private boolean isNewUpload = false;
+    private String defaultFileName = "";
+
+    public static void start(Context context, int type) {
+        Intent starter = new Intent(context, TedLocalActivity.class);
+        starter.putExtra(EXTRA_REQUEST_CODE, type);
+        context.startActivity(starter);
+    }
+
+    public static void start(Activity context, int type, int requestCode,  String filename) {
+        Intent starter = new Intent(context, TedLocalActivity.class);
+        starter.putExtra(EXTRA_REQUEST_CODE, type);
+        starter.putExtra(EXTRA_REQUEST_FN, filename);
+
+        context.startActivityForResult(starter, requestCode);
+    }
+
+    public void finishForGetPath(String path) {
+        Intent intent = new Intent();
+        intent.putExtra("path", path);
+        setResult(Activity.RESULT_OK, intent);
+        finish();
+    }
+
+    public void finishForOpen(String path, boolean isProj) {
+        Intent intent = new Intent();
+        intent.putExtra("path", path);
+        intent.putExtra("isProj", isProj);
+        setResult(Activity.RESULT_OK, intent);
+        finish();
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_local);
+        setSupportActionBar(binding.toolbar);
+        int type = getIntent().getIntExtra(EXTRA_REQUEST_CODE, REQUEST_HOME_PAGE);
+        initView();
+        initListener();
+        switch (type) {
+            case REQUEST_RECENT:
+                setTitle(R.string.recent);
+                binding.switchBtn.setVisibility(View.GONE);
+                firstPageFragment = ExplorerFragment.newInstance(type);
+                break;
+            case REQUEST_OPEN:
+                setTitle(R.string.open);
+                binding.switchBtn.setVisibility(View.GONE);
+                binding.explore.setVisibility(View.VISIBLE);
+                firstPageFragment = new LocalFragment();
+                break;
+            case REQUEST_SAVE_AS:
+                setTitle(R.string.save_as);
+                binding.vsSave.getRoot().setVisibility(View.VISIBLE);
+                initSaveListener();
+                String fn = getIntent().getStringExtra(EXTRA_REQUEST_FN);
+                if (fn!=null) {
+                    binding.vsSave.etName.setText(fn);
+                }
+
+                binding.switchBtn.setVisibility(View.GONE);
+                firstPageFragment = ExplorerFragment.newInstance(type);
+                break;
+            case REQUEST_HOME_PAGE:
+                setTitle(R.string.explorer);
+                firstPageFragment = ExplorerFragment.newInstance(type);
+                break;
+        }
+
+        getSupportFragmentManager().beginTransaction()
+                .add(R.id.container, firstPageFragment, FRAGMENT_EXPLORER)
+                .commit();
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+    }
+
+    private void initView() {
+        binding.toolbar.setNavigationIcon(R.drawable.ic_back);
+        binding.toolbar.setNavigationOnClickListener(v -> finish());
+        if (binding.switchBtn.getVisibility() == View.VISIBLE) {
+            myProjectFragment = new MyProjectFragment();
+        }
+    }
+
+    private void initListener() {
+        binding.switchBtn.setOnClickListener(v -> {
+            if (isExplorer) {
+                if (App.getUser() == null) {
+                    startActivityForResult(new Intent(this, SignInActivity.class), LOGIN_REQUEST_CODE);
+                    return;
+                }
+                binding.switchBtn.setImageResource(R.drawable.ic_folder_open);
+                binding.refresh.setVisibility(View.VISIBLE);
+                if (getSupportFragmentManager().findFragmentByTag(FRAGMENT_CLOUD) == null) {
+                    getSupportFragmentManager().beginTransaction().add(R.id.container, myProjectFragment, FRAGMENT_CLOUD).commit();
+                    getSupportFragmentManager().beginTransaction().hide(firstPageFragment).commit();
+                } else {
+                    getSupportFragmentManager().beginTransaction()
+                            .hide(firstPageFragment)
+                            .show(myProjectFragment)
+                            .commit();
+                }
+                myProjectFragment.needRefresh(isNewUpload);
+                isNewUpload = false;
+                if (!myProjectFragment.isLoading) {
+                    myProjectFragment.notifyDataSetChange();
+                }
+            } else {
+                binding.switchBtn.setImageResource(R.drawable.ic_cloud_list);
+                binding.refresh.setVisibility(View.GONE);
+                getSupportFragmentManager().beginTransaction()
+                        .hide(myProjectFragment)
+                        .show(firstPageFragment)
+                        .commit();
+            }
+            isExplorer = !isExplorer;
+        });
+
+        binding.refresh.setOnClickListener(v -> myProjectFragment.retry(true));
+
+        binding.explore.setOnClickListener(v -> {
+            start(this, REQUEST_HOME_PAGE);
+            finish();
+        });
+    }
+
+    public void doSave(String fn) {
+        if (fn.length() == 0) {
+            Toast.makeText(getApplicationContext(), R.string.toast_filename_empty, Toast.LENGTH_SHORT).show();
+        } else {
+            String filename = ((ExplorerFragment) firstPageFragment).getCurPath() + "/" + fn;
+            final File f = new File(filename);
+            if (f.exists()) {
+                AlertDialog.Builder builder = new AlertDialog.Builder(this, R.style.MyDialog);
+                builder.setTitle(R.string.confirm)
+                        .setMessage(R.string.editor_override)
+                        .setPositiveButton(R.string.yes, (dialog, which) -> {
+                            setSaveResult(f.getAbsolutePath());
+
+                        })
+                        .setNegativeButton(R.string.cancel, ((dialog, which) -> nothing()))
+                        .show();
+
+
+                //Toast.makeText(this, R.string.file_exist_hint, Toast.LENGTH_SHORT).show();
+            } else {
+                setSaveResult(f.getAbsolutePath());
+            }
+        }
+    }
+    private void nothing() {
+
+
+    }
+
+    protected boolean setSaveResult(String filepath) {
+        File f = new File(filepath);
+        if (f.getParentFile().canWrite()) {
+            finishForGetPath(filepath);
+        } else {
+            Toast.makeText(getApplicationContext(), R.string.toast_folder_cant_write, Toast.LENGTH_SHORT).show();
+        }
+        return true;
+    }
+
+    private void initSaveListener() {
+        binding.vsSave.btnSave.setOnClickListener(v -> doSave(binding.vsSave.etName.getText().toString()));
+        binding.vsSave.etName.setOnTouchListener((v, event) -> {
+            final int DRAWABLE_RIGHT = 2;
+            switch (event.getAction()) {
+                case MotionEvent.ACTION_DOWN:
+                    Drawable deleteText = ((EditText) v).getCompoundDrawables()[DRAWABLE_RIGHT];
+                    if (deleteText != null) {
+                        if (event.getRawX() >= (v.getRight() - deleteText.getBounds().width())) {
+                            ((EditText) v).setText("");
+                            return true;
+                        }
+                    }
+                    break;
+                case MotionEvent.ACTION_UP:
+                    v.performClick();
+                    break;
+                default:
+                    break;
+            }
+            return false;
+        });
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (resultCode == RESULT_OK) {
+            switch (requestCode) {
+                case LOGIN_REQUEST_CODE:
+                    binding.switchBtn.setImageResource(R.drawable.ic_folder_open);
+                    if (getSupportFragmentManager().findFragmentByTag(FRAGMENT_CLOUD) == null) {
+                        getSupportFragmentManager().beginTransaction().add(R.id.container, myProjectFragment, FRAGMENT_CLOUD).commit();
+                        getSupportFragmentManager().beginTransaction().hide(firstPageFragment).commit();
+                    } else {
+                        getSupportFragmentManager().beginTransaction()
+                                .hide(firstPageFragment)
+                                .show(myProjectFragment)
+                                .commit();
+                    }
+                    isExplorer = !isExplorer;
+                    break;
+            }
+        }
+    }
+
+    @Override
+    public void onBackPressed() {
+        if (firstPageFragment.isVisible() && firstPageFragment instanceof ExplorerFragment) {
+            ((ExplorerFragment) firstPageFragment).backToPrev();
+        } else {
+            super.onBackPressed();
+        }
+    }
+
+//    public void deleteCloudFile(String path) {
+//        if (firstPageFragment instanceof ExplorerFragment) {
+//            ((ExplorerFragment) firstPageFragment).deleteCloudedMap(path);
+//        }
+//    }
+//
+//    public void updateCloudFiles(List<CloudFile> cloudFiles) {
+//        Map<String, Boolean> map = new HashMap<>();
+//        for (CloudFile cloudFile : cloudFiles) {
+//            if (cloudFile.getPath().contains("/projects/")) {
+//                map.put(QPyConstants.ABSOLUTE_PATH + "/projects/" + cloudFile.getProjectName(), true);
+//            }
+//            map.put(QPyConstants.ABSOLUTE_PATH + cloudFile.getPath(), true);
+//        }
+//        ((ExplorerFragment) firstPageFragment).updateCloudedFiles(map);
+//    }
+//
+//    public void setNewUpload() {
+//        isNewUpload = true;
+//    }
+//
+//    /**
+//     * 保存云端文件目录到本地
+//     */
+//    public void locatedCloud(List<CloudFile> cloudFiles) {
+//        if (cloudFiles.size() > 0) {
+//            Type type = new TypeToken<List<CloudFile>>() {
+//            }.getType();
+//            FileHelper.writeToFile(CONF.CLOUD_MAP_CACHE_PATH, App.getGson().toJson(cloudFiles, type));
+//        }
+//    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        NotebookUtil.killServer();
+    }
+}
diff --git a/qpython/src/op/res/drawable-xxhdpi/ic_login.png b/qpython/src/op/res/drawable-xxhdpi/ic_login.png
new file mode 100644
index 00000000..d45ba05f
Binary files /dev/null and b/qpython/src/op/res/drawable-xxhdpi/ic_login.png differ
diff --git a/qpython/src/op/res/layout/activity_local.xml b/qpython/src/op/res/layout/activity_local.xml
new file mode 100644
index 00000000..4a03abe2
--- /dev/null
+++ b/qpython/src/op/res/layout/activity_local.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <LinearLayout
+        android:id="@+id/gd_action_bar_host"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:background="@color/colorPrimaryDark"
+        android:orientation="vertical">
+
+        <android.support.design.widget.AppBarLayout
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize">
+
+            <android.support.v7.widget.Toolbar
+                android:id="@+id/toolbar"
+                style="@style/Toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:background="#FF4A4A4A"
+                android:elevation="2dp"
+                app:popupTheme="@style/DefaultBlueToolbar"
+                app:theme="@style/ToolbarTheme">
+
+                <ImageButton
+                    android:id="@+id/switch_btn"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end"
+                    android:background="@null"
+                    android:padding="10dp"
+                    android:src="@drawable/ic_cloud_list"
+                    android:visibility="gone"/>
+
+                <ImageButton
+                    android:id="@+id/refresh"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end"
+                    android:layout_marginEnd="30dp"
+                    android:layout_marginRight="30dp"
+                    android:background="@color/transparency"
+                    android:src="@drawable/ic_library_reinstall"
+                    android:visibility="gone"/>
+
+                <Button
+                    android:id="@+id/explore"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end"
+                    android:textColor="#FFF"
+                    android:background="@color/transparency"
+                    android:text="@string/explorer"
+                    android:visibility="gone"/>
+            </android.support.v7.widget.Toolbar>
+        </android.support.design.widget.AppBarLayout>
+
+        <RelativeLayout
+            xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/colorPrimaryDark">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+                <FrameLayout
+                    android:id="@+id/container"
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="9"/>
+
+                <include
+                    android:id="@+id/vs_save"
+                    layout="@layout/view_stub_save_prompt"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"/>
+            </LinearLayout>
+        </RelativeLayout>
+    </LinearLayout>
+
+
+</layout>
\ No newline at end of file
diff --git a/qpython/src/op/res/values-zh-rCN/strings.xml b/qpython/src/op/res/values-zh-rCN/strings.xml
new file mode 100644
index 00000000..c41af5e6
--- /dev/null
+++ b/qpython/src/op/res/values-zh-rCN/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="sign_in_with_google">使用微信登录</string>
+    <string name="app_name">QPython OP</string>
+</resources>
diff --git a/qpython/src/op/res/values-zh-rTW/strings.xml b/qpython/src/op/res/values-zh-rTW/strings.xml
new file mode 100644
index 00000000..014a5c4a
--- /dev/null
+++ b/qpython/src/op/res/values-zh-rTW/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="sign_in_with_google">使用微信登錄</string>
+    <string name="app_name">Qpython L</string>
+</resources>
\ No newline at end of file
diff --git a/qpython/src/op/res/values/strings.xml b/qpython/src/op/res/values/strings.xml
new file mode 100644
index 00000000..04e7d001
--- /dev/null
+++ b/qpython/src/op/res/values/strings.xml
@@ -0,0 +1,4 @@
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="ExtraTranslation">
+    <string name="sign_in_with_google">Sign in with Wechat</string>
+    <string name="app_name">QPython OP</string>
+</resources>
diff --git a/qpython/src/os/AndroidManifest.xml b/qpython/src/os/AndroidManifest.xml
new file mode 100644
index 00000000..2cf45938
--- /dev/null
+++ b/qpython/src/os/AndroidManifest.xml
@@ -0,0 +1,402 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:tools="http://schemas.android.com/tools"
+          package="org.qpython.qpy">
+
+    <uses-feature
+        android:name="android.hardware.touchscreen"
+        android:required="false"/>
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.CAMERA"/>
+    <uses-permission android:name="android.permission.FLASHLIGHT"/>
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
+    <uses-permission android:name="com.android.vending.BILLING"/>
+    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
+    <uses-permission android:name="com.android.launcher.permission.UNINSTALL_SHORTCUT" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_MEDIA_STORAGE" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+    <uses-permission android:name="android.permission.NFC" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.ACCESS_NOTIFICATION_POLICY" />
+    <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES"/>
+    <uses-permission android:name="net.dinglisch.android.tasker.PERMISSION_RUN_TASKS" />
+    <!-- privacy sensitive permissions -->
+    <uses-permission android:name="android.permission.ACCESS_SUPERUSER" />
+    <uses-permission android:name="android.permission.READ_SMS"/>
+    <uses-permission android:name="android.permission.SEND_SMS" />
+    <uses-permission android:name="android.permission.RECEIVE_SMS"/>
+    <uses-permission android:name="android.permission.WRITE_SMS"/>
+    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+    <uses-permission android:name="android.permission.CALL_PHONE"/>
+    <uses-permission android:name="android.permission.READ_CALL_LOG"/>
+    <uses-permission android:name="android.permission.PROCESS_OUTGOING_CALLS"/>
+    <uses-permission android:name="android.permission.READ_CONTACTS"/>
+    <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+
+    <uses-feature android:name="android.hardware.microphone" android:required="false"/>
+    <uses-feature android:name="android.hardware.telephony" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.flash" android:required="false"/>
+    <uses-feature android:name="android.hardware.screen.landscape" android:required="false"/>
+    <uses-feature android:name="android.hardware.wifi" android:required="false"/>
+    <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
+    <uses-feature android:name="android.hardware.location.gps" android:required="false"/>
+    <uses-feature android:name="android.hardware.location.network" android:required="false"/>
+    <uses-feature android:name="android.hardware.bluetooth" android:required="false"/>
+
+    <uses-feature android:glEsVersion="0x00020000" android:required="false"/>
+
+    <application
+        android:networkSecurityConfig="@xml/network_security_config"
+        android:name="org.qpython.qpy.main.app.App"
+        android:allowBackup="true"
+        android:hardwareAccelerated="true"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:largeHeap="true"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
+        <uses-library android:name="org.apache.http.legacy" android:required="false"/>
+
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_icon"
+            android:resource="@drawable/img_home_logo"/>
+
+        <service android:name=".main.service.QPyService"/>
+        <service android:name="org.qpython.qsl4a.QPyScriptService"/>
+        <service android:name=".main.service.FTPServerService"/>
+        <activity
+            android:name=".main.activity.SignInActivity"
+            android:launchMode="singleTask"/>
+        <activity
+            android:name="org.renpy.android.PythonSDLActivity"
+            android:hardwareAccelerated="true"
+            android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|fontScale|uiMode|orientation"
+            android:launchMode="singleTask"
+            android:process=":python"
+            android:screenOrientation="user"
+            android:theme="@style/AppTheme"
+            android:windowSoftInputMode="stateAlwaysHidden">
+        </activity>
+
+        <activity
+            android:name="org.qpython.qpylib.MPyApi"
+            android:exported="true"
+            android:theme="@style/Theme.AppCompat"/>
+
+        <service
+            android:name="org.qpython.qpylib.MPyService"
+            android:exported="true"
+            tools:ignore="ExportedService"/>
+
+        <activity
+            android:name=".main.activity.SplashActivity"
+            android:theme="@style/FullscreenTheme"
+            >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name="org.qpython.qpy.main.activity.HomeMainActivity"
+            android:launchMode="singleTask">
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcuts"/>
+        </activity>
+
+        <activity
+            android:name="org.qpython.qpy.main.activity.QWebViewActivity"
+            android:label="@string/browser">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW"/>
+
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE"/>
+
+                <data android:mimeType="text/plain"/>
+                <data android:mimeType="image/*"/>
+                <data
+                    android:host="course"
+                    android:path="/"
+                    android:scheme="qpython"/>
+            </intent-filter>
+
+            <!-- Used to handle Chrome then menu then share.-->
+            <intent-filter>
+                <action android:name="android.intent.action.SEND"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <data android:mimeType="text/plain"/>
+                <data android:mimeType="image/*"/>
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".main.activity.CourseActivity"
+            android:configChanges="orientation|screenSize"/>
+        <activity android:name=".main.activity.CourseIndexActivity"/>
+        <activity android:name=".main.activity.GistEditActivity"/>
+        <activity android:name=".main.activity.CodeDetailActivity"/>
+        <activity android:name=".main.activity.CodeShareActivity"/>
+        <activity android:name=".main.activity.UserActivity"/>
+        <activity
+            android:name="org.qpython.qpy.main.activity.SettingActivity"
+            android:theme="@style/AppTheme"/>
+        <activity
+            android:name="org.qpython.qpy.console.TermActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:theme="@style/AppTheme"/>
+        <activity
+            android:name=".main.activity.LogActivity"
+            android:theme="@style/AppTheme"/>
+        <activity
+            android:name=".texteditor.EditorActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:exported="true"
+            android:label="@string/editor">
+            <intent-filter>
+                <!--<action android:name="android.intent.action.SEND"/>-->
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:mimeType="text/*"/>
+                <data android:scheme="file"/>
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="content"/>
+                <data android:host="*"/>
+                <data android:mimeType="*/*"/>
+                <data android:pathPattern=".*\\.txt"/>
+                <data android:pathPattern=".*\\.html"/>
+                <data android:pathPattern=".*\\.css"/>
+                <data android:pathPattern=".*\\.js"/>
+                <data android:pathPattern=".*\\.md"/>
+                <data android:pathPattern=".*\\.php"/>
+                <data android:pathPattern=".*\\.py"/>
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name="org.qpython.qpy.texteditor.TedLocalActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
+        <activity
+            android:name="org.qpython.qpy.texteditor.TedSettingsActivity"
+            android:theme="@style/SettingTheme"
+            android:windowSoftInputMode="stateHidden"/>
+        <activity
+            android:name="org.qpython.qpy.texteditor.TedFontActivity"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
+
+        <activity
+            android:name=".main.activity.LibActivity"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar">
+            <intent-filter>
+                <action android:name="org.qpython.qpy.OPEN_AIPY_FRAGMENT"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name=".main.activity.AboutActivity"/>
+
+        <activity
+            android:name=".main.activity.AppListActivity"
+            android:exported="true"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar">
+        </activity>
+        <activity
+            android:name="org.swiftp.gui.ServerPreferenceActivity"
+            android:label="Preferences"/>
+        <activity android:name=".texteditor.MFTPSettingActivity"/>
+        <activity android:name=".main.activity.PurchaseActivity"/>
+
+        <activity-alias
+            android:name="TermInternal"
+            android:exported="false"
+            android:targetActivity="org.qpython.qpy.console.TermActivity"
+            android:theme="@style/ConsoleTheme">
+            <intent-filter>
+                <action android:name="jackpal.androidterm.private.OPEN_NEW_WINDOW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="jackpal.androidterm.private.SWITCH_WINDOW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity-alias>
+        <activity
+            android:name="org.qpython.qpy.console.RemoteInterface"
+            android:excludeFromRecents="true"
+            android:theme="@style/ConsoleTheme">
+            <intent-filter>
+                <action android:name="jackpal.androidterm.OPEN_NEW_WINDOW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+        <activity-alias
+            android:name="TermHere"
+            android:exported="true"
+            android:label="@string/activity_term_here_title"
+            android:targetActivity="org.qpython.qpy.console.RemoteInterface"
+            android:theme="@style/ConsoleTheme">
+        </activity-alias>
+
+        <activity
+            android:name="org.qpython.qsl4a.qsl4a.activity.FutureActivity"
+            android:label="QSL4A FutureActivity"
+            android:theme="@style/AppTheme">
+            <intent-filter>
+                <action android:name="android.nfc.action.NDEF_DISCOVERED"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <data android:mimeType="application/com.hipipal.qpy.nfc"/>
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name="org.qpython.qpy.console.RunScript"
+            android:excludeFromRecents="true"
+            android:permission="jackpal.androidterm.permission.RUN_SCRIPT"
+            android:theme="@style/ConsoleTheme">
+            <intent-filter>
+                <action android:name="jackpal.androidterm.RUN_SCRIPT"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="org.qpython.qpy.console.RunShortcut"
+            android:excludeFromRecents="true"
+            android:theme="@style/ConsoleTheme">
+            <intent-filter>
+                <action android:name="jackpal.androidterm.RUN_SHORTCUT"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="org.qpython.qpy.console.TermPreferences"
+            android:label="@string/preferences"
+            android:theme="@style/ConsoleTheme"/>
+        <activity
+            android:name="org.qpython.qpy.console.WindowList"
+            android:label="@string/window_list"
+            android:theme="@style/ConsoleTheme"/>
+        <activity
+            android:name="org.qpython.qpy.console.shortcuts.AddShortcut"
+            android:configChanges="orientation|keyboard|keyboardHidden"
+            android:label="@string/activity_shortcut_create"
+            android:launchMode="singleTop"
+            android:theme="@style/Theme.AppCompat">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.CREATE_SHORTCUT"/>
+            </intent-filter>
+            <intent-filter>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <data android:mimeType="text/*"/>
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="org.qpython.qpy.console.shortcuts.FSNavigator"
+            android:configChanges="orientation|keyboardHidden"
+            android:exported="true"
+            android:label="@string/addshortcut_button_find_command"
+            android:launchMode="singleTop"
+            android:theme="@style/ConsoleTheme">
+            <intent-filter>
+                <action android:name="android.intent.action.PICK"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.GET_CONTENT"/>
+
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.OPENABLE"/>
+
+                <data android:mimeType="*/*"/>
+            </intent-filter>
+        </activity>
+
+        <activity android:name="org.qpython.qpy.plugin.activity.PluginManagerActivity"/>
+        <activity android:name="org.qpython.qpy.plugin.activity.LocalPluginInstallActivity"/>
+
+        <!--zxing-->
+        <activity android:name="org.qpython.qpy.main.activity.QrCodeActivity"/>
+        <activity
+            android:name=".main.activity.GistActivity"
+            android:configChanges="orientation"
+            android:launchMode="singleTask"/>
+        <activity
+            android:name=".main.activity.GistDetailActivity"
+            android:configChanges="orientation"/>
+        <activity
+            android:name=".main.activity.MyGistActivity"
+            android:configChanges="orientation"/>
+        <!--SERVICE-->
+        <service android:name="org.qpython.qpy.console.TermService"
+                 tools:ignore="ExportedService">
+            <intent-filter>
+                <action android:name="jackpal.androidterm.action.START_TERM.v1"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </service>
+
+        <activity android:name=".main.activity.CourseIndexFundingActivity"/>
+        <activity android:name=".main.activity.FundingPurchaseActivity"/>
+        <activity
+            android:name=".main.activity.NotebookActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:launchMode="singleTask"
+            android:windowSoftInputMode="adjustResize"
+            android:exported="true">
+            <intent-filter >
+                <action android:name="android.intent.action.VIEW"/>
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".main.activity.NotebookListActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"/>
+
+        <service
+            android:name=".main.service.MyFirebaseMessagingService"
+            tools:ignore="ExportedService">
+            <intent-filter>
+                <action android:name="com.google.firebase.MESSAGING_EVENT"/>
+            </intent-filter>
+        </service>
+        <service
+            android:name=".main.service.MyFirebaseInstanceIDService"
+            tools:ignore="ExportedService">
+            <intent-filter>
+                <action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
+            </intent-filter>
+        </service>
+    </application>
+
+    <meta-data
+        android:name="com.sec.android.support.multiwindow"
+        android:value="true"/>
+
+</manifest>
diff --git a/qpython/src/os/java/org/qpython/qpy/codeshare/ShareCodeUtil.java b/qpython/src/os/java/org/qpython/qpy/codeshare/ShareCodeUtil.java
new file mode 100644
index 00000000..3841e9a9
--- /dev/null
+++ b/qpython/src/os/java/org/qpython/qpy/codeshare/ShareCodeUtil.java
@@ -0,0 +1,743 @@
+package org.qpython.qpy.codeshare;
+
+import android.app.Activity;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+import android.util.Log;
+import android.widget.Toast;
+
+import com.google.firebase.database.DataSnapshot;
+import com.google.firebase.database.DatabaseError;
+import com.google.firebase.database.DatabaseReference;
+import com.google.firebase.database.FirebaseDatabase;
+import com.google.firebase.database.ValueEventListener;
+import com.google.gson.reflect.TypeToken;
+import com.quseit.util.ACache;
+import com.quseit.util.FileHelper;
+import com.quseit.util.NetStateUtil;
+
+import org.json.JSONObject;
+import org.qpython.qpy.R;
+import org.qpython.qpy.codeshare.pojo.BookmarkerList;
+import org.qpython.qpy.codeshare.pojo.CloudFile;
+import org.qpython.qpy.codeshare.pojo.Gist;
+import org.qpython.qpy.codeshare.pojo.GistBase;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.CONF;
+import org.qpython.qpy.texteditor.common.TextFileUtils;
+import org.qpython.qpysdk.utils.DateTimeHelper;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import rx.Observable;
+import rx.functions.Action1;
+
+import static org.qpython.qpy.codeshare.CONSTANT.DOT_REPLACE;
+import static org.qpython.qpy.codeshare.CONSTANT.SLASH_REPLACE;
+import static org.qpython.qpy.main.server.CacheKey.CLOUD_FILE;
+
+/**
+ * FireBase database util
+ * Created by Hmei on 2017-08-10.
+ */
+
+public class ShareCodeUtil {
+    private static final boolean CLEAR = false;
+
+    private static final String CLOUD        = "cloud";
+    private static final String GIST         = "gist";
+    private static final String USER         = "user";
+    private static final String BASE         = "base";
+    private static final String GIST_LIST    = "gist_list";
+    private static final String HISTORY      = "history";
+    private static final String COMMENT      = "comment";
+    private static final String BOOKMARK     = "bookmark";
+    private static final String COMMIT       = "commit";
+    private static final String INDEX        = "index";
+    private static final String USAGE        = "usage";
+    private static final String PROJECT      = "project";
+    private static final String SCRIPT       = "script";
+    private static final String OTHER        = "other";
+    private static final String PROJECT_PATH = "/projects/";
+    private static final String SCRIPTS_PATH = "/scripts/";
+
+    private static final int MAX_FILE = 100;
+
+    private DatabaseReference reference;
+    private String            email;
+    private String            userName;
+    private String            avatarUrl;
+
+    private SharedPreferences sharedPreferences;
+    private int currentFileCount = -1;
+
+    private ShareCodeUtil() {
+        reference = FirebaseDatabase.getInstance().getReference();
+        if (App.getUser() != null) {
+            email = App.getUser().getEmail().replace(".", "_");
+            userName = App.getUser().getUserName();
+            avatarUrl = App.getUser().getAvatarUrl();
+            sharedPreferences = PreferenceManager.getDefaultSharedPreferences(App.getContext());
+            initUsage(null);
+        } else {
+            email = "";
+            userName = "";
+            avatarUrl = "";
+        }
+        //LogUtil.d("ShareCodeUtil", "ShareCodeUtil:"+App.getUser().getEmail());
+
+        Log.d("ShareCodeUtil", "ShareCodeUtil:"+email);
+    }
+
+    public static ShareCodeUtil getInstance() {
+        return ShareCodeHolder.INSTANCE;
+    }
+
+    @SuppressWarnings({"DEBUG_ONLY"})
+    public void clearAll() {
+        if (CLEAR) {
+            reference.child(CLOUD).child(email).removeValue(
+                    (databaseError, databaseReference) ->
+                            Toast.makeText(App.getContext(), "Clear", Toast.LENGTH_SHORT).show());
+        }
+    }
+
+    public void createScriptGist(String title, String desc, String msg, String content, DatabaseReference.CompletionListener listener) {
+        String date = DateTimeHelper.getDate();
+        // Add to all gist repo
+        Gist gist = new Gist();
+        gist.setTitle(title);
+        gist.setAuthor(userName);
+        gist.setAvatar(avatarUrl);
+        gist.setDescribe(desc);
+        gist.setDate(date);
+        DatabaseReference path = reference.child(GIST).child(SCRIPT).push();// gist/script/<gist_id>
+        String gistId = path.getKey();
+        path.setValue(gist, listener);
+        commitGist(gistId, msg, content, null, null);
+
+        // Add to user repo
+        GistBase baseGist = new GistBase();
+        baseGist.setAuthor(userName);
+        baseGist.setAvatar(avatarUrl);
+        baseGist.setDate(date);
+        baseGist.setTitle(title);
+        reference.child(USER).child(email).child(GIST_LIST).child(SCRIPT).child(gistId).setValue(baseGist);// user/<email>/gist_list/script/<gist_id>
+
+        // Add to base repo
+        reference.child(BASE).child(SCRIPT).child(gistId).setValue(baseGist); // base/script/<gist_id>
+    }
+
+    public void createProjectGist(String projectName, String desc, String msg, List<String> paths, DatabaseReference.CompletionListener completionListener) {
+        for (String path : paths) {
+            File file = new File(path);
+            String code = TextFileUtils.readTextFile(file);
+            String fileName = file.getName().replace(".", DOT_REPLACE);
+
+            String date = DateTimeHelper.getDate();
+            // Add to all gist repo
+            Gist gist = new Gist();
+            gist.setTitle(fileName);
+            gist.setAuthor(userName);
+            gist.setAvatar(avatarUrl);
+            gist.setDescribe(desc);
+            gist.setDate(date);
+            DatabaseReference subReference = reference.child(GIST).child(PROJECT);// gist/script/<gist_id>
+            String gistId = subReference.getKey();
+            subReference.child(gistId).child(projectName).child(fileName).setValue(gist, completionListener);// gist/project/<gist_id>/<projectName>/<fileName>
+            commitGist(gistId, msg, code, projectName, fileName);
+
+            // Add to user repo
+            GistBase baseGist = new GistBase();
+            baseGist.setAuthor(userName);
+            baseGist.setAuthor(avatarUrl);
+            baseGist.setDate(date);
+            baseGist.setTitle(fileName);
+            // user/<email>/gist_list/project/<gist_id>/<projectName>/<fileName>
+            reference.child(USER).child(email).child(GIST_LIST).child(PROJECT).child(gistId).child(projectName).child(fileName).setValue(baseGist);
+
+            // Add to base repo
+            // base/project/<gist_id>/<projectName>/<fileName>
+            reference.child(BASE).child(PROJECT).child(gistId).child(projectName).child(fileName).setValue(baseGist);
+        }
+    }
+
+    public void commitGist(String gistId, String msg, String content, String projName, String fileName) {
+        Gist.HistoryBean historyBean = new Gist.HistoryBean();
+        historyBean.setData(DateTimeHelper.getDate());
+        historyBean.setMassage(msg);
+        historyBean.setContent(content);
+        if (projName != null) {
+            DatabaseReference subRe = reference.child(GIST).child(PROJECT).child(gistId).child(projName).child(fileName).child(HISTORY).push();
+            String historyId = subRe.getKey();
+            subRe.child(historyId).setValue(historyBean); // gist/<gist_id>/history/<historyId>}
+        } else {
+            DatabaseReference subRe = reference.child(GIST).child(SCRIPT).child(gistId).child(HISTORY).push();
+            String historyId = subRe.getKey();
+            subRe.child(historyId).setValue(historyBean); // gist/<gist_id>/history/<historyId>}
+            reference.child(GIST).child(SCRIPT).child(gistId).child("lastCommitCode").setValue(content);
+        }
+    }
+
+    public void sendComment(String gistId, String comment, boolean isProj, CommentCallback callback) {
+        sendComment(gistId, "", comment, "", isProj, callback);
+    }
+
+    /**
+     * @param comment   评论
+     * @param reComment 被回复的评论
+     */
+    public void sendComment(String gistId, String to, String comment, String reComment, boolean isProj, CommentCallback callback) {
+        Gist.CommentBean commentBean = new Gist.CommentBean();
+        commentBean.setFrom_content(comment);
+        commentBean.setData(DateTimeHelper.getDate());
+        commentBean.setFrom(userName);
+        commentBean.setAvatar(avatarUrl);
+        commentBean.setRe(to);
+        commentBean.setRe_content(reComment);
+        callback.commentBean(commentBean);
+        DatabaseReference subRe = reference.child(GIST).child(isProj ? PROJECT : SCRIPT).child(gistId).child(COMMENT).push();
+        String commentId = subRe.getKey();
+        subRe.child(commentId).setValue(commentBean);
+    }
+
+    public void bookmark(String gistId) {
+        reference.child(GIST).child(gistId).child(BOOKMARK).child(email).setValue(userName);
+        reference.child(USER).child(email).child(BOOKMARK).child(gistId).setValue(true);
+    }
+
+    public void cancelBookmark(String gistId) {
+        reference.child(GIST).child(gistId).child(BOOKMARK).child(email).removeValue();
+        reference.child(USER).child(email).child(BOOKMARK).child(gistId).removeValue();
+    }
+
+    public void getBaseScriptGistList(Action1<List<GistBase>> callback) {
+        reference.child(BASE).child(SCRIPT).addListenerForSingleValueEvent(new SimpleValueEventListener() {
+            @Override
+            public void onDataGet(HashMap value) {
+                List<GistBase> dataList = new ArrayList<>();
+                for (Object key : value.keySet()) {
+                    GistBase gistBase = App.getGson().fromJson(new JSONObject((Map) value.get(key)).toString(), GistBase.class);
+                    gistBase.setId((String) key);
+                    dataList.add(gistBase);
+                }
+                Observable.just(dataList)
+                        .subscribe(callback);
+            }
+        });
+    }
+
+    public void getBaseProjectGistList(Action1<List<GistBase>> callback) {
+        reference.child(BASE).child(PROJECT).addListenerForSingleValueEvent(new SimpleValueEventListener() {
+            @Override
+            public void onDataGet(HashMap value) {
+                List<GistBase> dataList = new ArrayList<>();
+                for (Object key : value.keySet()) {
+                    GistBase gistBase = App.getGson().fromJson(new JSONObject((Map) value.get(key)).toString(), GistBase.class);
+                    gistBase.setId((String) key);
+                    dataList.add(gistBase);
+                }
+                Observable.just(dataList)
+                        .subscribe(callback);
+            }
+        });
+    }
+
+    public void getGistDetail(String gistId, boolean isProj, Action1<Gist> callback) {
+        reference.child(GIST).child(isProj ? PROJECT : SCRIPT).child(gistId).addListenerForSingleValueEvent(new SimpleValueEventListener() {
+            @Override
+            public void onDataGet(HashMap value) {
+                JSONObject jsonObject = new JSONObject(value);
+                Gist gist = App.getGson().fromJson(String.valueOf(jsonObject), Gist.class);
+
+                HashMap historyMap = (HashMap) value.get(HISTORY);
+                if (historyMap != null) {
+                    List<Gist.HistoryBean> historyList = new ArrayList<>();
+                    for (Object historyKey : historyMap.keySet()) {
+                        Gist.HistoryBean historyBean = App.getGson().fromJson(String.valueOf(new JSONObject((Map) historyMap.get(historyKey))), Gist.HistoryBean.class);
+                        historyBean.setHistoryId((String) historyKey);
+                        historyList.add(historyBean);
+                    }
+                    gist.setHistory(historyList);
+                }
+
+                HashMap commentMap = (HashMap) value.get(COMMENT);
+                if (commentMap != null) {
+                    List<Gist.CommentBean> commentList = new ArrayList<>();
+                    for (Object commentKey : commentMap.keySet()) {
+                        Gist.CommentBean commentBean = App.getGson().fromJson(String.valueOf(new JSONObject((Map) commentMap.get(commentKey))), Gist.CommentBean.class);
+                        commentBean.setId((String) commentKey);
+                        commentList.add(commentBean);
+                    }
+                    gist.setComment(commentList);
+                }
+
+                HashMap bookmarkMap = (HashMap) value.get(BOOKMARK);
+                if (bookmarkMap != null) {
+                    List<Gist.BookmarkerBean> bookmarkerList = new ArrayList<>();
+                    for (Object bookmarkKey : bookmarkMap.keySet()) {
+                        Gist.BookmarkerBean bookmarkerBean = App.getGson().fromJson(String.valueOf(new JSONObject((Map) bookmarkMap.get(bookmarkKey))), Gist.BookmarkerBean.class);
+                        bookmarkerBean.setId((String) bookmarkKey);
+                        bookmarkerList.add(bookmarkerBean);
+                    }
+                    gist.setBookmarker(bookmarkerList);
+                }
+                Observable.just(gist)
+                        .subscribe(callback);
+            }
+        });
+    }
+
+    // TODO: 2017-08-14 Need to fix
+    public void getMyGistList(Action1<List<GistBase>> callback) {
+        reference.child(USER).child(GIST_LIST).addListenerForSingleValueEvent(new ValueEventListener() {
+            @Override
+            public void onDataChange(DataSnapshot dataSnapshot) {
+                HashMap object = (HashMap) dataSnapshot.getValue();
+                List<GistBase> userGist = new ArrayList<>();
+                if (object == null) {
+                    return;
+                }
+                for (Object key : object.keySet()) {
+                    userGist.add(App.getGson().fromJson(new JSONObject((Map) object.get(key)).toString(), GistBase.class));
+                }
+                Observable.just(userGist)
+                        .subscribe(callback);
+            }
+
+            @Override
+            public void onCancelled(DatabaseError databaseError) {
+
+            }
+        });
+    }
+
+    public void getMyBookmarkList(Action1<List<BookmarkerList>> callback) {
+        reference.child(USER).child(BOOKMARK).addListenerForSingleValueEvent(new ValueEventListener() {
+            @Override
+            public void onDataChange(DataSnapshot dataSnapshot) {
+                HashMap object = (HashMap) dataSnapshot.getValue();
+                List<BookmarkerList> userGist = new ArrayList<>();
+                if (object == null) {
+                    return;
+                }
+                for (Object key : object.keySet()) {
+                    userGist.add(App.getGson().fromJson(new JSONObject((Map) object.get(key)).toString(), BookmarkerList.class));
+                }
+                Observable.just(userGist)
+                        .subscribe(callback);
+            }
+
+            @Override
+            public void onCancelled(DatabaseError databaseError) {
+
+            }
+        });
+    }
+
+    public void getGistCommentList(String gistId, Action1<List<Gist.CommentBean>> callback) {
+        reference.child(GIST).child(gistId).child(COMMENT).addListenerForSingleValueEvent(new ValueEventListener() {
+            @Override
+            public void onDataChange(DataSnapshot dataSnapshot) {
+                HashMap object = (HashMap) dataSnapshot.getValue();
+                List<Gist.CommentBean> commentList = new ArrayList<>();
+                if (object == null) {
+                    return;
+                }
+                for (Object key : object.keySet()) {
+                    commentList.add(App.getGson().fromJson(new JSONObject((Map) object.get(key)).toString(), Gist.CommentBean.class));
+                }
+                Observable.just(commentList)
+                        .subscribe(callback);
+            }
+
+            @Override
+            public void onCancelled(DatabaseError databaseError) {
+
+            }
+        });
+    }
+
+    public boolean uploadFolder(String path, DatabaseReference.CompletionListener completionListener, int[] size) {
+        File folder = new File(path);
+        // 获取该文件夹下符合后缀文件及非隐藏文件
+
+        if (!folder.isDirectory()) {
+            return false;
+        }
+        List<File> files = FileHelper.filterExt(folder, App.getContext().getResources().getStringArray(R.array.support_file_ext), size[0]);
+        if (files.size() == 0) {
+            Toast.makeText(App.getContext(), R.string.no_file, Toast.LENGTH_SHORT).show();
+            return false;
+        }
+
+        if (!hasSpace(files.size())) {
+            return false;
+        }
+
+        for (File file : files) {
+            uploadFile(file.getAbsolutePath(), completionListener);
+        }
+
+//        // 如果在project目录下
+//        if ("projects".equals(folder.getName())) {
+//            DatabaseReference projNode = reference.child(CLOUD).child(email).child(PROJECT).child(folder.getName().replace(".", DOT_REPLACE));
+//            for (int i = 0; i < files.size(); i++) {
+//                String date = DateTimeHelper.AGO_FULL_DATE_FORMATTER.format(new Date(files.get(i).lastModified()));
+//                String subPath = files.get(i).getAbsolutePath();
+//                String subKey = subPath.substring(subPath.indexOf(folder.getName()) + folder.getName().length(), subPath.length()).replace(".", DOT_REPLACE).replace("/", SLASH_REPLACE);
+//                if (i == files.size() - 1) {
+//                    projNode.child(subKey)
+//                            .child(date)
+//                            .setValue(TextFileUtils.readTextFile(files.get(i)), completionListener);
+//                } else {
+//                    projNode.child(subKey)
+//                            .child(date)
+//                            .setValue(TextFileUtils.readTextFile(files.get(i)));
+//                }
+//                reference.child(CLOUD)
+//                        .child(email)
+//                        .child(INDEX)
+//                        .child(PROJECT)
+//                        .child(folder.getName().replace(".", DOT_REPLACE) + subKey)
+//                        .setValue(date);
+//            }
+//        } else if ("scripts".equals(folder.getName())) {
+//            // 上传整个scripts文件夹
+//            for (int i = 0; i < files.size(); i++) {
+//                String abs_path = files.get(i).getAbsolutePath();
+//                String key = abs_path
+//                        .substring(abs_path.indexOf(SCRIPTS_PATH) + SCRIPTS_PATH.length())
+//                        .replace(".", DOT_REPLACE)
+//                        .replace("/", SLASH_REPLACE);
+//                DatabaseReference content = reference.child(CLOUD)
+//                        .child(email)
+//                        .child(SCRIPT)
+//                        .child(key)
+//                        .child(DateTimeHelper.AGO_FULL_DATE_FORMATTER.format(new Date(files.get(i).lastModified())));
+//                if (i == files.size() - 1) {
+//                    content.setValue(TextFileUtils.readTextFile(files.get(i)), completionListener);
+//                } else {
+//                    content.setValue(TextFileUtils.readTextFile(files.get(i)));
+//                }
+//
+//                reference.child(CLOUD)
+//                        .child(email)
+//                        .child(INDEX)
+//                        .child(SCRIPT)
+//                        .child(key)
+//                        .setValue(DateTimeHelper.AGO_FULL_DATE_FORMATTER.format(new Date(files.get(i).lastModified())));
+//            }
+//        } else {
+//            // 普通文件夹
+//            int fileListSize = files.size();
+//            for (File file : files) {
+//                fileListSize--;
+//                final String rootNode = "/qpython/";
+//                String node = file.getAbsolutePath().substring(path.indexOf(rootNode) + rootNode.length());
+//                DatabaseReference child =
+//                        reference
+//                                .child(CLOUD)
+//                                .child(email)/*.child(folder.getName().replace(".", DOT_REPLACE))*/
+//                                .child(OTHER)
+//                                .child(node.replace(".", DOT_REPLACE).replace("/", SLASH_REPLACE))
+//                                .child(DateTimeHelper.getDate());
+//                if (fileListSize == 0) {
+//                    child.setValue(TextFileUtils.readTextFile(file), completionListener);
+//                } else {
+//                    child.setValue(TextFileUtils.readTextFile(file));
+//                }
+//
+//                reference.child(CLOUD)
+//                        .child(email)
+//                        .child(INDEX)
+//                        .child(OTHER)
+//                        .child(node.replace(".", DOT_REPLACE).replace("/", SLASH_REPLACE))
+//                        .setValue(DateTimeHelper.getDate());
+//            }
+//        }
+        return true;
+    }
+
+    public boolean uploadFile(String path, DatabaseReference.CompletionListener completionListener) {
+        File file = new File(path);
+
+        if (!hasSpace(1)) {
+            return false;
+        }
+
+        if (path.contains(PROJECT_PATH)) {
+            String subPath = path.substring(path.indexOf(PROJECT_PATH) + PROJECT_PATH.length());
+            String projName = subPath.split("/")[0];
+            reference.child(CLOUD)
+                    .child(email)
+                    .child(PROJECT)
+                    .child(projName)
+                    .child(subPath.replace(".", DOT_REPLACE).replace("/", SLASH_REPLACE).replace(projName, ""))
+                    .child(DateTimeHelper.AGO_FULL_DATE_FORMATTER.format(new Date(file.lastModified())))
+                    .setValue(TextFileUtils.readTextFile(file), completionListener);
+
+            reference.child(CLOUD)
+                    .child(email)
+                    .child(INDEX)
+                    .child(PROJECT)
+                    .child(subPath.replace(".", DOT_REPLACE).replace("/", SLASH_REPLACE))
+                    .setValue(DateTimeHelper.AGO_FULL_DATE_FORMATTER.format(new Date(file.lastModified())));
+        } else if (path.contains(SCRIPTS_PATH)) {
+            reference.child(CLOUD)
+                    .child(email)
+                    .child(SCRIPT)
+                    .child(file.getName().replace(".", DOT_REPLACE))
+                    .child(DateTimeHelper.AGO_FULL_DATE_FORMATTER.format(new Date(file.lastModified())))
+                    .setValue(TextFileUtils.readTextFile(file), completionListener);
+
+            reference.child(CLOUD)
+                    .child(email)
+                    .child(INDEX)
+                    .child(SCRIPT)
+                    .child(file.getName().replace(".", DOT_REPLACE))
+                    .setValue(DateTimeHelper.AGO_FULL_DATE_FORMATTER.format(new Date(file.lastModified())));
+        } else {
+            final String rootNode = "/qpython/";
+            String uploadKey = path.substring(path.indexOf(rootNode) + rootNode.length());
+            reference.child(CLOUD)
+                    .child(email)
+                    .child(OTHER)
+                    .child(uploadKey.replace(".", DOT_REPLACE).replace("/", SLASH_REPLACE))
+                    .child(DateTimeHelper.getDate())
+                    .setValue(TextFileUtils.readTextFile(file), completionListener);
+
+            reference.child(CLOUD)
+                    .child(email)
+                    .child(INDEX)
+                    .child(OTHER)
+                    .child(uploadKey.replace(".", DOT_REPLACE).replace("/", SLASH_REPLACE))
+                    .setValue(DateTimeHelper.getDate());
+        }
+        return true;
+    }
+
+    public void getUploadedScripts(boolean forceRefresh, Activity context, Action1<List<CloudFile>> callback) {
+        if (CLEAR) {
+            return;
+        }
+        String content = FileHelper.getFileContents(CONF.CLOUD_MAP_CACHE_PATH);
+        List<CloudFile> cloudFiles = content == null ? null : App.getGson().fromJson(content, new TypeToken<List<CloudFile>>() {
+        }.getType());
+        if (cloudFiles != null && !forceRefresh) {
+            Observable.just(cloudFiles)
+                    .subscribe(callback);
+        } else {
+            email = App.getUser()!=null?App.getUser().getEmail().replace(".","_"):"";
+            if (email.equals("")) {
+                Toast.makeText(context, "Waiting the firebase to initializ...",Toast.LENGTH_SHORT).show();
+
+            } else {
+                reference.child(CLOUD).child(email).child(INDEX).addListenerForSingleValueEvent(new ValueEventListener() {
+                    @Override
+                    public void onDataChange(DataSnapshot dataSnapshot) {
+                        HashMap<String, Object> value = (HashMap<String, Object>) dataSnapshot.getValue();
+                        if (value == null) {
+                            resetUsage(0);
+                            Observable.just(new ArrayList<CloudFile>())
+                                    .subscribe(callback);
+                            return;
+                        }
+                        List<CloudFile> cloudFiles = new ArrayList<>();
+                        for (String node : value.keySet()) {
+                            switch (node) {
+                                case SCRIPT:
+                                    HashMap<String, Object> script;
+                                    script = (HashMap<String, Object>) value.get(SCRIPT);
+                                    for (String o : script.keySet()) {
+                                        CloudFile cloudFile = new CloudFile();
+                                        cloudFile.setName(o);
+                                        cloudFile.setKey(SCRIPT + "/" + o);
+                                        cloudFile.setPath(SCRIPTS_PATH);
+                                        cloudFile.setUploadTime((String) script.get(o));
+                                        cloudFiles.add(cloudFile);
+                                    }
+                                    break;
+                                case PROJECT:
+                                    HashMap<String, Object> project = (HashMap<String, Object>) value.get(PROJECT);
+                                    for (String s : project.keySet()) {
+                                        CloudFile cloudFile = new CloudFile();
+                                        cloudFile.setKey(PROJECT + "/" + s);
+                                        String[] nodes = s.split(SLASH_REPLACE);
+                                        cloudFile.setName(nodes[nodes.length - 1]);
+                                        cloudFile.setProjectName(nodes[0]);
+                                        cloudFile.setPath(s.replace(nodes[0], ""));
+                                        cloudFile.setUploadTime((String) project.get(s));
+                                        cloudFiles.add(cloudFile);
+                                    }
+                                    break;
+                                default:
+                                    HashMap<String, Object> other = (HashMap<String, Object>) value.get(OTHER);
+                                    for (String s : other.keySet()) {
+                                        CloudFile cloudFile = new CloudFile();
+                                        cloudFile.setPath(s);
+                                        cloudFile.setKey(OTHER + "/" + s);
+                                        String[] nodes = s.split(SLASH_REPLACE);
+                                        boolean index = false;
+                                        for (String node1 : nodes) {
+                                            if (index) {
+                                                cloudFile.setProjectName(node1);
+                                                break;
+                                            } else if (node1.equals("projects3")) {
+                                                index = true;
+                                            }
+                                        }
+                                        cloudFile.setName(nodes[nodes.length - 1]);
+                                        cloudFile.setUploadTime((String) other.get(s));
+                                        cloudFiles.add(cloudFile);
+                                    }
+                                    break;
+                            }
+                        }
+                        resetUsage(cloudFiles.size());
+                        Observable.just(cloudFiles)
+                                .subscribe(callback);
+                        ACache.get(context).put(CLOUD_FILE, App.getGson().toJson(cloudFiles));
+
+                    }
+
+                    @Override
+                    public void onCancelled(DatabaseError databaseError) {
+
+                    }
+                });
+            }
+        }
+    }
+
+    public void getFileContent(String path, Action1<String> callback) {
+        reference.child(CLOUD)
+                .child(email)
+                .child(path)
+                .addListenerForSingleValueEvent(new ValueEventListener() {
+                    @Override
+                    public void onDataChange(DataSnapshot dataSnapshot) {
+                        HashMap<String, String> dateContent = (HashMap<String, String>) dataSnapshot.getValue();
+                        String latest = "";
+                        for (String s : dateContent.keySet()) {
+                            latest = DateTimeHelper.isLater(s, latest) ? s : latest;
+                        }
+
+                        Observable.just(dateContent.get(latest))
+                                .subscribe(callback);
+                    }
+
+                    @Override
+                    public void onCancelled(DatabaseError databaseError) {
+
+                    }
+                });
+    }
+
+    public void deleteUploadScript(CloudFile cloudFile, DatabaseReference.CompletionListener listener) {
+        reference.child(CLOUD)
+                .child(email)
+                .child(cloudFile.getKey())
+                .removeValue(listener);
+        reference.child(CLOUD)
+                .child(email)
+                .child(INDEX)
+                .child(cloudFile.getKey())
+                .removeValue();
+        changeUsage(-1);
+    }
+
+    public void initUsage(Action1<Integer> callback) {
+        if (CLEAR) {
+            return;
+        }
+        if (currentFileCount == -1) {
+            if (NetStateUtil.isConnected(App.getContext())) {
+                reference.child(CLOUD)
+                        .child(email)
+                        .child(USAGE)
+                        .addListenerForSingleValueEvent(new ValueEventListener() {
+                            @Override
+                            public void onDataChange(DataSnapshot dataSnapshot) {
+                                if (dataSnapshot.getValue() != null) {
+                                    currentFileCount = ((Long) dataSnapshot.getValue()).intValue();
+                                } else {
+                                    currentFileCount = 0;
+                                }
+                                if (callback != null) {
+                                    Observable.just(currentFileCount)
+                                            .subscribe(callback);
+                                }
+                            }
+
+                            @Override
+                            public void onCancelled(DatabaseError databaseError) {
+
+                            }
+                        });
+            }
+        } else {
+            callback.call(currentFileCount);
+        }
+    }
+
+    public int changeUsage(int change) {
+        currentFileCount += change;
+        reference.child(CLOUD)
+                .child(email)
+                .child(USAGE)
+                .setValue(currentFileCount);
+        return currentFileCount;
+    }
+
+    public void resetUsage(int value) {
+        currentFileCount = value;
+        reference.child(CLOUD)
+                .child(email)
+                .child(USAGE)
+                .setValue(currentFileCount);
+    }
+
+    private boolean hasSpace(int waiting) {
+        if (currentFileCount < 0) {
+            Toast.makeText(App.getContext(), R.string.usage_not_init, Toast.LENGTH_SHORT).show();
+            return false;
+        } else if (currentFileCount + waiting > MAX_FILE) {
+            Toast.makeText(App.getContext(), R.string.no_space, Toast.LENGTH_SHORT).show();
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+    public interface CommentCallback {
+        void commentBean(Gist.CommentBean comment);
+    }
+
+    private static class ShareCodeHolder {
+        private static final ShareCodeUtil INSTANCE = new ShareCodeUtil();
+    }
+
+    abstract class SimpleValueEventListener implements ValueEventListener {
+        @Override
+        public void onDataChange(DataSnapshot dataSnapshot) {
+            HashMap<String, Object> object = (HashMap<String, Object>) dataSnapshot.getValue();
+            if (object == null) {
+                return;
+            }
+            onDataGet(object);
+        }
+
+        @Override
+        public void onCancelled(DatabaseError databaseError) {
+
+        }
+
+        public abstract void onDataGet(HashMap<String, Object> value);
+    }
+}
\ No newline at end of file
diff --git a/qpython/src/os/java/org/qpython/qpy/codeshare/pojo/CloudFile.java b/qpython/src/os/java/org/qpython/qpy/codeshare/pojo/CloudFile.java
new file mode 100644
index 00000000..09a9471c
--- /dev/null
+++ b/qpython/src/os/java/org/qpython/qpy/codeshare/pojo/CloudFile.java
@@ -0,0 +1,97 @@
+package org.qpython.qpy.codeshare.pojo;
+
+
+import org.qpython.qpy.codeshare.CONSTANT;
+import org.qpython.qpysdk.QPyConstants;
+
+import java.io.Serializable;
+
+public class CloudFile implements Serializable {
+    private String  projectName;
+    private String  path;
+    private String  uploadTime;
+    private String  name;
+    private String  content;
+    private String  key;
+    private boolean uploading;
+
+    public String getPath() {
+        if (projectName == null) {
+            if (path.contains("scripts3")) {
+                return "/" + path.replace(CONSTANT.SLASH_REPLACE, "/").replace(CONSTANT.DOT_REPLACE, ".");
+            } else if (path.contains("scripts")) {
+                return path.replace(CONSTANT.SLASH_REPLACE, "/") + getName();
+            } else {
+                return "/" + path.replace(CONSTANT.SLASH_REPLACE, "/").replace(CONSTANT.DOT_REPLACE, ".");
+            }
+        } else {
+            String projNode = path.contains("projects3") ? "projects3/" : "projects/";
+            return "/" + projNode + getProjectName() + path
+                    .replace(CONSTANT.SLASH_REPLACE, "/")
+                    .replace(CONSTANT.DOT_REPLACE, ".")
+                    .replace(projNode, "")
+                    .replace(getProjectName(), "");
+        }
+    }
+
+    public void setPath(String path) {
+        this.path = path;
+    }
+
+    public String getUploadTime() {
+        return uploadTime;
+    }
+
+    public void setUploadTime(String uploadTime) {
+        this.uploadTime = uploadTime;
+    }
+
+    public String getName() {
+        return name.replace(CONSTANT.DOT_REPLACE, ".");
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public long getContentSize() {
+        return content == null ? 0 : content.length();
+    }
+
+    public String getProjectName() {
+        return projectName == null ? null : projectName.
+                replace(CONSTANT.SLASH_REPLACE, "/").replace(CONSTANT.DOT_REPLACE, ".");
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public boolean isUploading() {
+        return uploading;
+    }
+
+    public void setUploading(boolean uploading) {
+        this.uploading = uploading;
+    }
+
+    public String getKey() {
+        return key == null ? getName().replace(".", CONSTANT.DOT_REPLACE) : key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getAbsolutePath() {
+        return QPyConstants.ABSOLUTE_PATH + getPath();
+    }
+}
diff --git a/qpython/src/os/java/org/qpython/qpy/main/PayActivity.java b/qpython/src/os/java/org/qpython/qpy/main/PayActivity.java
new file mode 100644
index 00000000..c1a7b8d2
--- /dev/null
+++ b/qpython/src/os/java/org/qpython/qpy/main/PayActivity.java
@@ -0,0 +1,188 @@
+package org.qpython.qpy.main;
+
+import android.app.PendingIntent;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentSender;
+import android.content.ServiceConnection;
+import android.os.Bundle;
+import android.os.IBinder;
+import android.os.RemoteException;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.GridLayoutManager;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.Toast;
+
+import com.android.vending.billing.IInAppBillingService;
+import com.quseit.util.ImageUtil;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.qpython.qpy.R;
+import org.qpython.qpy.main.activity.PurchaseActivity;
+import org.qpython.qpy.main.server.MySubscriber;
+import org.qpython.qpy.main.widget.GridSpace;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import rx.Observable;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+/**
+ * Created by Hmei
+ * 1/30/18.
+ */
+
+public class PayActivity extends AppCompatActivity {
+    public static final int BUY_REQUEST_CODE = 2333;
+    private IInAppBillingService   mService;
+    private ServiceConnection      mServiceConn;
+    private ArrayList<String>      skuList;
+    private MySubscriber<String[]> callback;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+
+    void initIAB(ArrayList<String> skuList, MySubscriber<String[]> callback) {
+        this.skuList = skuList;
+        this.callback = callback;
+        mServiceConn = new ServiceConnection() {
+            @Override
+            public void onServiceDisconnected(ComponentName name) {
+                mService = null;
+            }
+
+            @Override
+            public void onServiceConnected(ComponentName name,
+                                           IBinder service) {
+                mService = IInAppBillingService.Stub.asInterface(service);
+                getPrices(skuList, callback);
+            }
+        };
+
+        Intent serviceIntent = new Intent("com.android.vending.billing.InAppBillingService.BIND");
+        serviceIntent.setPackage("com.android.vending");
+        bindService(serviceIntent, mServiceConn, Context.BIND_AUTO_CREATE);
+    }
+
+    /**
+     * 从Google服务器获取不同国家价格表并显示
+     */
+    private void getPrices(ArrayList<String> skuList, MySubscriber<String[]> callback) {
+        if (mService == null) {
+            Toast.makeText(this, R.string.lose_google_server, Toast.LENGTH_SHORT).show();
+            if (findViewById(R.id.pb) != null) findViewById(R.id.pb).setVisibility(View.GONE);
+            return;
+        }
+//        ArrayList<String> skuList;
+//        if (!isCrowdFunding) {
+//            skuList = new ArrayList<>(Arrays.asList(getResources().getStringArray(R.array.sku)));
+//        } else {
+//            skuList = new ArrayList<>(Arrays.asList(getResources().getStringArray(R.array.crowdfunding)));
+//            int index = (int) (getIntent().getIntExtra(PERCENT, 0) / 100.00 * 4);
+//            String sku = skuList.get(index);
+//            skuList.clear();
+//            skuList.add(sku);
+//        }
+        Bundle querySkus = new Bundle();
+        querySkus.putStringArrayList("ITEM_ID_LIST", skuList);
+        try {
+            Observable.just(mService.getSkuDetails(3, getPackageName(), "inapp", querySkus))
+                    .map(bundle -> {
+                                ArrayList<String> responseList = bundle.getStringArrayList("DETAILS_LIST");
+                                if (responseList == null) {
+                                    return null;
+                                }
+                                String[] prices = new String[responseList.size()];
+                                for (int i = 0; i < responseList.size(); i++) {
+                                    JSONObject object;
+                                    try {
+                                        object = new JSONObject(responseList.get(i));
+                                        String price = object.getString("price");
+                                        prices[i] = price;
+                                    } catch (JSONException e) {
+                                        e.printStackTrace();
+                                    }
+                                }
+                                Arrays.sort(prices, (o1, o2) -> Integer.parseInt(o1.replaceAll("[^0-9]", "")) - Integer.parseInt(o2.replaceAll("[^0-9]", "")));
+                                return prices;
+                            }
+                    )
+                    .subscribeOn(Schedulers.newThread())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe(callback
+//                            new MySubscriber<String[]>() {
+//                        @Override
+//                        public void onNext(String[] o) {
+//                            super.onNext(o);
+//                            if (o == null) {
+//                                return;
+//                            }
+//                            invalidateData();
+//                            GridSpace gridSpace = new GridSpace(2, (int) ImageUtil.dp2px(16), false);
+//                            binding.list.setLayoutManager(new GridLayoutManager(PurchaseActivity.this, 2));
+//                            binding.list.addItemDecoration(gridSpace);
+//                            binding.list.setAdapter(new PurchaseActivity.ListAdapter(o));
+//                        }
+//                    }
+                    );
+        } catch (RemoteException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void purchase(String sku) {
+//        String[] skus;
+//        if (isCrowdFunding) {
+//            skus = getResources().getStringArray(R.array.crowdfunding);
+//        } else {
+//            skus = getResources().getStringArray(R.array.sku);
+//        }
+        try {
+            if (mService == null) {
+                Toast.makeText(this, R.string.lose_google_server, Toast.LENGTH_SHORT).show();
+                return;
+            }
+            Bundle buyIntentBundle = mService.getBuyIntent(3, getPackageName(),
+                    sku, "inapp", "bGoa+V7g/yqDXvKRqq+JTFn4uQZbPiQJo4pf9RzJ");
+            switch (buyIntentBundle.getInt("RESPONSE_CODE")) {
+                case 0:
+                    //BILLING_RESPONSE_RESULT_OK
+                    PendingIntent pendingIntent = buyIntentBundle.getParcelable("BUY_INTENT");
+                    startIntentSenderForResult(pendingIntent.getIntentSender(),
+                            BUY_REQUEST_CODE, new Intent(), 0, 0, 0);
+                    break;
+
+            }
+        } catch (RemoteException | IntentSender.SendIntentException | NullPointerException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == R.id.refresh_menu) {
+            if (findViewById(R.id.pb) != null) findViewById(R.id.pb).setVisibility(View.VISIBLE);
+            getPrices(skuList, callback);
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        if (mService != null) {
+            unbindService(mServiceConn);
+        }
+    }
+
+}
diff --git a/qpython/src/os/java/org/qpython/qpy/main/activity/BaseActivity.java b/qpython/src/os/java/org/qpython/qpy/main/activity/BaseActivity.java
new file mode 100644
index 00000000..d3e259f8
--- /dev/null
+++ b/qpython/src/os/java/org/qpython/qpy/main/activity/BaseActivity.java
@@ -0,0 +1,301 @@
+package org.qpython.qpy.main.activity;
+
+import android.content.ActivityNotFoundException;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.content.res.Configuration;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Environment;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.app.ActivityCompat;
+import android.support.v4.content.ContextCompat;
+import android.support.v4.util.ArrayMap;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.app.AppCompatActivity;
+import android.widget.ArrayAdapter;
+import android.widget.Toast;
+import android.text.TextUtils;
+
+import com.quseit.util.NAction;
+import com.quseit.util.NUtil;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.console.ShellTermSession;
+import org.qpython.qpy.console.util.TermSettings;
+import org.renpy.android.ResourceManager;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.qpython.qpy.main.server.gist.TokenManager;
+
+public class BaseActivity extends AppCompatActivity {
+    // QPython interfaces
+    private static final int SCRIPT_CONSOLE_CODE = 1237;
+    private static final int PID_INIT_VALUE = -1;
+    private static final int DEFAULT_BUFFER_SIZE = 8192;
+    private static final int LOG_NOTIFICATION_ID = (int) System.currentTimeMillis();
+
+
+    //private FirebaseAnalytics mFirebaseAnalytics;
+    private ArrayList<String> mArguments = new ArrayList<>();
+    private InputStream mIn;
+    private OutputStream mOut;
+    private Map<Integer, PermissionAction> mActionMap = new ArrayMap<>();
+    private TermSettings mSettings;
+    private ShellTermSession session;
+
+    private boolean permissionGrant = true;
+
+    protected static ShellTermSession createTermSession(Context context, TermSettings settings, String initialCommand, String path) {
+        ShellTermSession session = null;
+        try {
+            session = new ShellTermSession(context, settings, initialCommand, path);
+            session.setProcessExitMessage(context.getString(R.string.process_exit_message));
+
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        return session;
+    }
+
+    protected void toast(String content) {
+        Toast.makeText(this, content, Toast.LENGTH_SHORT).show();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        //mFirebaseAnalytics = FirebaseAnalytics.getInstance(this);
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        PermissionAction action = mActionMap.get(requestCode);
+        if (action != null) {
+            if (grantResults.length > 0 && (grantResults[0] == PackageManager.PERMISSION_GRANTED)) {
+                action.onGrant();
+            } else {
+                action.onDeny();
+            }
+
+        }
+        mActionMap.remove(action);
+    }
+
+    public final void checkPermissionDo(String[] permissions, PermissionAction action) {
+        if (Build.VERSION.SDK_INT >= 23) {
+            boolean granted = true;
+            for (String permission : permissions) {
+                int checkPermission = ContextCompat.checkSelfPermission(this, permission);
+                granted = checkPermission == PackageManager.PERMISSION_GRANTED;
+            }
+            if (!granted) {
+                int code = permissions.hashCode() & 0xffff;
+                mActionMap.put(code, action);
+                ActivityCompat.requestPermissions(this, permissions, code);
+            } else {
+                action.onGrant();
+            }
+        } else {
+            action.onGrant();
+        }
+    }
+
+
+    // feedback
+    public void onFeedback(String feedback) {
+        String app = getString(R.string.app_name);
+        int ver = NUtil.getVersinoCode(getApplicationContext());
+        String subject = MessageFormat.format(getString(com.quseit.android.R.string.feeback_email_title), app, ver, Build.PRODUCT);
+
+        String lastError = "";
+        String code = NAction.getCode(getApplicationContext());
+        File log = new File(Environment.getExternalStorageDirectory() + "/" + code + "_last_err.log");
+        if (log.exists()) {
+            lastError = com.quseit.util.FileHelper.getFileContents(log.getAbsolutePath());
+        }
+
+        String body = feedback.isEmpty() ? feedback : MessageFormat.format(getString(R.string.feedback_email_body), Build.PRODUCT,
+                Build.VERSION.RELEASE, Build.VERSION.SDK, lastError, feedback);
+
+
+        Intent twitterIntent = getPackageManager().getLaunchIntentForPackage("com.twitter.android");
+        if (twitterIntent != null) {
+            List<String> list = new ArrayList<>();
+            list.add("Feedback with Twitter");
+            list.add("Feedback with Email");
+            new AlertDialog.Builder(this)
+                    .setTitle(R.string.feedback)
+                    .setNegativeButton(R.string.close, (dialog, which) -> dialog.dismiss())
+                    .setAdapter(new ArrayAdapter<>(this, R.layout.dialog_feedback, list), (dialog, which) -> {
+                        if (which == 0) {
+                            twitter(body);
+                        } else {
+                            email(subject, body);
+                        }
+                    })
+                    .show();
+        } else {
+            email(subject, body);
+        }
+    }
+
+    private void email(String subject, String body) {
+        Intent intent = new Intent(Intent.ACTION_SENDTO, Uri.parse("mailto:" + getString(R.string.ui_feedback_mail)));
+
+        intent.putExtra(Intent.EXTRA_SUBJECT, subject);
+        intent.putExtra(Intent.EXTRA_TEXT, session == null ? body : session.getTranscriptText().trim());
+        try {
+            startActivity(Intent.createChooser(intent,
+                    getString(R.string.email_transcript_chooser_title)));
+        } catch (ActivityNotFoundException e) {
+            Toast.makeText(this,
+                    R.string.email_transcript_no_email_activity_found,
+                    Toast.LENGTH_LONG)
+                    .show();
+        }
+    }
+
+    private void twitter(String message) {
+        Intent tweetIntent = new Intent(Intent.ACTION_SEND);
+        if (message.isEmpty()){
+            tweetIntent.putExtra(Intent.EXTRA_TEXT, "@qpython,");
+        }else {
+            tweetIntent.putExtra(Intent.EXTRA_TEXT, "@qpython\n" + message);
+        }
+        tweetIntent.setType("text/plain");
+
+        PackageManager packManager = getPackageManager();
+        List<ResolveInfo> resolvedInfoList = packManager.queryIntentActivities(tweetIntent, PackageManager.MATCH_DEFAULT_ONLY);
+
+        boolean resolved = false;
+        for (ResolveInfo resolveInfo : resolvedInfoList) {
+            if (resolveInfo.activityInfo.packageName.startsWith("com.twitter.android")) {
+                tweetIntent.setClassName(
+                        resolveInfo.activityInfo.packageName,
+                        resolveInfo.activityInfo.name);
+                resolved = true;
+                break;
+            }
+        }
+        if (resolved) {
+            startActivity(tweetIntent);
+        } else {
+            Intent i = new Intent();
+            i.putExtra(Intent.EXTRA_TEXT, message);
+            i.setAction(Intent.ACTION_VIEW);
+            i.setData(Uri.parse("https://twitter.com/intent/tweet?text=" + urlEncode(message)));
+            startActivity(i);
+            Toast.makeText(this, "Twitter app isn't found", Toast.LENGTH_LONG).show();
+        }
+    }
+
+    private String urlEncode(String s) {
+        try {
+            return URLEncoder.encode(s, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+            return "";
+        }
+    }
+
+    protected boolean checkExpired(final String resource, String filesDir, String tag) {
+        ResourceManager resourceManager = new ResourceManager(this);
+
+        String data_version = resourceManager.getString(resource + "_version");
+        String disk_version = "0";
+
+        // If no version, no unpacking is necessary.
+        if (data_version == null) {
+            return false;
+        }
+
+        // Check the current disk version, if any.
+        String disk_version_fn = filesDir + "/" + tag + "_" + resource + ".version";
+
+        try {
+            byte buf[] = new byte[64];
+            InputStream is = new FileInputStream(disk_version_fn);
+            int len = is.read(buf);
+            disk_version = new String(buf, 0, len);
+            is.close();
+        } catch (Exception e) {
+
+            disk_version = "0";
+
+        }
+
+        if (!NUtil.isNumeric(disk_version)) {
+            disk_version = "0";
+
+        }
+
+        if ((int) (Double.parseDouble(data_version) - Double.parseDouble(disk_version)) > 0 || disk_version.equals("0")) {
+            try {
+                FileOutputStream os = new FileOutputStream(disk_version_fn);
+                try {
+                    os.write(data_version.getBytes());
+                    os.close();
+
+                } catch (IOException e) {
+                    e.printStackTrace();
+                    //Mint.logException(e);
+
+                }
+
+            } catch (FileNotFoundException e) {
+                e.printStackTrace();
+                //Mint.logException(e);
+
+            }
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public interface PermissionAction {
+        void onGrant();
+
+        void onDeny();
+    }
+
+    public void ifLogin(Login afterLogin) {
+        if (!TextUtils.isEmpty(TokenManager.getToken())) {
+            afterLogin.process();
+        } else {
+            Toast.makeText(this, R.string.login_first, Toast.LENGTH_SHORT).show();
+        }
+    }
+    public interface Login {
+        void process();
+    }
+}
\ No newline at end of file
diff --git a/qpython/src/os/java/org/qpython/qpy/main/activity/FundingPurchaseActivity.java b/qpython/src/os/java/org/qpython/qpy/main/activity/FundingPurchaseActivity.java
new file mode 100644
index 00000000..6e6cf10a
--- /dev/null
+++ b/qpython/src/os/java/org/qpython/qpy/main/activity/FundingPurchaseActivity.java
@@ -0,0 +1,143 @@
+package org.qpython.qpy.main.activity;
+
+import android.content.Context;
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.view.Menu;
+import android.view.View;
+import android.widget.Toast;
+
+import com.quseit.util.VeDate;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ActivityFundingPurchaseBinding;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.server.MySubscriber;
+import org.qpython.qpy.main.server.model.GooglePurchaseModel;
+import org.qpython.qpy.utils.UpdateHelper;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+/**
+ * Created by Hmei
+ * 1/30/18.
+ */
+
+public class FundingPurchaseActivity extends PayActivity {
+    private static final String ARTICLE_ID    = "article_id";
+    private static final String FUNDING_COUNT = "fundingCount";
+    //    private final String[] prices = get
+    private ActivityFundingPurchaseBinding binding;
+    private String                         sku;
+
+    public static void startSupport(Context context, String articleId, int fundingPercent) {
+        Intent starter = new Intent(context, FundingPurchaseActivity.class);
+        starter.putExtra(ARTICLE_ID, articleId);
+        starter.putExtra(FUNDING_COUNT, fundingPercent);
+        context.startActivity(starter);
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_funding_purchase);
+        binding.pb.setVisibility(View.VISIBLE);
+        initView();
+        initPrice();
+        initListener();
+    }
+
+    private void initView() {
+        setSupportActionBar(binding.lt.toolbar);
+        binding.lt.toolbar.setNavigationIcon(R.drawable.ic_back);
+        binding.lt.toolbar.setNavigationOnClickListener(v -> finish());
+        setTitle(R.string.reward);
+    }
+
+    private void initPrice() {
+        String[] skus = getResources().getStringArray(R.array.crowdfunding);
+        int fundingCount = getIntent().getIntExtra(FUNDING_COUNT, 0);
+        if (fundingCount < 100) {
+            sku = skus[0];
+        } else if (fundingCount < 500) {
+            sku = skus[1];
+        } else if (fundingCount < 2000) {
+            sku = skus[2];
+        } else {
+            sku = skus[3];
+        }
+        ArrayList<String> skuList = new ArrayList<>();
+        skuList.add(sku);
+        initIAB(skuList, new MySubscriber<String[]>() {
+            @Override
+            public void onNext(String[] o) {
+                super.onNext(o);
+                if (o == null) {
+                    return;
+                }
+                invalidateData(true);
+                binding.price.setText(o[0]);
+            }
+        });
+    }
+
+    private void initListener() {
+        binding.price.setOnClickListener(v -> payUtil.purchase(sku));
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.refresh_menu, menu);
+        return true;
+    }
+
+    private void invalidateData(boolean showData) {
+        binding.price.setVisibility(showData ? View.VISIBLE : View.GONE);
+        binding.tvThanks.setVisibility(showData ? View.VISIBLE : View.GONE);
+        binding.noData.llRoot.setVisibility(showData ? View.GONE : View.VISIBLE);
+        binding.pb.setVisibility(View.GONE);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == BUY_REQUEST_CODE) {
+            if (resultCode == RESULT_OK) {
+                GooglePurchaseModel model = App.getGson().fromJson(data.getStringExtra("INAPP_PURCHASE_DATA"), GooglePurchaseModel.class);
+                if (model == null) {
+                    return;
+                }
+                switch (model.getProductId()) {
+                    default:
+                        Toast.makeText(this, R.string.thanks_your_support, Toast.LENGTH_SHORT).show();
+                        break;
+                }
+                // 统计赞赏数据
+                JSONObject jsonObject = new JSONObject();
+                try {
+                    jsonObject.put("type", model.getProductId());
+                    jsonObject.put("time", VeDate.getStringDateHourAsInt());
+                    int percent = getIntent().getIntExtra(FUNDING_COUNT, 0);
+                    String[] fundingCount = getResources().getStringArray(R.array.funding_count_divider);
+                    jsonObject.put("crowdfunding",
+                            percent > (Integer.parseInt(fundingCount[1]) / Integer.parseInt(fundingCount[2])) ? 3 :
+                                    percent > (Integer.parseInt(fundingCount[0]) / Integer.parseInt(fundingCount[1])) ? 2 : 1);//0 非众筹/ 1: 0-100 /2: 100-500/3 500-2000
+                    jsonObject.put("articleId", getIntent().getStringExtra(ARTICLE_ID));
+                    if (App.getUser() != null) {
+                        jsonObject.put("account", App.getUser().getEmail());
+                    }
+                } catch (JSONException e) {
+                    e.printStackTrace();
+                }
+                UpdateHelper.submitIAPLog(this, model.getOrderId(), App.getGson().toJson(jsonObject));
+                payUtil.digestPurchase(model.getPurchaseToken());
+                finish();
+            }
+        }
+    }
+}
diff --git a/qpython/src/os/java/org/qpython/qpy/main/activity/PayActivity.java b/qpython/src/os/java/org/qpython/qpy/main/activity/PayActivity.java
new file mode 100644
index 00000000..c637254e
--- /dev/null
+++ b/qpython/src/os/java/org/qpython/qpy/main/activity/PayActivity.java
@@ -0,0 +1,54 @@
+package org.qpython.qpy.main.activity;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+import android.view.MenuItem;
+import android.view.View;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.main.server.MySubscriber;
+import org.qpython.qpy.main.service.PayUtil;
+
+import java.util.ArrayList;
+
+/**
+ * Created by Hmei
+ * 1/30/18.
+ */
+
+public class PayActivity extends AppCompatActivity {
+    public static final int BUY_REQUEST_CODE = 2333;
+    private ArrayList<String>      skuList;
+    private MySubscriber<String[]> callback;
+    protected PayUtil payUtil;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        payUtil = new PayUtil(this);
+    }
+
+    protected void initIAB(ArrayList<String> skuList, MySubscriber<String[]> callback) {
+        this.skuList = skuList;
+        this.callback = callback;
+        payUtil.initIAP(() -> payUtil.getPrices(skuList,callback));
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == R.id.refresh_menu) {
+            if (findViewById(R.id.pb) != null) findViewById(R.id.pb).setVisibility(View.VISIBLE);
+            payUtil.getPrices(skuList, callback);
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        payUtil.unbindPayService();
+    }
+
+}
diff --git a/qpython/src/os/java/org/qpython/qpy/main/activity/PurchaseActivity.java b/qpython/src/os/java/org/qpython/qpy/main/activity/PurchaseActivity.java
new file mode 100644
index 00000000..74335cc2
--- /dev/null
+++ b/qpython/src/os/java/org/qpython/qpy/main/activity/PurchaseActivity.java
@@ -0,0 +1,158 @@
+package org.qpython.qpy.main.activity;
+
+import android.content.Context;
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.GridLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+import com.quseit.util.ImageUtil;
+import com.quseit.util.VeDate;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ActivityPurchaseBinding;
+import org.qpython.qpy.databinding.ItemPriceBinding;
+import org.qpython.qpy.main.adapter.MyViewHolder;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.server.MySubscriber;
+import org.qpython.qpy.main.server.model.GooglePurchaseModel;
+import org.qpython.qpy.main.widget.GridSpace;
+import org.qpython.qpy.utils.UpdateHelper;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+/**
+ * Google purchase activity
+ * Created by Hmei on 2017-07-19.
+ */
+
+public class PurchaseActivity extends PayActivity {
+
+    private static final String ARTICLE_ID = "article_id";
+
+    private ActivityPurchaseBinding binding;
+    private ArrayList<String>       skus;
+
+    public static void start(Context context, String articleId) {
+        Intent starter = new Intent(context, PurchaseActivity.class);
+        starter.putExtra(ARTICLE_ID, articleId);
+        context.startActivity(starter);
+    }
+
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_purchase);
+        skus = new ArrayList<>(Arrays.asList(getResources().getStringArray(R.array.sku)));
+
+        initIAB(skus, new MySubscriber<String[]>() {
+            @Override
+            public void onNext(String[] o) {
+                super.onNext(o);
+                if (o == null) {
+                    return;
+                }
+                invalidateData();
+                GridSpace gridSpace = new GridSpace(2, (int) ImageUtil.dp2px(16), false);
+                binding.list.setLayoutManager(new GridLayoutManager(PurchaseActivity.this, 2));
+                binding.list.addItemDecoration(gridSpace);
+                binding.list.setAdapter(new PurchaseActivity.ListAdapter(o));
+            }
+        });
+
+        initView();
+    }
+
+    private void initView() {
+        setSupportActionBar(binding.lt.toolbar);
+        binding.lt.toolbar.setNavigationIcon(R.drawable.ic_back);
+        binding.lt.toolbar.setNavigationOnClickListener(v -> finish());
+        setTitle(R.string.reward);
+    }
+
+    private void invalidateData() {
+        binding.tvThanks.setVisibility(View.VISIBLE);
+        binding.list.setVisibility(View.VISIBLE);
+        binding.noData.llRoot.setVisibility(View.GONE);
+    }
+
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.refresh_menu, menu);
+        return true;
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == BUY_REQUEST_CODE) {
+            if (resultCode == RESULT_OK) {
+                GooglePurchaseModel model = App.getGson().fromJson(data.getStringExtra("INAPP_PURCHASE_DATA"), GooglePurchaseModel.class);
+                if (model == null) {
+                    return;
+                }
+                switch (model.getProductId()) {
+                    default:
+                        Toast.makeText(this, R.string.thanks_your_support, Toast.LENGTH_SHORT).show();
+                        break;
+                }
+                // 统计赞赏数据
+                JSONObject jsonObject = new JSONObject();
+                try {
+                    jsonObject.put("type", model.getProductId());
+                    jsonObject.put("time", VeDate.getStringDateHourAsInt());
+                    jsonObject.put("crowdfunding", 0);//0 非众筹/ 1: 0-100 /2: 100-500/3 500-2000
+                    jsonObject.put("articleId", getIntent().getStringExtra(ARTICLE_ID));
+                    if (App.getUser() != null) {
+                        jsonObject.put("account", App.getUser().getEmail());
+                    }
+                } catch (JSONException e) {
+                    e.printStackTrace();
+                }
+                UpdateHelper.submitIAPLog(this, model.getOrderId(), App.getGson().toJson(jsonObject));
+                payUtil.digestPurchase(model.getPurchaseToken());
+                finish();
+            }
+        }
+    }
+
+    private class ListAdapter extends RecyclerView.Adapter<MyViewHolder<ItemPriceBinding>> {
+        String[] dataList;
+
+        ListAdapter(String[] dataList) {
+            this.dataList = dataList;
+        }
+
+        @Override
+        public MyViewHolder<ItemPriceBinding> onCreateViewHolder(ViewGroup parent, int viewType) {
+            ItemPriceBinding binding = DataBindingUtil.inflate(LayoutInflater.from(PurchaseActivity.this), R.layout.item_price, parent, false);
+            MyViewHolder<ItemPriceBinding> holder = new MyViewHolder<>(binding.getRoot());
+            holder.setBinding(binding);
+            return holder;
+        }
+
+        @Override
+        public void onBindViewHolder(MyViewHolder<ItemPriceBinding> holder, int position) {
+            ItemPriceBinding binding = holder.getBinding();
+            binding.tvPrices.setText(dataList[position]);
+            binding.tvPrices.setOnClickListener(v -> payUtil.purchase(skus.get(position)));
+        }
+
+        @Override
+        public int getItemCount() {
+            return dataList.length;
+        }
+    }
+}
diff --git a/qpython/src/os/java/org/qpython/qpy/main/activity/SignInActivity.java b/qpython/src/os/java/org/qpython/qpy/main/activity/SignInActivity.java
new file mode 100644
index 00000000..b5fc5d2c
--- /dev/null
+++ b/qpython/src/os/java/org/qpython/qpy/main/activity/SignInActivity.java
@@ -0,0 +1,184 @@
+package org.qpython.qpy.main.activity;
+
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+import android.text.Html;
+import android.util.Log;
+import android.view.View;
+import android.widget.Toast;
+
+import com.google.android.gms.auth.api.Auth;
+import com.google.android.gms.auth.api.signin.GoogleSignInAccount;
+import com.google.android.gms.auth.api.signin.GoogleSignInOptions;
+import com.google.android.gms.auth.api.signin.GoogleSignInResult;
+import com.google.android.gms.common.ConnectionResult;
+import com.google.android.gms.common.api.GoogleApiClient;
+import com.google.firebase.auth.AuthCredential;
+import com.google.firebase.auth.FirebaseAuth;
+import com.google.firebase.auth.FirebaseUser;
+import com.google.firebase.auth.GoogleAuthProvider;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ActivitySignInBinding;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.CONF;
+import org.qpython.qpy.main.app.User;
+import org.qpython.qpy.main.server.gist.loginScreen.LoginControler;
+import org.qpython.qpy.main.server.gist.loginScreen.LoginView;
+
+/**
+ * SignIn
+ * Created by Hmei on 2017-08-04.
+ */
+
+public class SignInActivity extends AppCompatActivity implements GoogleApiClient.OnConnectionFailedListener ,LoginView{
+    private static final int RC_SIGN_IN = 54503;
+
+    private GoogleApiClient mGoogleApiClient;
+    private ActivitySignInBinding binding;
+    private FirebaseAuth mAuth;
+
+    private LoginControler mLoginControler;
+
+    {
+        mAuth = FirebaseAuth.getInstance();
+        FirebaseUser currentUser = mAuth.getCurrentUser();
+        initUserInfo(currentUser);
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_sign_in);
+        binding.textView3.setText(Html.fromHtml(getString(R.string.by_signing_in_you_agree_to_out_privacy_policy_term_of_service)));
+        GoogleSignInOptions gso = new GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)
+                .requestIdToken(CONF.GOOGLE_ID_TOKEN)
+                .requestEmail()
+                .build();
+
+        mGoogleApiClient = new GoogleApiClient.Builder(this)
+                .enableAutoManage(this, this)
+                .addApi(Auth.GOOGLE_SIGN_IN_API, gso)
+                .addOnConnectionFailedListener(connectionResult -> showToast(getString(R.string.lost_google_hint)))
+                .build();
+        initListener();
+
+        mLoginControler = new LoginControler(this);
+    }
+
+    private void initListener() {
+        binding.textView3.setOnClickListener(v -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.privacy_html)))));
+        binding.button2.setOnClickListener(v -> signIn());
+        binding.button3.setOnClickListener(v -> finish());
+    }
+
+    private void signIn() {
+        Intent signInIntent = Auth.GoogleSignInApi.getSignInIntent(mGoogleApiClient);
+        startActivityForResult(signInIntent, RC_SIGN_IN);
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        // Result returned from launching the Intent from GoogleSignInApi.getSignInIntent(...);
+        if (requestCode == RC_SIGN_IN) {
+            GoogleSignInResult result = Auth.GoogleSignInApi.getSignInResultFromIntent(data);
+            if (result.isSuccess()) {
+                GoogleSignInAccount account = result.getSignInAccount();
+                firebaseAuthWithGoogle(account);
+            } else {
+                Log.e("LOGIN", result.getStatus().toString());
+                try {
+                    String msg = result.getStatus().getStatusMessage().trim();
+                    showToast(getString(R.string.login_error) + (msg.equals("") ? "" : ": ") + msg);
+                    initUserInfo(null);
+                } catch (NullPointerException ignore) {
+                    showToast(getString(R.string.no_google));
+                }
+            }
+        }
+    }
+
+    private void firebaseAuthWithGoogle(GoogleSignInAccount acct) {
+        showLoading();
+        AuthCredential credential = GoogleAuthProvider.getCredential(acct.getIdToken(), "45:FD:60:98:01:9A:37:D9:84:03:06:36:02:F6:85:2C:A2:1F:B8:67");
+        mAuth.signInWithCredential(credential)
+                .addOnCompleteListener(this, task -> {
+                    if (task.isSuccessful()) {
+                        FirebaseUser user = mAuth.getCurrentUser();
+                        initUserInfo(user);
+                    } else {
+                        showToast(getString(R.string.auth_failed));
+                        initUserInfo(null);
+                        hideLoading();
+                    }
+                });
+    }
+
+    private void initUserInfo(FirebaseUser currentUser) {
+        if (currentUser == null) {
+            App.setUser(null);
+            return;
+        }
+        Log.d("SingInActivity", "NICK:"+currentUser.getDisplayName()+"-UN:"+currentUser.getEmail());
+        User user = new User();
+        user.setUserId(currentUser.getUid());
+        user.setAvatarUrl(currentUser.getPhotoUrl() == null ? "" : currentUser.getPhotoUrl().toString());
+        user.setEmail(currentUser.getEmail());
+        user.setUserName(currentUser.getEmail());
+        user.setNick(currentUser.getDisplayName());
+        App.setUser(user);
+        if (mLoginControler!=null) {
+            mLoginControler.login(user);
+        } else {
+            Toast.makeText(this, R.string.signin_error, Toast.LENGTH_SHORT).show();
+        }
+    }
+
+    @Override
+    public void onConnectionFailed(@NonNull ConnectionResult connectionResult) {
+        initUserInfo(null);
+    }
+
+    @Override
+    public void showLoading() {
+        binding.progressBar2.setVisibility(View.VISIBLE);
+    }
+
+    @Override
+    public void hideLoading() {
+        binding.progressBar2.setVisibility(View.GONE);
+    }
+
+    @Override
+    public void showToast(String msg) {
+        Toast.makeText(SignInActivity.this, msg, Toast.LENGTH_SHORT)
+                .show();
+    }
+
+    @Override
+    public void loginSuccess() {
+        Log.d("SignInActivity", "loginSuccess");
+//        setResult(RESULT_OK);
+//        this.finish();
+
+        setResult(RESULT_OK);
+        binding.progressBar2.setVisibility(View.GONE);
+        showToast("login successfully");
+        finish();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        if (mLoginControler!=null) {
+
+            mLoginControler.onDestroy();
+        }
+    }
+}
\ No newline at end of file
diff --git a/qpython/src/os/java/org/qpython/qpy/main/activity/UserActivity.java b/qpython/src/os/java/org/qpython/qpy/main/activity/UserActivity.java
new file mode 100644
index 00000000..b142018e
--- /dev/null
+++ b/qpython/src/os/java/org/qpython/qpy/main/activity/UserActivity.java
@@ -0,0 +1,76 @@
+package org.qpython.qpy.main.activity;
+
+import android.content.Context;
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+
+import com.google.firebase.auth.FirebaseAuth;
+import com.quseit.util.ImageDownLoader;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.codeshare.CONSTANT;
+import org.qpython.qpy.codeshare.ShareCodeUtil;
+import org.qpython.qpy.databinding.ActivityUserBinding;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.CONF;
+
+import java.io.File;
+
+public class UserActivity extends AppCompatActivity {
+    ActivityUserBinding binding;
+
+    public static void start(Context context) {
+        Intent starter = new Intent(context, UserActivity.class);
+        context.startActivity(starter);
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_user);
+        setSupportActionBar(binding.toolbar);
+        setTitle(getString(R.string.me));
+        binding.toolbar.setNavigationIcon(R.drawable.ic_back);
+        binding.toolbar.setNavigationOnClickListener(v -> finish());
+
+        ImageDownLoader.setImageFromUrl(this, binding.avatar, App.getUser().getAvatarUrl());
+        binding.name.setText(App.getUser().getNick());
+        //binding.email.setText(App.getUser().getEmail());
+
+        binding.usage.setText(R.string.my_space_empty);
+        binding.logout.setOnClickListener(v -> logout());
+        binding.myShareLayout.setOnClickListener(v -> MyGistActivity.startMyShare(UserActivity.this));
+        setUsage();
+    }
+
+    private void setUsage() {
+        ShareCodeUtil.getInstance().initUsage(integer ->
+                binding.usage.setText(getString(R.string.my_space, integer == null ? 0 : integer)));
+    }
+
+    private void logout() {
+        new AlertDialog.Builder(this, R.style.MyDialog)
+                .setTitle(R.string.lout)
+                .setPositiveButton(R.string.yes, (dialog, which) -> {
+                    FirebaseAuth.getInstance().signOut();
+                    App.setUser(null);
+                    getPreferences(MODE_PRIVATE).edit().putBoolean(CONSTANT.IS_UPLOAD_INIT, false)
+                            .putString(CONSTANT.CLOUDED_MAP, "")
+                            .apply();
+                    File cloud_cache = new File(CONF.CLOUD_MAP_CACHE_PATH);
+                    if (cloud_cache.exists()) {
+                        cloud_cache.delete();
+                    }
+                    finish();
+                })
+                .setNegativeButton(R.string.no, null)
+                .create()
+                .show();
+
+    }
+}
\ No newline at end of file
diff --git a/qpython/src/os/java/org/qpython/qpy/main/app/AppInit.java b/qpython/src/os/java/org/qpython/qpy/main/app/AppInit.java
new file mode 100644
index 00000000..76cc52ab
--- /dev/null
+++ b/qpython/src/os/java/org/qpython/qpy/main/app/AppInit.java
@@ -0,0 +1,37 @@
+package org.qpython.qpy.main.app;
+
+import android.content.Context;
+import android.util.Log;
+
+import com.google.firebase.FirebaseApp;
+import com.google.firebase.iid.FirebaseInstanceId;
+import com.quseit.config.BASE_CONF;
+
+import org.qpython.qpy.codeshare.ShareCodeUtil;
+
+/**
+ * 文 件 名: AppInit
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/8 15:13
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class AppInit {
+
+    public static void init(Context context){
+
+        FirebaseApp.initializeApp(context);
+        if (BASE_CONF.DEBUG) {
+            try {
+                FirebaseInstanceId xx = FirebaseInstanceId.getInstance();
+                if (xx != null) {
+                    Log.e("Firebase", xx.getToken());
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        ShareCodeUtil.getInstance();
+    }
+}
diff --git a/qpython/src/os/java/org/qpython/qpy/main/fragment/ExplorerFragment.java b/qpython/src/os/java/org/qpython/qpy/main/fragment/ExplorerFragment.java
new file mode 100644
index 00000000..6705c248
--- /dev/null
+++ b/qpython/src/os/java/org/qpython/qpy/main/fragment/ExplorerFragment.java
@@ -0,0 +1,503 @@
+package org.qpython.qpy.main.fragment;
+
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.graphics.Color;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Environment;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.widget.LinearLayoutManager;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+import com.google.firebase.database.DatabaseReference;
+import com.quseit.util.FileHelper;
+import com.quseit.util.ImageUtil;
+import com.yanzhenjie.recyclerview.swipe.SwipeMenuCreator;
+import com.yanzhenjie.recyclerview.swipe.SwipeMenuItem;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.codeshare.ShareCodeUtil;
+import org.qpython.qpy.codeshare.pojo.CloudFile;
+import org.qpython.qpy.databinding.FragmentExplorerBinding;
+import org.qpython.qpy.main.activity.NotebookActivity;
+import org.qpython.qpy.main.activity.SettingActivity;
+import org.qpython.qpy.main.activity.SignInActivity;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.CONF;
+import org.qpython.qpy.texteditor.EditorActivity;
+import org.qpython.qpy.texteditor.TedLocalActivity;
+import org.qpython.qpy.texteditor.common.CommonEnums;
+import org.qpython.qpy.texteditor.common.RecentFiles;
+import org.qpython.qpy.texteditor.ui.adapter.FolderAdapter;
+import org.qpython.qpy.texteditor.ui.adapter.bean.FolderBean;
+import org.qpython.qpy.texteditor.ui.view.EnterDialog;
+import org.qpython.qpy.texteditor.widget.crouton.Crouton;
+import org.qpython.qpy.texteditor.widget.crouton.Style;
+import org.qpython.qpy.utils.FileUtils;
+import org.qpython.qpy.utils.NotebookUtil;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static com.quseit.util.FolderUtils.sortTypeByName;
+
+public class ExplorerFragment extends Fragment {
+    private static final int REQUEST_SAVE_AS   = 107;
+    private static final int REQUEST_HOME_PAGE = 109;
+    private static final int REQUEST_RECENT    = 111;
+    private static final int LOGIN_REQUEST     = 2741;
+
+    private static final String TYPE = "type";
+
+    private int WIDTH = (int) ImageUtil.dp2px(60);
+
+    private FragmentExplorerBinding binding;
+    private List<FolderBean>        folderList;
+    private FolderAdapter           adapter;
+    private Map<String, Boolean> cloudedMap = new HashMap<>();
+
+    private boolean openable = true; // 是否可打开文件
+    private boolean uploadable;
+
+    private int    type;
+    private String curPath;
+
+    public static ExplorerFragment newInstance(int type) {
+        ExplorerFragment myFragment = new ExplorerFragment();
+
+        Bundle args = new Bundle();
+        args.putInt(TYPE, type);
+        myFragment.setArguments(args);
+
+        return myFragment;
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_explorer, null);
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        binding = DataBindingUtil.bind(view);
+        type = getArguments().getInt(TYPE);
+        initView();
+        initListener();
+        initCloud();
+        switch (type) {
+            case REQUEST_RECENT:
+                binding.rlPath.setVisibility(View.GONE);
+                uploadable = false;
+                break;
+            case REQUEST_SAVE_AS:
+                binding.ivNewFolder.setVisibility(View.VISIBLE);
+                uploadable = false;
+                break;
+            case REQUEST_HOME_PAGE:
+                binding.ivNewFolder.setVisibility(View.VISIBLE);
+                uploadable = true;
+                break;
+        }
+    }
+
+    private void initView() {
+        SwipeMenuCreator swipeMenuCreator = (leftMenu, rightMenu, viewType) -> {
+//            SwipeMenuItem uploadItem = new SwipeMenuItem(getContext())
+//                    .setBackgroundColor(Color.parseColor("#FF4798F3"))
+//                    .setImage(R.drawable.ic_cloud_upload)
+//                    .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+//                    .setWidth(WIDTH);
+
+            SwipeMenuItem renameItem = new SwipeMenuItem(getContext())
+                    .setBackgroundColor(Color.parseColor("#FF4BAC07"))
+                    .setImage(R.drawable.ic_file_rename)
+                    .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+                    .setWidth(WIDTH);
+
+            SwipeMenuItem deleteItem = new SwipeMenuItem(getContext())
+                    .setBackgroundColor(Color.parseColor("#FFD14136"))
+                    .setImage(R.drawable.ic_editor_filetree_close)
+                    .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+                    .setWidth(WIDTH);
+
+            switch (type) {
+                case REQUEST_RECENT:
+                    rightMenu.addMenuItem(deleteItem);
+                    break;
+                case REQUEST_SAVE_AS:
+                    rightMenu.addMenuItem(deleteItem);
+                    break;
+                case REQUEST_HOME_PAGE:
+                    //rightMenu.addMenuItem(uploadItem);
+                    rightMenu.addMenuItem(renameItem);
+                    rightMenu.addMenuItem(deleteItem);
+                    break;
+            }
+        };
+
+        folderList = new ArrayList<>();
+        adapter = new FolderAdapter(folderList, getArguments().getInt(TYPE) == REQUEST_RECENT);
+        adapter.setCloudMap(cloudedMap);
+        binding.swipeList.setLayoutManager(new LinearLayoutManager(getContext()));
+        binding.swipeList.setSwipeMenuCreator(swipeMenuCreator);
+        openDir(CONF.ABSOLUTE_PATH);
+    }
+
+    private void initListener() {
+        binding.ivNewFolder.setOnClickListener(v -> doNewDir());
+        binding.prevFolder.setOnClickListener(v -> {
+            try {
+                //采用Environment来获取sdcard路径
+                String parentPath = new File(curPath).getParent();
+
+                if (parentPath.length()>=Environment.getExternalStorageDirectory().getAbsolutePath().length()) {
+                    openDir(parentPath);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        });
+        binding.swipeList.setSwipeMenuItemClickListener(menuBridge -> {
+            binding.swipeList.smoothCloseMenu();
+            switch (menuBridge.getPosition()) {
+                case 0:
+//                    if (uploadable) {
+//                        uploadFile(menuBridge.getAdapterPosition());
+//                    } else {
+//                        deleteFile(menuBridge.getAdapterPosition());
+//                    }
+//                    break;
+//                case 1:
+                    renameFile(menuBridge.getAdapterPosition());
+                    break;
+                case 1:
+                    deleteFile(menuBridge.getAdapterPosition());
+                    break;
+            }
+        });
+        adapter.setClickListener(new FolderAdapter.Click() {
+            @Override
+            public void onItemClick(int position) {
+                FolderBean item = folderList.get(position);
+                if (item.getType().equals(CommonEnums.FileType.FILE)) {
+                    if (!openable) {
+                        Toast.makeText(getActivity(), R.string.cant_open, Toast.LENGTH_SHORT).show();
+                        return;
+                    }
+                    //判断文件类型
+                    int lastDot = item.getName().lastIndexOf(".");
+                    if (lastDot != -1) {
+                        String ext = item.getName().substring(lastDot + 1);
+                        openFile(item.getFile(), ext);
+                    }
+                } else {
+                    openDir(item.getPath());
+                }
+            }
+
+            @Override
+            public void onLongClick(int position) {
+                binding.swipeList.smoothOpenRightMenu(position);
+            }
+        });
+
+        binding.swipeList.setAdapter(adapter);
+    }
+
+    private void gotoSetting() {
+        SettingActivity.startActivity(getActivity());
+    }
+    private void openFile(File file, String ext) {
+        List<String> textExts = Arrays.asList(getContext().getResources().getStringArray(R.array.text_ext));
+        if (textExts.contains(ext)) {
+            EditorActivity.start(getContext(), Uri.fromFile(file));
+        } else if (ext.equals("ipynb")) {
+            boolean notebookenable = NotebookUtil.isNotebookEnable(getActivity());
+            if (notebookenable) {
+                NotebookActivity.start(getActivity(), file.getAbsolutePath(), false);
+            } else {
+
+                new AlertDialog.Builder(getActivity(),R.style.MyDialog)
+                        .setTitle(R.string.dialog_alert)
+                        .setMessage(getString(R.string.ennable_notebook_first))
+                        .setNegativeButton(R.string.cancel, (dialog1, which) -> dialog1.dismiss())
+                        .setPositiveButton(R.string.ok, (dialog1, which) -> gotoSetting())
+                        .create()
+                        .show();
+
+                //Toast.makeText(getActivity(), R.string.ennable_notebook_first, Toast.LENGTH_SHORT).show();
+            }
+        } else {
+            FileUtils.openFile(getContext(), file);
+        }
+    }
+
+    private void uploadFile(int adapterPosition) {
+        File file = folderList.get(adapterPosition).getFile();
+
+        // only support type in <R.array.support_file_ext>
+        String ext = "";
+        if (file.getName().lastIndexOf(".") > 0) {
+            ext = file.getName().substring(file.getName().lastIndexOf(".") + 1);
+        }
+        boolean isSupport = false;
+        if (!file.isDirectory()) {
+            for (String s : getResources().getStringArray(R.array.support_file_ext)) {
+                if (s.equals(ext)) {
+                    isSupport = true;
+                    break;
+                }
+            }
+        } else {
+            isSupport = true;
+        }
+
+        if (!isSupport) {
+            Toast.makeText(getContext(), R.string.not_support_type_hint, Toast.LENGTH_SHORT).show();
+            return;
+        }
+
+        // only available for already login user
+        if (App.getUser() == null) {
+            new AlertDialog.Builder(getActivity(), R.style.MyDialog)
+                    .setTitle(R.string.need_login)
+                    .setMessage(R.string.upload_login_hint)
+                    .setNegativeButton(R.string.no, null)
+                    .setPositiveButton(getString(R.string.login_now), (dialog, which) ->
+                            startActivityForResult(new Intent(getActivity(), SignInActivity.class), LOGIN_REQUEST)
+                    )
+                    .create()
+                    .show();
+            return;
+        }
+
+        // upload
+        folderList.get(adapterPosition).setUploading(true);
+        adapter.notifyItemChanged(adapterPosition);
+        int[] size = {1};
+        DatabaseReference.CompletionListener listener = ((databaseError, databaseReference) -> {
+            if (databaseError == null) {
+//                updateClouded(folderList.get(adapterPosition).getFile());
+//                adapter.setUploadFile(adapterPosition);
+//                ((TedLocalActivity) getActivity()).setNewUpload();
+//                Toast.makeText(getActivity(), R.string.upload_suc, Toast.LENGTH_SHORT).show();
+//                ShareCodeUtil.getInstance().changeUsage(size[0]);
+            } else {
+                Toast.makeText(getActivity(), databaseError.getMessage(), Toast.LENGTH_SHORT).show();
+            }
+            folderList.get(adapterPosition).setUploading(false);
+            adapter.notifyDataSetChanged();
+        });
+        if (folderList.get(adapterPosition).getFile().isDirectory()) {
+            // 如果上传整个projects目录，则将该目录下项目分开上传
+            if (folderList.get(adapterPosition).getName().contains("projects")) {
+                File[] files = folderList.get(adapterPosition).getFile().listFiles();
+                for (int i = 0; i < files.length; i++) {
+                    if (!ShareCodeUtil.getInstance().uploadFolder(files[i].getPath(), i == 0 ? null : listener, size)) {
+                        folderList.get(adapterPosition).setUploading(false);
+                        adapter.notifyDataSetChanged();
+                    }
+                }
+            } else {
+                if (!ShareCodeUtil.getInstance().uploadFolder(folderList.get(adapterPosition).getPath(), listener, size)) {
+                    folderList.get(adapterPosition).setUploading(false);
+                    adapter.notifyDataSetChanged();
+                }
+            }
+        } else {
+            if (!ShareCodeUtil.getInstance().uploadFile(folderList.get(adapterPosition).getPath(), listener)) {
+                folderList.get(adapterPosition).setUploading(false);
+                adapter.notifyDataSetChanged();
+            }
+        }
+    }
+
+    private void renameFile(int adapterPosition) {
+        new EnterDialog(getContext())
+                .setTitle(getString(R.string.rename))
+                .setConfirmListener(name -> {
+                    File oldFile = folderList.get(adapterPosition).getFile();
+                    File newFile = new File(oldFile.getParent(), name);
+                    boolean renameSuc = oldFile.renameTo(newFile);
+                    if (renameSuc) {
+                        folderList.set(adapterPosition, new FolderBean(newFile));
+                        adapter.notifyItemChanged(adapterPosition);
+                        return true;
+                    } else {
+                        Toast.makeText(getActivity(), R.string.rename_fail, Toast.LENGTH_SHORT).show();
+                        return false;
+                    }
+                })
+                .setText(folderList.get(adapterPosition).getName())
+                .show();
+    }
+
+    private void deleteFile(int adapterPosition) {
+        switch (type) {
+            case REQUEST_RECENT:
+                RecentFiles.removePath(folderList.get(adapterPosition).getPath());
+                folderList.remove(adapterPosition);
+                adapter.notifyDataSetChanged();
+                break;
+            case REQUEST_HOME_PAGE:
+            case REQUEST_SAVE_AS:
+                AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.MyDialog);
+                builder.setTitle(R.string.warning)
+                        .setMessage(R.string.delete_file_hint)
+                        .setNegativeButton(R.string.no, null)
+                        .setPositiveButton(R.string.yes, (dialog, which) -> {
+                            String dir = folderList.get(adapterPosition).getFile().getParent();
+                            FileHelper.clearDir(folderList.get(adapterPosition).getFile().getAbsolutePath(), 0, true);
+                            openDir(dir);
+
+//                            folderList.remove(adapterPosition);
+//                            adapter.notifyItemRemoved(adapterPosition);
+                        })
+                        .show();
+                break;
+        }
+    }
+
+    private void openDir(String dirPath) {
+        if (type == REQUEST_RECENT) {
+            folderList.clear();
+            for (String path : RecentFiles.getRecentFiles()) {
+                folderList.add(new FolderBean(new File(path)));
+            }
+
+            if (folderList.size() == 0) {
+                binding.emptyHint.setVisibility(View.VISIBLE);
+            } else {
+                binding.emptyHint.setVisibility(View.GONE);
+                adapter.notifyDataSetChanged();
+            }
+        } else {
+            binding.tvPath.setText(dirPath);
+            curPath = dirPath;
+            File dir = new File(dirPath);
+            if (dir.exists()) {
+                File[] files = dir.listFiles();
+                if (files != null) {
+                    Arrays.sort(files, sortTypeByName);
+                    folderList.clear();
+                    adapter.notifyDataSetChanged();
+                    for (File file : files) {
+                        if (!dir.getName().equals(CONF.BASE_PATH)) {
+                            if (!file.getName().startsWith(".")) {
+                                folderList.add(new FolderBean(file));
+                            }
+
+                        } else {
+                            folderList.add(new FolderBean(file));
+
+                        }
+
+                    }
+                    adapter.notifyDataSetChanged();
+                }
+            } else {
+                Toast.makeText(getContext(), R.string.file_not_exists, Toast.LENGTH_SHORT).show();
+            }
+        }
+    }
+
+    private void doNewDir() {
+        new EnterDialog(getContext())
+                .setTitle(getString(R.string.new_folder))
+                .setHint(getString(R.string.folder_name))
+                .setConfirmListener(name -> {
+                    File dirN = new File(curPath, name.equals("") ? getString(R.string.untitled_folder) : name);
+                    if (dirN.exists()) {
+                        Crouton.makeText(getActivity(), getString(R.string.toast_folder_exist), Style.ALERT).show();
+                        return false;
+                    } else {
+                        if (dirN.mkdirs()) {
+                            openDir(curPath + "/" + name);
+                        } else {
+                            Toast.makeText(getContext(), R.string.mkdir_fail, Toast.LENGTH_SHORT).show();
+                        }
+                        return true;
+                    }
+                })
+                .show();
+    }
+
+    public void backToPrev() {
+        Log.d("ExplorerFragment", "backToPrev:"+curPath);
+        String qpyDir = Environment.getExternalStorageDirectory().getAbsolutePath()+"/qpython";
+        if (curPath == null || qpyDir.equals(curPath) || Environment.getExternalStorageDirectory().getAbsolutePath().equals(curPath)) {
+            getActivity().finish();
+        } else {
+            String parentPath = new File(curPath).getParent();
+            if (!TextUtils.isEmpty(parentPath)) openDir(parentPath);
+        }
+    }
+
+    private void updateClouded(File file) {
+        if (file.getParent().contains("projects")) {
+            String parent = file.getParent() + "/";
+            String subPath = file.getPath().substring(file.getPath().indexOf(parent) + parent.length());
+            String projName = subPath.contains("/") ? subPath.substring(0, subPath.indexOf("/")) : "/" + subPath;
+            cloudedMap.put(CONF.ABSOLUTE_PATH + projName, true);
+        }
+        if (file.isDirectory()) {
+            for (File file1 : FileHelper.filterExt(file, getResources().getStringArray(R.array.support_file_ext))) {
+                cloudedMap.put(file1.getPath(), true);
+            }
+        } else {
+            cloudedMap.put(file.getPath(), true);
+        }
+    }
+
+    public String getCurPath() {
+        return curPath;
+    }
+
+    private void initCloud() {
+        if (App.getUser() == null) {
+            return;
+        }
+        ShareCodeUtil.getInstance().getUploadedScripts(false, getActivity(), cloudFiles -> {
+            if (cloudFiles == null || cloudFiles.size() == 0) {
+                return;
+            }
+            for (CloudFile cloudFile : cloudFiles) {
+                if (cloudFile.getPath().contains("/projects")) {
+                    String projNode = cloudFile.getPath().contains("/projects3/") ? "/projects3/" : "/projects/";
+                    cloudedMap.put(CONF.ABSOLUTE_PATH + projNode + cloudFile.getProjectName(), true);
+                }
+                cloudedMap.put(CONF.ABSOLUTE_PATH + cloudFile.getPath(), true);
+            }
+            adapter.setCloudMap(cloudedMap);
+            adapter.notifyDataSetChanged();
+        });
+    }
+
+    public void deleteCloudedMap(String absolutePath) {
+        if (cloudedMap.containsKey(absolutePath)) {
+            cloudedMap.remove(absolutePath);
+            adapter.notifyDataSetChanged();
+        }
+    }
+
+    public void updateCloudedFiles(Map<String, Boolean> map) {
+        if (map != null) {
+            cloudedMap.putAll(map);
+        }
+        adapter.notifyDataSetChanged();
+    }
+}
diff --git a/qpython/src/os/java/org/qpython/qpy/main/fragment/MyProjectFragment.java b/qpython/src/os/java/org/qpython/qpy/main/fragment/MyProjectFragment.java
new file mode 100644
index 00000000..1b52cf26
--- /dev/null
+++ b/qpython/src/os/java/org/qpython/qpy/main/fragment/MyProjectFragment.java
@@ -0,0 +1,256 @@
+package org.qpython.qpy.main.fragment;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.databinding.DataBindingUtil;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.widget.LinearLayoutManager;
+import android.text.Html;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+import com.quseit.util.DateTimeHelper;
+import com.quseit.util.ImageUtil;
+import com.yanzhenjie.recyclerview.swipe.SwipeMenuCreator;
+import com.yanzhenjie.recyclerview.swipe.SwipeMenuItem;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.codeshare.CONSTANT;
+import org.qpython.qpy.codeshare.ShareCodeUtil;
+import org.qpython.qpy.codeshare.pojo.CloudFile;
+import org.qpython.qpy.databinding.FragmentRefreshRvBinding;
+import org.qpython.qpy.main.adapter.CloudScriptAdapter;
+import org.qpython.qpy.texteditor.TedLocalActivity;
+import org.qpython.qpysdk.QPyConstants;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import rx.Observable;
+import rx.android.schedulers.AndroidSchedulers;
+
+public class MyProjectFragment extends Fragment {
+    private int WIDTH = (int) ImageUtil.dp2px(60);
+    private FragmentRefreshRvBinding binding;
+    private CloudScriptAdapter adapter;
+    private List<CloudFile> scriptList = new ArrayList<>();
+    private TedLocalActivity activity;
+
+    public boolean isLoading;
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        binding = DataBindingUtil.bind(LayoutInflater.from(getContext()).inflate(R.layout.fragment_refresh_rv, null));
+        return binding.getRoot();
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        scriptList = new ArrayList<>();
+        adapter = new CloudScriptAdapter(scriptList);
+        ShareCodeUtil.getInstance().clearAll();
+        initView();
+        initListener();
+        retry(true);
+    }
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        activity = (TedLocalActivity) context;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (adapter != null) {
+            adapter.notifyDataSetChanged();
+        }
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+//        activity.locatedCloud(scriptList);
+    }
+
+    public void retry(boolean forceRefresh) {
+        if (scriptList != null && adapter != null) {
+            scriptList.clear();
+            adapter.notifyDataSetChanged();
+        }
+        startProgressBar();
+        isLoading = true;
+        ShareCodeUtil.getInstance().getUploadedScripts(forceRefresh, getActivity(), cloudFiles -> {
+            isLoading = false;
+            if (cloudFiles == null || cloudFiles.size() == 0) {
+                showEmpty();
+                return;
+            }
+//            ((TedLocalActivity) getActivity()).updateCloudFiles(cloudFiles);
+            scriptList.clear();
+            scriptList.addAll(cloudFiles);
+            adapter.notifyDataSetChanged();
+            binding.progressBar.setVisibility(View.GONE);
+            binding.netError.setVisibility(View.GONE);
+        });
+    }
+
+    public void notifyDataSetChange() {
+        if (adapter != null) adapter.notifyDataSetChanged();
+    }
+
+    private void startProgressBar() {
+        binding.progressBar.setVisibility(View.VISIBLE);
+        binding.netError.setVisibility(View.GONE);
+        Observable.just(null)
+                .delay(5, TimeUnit.SECONDS)
+                .observeOn(AndroidSchedulers.mainThread())
+                .doOnNext(o -> showNetErrorText())
+                .subscribe();
+    }
+
+    private void showEmpty() {
+        if (binding.progressBar.getVisibility() == View.VISIBLE) {
+            binding.progressBar.setVisibility(View.GONE);
+            binding.netError.setText(R.string.cloud_empty_hint);
+            binding.netError.setVisibility(View.VISIBLE);
+        }
+    }
+
+    private void showNetErrorText() {
+        if (binding.progressBar.getVisibility() == View.VISIBLE) {
+            binding.progressBar.setVisibility(View.GONE);
+            binding.netError.setText(R.string.net_lagging);
+            binding.netError.setVisibility(View.VISIBLE);
+        }
+    }
+
+    private void initView() {
+        SwipeMenuCreator swipeMenuCreator = (leftMenu, rightMenu, viewType) -> {
+            SwipeMenuItem deleteItem = new SwipeMenuItem(getContext())
+                    .setBackgroundColor(Color.parseColor("#FFD14136"))
+                    .setImage(R.drawable.ic_editor_filetree_close)
+                    .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+                    .setWidth(WIDTH);
+
+            SwipeMenuItem downloadItem = new SwipeMenuItem(getContext())
+                    .setBackgroundColor(Color.parseColor("#FF4798F3"))
+                    .setImage(R.drawable.ic_cloud_download)
+                    .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+                    .setWidth(WIDTH);
+            rightMenu.addMenuItem(downloadItem);
+            rightMenu.addMenuItem(deleteItem);
+        };
+        binding.swipeList.setLayoutManager(new LinearLayoutManager(getContext()));
+        binding.swipeList.setSwipeMenuCreator(swipeMenuCreator);
+    }
+
+    @SuppressLint("StringFormatMatches")
+    private void initListener() {
+        binding.netError.setOnClickListener(v -> retry(true));
+        binding.swipeList.setSwipeMenuItemClickListener(menuBridge -> {
+            menuBridge.closeMenu();
+            switch (menuBridge.getPosition()) {
+                case 0:
+                    // download
+                    CloudFile cloudFile = scriptList.get(menuBridge.getAdapterPosition());
+                    cloudFile.setUploading(true);
+                    adapter.notifyItemChanged(menuBridge.getAdapterPosition());
+                    String path;
+                    path = QPyConstants.ABSOLUTE_PATH + cloudFile.getPath();
+                    File file = new File(path);
+                    if (file.exists()) {
+                        new AlertDialog.Builder(getContext(), R.style.MyDialog)
+                                .setTitle(R.string.override_hint)
+                                .setMessage(Html.fromHtml(getString(R.string.conflict_hint,
+                                        cloudFile.getUploadTime(),
+                                        DateTimeHelper.AGO_FULL_DATE_FORMATTER.format(new Date(file.lastModified())))))
+                                .setNegativeButton(R.string.no, (dialog, which) ->{
+                                    cloudFile.setUploading(false);
+                                    adapter.notifyItemChanged(menuBridge.getAdapterPosition());
+                                })
+                                .setPositiveButton(R.string.yes,
+                                        (dialog, which) ->
+                                                getRemoteContentNWrite(cloudFile, path, menuBridge.getAdapterPosition()))
+                                .create()
+                                .show();
+                    } else {
+                        getRemoteContentNWrite(cloudFile, path, menuBridge.getAdapterPosition());
+                    }
+                    break;
+                case 1:
+                    // delete
+                    scriptList.get(menuBridge.getAdapterPosition()).setUploading(true);
+                    adapter.notifyItemChanged(menuBridge.getAdapterPosition());
+                    ShareCodeUtil.getInstance().deleteUploadScript(scriptList.get(menuBridge.getAdapterPosition()), (databaseError, databaseReference) -> {
+//                        if (databaseError == null && getContext() != null) {
+//                            Toast.makeText(getContext(), R.string.delete_remote_suc, Toast.LENGTH_SHORT).show();
+//                            adapter.notifyItemRemoved(menuBridge.getAdapterPosition());
+//                            ((TedLocalActivity) getActivity()).deleteCloudFile(scriptList.get(menuBridge.getAdapterPosition()).getAbsolutePath());
+//                            scriptList.remove(menuBridge.getAdapterPosition());
+//                            if (scriptList.size() == 0) {
+//                                binding.netError.setText(R.string.cloud_empty_hint);
+//                                binding.netError.setVisibility(View.VISIBLE);
+//                            } else {
+//                                binding.netError.setVisibility(View.INVISIBLE);
+//                            }
+//                        } else {
+//                            Toast.makeText(getContext(), databaseError.getMessage(), Toast.LENGTH_SHORT).show();
+//                        }
+                    });
+                    break;
+            }
+        });
+        adapter.setCallback((position) -> binding.swipeList.smoothOpenRightMenu(position));
+        binding.swipeList.setAdapter(adapter);
+    }
+
+    private void getRemoteContentNWrite(CloudFile cloudFile, String path, int position) {
+        String key = cloudFile.getKey();
+        if (cloudFile.getProjectName() != null && !cloudFile.getKey().contains("projects3")) {
+            key = key.replace(cloudFile.getProjectName() + CONSTANT.SLASH_REPLACE, cloudFile.getProjectName() + "/" + CONSTANT.SLASH_REPLACE);
+        }
+        ShareCodeUtil.getInstance().getFileContent(key, content -> {
+            writeFile(path, content, position);
+            scriptList.get(position).setUploading(false);
+            adapter.notifyItemChanged(position);
+        });
+    }
+
+    private void writeFile(String path, String content, int adapterPosition) {
+        try {
+            FileWriter writer = new FileWriter(new File(path), false);
+            writer.write(content);
+            writer.close();
+            Toast.makeText(getContext(), R.string.file_downloaded, Toast.LENGTH_SHORT).show();
+            adapter.notifyItemChanged(adapterPosition);
+        } catch (IOException e) {
+            e.printStackTrace();
+            Toast.makeText(getContext(), R.string.override_fail_hint, Toast.LENGTH_SHORT).show();
+        }
+    }
+
+    public void needRefresh(boolean isNewUpload) {
+        if (binding == null) {
+            // not init yet
+            return;
+        }
+        if (isNewUpload) {
+            retry(true);
+        }
+    }
+}
diff --git a/qpython/src/os/java/org/qpython/qpy/main/receiver/LeancloudReceiver.java b/qpython/src/os/java/org/qpython/qpy/main/receiver/LeancloudReceiver.java
new file mode 100644
index 00000000..6f12375e
--- /dev/null
+++ b/qpython/src/os/java/org/qpython/qpy/main/receiver/LeancloudReceiver.java
@@ -0,0 +1,18 @@
+package org.qpython.qpy.main.receiver;
+
+import android.annotation.SuppressLint;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+/**
+ * 处理leancloud的消息推送
+ */
+public class LeancloudReceiver extends BroadcastReceiver {
+
+    @SuppressLint("UnsafeProtectedBroadcastReceiver")
+    @Override
+    public void onReceive(Context context, Intent intent) {
+
+    }
+}
\ No newline at end of file
diff --git a/qpython/src/os/java/org/qpython/qpy/main/service/MyFirebaseInstanceIDService.java b/qpython/src/os/java/org/qpython/qpy/main/service/MyFirebaseInstanceIDService.java
new file mode 100644
index 00000000..362c2336
--- /dev/null
+++ b/qpython/src/os/java/org/qpython/qpy/main/service/MyFirebaseInstanceIDService.java
@@ -0,0 +1,15 @@
+package org.qpython.qpy.main.service;
+
+import com.google.firebase.iid.FirebaseInstanceId;
+import com.google.firebase.iid.FirebaseInstanceIdService;
+
+/**
+ * Created by Hmei on 2017-06-29.
+ */
+
+public class MyFirebaseInstanceIDService extends FirebaseInstanceIdService {
+    @Override
+    public void onTokenRefresh() {
+        String refreshedToken = FirebaseInstanceId.getInstance().getToken();
+    }
+}
diff --git a/qpython/src/os/java/org/qpython/qpy/main/service/MyFirebaseMessagingService.java b/qpython/src/os/java/org/qpython/qpy/main/service/MyFirebaseMessagingService.java
new file mode 100644
index 00000000..9f333943
--- /dev/null
+++ b/qpython/src/os/java/org/qpython/qpy/main/service/MyFirebaseMessagingService.java
@@ -0,0 +1,88 @@
+package org.qpython.qpy.main.service;
+
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.net.Uri;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+
+import com.google.firebase.messaging.FirebaseMessagingService;
+import com.google.firebase.messaging.RemoteMessage;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.qpython.qpy.R;
+import org.qpython.qpy.main.activity.QWebViewActivity;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.CONF;
+import org.qpython.qpy.main.receiver.NotificationBean;
+
+import java.util.Map;
+
+
+public class MyFirebaseMessagingService extends FirebaseMessagingService {
+    private static final int LOG_NOTIFICATION_ID = (int) System.currentTimeMillis();
+
+    private boolean handled = false;
+
+    @Override
+    public void onMessageReceived(RemoteMessage remoteMessage) {
+        super.onMessageReceived(remoteMessage);
+        Map<String, String> data = remoteMessage.getData();
+        String json = App.getGson().toJson(data);
+        NotificationBean bean = App.getGson().fromJson(json, NotificationBean.class);
+        if (!bean.isForce()&&!PreferenceManager.getDefaultSharedPreferences(this).getBoolean(getString(R.string.key_hide_push), true)) {
+            return;
+        }
+        Intent intent;
+        if (bean.getType().equals("ext")) {
+            intent = new Intent(Intent.ACTION_VIEW, Uri.parse(bean.getLink()));
+        } else {
+            intent = new Intent(App.getContext(), QWebViewActivity.class);
+            intent.putExtra(QWebViewActivity.TITLE, bean.getTitle());
+            intent.putExtra("url", bean.getLink());
+        }
+
+        PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_ONE_SHOT);
+
+        Notification.Builder builder = new Notification.Builder(this)
+                .setSmallIcon(R.drawable.img_home_logo)
+                .setContentTitle(getString(R.string.app_name))
+                .setContentText(bean.getMsg())
+                .setContentIntent(pendingIntent)
+                .setAutoCancel(true);
+
+        Notification notification;
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN) {
+            notification = builder.build();
+        } else {
+            notification = builder.getNotification();
+        }
+        NotificationManager mNotifyMgr = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
+        mNotifyMgr.notify(LOG_NOTIFICATION_ID, notification);
+        handled = true;
+    }
+
+ /*   @Override
+    public void handleIntent(Intent intent) {
+        super.handleIntent(intent);
+        if (handled) {
+            return;
+        }
+        Bundle bundle = intent.getExtras();
+        JSONObject extras = new JSONObject();
+        try {
+            for (String s : bundle.keySet()) {
+                extras.put(s, bundle.get(s));
+            }
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        SharedPreferences.Editor editor = getSharedPreferences(CONF.NOTIFICATION_SP_NAME, MODE_PRIVATE).edit();
+        editor.putString(CONF.NOTIFICATION_SP_OBJ, extras.toString());
+        editor.apply();
+    }*/
+}
\ No newline at end of file
diff --git a/qpython/src/os/java/org/qpython/qpy/main/service/PayUtil.java b/qpython/src/os/java/org/qpython/qpy/main/service/PayUtil.java
new file mode 100644
index 00000000..8b88e8cc
--- /dev/null
+++ b/qpython/src/os/java/org/qpython/qpy/main/service/PayUtil.java
@@ -0,0 +1,150 @@
+package org.qpython.qpy.main.service;
+
+import android.app.Activity;
+import android.app.PendingIntent;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentSender;
+import android.content.ServiceConnection;
+import android.os.Bundle;
+import android.os.IBinder;
+import android.os.RemoteException;
+import android.view.View;
+import android.widget.Toast;
+
+import com.android.vending.billing.IInAppBillingService;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.qpython.qpy.R;
+import org.qpython.qpy.main.server.MySubscriber;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+import rx.Observable;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+/**
+ * Created by Hmei
+ * 1/31/18.
+ */
+
+public class PayUtil {
+    private static final int BUY_REQUEST_CODE = 2333;
+    private IInAppBillingService mService;
+    private ServiceConnection    mServiceConn;
+    private Activity             context;
+
+    public PayUtil(Activity context) {
+        this.context = context;
+    }
+
+    public void initIAP(PayCallback callback) {
+        mServiceConn = new ServiceConnection() {
+            @Override
+            public void onServiceDisconnected(ComponentName name) {
+                mService = null;
+            }
+
+            @Override
+            public void onServiceConnected(ComponentName name,
+                                           IBinder service) {
+                mService = IInAppBillingService.Stub.asInterface(service);
+                if (callback != null) callback.doAfterConn();
+            }
+        };
+        Intent serviceIntent = new Intent("com.android.vending.billing.InAppBillingService.BIND");
+        serviceIntent.setPackage("com.android.vending");
+        context.bindService(serviceIntent, mServiceConn, Context.BIND_AUTO_CREATE);
+    }
+
+    /**
+     * 从Google服务器获取不同国家价格表并显示
+     */
+    public void getPrices(ArrayList<String> skuList, MySubscriber<String[]> callback) {
+        if (mService == null) {
+            Toast.makeText(context, R.string.lose_google_server, Toast.LENGTH_SHORT).show();
+            if (context.findViewById(R.id.pb) != null)
+                context.findViewById(R.id.pb).setVisibility(View.GONE);
+            return;
+        }
+        Bundle querySkus = new Bundle();
+        querySkus.putStringArrayList("ITEM_ID_LIST", skuList);
+        try {
+            Observable.just(mService.getSkuDetails(3, context.getPackageName(), "inapp", querySkus))
+                    .map(bundle -> {
+                                ArrayList<String> responseList = bundle.getStringArrayList("DETAILS_LIST");
+                                if (responseList == null) {
+                                    return null;
+                                }
+                                String[] prices = new String[responseList.size()];
+                                for (int i = 0; i < responseList.size(); i++) {
+                                    JSONObject object;
+                                    try {
+                                        object = new JSONObject(responseList.get(i));
+                                        String price = object.getString("price");
+                                        prices[i] = price;
+                                    } catch (JSONException e) {
+                                        e.printStackTrace();
+                                    }
+                                }
+                                Arrays.sort(prices, (o1, o2) -> Integer.parseInt(o1.replaceAll("[^0-9]", "")) - Integer.parseInt(o2.replaceAll("[^0-9]", "")));
+                                return prices;
+                            }
+                    )
+                    .subscribeOn(Schedulers.newThread())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe(callback);
+        } catch (RemoteException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void digestPurchase(String purchaseToken) {
+        // 消耗购买，使能重复赞赏同一金额
+        try {
+            Observable.just(mService.consumePurchase(3, context.getPackageName(), purchaseToken))
+                    .subscribeOn(Schedulers.newThread())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe();
+        } catch (RemoteException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void purchase(String sku) {
+        try {
+            if (mService == null) {
+                Toast.makeText(context, R.string.lose_google_server, Toast.LENGTH_SHORT).show();
+                return;
+            }
+            Bundle buyIntentBundle = mService.getBuyIntent(3, context.getPackageName(),
+                    sku, "inapp", "bGoa+V7g/yqDXvKRqq+JTFn4uQZbPiQJo4pf9RzJ");
+            switch (buyIntentBundle.getInt("RESPONSE_CODE")) {
+                case 0:
+                    //BILLING_RESPONSE_RESULT_OK
+                    PendingIntent pendingIntent = buyIntentBundle.getParcelable("BUY_INTENT");
+                    context.startIntentSenderForResult(pendingIntent.getIntentSender(),
+                            BUY_REQUEST_CODE, new Intent(), 0, 0, 0);
+                    break;
+
+            }
+        } catch (RemoteException | IntentSender.SendIntentException | NullPointerException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void unbindPayService() {
+        if (mService != null) {
+            context.unbindService(mServiceConn);
+        }
+    }
+
+    public interface PayCallback {
+        void doAfterConn();
+    }
+
+}
diff --git a/qpython/src/os/java/org/qpython/qpy/texteditor/TedLocalActivity.java b/qpython/src/os/java/org/qpython/qpy/texteditor/TedLocalActivity.java
new file mode 100644
index 00000000..466f0c8a
--- /dev/null
+++ b/qpython/src/os/java/org/qpython/qpy/texteditor/TedLocalActivity.java
@@ -0,0 +1,308 @@
+package org.qpython.qpy.texteditor;
+
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Configuration;
+import android.databinding.DataBindingUtil;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v7.app.AppCompatActivity;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.Toast;
+
+import com.google.gson.reflect.TypeToken;
+import com.quseit.util.FileHelper;
+import com.quseit.util.NAction;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.codeshare.pojo.CloudFile;
+import org.qpython.qpy.databinding.ActivityLocalBinding;
+import org.qpython.qpy.main.activity.SignInActivity;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.CONF;
+import org.qpython.qpy.main.fragment.ExplorerFragment;
+import org.qpython.qpy.main.fragment.LocalFragment;
+import org.qpython.qpy.main.fragment.MyProjectFragment;
+import org.qpython.qpy.utils.NotebookUtil;
+import org.qpython.qpysdk.QPyConstants;
+
+import java.io.File;
+import java.lang.reflect.Type;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class TedLocalActivity extends AppCompatActivity {
+    public static final  int REQUEST_SAVE_AS    = 107;
+    public static final  int REQUEST_OPEN       = 108;
+    public static final  int REQUEST_HOME_PAGE  = 109;
+    public static final  int REQUEST_RECENT     = 111;
+    private static final int LOGIN_REQUEST_CODE = 4806;
+
+    private static final String EXTRA_REQUEST_CODE = "request_code";
+    private static final String EXTRA_REQUEST_FN = "request_fn";
+
+    private static final String FRAGMENT_EXPLORER  = "explorer";
+    private static final String FRAGMENT_CLOUD     = "cloud";
+
+    private ActivityLocalBinding binding;
+
+    private Fragment firstPageFragment;
+    private MyProjectFragment myProjectFragment;
+
+    private boolean isExplorer  = true;
+    private boolean isNewUpload = false;
+    //private String defaultFileName = "";
+
+    public static void start(Context context, int type) {
+        Intent starter = new Intent(context, TedLocalActivity.class);
+        starter.putExtra(EXTRA_REQUEST_CODE, type);
+        context.startActivity(starter);
+    }
+
+    public static void start(Activity context, int type, int requestCode, String filename) {
+        Intent starter = new Intent(context, TedLocalActivity.class);
+        starter.putExtra(EXTRA_REQUEST_CODE, type);
+        starter.putExtra(EXTRA_REQUEST_FN, filename);
+
+        context.startActivityForResult(starter, requestCode);
+    }
+
+    public void finishForGetPath(String path) {
+        Intent intent = new Intent();
+        intent.putExtra("path", path);
+        setResult(Activity.RESULT_OK, intent);
+        finish();
+    }
+
+    public void finishForOpen(String path, boolean isProj) {
+        Intent intent = new Intent();
+        intent.putExtra("path", path);
+        intent.putExtra("isProj", isProj);
+        setResult(Activity.RESULT_OK, intent);
+        finish();
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_local);
+        setSupportActionBar(binding.toolbar);
+        int type = getIntent().getIntExtra(EXTRA_REQUEST_CODE, REQUEST_HOME_PAGE);
+
+        initView();
+        initListener();
+        switch (type) {
+            case REQUEST_RECENT:
+                setTitle(R.string.recent);
+                binding.switchBtn.setVisibility(View.GONE);
+                firstPageFragment = ExplorerFragment.newInstance(type);
+                break;
+            case REQUEST_OPEN:
+                setTitle(R.string.open);
+                binding.switchBtn.setVisibility(View.GONE);
+                binding.explore.setVisibility(View.VISIBLE);
+                firstPageFragment = new LocalFragment();
+                break;
+            case REQUEST_SAVE_AS:
+                setTitle(R.string.save_as);
+                binding.vsSave.getRoot().setVisibility(View.VISIBLE);
+                initSaveListener();
+
+                String fn = getIntent().getStringExtra(EXTRA_REQUEST_FN);
+                if (fn!=null) {
+                    binding.vsSave.etName.setText(fn);
+                }
+                binding.switchBtn.setVisibility(View.GONE);
+                firstPageFragment = ExplorerFragment.newInstance(type);
+                break;
+            case REQUEST_HOME_PAGE:
+                setTitle(R.string.explorer);
+                firstPageFragment = ExplorerFragment.newInstance(type);
+                break;
+        }
+
+        getSupportFragmentManager().beginTransaction()
+                .add(R.id.container, firstPageFragment, FRAGMENT_EXPLORER)
+                .commit();
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+    }
+
+    private void initView() {
+        binding.toolbar.setNavigationIcon(R.drawable.ic_back);
+        binding.toolbar.setNavigationOnClickListener(v -> finish());
+        if (binding.switchBtn.getVisibility() == View.VISIBLE) {
+            myProjectFragment = new MyProjectFragment();
+        }
+    }
+
+    private void initListener() {
+        binding.switchBtn.setOnClickListener(v -> {
+            if (isExplorer) {
+                if (App.getUser() == null) {
+                    startActivityForResult(new Intent(this, SignInActivity.class), LOGIN_REQUEST_CODE);
+                    return;
+                }
+                binding.switchBtn.setImageResource(R.drawable.ic_folder_open);
+                binding.refresh.setVisibility(View.VISIBLE);
+                if (getSupportFragmentManager().findFragmentByTag(FRAGMENT_CLOUD) == null) {
+                    getSupportFragmentManager().beginTransaction().add(R.id.container, myProjectFragment, FRAGMENT_CLOUD).commit();
+                    getSupportFragmentManager().beginTransaction().hide(firstPageFragment).commit();
+                } else {
+                    getSupportFragmentManager().beginTransaction()
+                            .hide(firstPageFragment)
+                            .show(myProjectFragment)
+                            .commit();
+                }
+                myProjectFragment.needRefresh(isNewUpload);
+                isNewUpload = false;
+                if (!myProjectFragment.isLoading) {
+                    myProjectFragment.notifyDataSetChange();
+                }
+            } else {
+                binding.switchBtn.setImageResource(R.drawable.ic_cloud_list);
+                binding.refresh.setVisibility(View.GONE);
+                getSupportFragmentManager().beginTransaction()
+                        .hide(myProjectFragment)
+                        .show(firstPageFragment)
+                        .commit();
+            }
+            isExplorer = !isExplorer;
+        });
+
+        binding.refresh.setOnClickListener(v -> myProjectFragment.retry(true));
+
+        binding.explore.setOnClickListener(v -> {
+            start(this, REQUEST_HOME_PAGE);
+            finish();
+        });
+    }
+
+    public void doSave(String fn) {
+        if (fn.length() == 0) {
+            Toast.makeText(getApplicationContext(), R.string.toast_filename_empty, Toast.LENGTH_SHORT).show();
+        } else {
+            String filename = ((ExplorerFragment) firstPageFragment).getCurPath() + "/" + fn;
+            final File f = new File(filename);
+            if (f.exists()) {
+                Toast.makeText(this, R.string.file_exist_hint, Toast.LENGTH_SHORT).show();
+            } else {
+                setSaveResult(f.getAbsolutePath());
+            }
+        }
+    }
+
+    protected boolean setSaveResult(String filepath) {
+        File f = new File(filepath);
+        if (f.getParentFile().canWrite()) {
+            finishForGetPath(filepath);
+        } else {
+            Toast.makeText(getApplicationContext(), R.string.toast_folder_cant_write, Toast.LENGTH_SHORT).show();
+        }
+        return true;
+    }
+
+    private void initSaveListener() {
+        binding.vsSave.btnSave.setOnClickListener(v -> doSave(binding.vsSave.etName.getText().toString()));
+        binding.vsSave.etName.setOnTouchListener((v, event) -> {
+            final int DRAWABLE_RIGHT = 2;
+            switch (event.getAction()) {
+                case MotionEvent.ACTION_DOWN:
+                    Drawable deleteText = ((EditText) v).getCompoundDrawables()[DRAWABLE_RIGHT];
+                    if (deleteText != null) {
+                        if (event.getRawX() >= (v.getRight() - deleteText.getBounds().width())) {
+                            ((EditText) v).setText("");
+                            return true;
+                        }
+                    }
+                    break;
+                case MotionEvent.ACTION_UP:
+                    v.performClick();
+                    break;
+                default:
+                    break;
+            }
+            return false;
+        });
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (resultCode == RESULT_OK) {
+            switch (requestCode) {
+                case LOGIN_REQUEST_CODE:
+                    binding.switchBtn.setImageResource(R.drawable.ic_folder_open);
+                    if (getSupportFragmentManager().findFragmentByTag(FRAGMENT_CLOUD) == null) {
+                        getSupportFragmentManager().beginTransaction().add(R.id.container, myProjectFragment, FRAGMENT_CLOUD).commit();
+                        getSupportFragmentManager().beginTransaction().hide(firstPageFragment).commit();
+                    } else {
+                        getSupportFragmentManager().beginTransaction()
+                                .hide(firstPageFragment)
+                                .show(myProjectFragment)
+                                .commit();
+                    }
+                    isExplorer = !isExplorer;
+                    break;
+            }
+        }
+    }
+
+    @Override
+    public void onBackPressed() {
+        if (firstPageFragment.isVisible() && firstPageFragment instanceof ExplorerFragment) {
+            ((ExplorerFragment) firstPageFragment).backToPrev();
+        } else {
+            super.onBackPressed();
+        }
+    }
+
+//    public void deleteCloudFile(String path) {
+//        if (firstPageFragment instanceof ExplorerFragment) {
+//            ((ExplorerFragment) firstPageFragment).deleteCloudedMap(path);
+//        }
+//    }
+//
+//    public void updateCloudFiles(List<CloudFile> cloudFiles) {
+//        Map<String, Boolean> map = new HashMap<>();
+//        boolean isQPy3 = NAction.isQPy3(getBaseContext());
+//        String tag = isQPy3?"/projects3/":"/projects/";
+//        for (CloudFile cloudFile : cloudFiles) {
+//            if (cloudFile.getPath().contains(tag)) {
+//                map.put(QPyConstants.ABSOLUTE_PATH + tag + cloudFile.getProjectName(), true);
+//            }
+//            map.put(QPyConstants.ABSOLUTE_PATH + cloudFile.getPath(), true);
+//        }
+//        ((ExplorerFragment) firstPageFragment).updateCloudedFiles(map);
+//    }
+//
+//    public void setNewUpload() {
+//        isNewUpload = true;
+//    }
+
+    /**
+     * 保存云端文件目录到本地
+     */
+//    public void locatedCloud(List<CloudFile> cloudFiles) {
+//        if (cloudFiles.size() > 0) {
+//            Type type = new TypeToken<List<CloudFile>>() {
+//            }.getType();
+//            FileHelper.writeToFile(CONF.CLOUD_MAP_CACHE_PATH, App.getGson().toJson(cloudFiles, type));
+//        }
+//    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        NotebookUtil.killServer();
+    }
+}
diff --git a/qpython/src/os/res/layout/activity_local.xml b/qpython/src/os/res/layout/activity_local.xml
new file mode 100644
index 00000000..abdcb0aa
--- /dev/null
+++ b/qpython/src/os/res/layout/activity_local.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <LinearLayout
+        android:id="@+id/gd_action_bar_host"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:background="@color/colorPrimaryDark"
+        android:orientation="vertical">
+
+        <android.support.design.widget.AppBarLayout
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize">
+
+            <android.support.v7.widget.Toolbar
+                android:id="@+id/toolbar"
+                style="@style/Toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:background="#FF4A4A4A"
+                android:elevation="2dp"
+                app:popupTheme="@style/DefaultBlueToolbar"
+                app:theme="@style/ToolbarTheme">
+
+                <ImageButton
+                    android:id="@+id/switch_btn"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end"
+                    android:background="@null"
+                    android:padding="10dp"
+                    android:src="@drawable/ic_cloud_list"
+                    android:visibility="gone"/>
+
+                <ImageButton
+                    android:id="@+id/refresh"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end"
+                    android:visibility="gone"
+                    android:layout_marginEnd="30dp"
+                    android:layout_marginRight="30dp"
+                    android:background="@color/transparency"
+                    android:src="@drawable/ic_library_reinstall"/>
+
+                <Button
+                    android:id="@+id/explore"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end"
+                    android:textColor="#FFF"
+                    android:background="@color/transparency"
+                    android:text="@string/explorer"
+                    android:visibility="gone"/>
+            </android.support.v7.widget.Toolbar>
+        </android.support.design.widget.AppBarLayout>
+
+        <RelativeLayout
+            xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/colorPrimaryDark">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+                <FrameLayout
+                    android:id="@+id/container"
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="9"/>
+
+                <include
+                    android:id="@+id/vs_save"
+                    layout="@layout/view_stub_save_prompt"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"/>
+            </LinearLayout>
+        </RelativeLayout>
+    </LinearLayout>
+
+
+</layout>
\ No newline at end of file
diff --git a/qpython/src/os/res/values-zh-rCN/strings.xml b/qpython/src/os/res/values-zh-rCN/strings.xml
new file mode 100644
index 00000000..a900de8f
--- /dev/null
+++ b/qpython/src/os/res/values-zh-rCN/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="sign_in_with_google">使用谷歌登录</string>
+    <string name="app_name">QPython OS</string>
+</resources>
diff --git a/qpython/src/os/res/values/strings.xml b/qpython/src/os/res/values/strings.xml
new file mode 100644
index 00000000..49b3ca29
--- /dev/null
+++ b/qpython/src/os/res/values/strings.xml
@@ -0,0 +1,4 @@
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="ExtraTranslation">
+    <string name="sign_in_with_google">Sign in with Google</string>
+    <string name="app_name">QPython OS</string>
+</resources>
diff --git a/res/drawable-hdpi/ic_edit_b.png b/res/drawable-hdpi/ic_edit_b.png
deleted file mode 100644
index 4a939679..00000000
Binary files a/res/drawable-hdpi/ic_edit_b.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_edit_l.png b/res/drawable-hdpi/ic_edit_l.png
deleted file mode 100644
index 3eb5190f..00000000
Binary files a/res/drawable-hdpi/ic_edit_l.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_log_b.png b/res/drawable-hdpi/ic_log_b.png
deleted file mode 100644
index ba812099..00000000
Binary files a/res/drawable-hdpi/ic_log_b.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_log_l.png b/res/drawable-hdpi/ic_log_l.png
deleted file mode 100644
index c3abcb20..00000000
Binary files a/res/drawable-hdpi/ic_log_l.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_main_b.png b/res/drawable-hdpi/ic_main_b.png
deleted file mode 100644
index 23778ae9..00000000
Binary files a/res/drawable-hdpi/ic_main_b.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_main_l.png b/res/drawable-hdpi/ic_main_l.png
deleted file mode 100644
index 64538ce8..00000000
Binary files a/res/drawable-hdpi/ic_main_l.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_run_error.png b/res/drawable-hdpi/ic_run_error.png
deleted file mode 100644
index 8ed186b4..00000000
Binary files a/res/drawable-hdpi/ic_run_error.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_run_ok.png b/res/drawable-hdpi/ic_run_ok.png
deleted file mode 100644
index 58bf9721..00000000
Binary files a/res/drawable-hdpi/ic_run_ok.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_up_b.png b/res/drawable-hdpi/ic_up_b.png
deleted file mode 100644
index bd405bad..00000000
Binary files a/res/drawable-hdpi/ic_up_b.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_up_l.png b/res/drawable-hdpi/ic_up_l.png
deleted file mode 100644
index ca78f2ec..00000000
Binary files a/res/drawable-hdpi/ic_up_l.png and /dev/null differ
diff --git a/res/drawable-hdpi/icon_nb.png b/res/drawable-hdpi/icon_nb.png
deleted file mode 100644
index f2ccdf5b..00000000
Binary files a/res/drawable-hdpi/icon_nb.png and /dev/null differ
diff --git a/res/drawable-hdpi/icon_notify.png b/res/drawable-hdpi/icon_notify.png
deleted file mode 100644
index a57f053c..00000000
Binary files a/res/drawable-hdpi/icon_notify.png and /dev/null differ
diff --git a/res/drawable-hdpi/share_via_barcode.png b/res/drawable-hdpi/share_via_barcode.png
deleted file mode 100644
index 56c34492..00000000
Binary files a/res/drawable-hdpi/share_via_barcode.png and /dev/null differ
diff --git a/res/drawable-hdpi/shopper_icon.png b/res/drawable-hdpi/shopper_icon.png
deleted file mode 100644
index 09735588..00000000
Binary files a/res/drawable-hdpi/shopper_icon.png and /dev/null differ
diff --git a/res/drawable-ldpi/ic_launcher.png b/res/drawable-ldpi/ic_launcher.png
deleted file mode 100644
index 1095584e..00000000
Binary files a/res/drawable-ldpi/ic_launcher.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_launcher.png b/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index a07c69fa..00000000
Binary files a/res/drawable-mdpi/ic_launcher.png and /dev/null differ
diff --git a/res/drawable/ic_edit_a.xml b/res/drawable/ic_edit_a.xml
deleted file mode 100644
index eb8358e9..00000000
--- a/res/drawable/ic_edit_a.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-<item android:state_pressed="true" android:drawable="@drawable/ic_edit_l" />
-
-<item android:drawable="@drawable/ic_edit_b" />
-
-<item android:state_checked="true" android:drawable="@drawable/ic_edit_l" />
-
-</selector>
\ No newline at end of file
diff --git a/res/drawable/ic_log_a.xml b/res/drawable/ic_log_a.xml
deleted file mode 100644
index 4bad662a..00000000
--- a/res/drawable/ic_log_a.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-<item android:state_pressed="true" android:drawable="@drawable/ic_log_l" />
-
-<item android:drawable="@drawable/ic_log_b" />
-
-<item android:state_checked="true" android:drawable="@drawable/ic_log_l" />
-
-</selector>
\ No newline at end of file
diff --git a/res/drawable/ic_main_a.xml b/res/drawable/ic_main_a.xml
deleted file mode 100644
index 85e061a3..00000000
--- a/res/drawable/ic_main_a.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-<item android:state_pressed="true" android:drawable="@drawable/ic_main_l" />
-
-<item android:drawable="@drawable/ic_main_b" />
-
-<item android:state_checked="true" android:drawable="@drawable/ic_main_l" />
-
-</selector>
\ No newline at end of file
diff --git a/res/drawable/ic_up_a.xml b/res/drawable/ic_up_a.xml
deleted file mode 100644
index 62e46dbe..00000000
--- a/res/drawable/ic_up_a.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-<item android:state_pressed="true" android:drawable="@drawable/ic_up_l" />
-
-<item android:drawable="@drawable/ic_up_b" />
-
-<item android:state_checked="true" android:drawable="@drawable/ic_up_l" />
-
-</selector>
\ No newline at end of file
diff --git a/res/layout/bookmark_picker_list_item.xml b/res/layout/bookmark_picker_list_item.xml
deleted file mode 100644
index 6ff455d9..00000000
--- a/res/layout/bookmark_picker_list_item.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2008 ZXing authors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:padding="4dip">
-
-
-  <TextView android:id="@+id/bookmark_title"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:singleLine="true"/>
-
-  <TextView android:id="@+id/bookmark_url"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:singleLine="false"/>
-
-</LinearLayout>
diff --git a/res/layout/dialog.xml b/res/layout/dialog.xml
deleted file mode 100644
index db6b243b..00000000
--- a/res/layout/dialog.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:id="@+id/color_layout"
-  android:layout_height="fill_parent"
-  android:layout_width="fill_parent"
-  android:gravity="center">
-  <ProgressBar
-    android:id="@+id/progress_bar"
-    android:layout_height="wrap_content"
-    android:layout_width="wrap_content"
-    style="android:attr/ProgressBar_indeterminate"
-    android:layout_centerVertical="true" />
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/encode.xml b/res/layout/encode.xml
deleted file mode 100644
index 21c0b809..00000000
--- a/res/layout/encode.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2008 ZXing authors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="fill_parent"
-              android:layout_height="fill_parent"
-              android:fillViewport="true"
-              android:background="@color/encode_view"
-              android:orientation="vertical"
-              android:gravity="center">
-
-  <ImageView android:id="@+id/image_view"
-             android:layout_width="fill_parent"
-             android:layout_height="wrap_content"
-             android:layout_gravity="center_horizontal"
-             android:scaleType="center"/>
-
-  <ScrollView android:layout_width="fill_parent"
-              android:layout_height="wrap_content"
-              android:layout_gravity="center_horizontal"
-              android:gravity="center">
-
-    <TextView android:id="@+id/contents_text_view"
-              android:layout_width="fill_parent"
-              android:layout_height="wrap_content"
-              android:layout_gravity="center_horizontal"
-              android:gravity="center"
-              android:textColor="@color/contents_text"
-              android:textSize="18sp"
-              android:paddingBottom="8dip"
-              android:paddingLeft="8dip"
-              android:paddingRight="8dip"/>
-
-  </ScrollView>
-
-</LinearLayout>
diff --git a/res/layout/global_layout_no_top.xml b/res/layout/global_layout_no_top.xml
deleted file mode 100644
index f6e1820a..00000000
--- a/res/layout/global_layout_no_top.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright (C) 2010 Cyril Mottier (http://www.cyrilmottier.com)
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<greendroid.widget.ActionBarHost
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:id="@id/gd_action_bar_host"
-	android:layout_width="fill_parent"
-	android:layout_height="fill_parent"
-	android:orientation="vertical">
-
-	<greendroid.widget.ActionBar
-		android:id="@+id/gd_action_bar"
-		android:layout_height="@dimen/gd_action_bar_height"
-		android:layout_width="fill_parent"
-		android:background="?attr/gdActionBarBackground" 
-		android:visibility="gone"
-		
-		/>
-
-	<FrameLayout
-		android:id="@id/gd_action_bar_content_view"
-		android:layout_height="0dp"
-		android:layout_width="fill_parent"
-		android:layout_weight="1" />
-
-</greendroid.widget.ActionBarHost>
\ No newline at end of file
diff --git a/res/layout/history_list_item.xml b/res/layout/history_list_item.xml
deleted file mode 100644
index c970e0a0..00000000
--- a/res/layout/history_list_item.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:padding="8dip">
-
-  <TextView android:id="@+id/history_title"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:singleLine="true"/>
-
-  <TextView android:id="@+id/history_detail"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:singleLine="false"/>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/m_barcode.xml b/res/layout/m_barcode.xml
deleted file mode 100644
index c54552df..00000000
--- a/res/layout/m_barcode.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- /*
- ** Copyright (C) 2011 Cyril Mottier (http://www.cyrilmottier.com)
- **
- ** Licensed under the Apache License, Version 2.0 (the "License");
- ** you may not use this file except in compliance with the License.
- ** You may obtain a copy of the License at
- **
- **     http://www.apache.org/licenses/LICENSE-2.0
- **
- ** Unless required by applicable law or agreed to in writing, software
- ** distributed under the License is distributed on an "AS IS" BASIS,
- ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ** See the License for the specific language governing permissions and
- ** limitations under the License.
- */
- -->
-
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:greendroid="http://schemas.android.com/apk/res/com.hipipal.yd2"
-	android:layout_width="fill_parent"
-	android:layout_height="fill_parent"
-	android:background="@color/cwhite3"
-	android:orientation="vertical">
-	<LinearLayout 
-		android:orientation="vertical"
-		android:layout_width="fill_parent"
-		android:layout_height="5dp"
-		android:background="@drawable/gradual2"
-		/>
-	<FrameLayout
-		android:id="@id/gd_action_bar_content_view"
-		android:layout_height="wrap_content"
-		android:layout_width="fill_parent"
-		android:layout_weight="1"
-		>	
-		<ScrollView
-			android:layout_width="fill_parent"
-			android:layout_height="fill_parent"
-			android:id="@+id/main_content_view"
-			>
-	<LinearLayout
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:orientation="vertical">
-		
-		<ImageView
- 			android:id="@+id/barcode_img"
- 			android:visibility="gone"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:scaleType="centerInside"
-			android:src="@null" />
-			
-			<View style="@style/p_line"
-				android:visibility="gone"
-				android:id="@+id/image_line"
-			/>
-						
-			<TextView
-				android:id="@+id/about"
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
-				android:layout_margin="5.0dip" 
-				android:scrollHorizontally="true" 
-				android:gravity="center"
-		
-				android:paddingLeft="10.0dip"
-				android:paddingRight="10.0dip"
-		
-				android:textColor="@color/topbar"
-				android:text="@string/getcode_desc" />
-		
-			<EditText 
-				android:id="@+id/barcode_content"
-        		android:layout_height="wrap_content" 
-        		android:layout_width="fill_parent"
-				android:layout_margin="10.0dip" 
-				android:paddingLeft="10.0dip"
-				android:paddingRight="10.0dip"
-
-        		android:scrollHorizontally="true" 
-        		android:autoText="false"
-       		 	android:capitalize="none" 
-        		android:gravity="fill_horizontal"
-        		android:lines="5"
-        		android:maxLines="6"
-        		android:textAppearance="?android:attr/textAppearanceMedium" />
-        
-       		<Button
-				android:gravity="center"
-				android:id="@+id/selfcheck_btn"
-				style="@style/gridBox_Title"
-				android:text="@string/form_submit"
-				android:padding="10dp"				
-				android:background="@drawable/background_button"
-				android:layout_marginTop="10.0dip"
-				android:layout_marginBottom="20.0dip"
-				android:layout_marginLeft="50.0dip"
-				android:layout_marginRight="50.0dip"					
-				android:layout_width="fill_parent"
-				android:scaleType="centerInside"
-				android:textColor="@color/cwhite"
-				android:onClick="onNext"
-				android:layout_height="wrap_content"
-				/>  
-
-	</LinearLayout>
-	</ScrollView>
-	
-	</FrameLayout>
-	
-		<LinearLayout 
-		android:id="@+id/return_bar"
-		android:orientation="vertical"
-		android:layout_width="fill_parent"
-		android:layout_height="2dp"
-		>
-	</LinearLayout>
-
-	<include layout="@layout/hi_ad_mod" /> 
-	
-	<LinearLayout
-		android:id="@+id/return_bar_box"
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:background="@color/cgrey6"
-		>	
-	<ImageButton
-		android:layout_width="0dp"
-		android:layout_height="0dp"
-		android:layout_weight="1"
-		android:onClick="onReturn"
-		android:src="@drawable/ic_right_a" 
-		android:background="@null"
-		/>
-
-		
-
-		<ImageButton
-		android:paddingTop="15.0dip"
-		android:layout_width="0dp"
-		android:layout_height="0dp"
-		android:layout_weight="1"
-		android:src="@drawable/ic_social_share" 
-		android:background="@null"
-		android:onClick="onShare"
-		/>
-
-	</LinearLayout>		
-	
-</LinearLayout>
diff --git a/res/layout/o_log.xml b/res/layout/o_log.xml
deleted file mode 100644
index bd50544f..00000000
--- a/res/layout/o_log.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:greendroid="http://schemas.android.com/apk/res/com.zuowuxuxi.yd2"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-	android:layout_height="fill_parent"
-	android:id="@+id/about_box"
-    android:background="@color/cwhite3"	
-    >
-    <LinearLayout 
-		android:orientation="vertical"
-		android:layout_width="fill_parent"
-		android:layout_height="5dp"
-		android:background="@drawable/gradual2"
-		/>
-	<FrameLayout
-		android:id="@id/gd_action_bar_content_view"
-		android:layout_height="wrap_content"
-		android:layout_width="fill_parent"
-		android:layout_weight="1"
-		>
-		<ScrollView
-			android:layout_width="fill_parent"
-			android:layout_height="fill_parent"
-			android:id="@+id/main_content_view"
-			>
-			
-			<LinearLayout
-				android:paddingLeft="8dp"
-				android:paddingRight="8dp"
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
-				android:paddingTop="10.0dip"
-				android:orientation="vertical">
-				
-				<TextView
-				style="@style/gridBox_desc"
-				android:id="@+id/about_title"
-				android:text="@string/about_about"
-				android:textSize="17sp" />
-			
-				<View style="@style/p_line"
-					android:id="@+id/about_line"
-				
-				 />
-				<!-- app desc-->
-				
-				<TextView
-				android:id="@+id/about_log"
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
-				style="@style/LinkText_Mid"
-				android:singleLine="false"
-				android:text="@null" 
-				android:textColor="@color/cblack"
-				android:paddingRight="10dp"
-				android:paddingLeft="10dp"
-				/>
-				
-			</LinearLayout>
-			
-		</ScrollView>
-	</FrameLayout>
-	
-	
-	<LinearLayout
-		android:id="@+id/return_bar_box"
-		android:layout_width="fill_parent"
-		android:background="@color/cgrey6"
-		android:layout_height="wrap_content"
-		>			
-		
-		<ImageButton
-		android:layout_width="0dp"
-		android:layout_height="wrap_content"
-		android:layout_weight="1"
-		android:padding="5.0dip"
-		android:layout_margin="0.0dip"
-		android:src="@drawable/ic_main_a" 
-		android:background="@null"
-		android:onClick="onBack"		
-		
-		/>
-		
-		
-		<ImageButton
-		android:id="@+id/play_btn"
-		android:layout_width="0dp"
-		android:layout_height="wrap_content"
-		android:layout_weight="1"
-		android:src="@drawable/transparent" 
-		android:padding="5.0dip"
-		android:onClick="onPlay"				
-		android:background="@drawable/transparent"
-		/>
-		
-		<ImageButton
-		android:layout_width="0dp"
-		android:layout_height="wrap_content"
-		android:layout_weight="1"
-		android:padding="5.0dip"
-		android:src="@drawable/transparent" 
-		android:background="@null"
-		/>
-		
-	</LinearLayout>	
-	
-</LinearLayout>
\ No newline at end of file
diff --git a/res/raw/pymain.py b/res/raw/pymain.py
deleted file mode 100644
index b89f2b94..00000000
--- a/res/raw/pymain.py
+++ /dev/null
@@ -1,6 +0,0 @@
-#qpy:http://zuowuxuxi.com/s/sample.py
-import android
-
-print("Hello, QPython !")
-droid = android.Android()
-droid.makeToast("Hello, QPython !")
diff --git a/res/values-land/themes.xml b/res/values-land/themes.xml
deleted file mode 100644
index 7a437da5..00000000
--- a/res/values-land/themes.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright (C) 2010 Cyril Mottier (http://www.cyrilmottier.com)
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<resources>
-
-	<style name="Theme.GDCatalogNB" parent="@style/Theme.GreenDroid.NoTitleBar">
-		<item name="android:windowBackground">@drawable/splash_land</item> 
-		<item name="gdActionBarBackground">@color/topbar</item>
-		<item name="gdActionBarDividerDrawable">@null</item>
-		<item name="gdActionBarDividerWidth">1px</item>
-		<item name="gdActionBarApplicationDrawable">@drawable/icon_nb</item>
-		<item name="gdTabIndicatorStyle">@style/GreenDroid.Widget.TabIndicator</item>
-		<item name="gdTabIndicatorBackground">@drawable/v_tab_indicator</item>	
-		<item name="gdItemViewPreferredHeight">40dip</item>
-		<item name="gdDrawableItemViewStyleDrawable">@style/GreenDroid.Widget.ItemView.DrawableItemView.Drawable</item>		
-		<item name="gdActionBarHomeDrawable">@drawable/icon_nb</item>		
-
-
-	</style>
-	
-	<style name="Theme.GDCatalog" parent="@style/Theme.GreenDroid.NoTitleBar">
-		<item name="android:windowBackground">@drawable/splash_land</item> 
-		<item name="gdActionBarBackground">@color/topbar</item>
-		<item name="gdActionBarDividerDrawable">@null</item>
-		<item name="gdActionBarDividerWidth">1px</item>
-		<item name="gdActionBarApplicationDrawable">@null</item>
-		<item name="gdTabIndicatorStyle">@style/GreenDroid.Widget.TabIndicator</item>
-		<item name="gdTabIndicatorBackground">@drawable/v_tab_indicator</item>	
-		<item name="gdItemViewPreferredHeight">40dip</item>
-		<item name="gdDrawableItemViewStyleDrawable">@style/GreenDroid.Widget.ItemView.DrawableItemView.Drawable</item>		
-		
-	</style>
-
-    
-</resources>
\ No newline at end of file
diff --git a/res/values-port/themes.xml b/res/values-port/themes.xml
deleted file mode 100644
index 4d84d64c..00000000
--- a/res/values-port/themes.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright (C) 2010 Cyril Mottier (http://www.cyrilmottier.com)
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<resources>
-
-	<style name="Theme.GDCatalogNB" parent="@style/Theme.GreenDroid.NoTitleBar">
-		<item name="android:windowBackground">@drawable/splash_port</item> 
-		<item name="gdActionBarBackground">@color/topbar</item>
-		<item name="gdActionBarDividerDrawable">@null</item>
-		<item name="gdActionBarDividerWidth">1px</item>
-		<item name="gdActionBarApplicationDrawable">@drawable/icon_nb</item>
-		<item name="gdTabIndicatorStyle">@style/GreenDroid.Widget.TabIndicator</item>
-		<item name="gdTabIndicatorBackground">@drawable/v_tab_indicator</item>	
-		<item name="gdItemViewPreferredHeight">40dip</item>
-		<item name="gdDrawableItemViewStyleDrawable">@style/GreenDroid.Widget.ItemView.DrawableItemView.Drawable</item>		
-		<item name="gdActionBarHomeDrawable">@drawable/icon_nb</item>		
-
-
-	</style>
-	
-	<style name="Theme.GDCatalog" parent="@style/Theme.GreenDroid.NoTitleBar">
-		<item name="android:windowBackground">@drawable/splash_port</item> 
-		<item name="gdActionBarBackground">@color/topbar</item>
-		<item name="gdActionBarDividerDrawable">@null</item>
-		<item name="gdActionBarDividerWidth">1px</item>
-		<item name="gdActionBarApplicationDrawable">@null</item>
-		<item name="gdTabIndicatorStyle">@style/GreenDroid.Widget.TabIndicator</item>
-		<item name="gdTabIndicatorBackground">@drawable/v_tab_indicator</item>	
-		<item name="gdItemViewPreferredHeight">40dip</item>
-		<item name="gdDrawableItemViewStyleDrawable">@style/GreenDroid.Widget.ItemView.DrawableItemView.Drawable</item>		
-		
-	</style>
-
-    
-</resources>
\ No newline at end of file
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
deleted file mode 100644
index 4e559516..00000000
--- a/res/values-zh-rCN/strings.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><resources> 
-    <string name="app_name">QPython</string>
-    <string name="downloaded_home">下载</string>    
-    <string name="nav_barcode">条码扫描</string>    
-    <string name="nav_barcode_desc">扫描下载</string>    
-    <string name="nav_enter">使用插件</string>    
-    <string name="nav_enter_desc">扩展</string>    
-
-    <string name="info_log_of">运行输出 {0}</string>
-    <string name="info_src_of">来源 {0}</string>
-
-    <string name="exec_script">执行这个脚本？</string>
-    <string name="no_log_info">无日志信息</string>
-    <string name="no_src_info">脚本不存在</string>
-    <string name="info_run">运行</string>
-    <string name="info_edit"><![CDATA[查看和编辑]]></string>
-    <string name="m_title_log">查看运行日志</string>
-    <string name="m_title_src">查看脚本详情</string>
-
-    <string name="t_log_not_found">没有找到最近的运行日志</string>  
-    <string name="nav_createcode">获取 QRCode</string>
-    <string name="nav_createcode_desc">创建 QRCode</string>
-    <string name="not_py_file">它不是 Python 文件</string>
-    <string name="err_when_download">下载错误</string>
-    <string name="saved_as">保存为： {0}</string>
-
-    <string name="getcode_desc">输入内容来获得条形码</string>
-    <string name="input_barcode_content">请输入内容</string>
-    <string name="nav_doc">文件</string>
-    <string name="nav_doc_desc">手动文档</string>
-
-    <string name="about_content"><![CDATA[QPython - 是一个在手机或平板电脑等安卓设备上运行的脚本引擎，它集成了Python编程和QRCode的读写技术，能帮助你更快更有效地驱动安卓设备工作。]]> </string>
-    <string name="share_info"><![CDATA[QPython - 是一个在手机或平板电脑等安卓设备上运行的脚本引擎，它集成了Python编程和QRCode的读写技术，能帮助你更快更有效地驱动安卓设备工作。  {0}]]></string>
-
-    <string name="t_wait">载入</string>
-    <string name="running">运行 ...</string>
-
-    <string name="py_install_ok">安装成功</string>
-    <string name="py_install_failed">安装失败,请检查日志</string>
-    <string name="need_initialization">你需要初始化 Python 环境</string>
-
-    <string name="initialization">初始化中 ...</string>
-    <string name="m_local_single">本地脚本</string>
-    <string name="k">KB</string>
-
-    <string name="t_intro">快速开始</string>
-
-    <string name="sl4a_running">SL4A 服务正在运行</string>
-
-</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
deleted file mode 100644
index 48d7bbe2..00000000
--- a/res/values-zh-rTW/strings.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><resources>
-<string name="app_name">QPython</string>
-<string name="downloaded_home">下載</string>
-<string name="nav_barcode">條碼掃描</string>
-<string name="nav_barcode_desc">掃描下載</string>
-<string name="nav_enter">使用插件</string>
-<string name="nav_enter_desc">擴展</string>
-<string name="info_log_of">運行輸出{0}</string>
-<string name="info_src_of">來源 {0}</string>
-<string name="exec_script">執行這個腳本？ </string>
-<string name="no_log_info">無日誌信息</string>
-<string name="no_src_info">腳本不存在</string>
-<string name="info_run">運行</string>
-<string name="info_edit"><![CDATA[查看和編輯]]></string>
-<string name="m_title_log">查看運行日誌</string>
-<string name="m_title_src">查看腳本詳情</string>
-<string name="t_log_not_found">沒有找到最近的運行日誌</string>
-<string name="nav_createcode">獲取QRCode</string>
-<string name="nav_createcode_desc">創建QRCode</string>
-<string name="not_py_file">它不是Python 文件</string>
-<string name="err_when_download">下載錯誤</string>
-<string name="saved_as">保存為： {0}</string>
-<string name="getcode_desc">輸入內容來獲得條形碼</string>
-<string name="input_barcode_content">請輸入內容</string>
-<string name="nav_doc">文件</string>
-<string name="nav_doc_desc">手動文檔</string>
-<string name="about_content"><![CDATA[QPython - 是一個在手機或平板電腦等安卓設備上運行的腳本引擎，它集成了Python編程和QRCode的讀寫技術，能幫助你更快更有效地驅動安卓設備工作。 ]]> </string>
-<string name="share_info"><![CDATA[QPython - 是一個在手機或平板電腦等安卓設備上運行的腳本引擎，它集成了Python編程和QRCode的讀寫技術，能幫助你更快更有效地驅動安卓設備工作。 {0}]]></string>
-<string name="t_wait">載入</string>
-<string name="running">運行 ...</string>
-<string name="py_install_ok">安裝成功</string>
-<string name="py_install_failed">安裝失敗,請檢查日誌</string>
-<string name="need_initialization">你需要初始化Python 環境</string>
-<string name="initialization">初始化中...</string>
-<string name="m_local_single">本地腳本</string>
-<string name="k">KB</string>
-<string name="t_intro">快速開始</string>
-<string name="sl4a_running">SL4A 服務正在運行</string>
-</resources>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
deleted file mode 100644
index 82c675ba..00000000
--- a/res/values/arrays.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>    
-    <string-array name="md_titles">
-        <item>Downloading</item>   
-        <item>Completed</item>
-    </string-array> 
-    <string-array name="select_quality">
-        <item>1280x720 (HD, MP4)</item>
-    	<item>640x360 (MP4)</item>
-    	<!--item>854x480 (FLV)</item-->
-    	<item>640x360 (FLV)</item>
-    	<item>320x240 (FLV)</item>
-    </string-array>
-    <string-array name="select_quality_val">
-    	<!--item>45</item>
-    	<item>44</item>
-    	<item>43</item-->
-    	<item>22</item>
-    	<item>34</item>
-
-    	<!--item>35</item-->
-    	<item>18</item>
-    	<item>5</item>
-
-    </string-array>
-    
-    <string-array name="select_cat_opt">
-        <item>Local</item>   
-    </string-array> 
-    <string-array name="time_labels">
-        <item>days ago</item>   
-        <item>hours ago</item>
-        <item>minutes ago</item>    
-        <item>just now</item>
-    </string-array> 
-    <string-array name="select_cat_val">
-        <item>Local</item>   
-    </string-array>    
-    <string-array name="select_nav_opt">
-        <item>Local</item>   
-        <item><![CDATA[Science]]></item>
-        <item>Car</item>                
-        <item>Sport</item>    
-        <item>Music</item>
-        <item>Movie</item>  
-        <item>travel</item>        
-        <item>Social</item>                
-    </string-array>
-   	<string-array name="select_program">
-        <item>Execute from QRCode</item> 
-        <item>Download by QRCode</item> 
-        <item>Execute from local</item> 
-        <item>How to use</item> 
-
-    </string-array>     
-  <array name="country_codes">
-    <item>-</item>
-    <item>AR</item>
-    <item>AU</item>
-    <item>BR</item>
-    <item>BG</item>
-    <item>CA</item>
-    <item>CN</item>
-    <item>CZ</item>
-    <item>DE</item>
-    <item>DK</item>
-    <item>ES</item>
-    <item>FI</item>
-    <item>FR</item>
-    <item>GB</item>
-    <item>GR</item>
-    <item>HU</item>
-    <item>ID</item>
-    <item>IT</item>
-    <item>JP</item>
-    <item>KR</item>
-    <item>NL</item>
-    <item>PL</item>
-    <item>PT</item>
-    <item>RU</item>
-    <item>SE</item>
-    <item>SK</item>
-    <item>SI</item>
-    <item>TR</item>
-    <item>TW</item>
-    <item>US</item>
-  </array>      
-</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
deleted file mode 100644
index 19de19f6..00000000
--- a/res/values/colors.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2008 ZXing authors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<resources>
-  <color name="contents_text">#ff000000</color>
-  <color name="encode_view">#ffffffff</color>
-  <color name="help_button_view">#ffcccccc</color>
-  <color name="help_view">#ff404040</color>
-  <color name="possible_result_points">#c0ffff00</color>
-  <color name="result_image_border">#ffffffff</color>
-  <color name="result_minor_text">#ffc0c0c0</color>
-  <color name="result_points">#c000ff00</color>
-  <color name="result_text">#ffffffff</color>
-  <color name="result_view">#b0000000</color>
-  <color name="sbc_header_text">#ff808080</color>
-  <color name="sbc_header_view">#ffffffff</color>
-  <color name="sbc_list_item">#fffff0e0</color>
-  <color name="sbc_layout_view">#ffffffff</color>
-  <color name="sbc_page_number_text">#ff000000</color>
-  <color name="sbc_snippet_text">#ff4b4b4b</color>
-  <color name="share_text">#ff000000</color>
-  <color name="status_text">#ffffffff</color>
-  <color name="transparent">#00000000</color>
-  <color name="viewfinder_frame">#ff000000</color>
-  <color name="viewfinder_laser">#ffff0000</color>
-  <color name="viewfinder_mask">#60000000</color>
-</resources>
diff --git a/res/values/ids.xml b/res/values/ids.xml
deleted file mode 100644
index 095ee5a5..00000000
--- a/res/values/ids.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2008 ZXing authors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<resources>
-  <item type="id" name="decode"/>
-  <item type="id" name="decode_failed"/>
-  <item type="id" name="decode_succeeded"/>
-  <item type="id" name="launch_product_query"/>
-  <item type="id" name="quit"/>
-  <item type="id" name="restart_preview"/>
-  <item type="id" name="return_scan_result"/>
-  <item type="id" name="search_book_contents_failed"/>
-  <item type="id" name="search_book_contents_succeeded"/>
-</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
deleted file mode 100644
index ce5d1bee..00000000
--- a/res/values/strings.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><resources> 
-    <string name="app_name">QPython</string>
-    <string name="downloaded_home">Downloaded</string>    
-    <string name="nav_barcode">Barcode Scan</string>    
-    <string name="nav_barcode_desc">Scan to Download</string>    
-    <string name="nav_enter">Use Plugin</string>    
-    <string name="nav_enter_desc">Extension</string>    
-    <string name="info_log_of">Output of running {0}</string>
-    <string name="info_src_of">Source of {0}</string>
-    <string name="exec_script">Execute this script?</string>
-    <string name="no_log_info">No log information</string>
-    <string name="no_src_info">Script does not exist</string>
-    <string name="info_run">Run</string>
-    <string name="info_edit"><![CDATA[View & Edit]]></string>
-    <string name="m_title_log">View run Log</string>
-    <string name="m_title_src">View Script Detail</string>
-
-    <string name="t_log_not_found">Not found last run log</string>  
-    <string name="nav_createcode">Get QRCode</string>
-    <string name="nav_createcode_desc">Create QRCode</string>
-    <string name="not_py_file">It is not python file</string>
-    <string name="err_when_download">Error when download</string>
-    <string name="saved_as">Saved as: {0}</string>
-
-    <string name="getcode_desc">Input Content to get barcode</string>
-    <string name="input_barcode_content">Please input content</string>
-    <string name="nav_doc">Document</string>
-    <string name="nav_doc_desc">Document manually</string>
-
-    <string name="about_content"><![CDATA[QPython - a script Engine running on Android devices like phone or tablet, It integrates the Python Programming and QRCode read & write technology, which help driving your android device to work as you want more quickly and more effectively.]]> </string>
-    <string name="share_info"><![CDATA[QPython - a script Engine running on Android devices like phone or tablet, It integrates the Python Programming and QRCode read & write technology, which help driving your android device to work as you want more quickly and more effectively.  {0}]]></string>
-    <string name="t_wait">Loading</string>
-    <string name="running">Running ...</string>
-    <string name="py_install_ok">Install Succeed</string>
-    <string name="py_install_failed">Install Failed. Please check logs</string>
-    <string name="need_initialization">You need to initialize the python environment</string>
-    <string name="initialization">Initializating...</string>
-    <string name="m_local_single">Local Scripts</string>
-    <string name="k">KB</string>
-    <string name="t_intro">Quick Start</string>
-    <string name="sl4a_running">SL4A Service Running</string>
-</resources>
diff --git a/res/values/themes.xml b/res/values/themes.xml
deleted file mode 100644
index 5dcf06cf..00000000
--- a/res/values/themes.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright (C) 2010 Cyril Mottier (http://www.cyrilmottier.com)
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<resources>
-
-	<style name="Theme.GDCatalogNB" parent="@style/Theme.GreenDroid.NoTitleBar">
-		<item name="gdActionBarTitleColor">@android:color/white</item>	
-			
-		<item name="gdActionBarBackground">@color/topbar</item>
-		<item name="gdActionBarDividerDrawable">@null</item>
-		<item name="gdActionBarDividerWidth">1px</item>
-		<item name="gdActionBarApplicationDrawable">@drawable/icon_nb</item>
-		<item name="gdTabIndicatorStyle">@style/GreenDroid.Widget.TabIndicator</item>
-		<item name="gdTabIndicatorBackground">@drawable/v_tab_indicator</item>	
-		<item name="gdItemViewPreferredHeight">40dip</item>
-		<item name="gdDrawableItemViewStyleDrawable">@style/GreenDroid.Widget.ItemView.DrawableItemView.Drawable</item>		
-		<item name="gdActionBarHomeDrawable">@drawable/icon_nb</item>		
-
-	</style>
-	
-	<style name="Theme.GDCatalog" parent="@style/Theme.GreenDroid.NoTitleBar">
-		<item name="gdActionBarTitleColor">@android:color/white</item>	
-			
-		<item name="gdActionBarBackground">@color/topbar</item>
-		<item name="gdActionBarDividerDrawable">@null</item>
-		<item name="gdActionBarDividerWidth">1px</item>
-		<item name="gdActionBarApplicationDrawable">@null</item>
-		<item name="gdTabIndicatorStyle">@style/GreenDroid.Widget.TabIndicator</item>
-		<item name="gdTabIndicatorBackground">@drawable/v_tab_indicator</item>	
-		<item name="gdItemViewPreferredHeight">40dip</item>
-		<item name="gdDrawableItemViewStyleDrawable">@style/GreenDroid.Widget.ItemView.DrawableItemView.Drawable</item>		
-	</style>
-
-    
-</resources>
\ No newline at end of file
diff --git a/resources/armeabi/libcom_googlecode_android_scripting_Exec.so b/resources/armeabi/libcom_googlecode_android_scripting_Exec.so
deleted file mode 100644
index 04635e30..00000000
Binary files a/resources/armeabi/libcom_googlecode_android_scripting_Exec.so and /dev/null differ
diff --git a/resources/x86/libcom_googlecode_android_scripting_Exec.so b/resources/x86/libcom_googlecode_android_scripting_Exec.so
deleted file mode 100644
index b8572e57..00000000
Binary files a/resources/x86/libcom_googlecode_android_scripting_Exec.so and /dev/null differ
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 00000000..7ec06007
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1,8 @@
+include ':qpython',
+        ':termemulator',
+        ':termexec',
+        ':qpypluginman',
+        ':qpysl4a',
+        ':qpysdk',
+        ':qbaselib',
+        ':qftplib'
diff --git a/src/com/android/python27/config/GlobalConstants.java b/src/com/android/python27/config/GlobalConstants.java
deleted file mode 100644
index b9e6a194..00000000
--- a/src/com/android/python27/config/GlobalConstants.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.android.python27.config;
-
-public interface GlobalConstants {
-
-	public static final String PACKAGE_NAME = "com.hipipal.mi";
-	
-	public static final String PYTHON_MAIN_SCRIPT_NAME = "hello.py";
-	public static final String PYTHON_PROJECT_ZIP_NAME = "my_python_project.zip";
-	public static final String LOCAL_ZIP_NAME = "my_local.zip";
-	
-	public static final String PYTHON_NICE_NAME = "Python 2.7.2";
-	public static final String PYTHON_ZIP_NAME = "python_27.zip";
-	public static final String PYTHON_EXTRAS_ZIP_NAME = "python_extras_27.zip";
-
-	public static final String LOG_TAG = "PythonAPK";
-}
\ No newline at end of file
diff --git a/src/com/android/python27/process/InterpreterProcess.java b/src/com/android/python27/process/InterpreterProcess.java
deleted file mode 100644
index 7a3d666f..00000000
--- a/src/com/android/python27/process/InterpreterProcess.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package com.android.python27.process;
-
-import android.os.Environment;
-
-import com.android.python27.config.GlobalConstants;
-import com.googlecode.android_scripting.Analytics;
-import com.googlecode.android_scripting.AndroidProxy;
-import com.googlecode.android_scripting.interpreter.Interpreter;
-import com.googlecode.android_scripting.interpreter.MyInterpreter;
-import com.googlecode.android_scripting.interpreter.InterpreterConstants;
-import com.googlecode.android_scripting.jsonrpc.RpcReceiverManagerFactory;
-import com.hipipal.sl4alib.PyScriptService;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-public class InterpreterProcess extends Process {
-
-  private final AndroidProxy mProxy;
-  private final Interpreter mInterpreter;
-  private String mCommand;
-  
-  private String pyname = "python";
-  private File binary = null;
-  private String niceName;
-  private String interactiveCommand;
-  private List<String> arguments;
-  private Map<String, String> environmentVariables = null;
-  
-  /**
-   * Creates a new {@link InterpreterProcess}.
-   *
-   * @param launchScript
-   *          the absolute path to a script that should be launched with the interpreter
-   * @param port
-   *          the port that the AndroidProxy is listening on
-   */
-  public InterpreterProcess(PyScriptService context, MyInterpreter myInterpreter, AndroidProxy paramAndroidProxy) {
-	super(context);
-    mProxy = paramAndroidProxy;
-    mInterpreter = myInterpreter.getInterpreter();
-
-//    if(mInterpreter != null) {
-//        binary = mInterpreter.getBinary();
-//        niceName = mInterpreter.getNiceName();
-//        pyname = mInterpreter.getName();
-//        interactiveCommand = mInterpreter.getInteractiveCommand();
-//        arguments = myInterpreter.getArguments();
-//        environmentVariables = mInterpreter.getEnvironmentVariables();	
-//    }
-//    // this means we are using our embedded python
-//    else {
-    	niceName = GlobalConstants.PYTHON_NICE_NAME;
-        pyname = "python";
-        interactiveCommand = "";
-        arguments = new ArrayList<String>();
-//    }
-    
-//    Log.e("mInterpreter.getBinary() " + binary );
-//    Log.e("mInterpreter.getNiceName() " + niceName);
-//    Log.e("mInterpreter.getName() " + pyname);
-//    Log.e("mInterpreter.getInteractiveCommand() " + interactiveCommand);
-//    Log.e("myInterpreter.getArguments( " + arguments);
-//    Log.e("mInterpreter.getEnvironmentVariables() " + environmentVariables);
-//
-//    Log.e("System.getenv() " + System.getenv());
-//    Log.e("getHost() " + getHost());
-//    Log.e("Integer.toString(getPort()) " + Integer.toString(getPort()));
-//    if (paramAndroidProxy.getSecret() != null) {
-//        Log.e("getSecret() " + getSecret());
-//    }
-    
-    if(binary != null) {
-        setBinary(binary);
-    }
-    setName(niceName);
-    setCommand(interactiveCommand);
-    addAllArguments(arguments);
-    putAllEnvironmentVariables(System.getenv());
-    putEnvironmentVariable("AP_HOST", getHost());
-    putEnvironmentVariable("AP_PORT", Integer.toString(getPort()));
-    if (paramAndroidProxy.getSecret() != null) {
-      putEnvironmentVariable("AP_HANDSHAKE", getSecret());
-    }
-    
-    if(environmentVariables != null) {
-        putAllEnvironmentVariables(environmentVariables);
-    }
-  }
-
-  protected void setCommand(String command) {
-    mCommand = command;
-  }
-
-  public Interpreter getInterpreter() {
-    return mInterpreter;
-  }
-
-  public String getHost() {
-    return mProxy.getAddress().getHostName();
-  }
-
-  public int getPort() {
-    return mProxy.getAddress().getPort();
-  }
-
-  public String getSecret() {
-    return mProxy.getSecret();
-  }
-
-  /*@Override
-  public void start(final Runnable shutdownHook) {
-    start(shutdownHook, null);
-  }*/
-
-  @Override
-  public String getWorkingDirectory() {
-    return InterpreterConstants.SDCARD_SL4A_ROOT;
-  }
-
-  @Override
-  public String getSdcardPackageDirectory() {
-    return Environment.getExternalStorageDirectory().getAbsolutePath() + "/" + GlobalConstants.PACKAGE_NAME;
-  }
-  
-  public RpcReceiverManagerFactory getRpcReceiverManagerFactory()
-  {
-    return this.mProxy.getRpcReceiverManagerFactory();
-  }
-  
-  public void start(Runnable paramRunnable, List<String> paramList) {
-    String[] arrayOfString = new String[1];
-    arrayOfString[0] = pyname;
-    Analytics.track(arrayOfString);
-    if (!this.mCommand.equals(""))
-      addArgument(this.mCommand);
-    if (paramList != null)
-      addAllArguments(paramList);
-    //super.start(paramRunnable);
-  }
-  
-  @Override
-  public void kill() {
-    super.kill();
-    mProxy.shutdown();
-  }
-
-}
diff --git a/src/com/android/python27/process/MyScriptProcess.java b/src/com/android/python27/process/MyScriptProcess.java
deleted file mode 100644
index f6d5b25d..00000000
--- a/src/com/android/python27/process/MyScriptProcess.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.android.python27.process;
-
-import com.googlecode.android_scripting.AndroidProxy;
-import com.googlecode.android_scripting.interpreter.InterpreterConfiguration;
-import com.hipipal.sl4alib.PyScriptService;
-
-import java.io.File;
-import java.util.List;
-import java.util.Map;
-
-public class MyScriptProcess extends PythonScriptProcess {
-
-	  private String workingDirectory;
-	  private String sdcardPackageDirectory;
-
-	  private MyScriptProcess(PyScriptService context,File paramFile, InterpreterConfiguration paramInterpreterConfiguration, AndroidProxy paramAndroidProxy, String workingDir, String sdcardPackageDirectory) {
-	    super(context, paramFile, paramInterpreterConfiguration, paramAndroidProxy);
-	    this.workingDirectory = workingDir;
-	    this.sdcardPackageDirectory = sdcardPackageDirectory;
-	  }
-
-	  public static MyScriptProcess launchScript(PyScriptService context,File script, InterpreterConfiguration configuration, final AndroidProxy proxy, Runnable shutdownHook, String workingDir, String sdcardPackageDirectory, List<String> args, Map<String, String> envVars, File binary) {
-		  /*if (!script.exists()) {
-	        throw new RuntimeException("No such script to launch.");
-	      }*/
-
-		  MyScriptProcess localScriptProcess = new MyScriptProcess(context,script, configuration, proxy, workingDir, sdcardPackageDirectory);
-		  localScriptProcess.putAllEnvironmentVariables(envVars); // set our python env var
-		  /*localScriptProcess.setBinary(binary);
-	    
-		  if (shutdownHook == null) {
-			  localScriptProcess.start(new Runnable() {
-		          @Override
-		          public void run() {
-		            proxy.shutdown();
-		          }
-			  }, args);
-		  } else {
-			  localScriptProcess.start(shutdownHook, args);
-	      }*/
-	      return localScriptProcess;
-	  }
-	    
-	  @Override
-	  public String getWorkingDirectory() {
-	    return workingDirectory;
-	  }
-
-	  @Override
-	  public String getSdcardPackageDirectory() {
-	    return sdcardPackageDirectory;
-	  }
-}
\ No newline at end of file
diff --git a/src/com/android/python27/process/Process.java b/src/com/android/python27/process/Process.java
deleted file mode 100644
index 406541d5..00000000
--- a/src/com/android/python27/process/Process.java
+++ /dev/null
@@ -1,227 +0,0 @@
-package com.android.python27.process;
-import android.os.Environment;
-import android.os.Message;
-import android.util.Log;
-
-import com.android.python27.config.GlobalConstants;
-import com.googlecode.android_scripting.Exec;
-import com.hipipal.sl4alib.CONF;
-import com.hipipal.sl4alib.PyScriptService;
-import com.hipipal.sl4alib.StreamGobbler;
-
-import java.io.File;
-import java.io.FileDescriptor;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.concurrent.atomic.AtomicInteger;
-
-public class Process {
-  private static final int DEFAULT_BUFFER_SIZE = 8192;
-
-  private final List<String> mArguments;
-  private final Map<String, String> mEnvironment;
-
-  private static final int PID_INIT_VALUE = -1;
-
-  @SuppressWarnings("unused")
-  private File mBinary;
-  private String mName;
-  private long mStartTime;
-  private long mEndTime;
-
-  protected final AtomicInteger mPid;
-  protected FileDescriptor mFd;
-  protected OutputStream mOut;
-  protected InputStream mIn;
-  protected File mLog;
-
-  private int returnValue;
-  
-  public PyScriptService context;
-  
-  public int getReturnValue() {
-    return this.returnValue;
-  }
-  
-  public Process(PyScriptService context) {
-    mArguments = new ArrayList<String>();
-    mEnvironment = new HashMap<String, String>();
-    mPid = new AtomicInteger(PID_INIT_VALUE);
-    this.context = context;
-  }
-
-  public void addArgument(String argument) {
-    mArguments.add(argument);
-  }
-
-  public void addAllArguments(List<String> arguments) {
-    mArguments.addAll(arguments);
-  }
-
-  public void putAllEnvironmentVariables(Map<String, String> environment) {
-    mEnvironment.putAll(environment);
-  }
-
-  public void putEnvironmentVariable(String key, String value) {
-    mEnvironment.put(key, value);
-  }
-
-  public void setBinary(File binary) {
-    /*if (!binary.exists()) {
-      throw new RuntimeException("Binary " + binary + " does not exist!");
-    }*/
-    mBinary = binary;
-  }
-
-  public Integer getPid() {
-    return mPid.get();
-  }
-
-  public FileDescriptor getFd() {
-    return mFd;
-  }
-
-  public OutputStream getOut() {
-    return mOut;
-  }
-
-  public OutputStream getErr() {
-    return getOut();
-  }
-
-  public File getLogFile() {
-    return mLog;
-  }
-
-  public InputStream getIn() {
-    return mIn;
-  }
-
-  public void start(final Runnable shutdownHook) {
-    if (isAlive()) {
-      throw new RuntimeException("Attempted to start process that is already running.");
-    }
-
-    String binaryPath = mBinary.getAbsolutePath();
-    Log.i(GlobalConstants.LOG_TAG,  "Executing " + binaryPath + " with arguments " + mArguments + " and with environment "
-        + mEnvironment.toString());
-
-    int[] pid = new int[1];
-    String[] argumentsArray = mArguments.toArray(new String[mArguments.size()]);
-
-    mLog = new File(String.format("%s/%s.log", Environment.getExternalStorageDirectory()+"/"+CONF.BASE_PATH+"/", getName()));
-    //mLog = new File( Environment.getExternalStorageDirectory()+"/"+getName()+".log" );
-    //Log.d("Process", "logFile:"+mLog.getAbsolutePath());
-
-    mFd = Exec.createSubprocess(binaryPath, argumentsArray, getEnvironmentArray(), getWorkingDirectory(), pid);
-    //Log.d("QPY", "binaryPath:"+binaryPath+"-argumentsArray:"+argumentsArray+"-getEnvironmentArray:"+getEnvironmentArray()+"-getWorkingDirectory:"+getWorkingDirectory()+"-pid:"+pid);
-    
-    mPid.set(pid[0]);
-    mOut = new FileOutputStream(mFd);
-    mIn = new StreamGobbler(new FileInputStream(mFd), mLog, DEFAULT_BUFFER_SIZE);
-    mStartTime = System.currentTimeMillis();
-
-    new Thread(new Runnable() {
-      public void run() {
-        returnValue = Exec.waitFor(mPid.get());
-        mEndTime = System.currentTimeMillis();
-        int pid = mPid.getAndSet(PID_INIT_VALUE);
-        //Log.d("QPYTHON", "out:"+mFd.out.toString());
-        
-        Message msg = new Message();
-        msg.what = returnValue;
-        msg.obj = mArguments.get(0);
-        //updatePositionHandler.sendMessage(msg);
-        Log.d(GlobalConstants.LOG_TAG, "Process " + pid + " exited with result code " + returnValue + ".");
-
-        try {
-            mIn.close();
-          } catch (IOException e) {
-            Log.e(GlobalConstants.LOG_TAG, e.getMessage());
-          }
-        
-        try {
-            mOut.close();
-          } catch (IOException e) {
-              Log.e(GlobalConstants.LOG_TAG, e.getMessage());
-          }
-        
-        if (shutdownHook != null) {
-          shutdownHook.run();
-        }
-        context.updateNotify(msg);
-
-      }
-    }).start();
-  }
-
-  @SuppressWarnings("unused")
-  private String[] getEnvironmentArray() {
-	    List<String> environmentVariables = new ArrayList<String>();
-	    for (Entry<String, String> entry : mEnvironment.entrySet()) {
-	      environmentVariables.add(entry.getKey() + "=" + entry.getValue());
-	    }
-	    String[] environment = environmentVariables.toArray(new String[environmentVariables.size()]);
-	    return environment;
-  }
-
-	/**/
-	
-
-	
-  public void kill() {
-    if (isAlive()) {
-      android.os.Process.killProcess(mPid.get());
-      Log.d(GlobalConstants.LOG_TAG, "Killed process " + mPid);
-    }
-  }
-
-  public boolean isAlive() {
-    return (mFd != null && mFd.valid()) && mPid.get() != PID_INIT_VALUE;
-  }
-
-  public String getWorkingDirectory() {
-    return null;
-  }
-
-  public String getSdcardPackageDirectory() {
-	return null;
-  }
-  
-  public String getUptime() {
-    long ms;
-    if (!isAlive()) {
-      ms = mEndTime - mStartTime;
-    } else {
-      ms = System.currentTimeMillis() - mStartTime;
-    }
-    StringBuilder buffer = new StringBuilder();
-    int days = (int) (ms / (1000 * 60 * 60 * 24));
-    int hours = (int) (ms % (1000 * 60 * 60 * 24)) / 3600000;
-    int minutes = (int) (ms % 3600000) / 60000;
-    int seconds = (int) (ms % 60000) / 1000;
-    if (days != 0) {
-      buffer.append(String.format("%02d:%02d:", days, hours));
-    } else if (hours != 0) {
-      buffer.append(String.format("%02d:", hours));
-    }
-    buffer.append(String.format("%02d:%02d", minutes, seconds));
-    return buffer.toString();
-  }
-
-  public String getName() {
-    return mName;
-  }
-
-  public void setName(String name) {
-    mName = name;
-  }
-}
\ No newline at end of file
diff --git a/src/com/android/python27/process/PythonScriptProcess.java b/src/com/android/python27/process/PythonScriptProcess.java
deleted file mode 100644
index bc8fa9e5..00000000
--- a/src/com/android/python27/process/PythonScriptProcess.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.android.python27.process;
-
-
-import com.googlecode.android_scripting.AndroidProxy;
-import com.googlecode.android_scripting.interpreter.InterpreterConfiguration;
-import com.googlecode.android_scripting.interpreter.MyInterpreter;
-import com.hipipal.sl4alib.PyScriptService;
-
-import java.io.File;
-
-public class PythonScriptProcess extends InterpreterProcess
-{
-  private final File mScript;
-
-  public PythonScriptProcess(PyScriptService context, File paramFile, InterpreterConfiguration paramInterpreterConfiguration, AndroidProxy paramAndroidProxy) {
-    super(context, new MyInterpreter( null ) , paramAndroidProxy);
-    this.mScript = paramFile;
-    setName(paramFile.getName());
-    
-    String str = "";
-//    if(paramInterpreterConfiguration.getInterpreterForScript("foo.py") != null) {
-//    	str = paramInterpreterConfiguration.getInterpreterForScript("foo.py").getScriptCommand();
-//    }
-    Object[] arrayOfObject = new Object[1];
-    arrayOfObject[0] = paramFile.getAbsolutePath();
-    setCommand(String.format(str, arrayOfObject));
-  }
-
-  public String getPath() {
-    return this.mScript.getPath();
-  }
-}
\ No newline at end of file
diff --git a/src/com/android/python27/support/Utils.java b/src/com/android/python27/support/Utils.java
deleted file mode 100644
index 2034904a..00000000
--- a/src/com/android/python27/support/Utils.java
+++ /dev/null
@@ -1,169 +0,0 @@
-package com.android.python27.support;
-
-import android.os.Environment;
-import android.util.Log;
-
-import com.android.python27.config.GlobalConstants;
-import com.googlecode.android_scripting.FileUtils;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-
-public class Utils {
-	public static String getFileExtension(String sFileName) {
-	  int dotIndex = sFileName.lastIndexOf('.');
-	  if (dotIndex == -1) {
-	    return null;
-	  }
-	  return sFileName.substring(dotIndex);
-	}
- 
-	//-------------------------------------------------------------------------------------------------
-
-	  public static boolean unzip(InputStream inputStream, String dest, boolean replaceIfExists) {
-		  
-		  final int BUFFER_SIZE = 4096;
-		  
-		  BufferedOutputStream bufferedOutputStream = null;
-		  
-		  boolean succeed = true;
-		  
-		  try {
-		      ZipInputStream zipInputStream = new ZipInputStream(new BufferedInputStream(inputStream));
-		      ZipEntry zipEntry;
-		      
-		      while ((zipEntry = zipInputStream.getNextEntry()) != null){
-		       
-		       String zipEntryName = zipEntry.getName();
-		       
-		       
-//		       if(!zipEntry.isDirectory()) {
-//		 	       File fil = new File(dest + zipEntryName);
-//		 	       fil.getParent()
-//		       }
-		       
-		       // file exists ? delete ?
-	 	       File file2 = new File(dest + zipEntryName);
-
-	 	       if(file2.exists()) {
-	 		        if (replaceIfExists) {
-	 		        	
-	 		 	       try {
-	 		 	    	  boolean b = deleteDir(file2);
-	 		 	    		  if(!b) {
-	 		 						Log.e(GlobalConstants.LOG_TAG, "Unzip failed to delete " + dest + zipEntryName);
-	 		 	    		  }
-	 		 	    		  else {
-	 		 						Log.d(GlobalConstants.LOG_TAG, "Unzip deleted " + dest + zipEntryName);
-	 		 	    		  }
-	 					} catch (Exception e) {
-	 						Log.e(GlobalConstants.LOG_TAG, "Unzip failed to delete " + dest + zipEntryName, e);
-	 					}
-	 		        } 	    	   
-	 	       }
-
-		       // extract
-		       File file = new File(dest + zipEntryName);
-		       
-		       if (file.exists()){
-
-		       } else {
-		        if(zipEntry.isDirectory()){
-		         file.mkdirs(); 
-		         FileUtils.chmod(file, 0755);
-
-		        }else{
-		        	
-	 	         // create parent file folder if not exists yet
-	 	         if(!file.getParentFile().exists()) {
-			          file.getParentFile().mkdirs(); 
-			          FileUtils.chmod(file.getParentFile(), 0755);
-	 	         }
-			 	       
-		         byte buffer[] = new byte[BUFFER_SIZE];
-		         bufferedOutputStream = new BufferedOutputStream(new FileOutputStream(file), BUFFER_SIZE);
-		         int count;
-
-		         while ((count = zipInputStream.read(buffer, 0, BUFFER_SIZE)) != -1) {
-		          bufferedOutputStream.write(buffer, 0, count);
-		         }
-
-		         bufferedOutputStream.flush();
-		         bufferedOutputStream.close(); 
-		        }
-		       }
-		       
-		       // enable standalone python
-		       if(file.getName().endsWith(".so")) {
-			       FileUtils.chmod(file, 0755);
-		       }
-
-		       //Log.d(GlobalConstants.LOG_TAG,"Unzip extracted " + dest + zipEntryName);
-		      }
-		      
-		      zipInputStream.close();
-
-		     } catch (FileNotFoundException e) {
-		    	 Log.e(GlobalConstants.LOG_TAG,"Unzip error, file not found", e);
-		    	 succeed = false;
-		     }catch (Exception e) {
-		    	 Log.e(GlobalConstants.LOG_TAG,"Unzip error: ", e);
-		    	 succeed = false;
-		     }
-		    
-		     return succeed;		     
-	  }
-	  
-	  //-------------------------------------------------------------------------------------------------
-
-	  public static boolean deleteDir(File dir) {
-		  try {
-		      if (dir.isDirectory()) {
-		          String[] children = dir.list();
-		          for (int i=0; i<children.length; i++) {
-		              boolean success = deleteDir(new File(dir, children[i]));
-		              if (!success) {
-		                  return false;
-		              }
-		          }
-		      }
-		  
-		      // The directory is now empty so delete it
-		      return dir.delete();
-		      
-		} catch (Exception e) {
-			Log.e(GlobalConstants.LOG_TAG,"Failed to delete " + dir + " : " + e);
-			return false;
-		}
-	  }
-	  
-	public static void createDirectoryOnExternalStorage(String path) {
-        try {
-    		if(Environment.getExternalStorageState().equalsIgnoreCase("mounted")) {
-    		    File file = new File(Environment.getExternalStorageDirectory(), path);
-    		    if (!file.exists()) {
-    		    	try {
-    		    		file.mkdirs();
-
-    		    		Log.d(GlobalConstants.LOG_TAG, "createDirectoryOnExternalStorage created " + Environment.getExternalStorageDirectory().getAbsolutePath() + "/" +path);
-    				} catch (Exception e) {
-    		            Log.e(GlobalConstants.LOG_TAG,"createDirectoryOnExternalStorage error: ", e);
-    				}
-    		    }		
-    		}
-    		else {
-                Log.e(GlobalConstants.LOG_TAG,"createDirectoryOnExternalStorage error: " + "External storage is not mounted");		
-    		}
-		} catch (Exception e) {
-            Log.e(GlobalConstants.LOG_TAG,"createDirectoryOnExternalStorage error: " + e);		
-		}
-
-	}
-	
-}
diff --git a/src/com/googlecode/android_scripting/Analytics.java b/src/com/googlecode/android_scripting/Analytics.java
deleted file mode 100644
index 9687473b..00000000
--- a/src/com/googlecode/android_scripting/Analytics.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (C) 2009 Google Inc.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
-
-import com.google.android.apps.analytics.GoogleAnalyticsTracker;
-
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-public class Analytics {
-  private static GoogleAnalyticsTracker mTracker;
-  private static SharedPreferences mPrefs;
-  private static String mSl4aVersion;
-  private static ExecutorService mWorkPool;
-  private static volatile boolean mStarted = false;
-
-  private Analytics() {
-    // Utility class.
-  }
-
-  // TODO(Alexey): Add Javadoc. "Also, it would be cool to wrap up the Analytics API into a facade."
-  @SuppressWarnings("deprecation")
-public static synchronized void start(Context context, String analyticsAccountId) {
-    if (context == null || analyticsAccountId == null) {
-      return;
-    }
-    mSl4aVersion = Version.getVersion(context);
-    mPrefs = PreferenceManager.getDefaultSharedPreferences(context);
-    mTracker = GoogleAnalyticsTracker.getInstance();
-    mTracker.start(analyticsAccountId, 10, context);
-    mWorkPool = Executors.newSingleThreadExecutor();
-    mStarted = true;
-  }
-
-  private static class PageNameBuilder {
-    private final StringBuilder mmName = new StringBuilder();
-
-    void add(String pathPart) {
-      mmName.append("/");
-      mmName.append(pathPart);
-    }
-
-    String build() {
-      return mmName.toString();
-    }
-  }
-
-  public static void track(final String... nameParts) {
-    if (mStarted && mPrefs.getBoolean("usagetracking", false)) {
-      mWorkPool.submit(new Runnable() {
-        public void run() {
-          PageNameBuilder builder = new PageNameBuilder();
-          builder.add(mSl4aVersion);
-          for (String part : nameParts) {
-            builder.add(part);
-          }
-          String name = builder.build();
-          mTracker.trackPageView(name);
-        }
-      });
-    }
-  }
-
-  public static void trackActivity(Activity activity) {
-    String name = activity.getClass().getSimpleName();
-    track(name);
-  }
-
-  @SuppressWarnings("deprecation")
-public static synchronized void stop() {
-    if (mStarted) {
-      mStarted = false;
-      mWorkPool.shutdownNow();
-      mTracker.stop();
-    }
-  }
-}
diff --git a/src/com/googlecode/android_scripting/AndroidProxy.java b/src/com/googlecode/android_scripting/AndroidProxy.java
deleted file mode 100644
index 3d29abb4..00000000
--- a/src/com/googlecode/android_scripting/AndroidProxy.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (C) 2009 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting;
-
-import android.app.Service;
-import android.content.Intent;
-
-import com.googlecode.android_scripting.facade.FacadeConfiguration;
-import com.googlecode.android_scripting.facade.FacadeManagerFactory;
-import com.googlecode.android_scripting.jsonrpc.JsonRpcServer;
-import com.googlecode.android_scripting.jsonrpc.RpcReceiverManagerFactory;
-
-import java.net.InetSocketAddress;
-import java.util.UUID;
-
-public class AndroidProxy {
-
-  private InetSocketAddress mAddress;
-  private final JsonRpcServer mJsonRpcServer;
-  private final UUID mSecret;
-  private final RpcReceiverManagerFactory mFacadeManagerFactory;
-
-  /**
-   * 
-   * @param service
-   *          Android service (required to build facades).
-   * @param intent
-   *          the intent that launched the proxy/script.
-   * @param requiresHandshake
-   *          indicates whether RPC security protocol should be enabled.
-   */
-  public AndroidProxy(Service service, Intent intent, boolean requiresHandshake) {
-    if (requiresHandshake) {
-      mSecret = UUID.randomUUID();
-    } else {
-      mSecret = null;
-    }
-    mFacadeManagerFactory =
-        new FacadeManagerFactory(FacadeConfiguration.getSdkLevel(), service, intent,
-            FacadeConfiguration.getFacadeClasses());
-    mJsonRpcServer = new JsonRpcServer(mFacadeManagerFactory, getSecret());
-  }
-
-  public InetSocketAddress getAddress() {
-    return mAddress;
-  }
-
-  public InetSocketAddress startLocal() {
-    return startLocal(0);
-  }
-
-  public InetSocketAddress startLocal(int port) {
-    mAddress = mJsonRpcServer.startLocal(port);
-    return mAddress;
-  }
-  
-  public InetSocketAddress startPublic() {
-    return startPublic(0);
-  }
-
-  public InetSocketAddress startPublic(int port) {
-    mAddress = mJsonRpcServer.startPublic(port);
-    return mAddress;
-  }
-
-  public void shutdown() {
-	  if (mJsonRpcServer!=null) {
-		  mJsonRpcServer.shutdown();
-	  }
-  }
-
-  public String getSecret() {
-    if (mSecret == null) {
-      return null;
-    }
-    return mSecret.toString();
-  }
-
-  public RpcReceiverManagerFactory getRpcReceiverManagerFactory() {
-    return mFacadeManagerFactory;
-  }
-}
diff --git a/src/com/googlecode/android_scripting/BaseApplication.java b/src/com/googlecode/android_scripting/BaseApplication.java
deleted file mode 100644
index 1e24860d..00000000
--- a/src/com/googlecode/android_scripting/BaseApplication.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2009 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting;
-
-import android.app.Application;
-
-import com.googlecode.android_scripting.interpreter.InterpreterConfiguration;
-import com.googlecode.android_scripting.trigger.TriggerRepository;
-
-public class BaseApplication extends Application {
-
-  private final FutureActivityTaskExecutor mTaskExecutor = new FutureActivityTaskExecutor(this);
-  private TriggerRepository mTriggerRepository;
-
-  protected InterpreterConfiguration mConfiguration;
-
-  public FutureActivityTaskExecutor getTaskExecutor() {
-    return mTaskExecutor;
-  }
-
-  @Override
-  public void onCreate() {
-    mConfiguration = new InterpreterConfiguration(this);
-    mConfiguration.startDiscovering();
-    mTriggerRepository = new TriggerRepository(this);
-  }
-
-  public InterpreterConfiguration getInterpreterConfiguration() {
-    return mConfiguration;
-  }
-
-  public TriggerRepository getTriggerRepository() {
-    return mTriggerRepository;
-  }
-}
diff --git a/src/com/googlecode/android_scripting/Constants.java b/src/com/googlecode/android_scripting/Constants.java
deleted file mode 100644
index b6c366dc..00000000
--- a/src/com/googlecode/android_scripting/Constants.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (C) 2009 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting;
-
-import android.content.ComponentName;
-
-public interface Constants {
-
-  public static final String ACTION_LAUNCH_FOREGROUND_SCRIPT =
-      "com.googlecode.android_scripting.action.LAUNCH_FOREGROUND_SCRIPT";
-  public static final String ACTION_LAUNCH_BACKGROUND_SCRIPT =
-      "com.googlecode.android_scripting.action.LAUNCH_BACKGROUND_SCRIPT";
-  public static final String ACTION_LAUNCH_SCRIPT_FOR_RESULT =
-      "com.googlecode.android_scripting.action.ACTION_LAUNCH_SCRIPT_FOR_RESULT";
-  public static final String ACTION_LAUNCH_INTERPRETER =
-      "com.googlecode.android_scripting.action.LAUNCH_INTERPRETER";
-  public static final String ACTION_EDIT_SCRIPT =
-      "com.googlecode.android_scripting.action.EDIT_SCRIPT";
-  public static final String ACTION_SAVE_SCRIPT =
-      "com.googlecode.android_scripting.action.SAVE_SCRIPT";
-  public static final String ACTION_SAVE_AND_RUN_SCRIPT =
-      "com.googlecode.android_scripting.action.SAVE_AND_RUN_SCRIPT";
-  public static final String ACTION_KILL_PROCESS =
-      "com.googlecode.android_scripting.action.KILL_PROCESS";
-  public static final String ACTION_KILL_ALL = "com.googlecode.android_scripting.action.KILL_ALL";
-  public static final String ACTION_SHOW_RUNNING_SCRIPTS =
-      "com.googlecode.android_scripting.action.SHOW_RUNNING_SCRIPTS";
-  public static final String ACTION_CANCEL_NOTIFICATION =
-      "com.googlecode.android_scripting.action.CANCEL_NOTIFICAITON";
-  public static final String ACTION_ACTIVITY_RESULT =
-      "com.googlecode.android_scripting.action.ACTIVITY_RESULT";
-  public static final String ACTION_LAUNCH_SERVER =
-      "com.googlecode.android_scripting.action.LAUNCH_SERVER";
-
-  public static final String EXTRA_RESULT = "SCRIPT_RESULT";
-  public static final String EXTRA_SCRIPT_PATH =
-      "com.googlecode.android_scripting.extra.SCRIPT_PATH";
-  public static final String EXTRA_SCRIPT_CONTENT =
-      "com.googlecode.android_scripting.extra.SCRIPT_CONTENT";
-  public static final String EXTRA_INTERPRETER_NAME =
-      "com.googlecode.android_scripting.extra.INTERPRETER_NAME";
-
-  public static final String EXTRA_USE_EXTERNAL_IP =
-      "com.googlecode.android_scripting.extra.USE_PUBLIC_IP";
-  public static final String EXTRA_USE_SERVICE_PORT =
-      "com.googlecode.android_scripting.extra.USE_SERVICE_PORT";
-  public static final String EXTRA_SCRIPT_TEXT =
-      "com.googlecode.android_scripting.extra.SCRIPT_TEXT";
-  public static final String EXTRA_RPC_HELP_TEXT =
-      "com.googlecode.android_scripting.extra.RPC_HELP_TEXT";
-  public static final String EXTRA_API_PROMPT_RPC_NAME =
-      "com.googlecode.android_scripting.extra.API_PROMPT_RPC_NAME";
-  public static final String EXTRA_API_PROMPT_VALUES =
-      "com.googlecode.android_scripting.extra.API_PROMPT_VALUES";
-  public static final String EXTRA_PROXY_PORT = "com.googlecode.android_scripting.extra.PROXY_PORT";
-  public static final String EXTRA_PROCESS_ID =
-      "com.googlecode.android_scripting.extra.SCRIPT_PROCESS_ID";
-  public static final String EXTRA_IS_NEW_SCRIPT =
-      "com.googlecode.android_scripting.extra.IS_NEW_SCRIPT";
-  public static final String EXTRA_TRIGGER_ID =
-      "com.googlecode.android_scripting.extra.EXTRA_TRIGGER_ID";
-  public static final String EXTRA_LAUNCH_IN_BACKGROUND =
-      "com.googlecode.android_scripting.extra.EXTRA_LAUNCH_IN_BACKGROUND";
-  public static final String EXTRA_TASK_ID = "com.googlecode.android_scripting.extra.EXTRA_TASK_ID";
-
-  // BluetoothDeviceManager
-  public static final String EXTRA_DEVICE_ADDRESS =
-      "com.googlecode.android_scripting.extra.device_address";
-
-  public static final ComponentName SL4A_SERVICE_COMPONENT_NAME = new ComponentName(
-      "com.googlecode.android_scripting",
-      "com.googlecode.android_scripting.activity.ScriptingLayerService");
-  public static final ComponentName SL4A_SERVICE_LAUNCHER_COMPONENT_NAME = new ComponentName(
-      "com.googlecode.android_scripting",
-      "com.googlecode.android_scripting.activity.ScriptingLayerServiceLauncher");
-  public static final ComponentName BLUETOOTH_DEVICE_LIST_COMPONENT_NAME = new ComponentName(
-      "com.googlecode.android_scripting",
-      "com.googlecode.android_scripting.activity.BluetoothDeviceList");
-  public static final ComponentName TRIGGER_SERVICE_COMPONENT_NAME = new ComponentName(
-      "com.googlecode.android_scripting",
-      "com.googlecode.android_scripting.activity.TriggerService");
-
-  // Preference Keys
-
-  public static final String FORCE_BROWSER = "helpForceBrowser";
-  public final static String HIDE_NOTIFY = "hideServiceNotifications";
-}
\ No newline at end of file
diff --git a/src/com/googlecode/android_scripting/Exec.java b/src/com/googlecode/android_scripting/Exec.java
deleted file mode 100644
index d5fae793..00000000
--- a/src/com/googlecode/android_scripting/Exec.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.googlecode.android_scripting;
-
-import java.io.FileDescriptor;
-
-/**
- * Tools for executing commands.
- */
-public class Exec {
-  /**
-   * @param cmd
-   *          The command to execute
-   * @param arg0
-   *          The first argument to the command, may be null
-   * @param arg1
-   *          the second argument to the command, may be null
-   * @return the file descriptor of the started process.
-   * 
-   */
-  public static FileDescriptor createSubprocess(String command, String[] arguments,
-      String[] environmentVariables, String workingDirectory) {
-    return createSubprocess(command, arguments, environmentVariables, workingDirectory, null);
-  }
-
-  /**
-   * @param cmd
-   *          The command to execute
-   * @param arguments
-   *          Array of arguments, may be null
-   * @param environmentVariables
-   *          Array of environment variables, may be null
-   * @param processId
-   *          A one-element array to which the process ID of the started process will be written.
-   * @return the file descriptor of the opened process's psuedo-terminal.
-   * 
-   */
-  public static native FileDescriptor createSubprocess(String command, String[] arguments,
-      String[] environmentVariables, String workingDirectory, int[] processId);
-
-  public static native void setPtyWindowSize(FileDescriptor fd, int row, int col, int xpixel,
-      int ypixel);
-
-  /**
-   * Causes the calling thread to wait for the process associated with the receiver to finish
-   * executing.
-   * 
-   * @return The exit value of the Process being waited on
-   * 
-   */
-  public static native int waitFor(int processId);
-
-  static {
-    System.loadLibrary("com_googlecode_android_scripting_Exec");
-  }
-}
diff --git a/src/com/googlecode/android_scripting/FeaturedInterpreters.java b/src/com/googlecode/android_scripting/FeaturedInterpreters.java
deleted file mode 100644
index 5056616c..00000000
--- a/src/com/googlecode/android_scripting/FeaturedInterpreters.java
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright 2010 Google Inc. All Rights Reserved.
-
-package com.googlecode.android_scripting;
-
-import android.content.Context;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class FeaturedInterpreters {
-  private static final Map<String, FeaturedInterpreter> mNameMap =
-      new HashMap<String, FeaturedInterpreter>();
-  private static final Map<String, FeaturedInterpreter> mExtensionMap =
-      new HashMap<String, FeaturedInterpreter>();
-
-  static {
-    try {
-      FeaturedInterpreter interpreters[] =
-          {
-            new FeaturedInterpreter("BeanShell 2.0b4", ".bsh",
-                "http://android-scripting.googlecode.com/files/beanshell_for_android_r2.apk"),
-            new FeaturedInterpreter("JRuby", ".rb",
-                "https://github.com/downloads/ruboto/sl4a_jruby_interpreter/JRubyForAndroid_r2dev.apk"),
-            new FeaturedInterpreter("Lua 5.1.4", ".lua",
-                "http://android-scripting.googlecode.com/files/lua_for_android_r1.apk"),
-            new FeaturedInterpreter("Perl 5.10.1", ".pl",
-                "http://android-scripting.googlecode.com/files/perl_for_android_r1.apk"),
-            new FeaturedInterpreter("Python 2.6.2", ".py",
-                "http://python-for-android.googlecode.com/files/PythonForAndroid_r5.apk"),
-            new FeaturedInterpreter("Rhino 1.7R2", ".js",
-                "http://android-scripting.googlecode.com/files/rhino_for_android_r2.apk"),
-            new FeaturedInterpreter("PHP 5.3.3", ".php",
-                "http://php-for-android.googlecode.com/files/phpforandroid_r1.apk") };
-      for (FeaturedInterpreter interpreter : interpreters) {
-        mNameMap.put(interpreter.mmName, interpreter);
-        mExtensionMap.put(interpreter.mmExtension, interpreter);
-      }
-    } catch (MalformedURLException e) {
-      Log.e(e);
-    }
-  }
-
-  public static List<String> getList() {
-    ArrayList<String> list = new ArrayList<String>(mNameMap.keySet());
-    Collections.sort(list);
-    return list;
-  }
-
-  public static URL getUrlForName(String name) {
-    if (!mNameMap.containsKey(name)) {
-      return null;
-    }
-    return mNameMap.get(name).mmUrl;
-  }
-
-  public static String getInterpreterNameForScript(String fileName) {
-    String extension = getExtension(fileName);
-    if (extension == null || !mExtensionMap.containsKey(extension)) {
-      return null;
-    }
-    return mExtensionMap.get(extension).mmName;
-  }
-
-  public static boolean isSupported(String fileName) {
-    String extension = getExtension(fileName);
-    return (extension != null) && (mExtensionMap.containsKey(extension));
-  }
-
-  public static int getInterpreterIcon(Context context, String key) {
-    String packageName = context.getPackageName();
-    String name = "_icon";
-    if (key.contains(".")) {
-      name = key.substring(key.lastIndexOf('.') + 1) + name;
-    } else {
-      name = key + name;
-    }
-    return context.getResources().getIdentifier(name, "drawable", packageName);
-  }
-
-  private static String getExtension(String fileName) {
-    int dotIndex = fileName.lastIndexOf('.');
-    if (dotIndex == -1) {
-      return null;
-    }
-    return fileName.substring(dotIndex);
-  }
-
-  private static class FeaturedInterpreter {
-    private final String mmName;
-    private final String mmExtension;
-    private final URL mmUrl;
-
-    private FeaturedInterpreter(String name, String extension, String url)
-        throws MalformedURLException {
-      mmName = name;
-      mmExtension = extension;
-      mmUrl = new URL(url);
-    }
-  }
-
-}
diff --git a/src/com/googlecode/android_scripting/FileUtils.java b/src/com/googlecode/android_scripting/FileUtils.java
deleted file mode 100644
index 429e990e..00000000
--- a/src/com/googlecode/android_scripting/FileUtils.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting;
-
-import android.content.Context;
-import android.content.res.AssetManager;
-import android.os.Environment;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.lang.reflect.Method;
-
-/**
- * Utility functions for handling files.
- * 
- * @author Damon Kohler (damonkohler@gmail.com)
- */
-public class FileUtils {
-
-  private FileUtils() {
-    // Utility class.
-  }
-
-  static public boolean externalStorageMounted() {
-    String state = Environment.getExternalStorageState();
-    return Environment.MEDIA_MOUNTED.equals(state)
-        || Environment.MEDIA_MOUNTED_READ_ONLY.equals(state);
-  }
-
-  public static int chmod(File path, int mode) throws Exception {
-    Class<?> fileUtils = Class.forName("android.os.FileUtils");
-    Method setPermissions =
-        fileUtils.getMethod("setPermissions", String.class, int.class, int.class, int.class);
-    return (Integer) setPermissions.invoke(null, path.getAbsolutePath(), mode, -1, -1);
-  }
-
-  public static boolean recursiveChmod(File root, int mode) throws Exception {
-    boolean success = chmod(root, mode) == 0;
-    for (File path : root.listFiles()) {
-      if (path.isDirectory()) {
-        success = recursiveChmod(path, mode);
-      }
-      success &= (chmod(path, mode) == 0);
-    }
-    return success;
-  }
-
-  public static boolean delete(File path) {
-    boolean result = true;
-    if (path.exists()) {
-      if (path.isDirectory()) {
-        for (File child : path.listFiles()) {
-          result &= delete(child);
-        }
-        result &= path.delete(); // Delete empty directory.
-      }
-      if (path.isFile()) {
-        result &= path.delete();
-      }
-      if (!result) {
-        Log.e("Delete failed;");
-      }
-      return result;
-    } else {
-      Log.e("File does not exist.");
-      return false;
-    }
-  }
-
-  public static File copyFromStream(String name, InputStream input) {
-    if (name == null || name.length() == 0) {
-      Log.e("No script name specified.");
-      return null;
-    }
-    File file = new File(name);
-    if (!makeDirectories(file.getParentFile(), 0755)) {
-      return null;
-    }
-    try {
-      OutputStream output = new FileOutputStream(file);
-      IoUtils.copy(input, output);
-    } catch (Exception e) {
-      Log.e(e);
-      return null;
-    }
-    return file;
-  }
-
-  public static boolean makeDirectories(File directory, int mode) {
-    File parent = directory;
-    while (parent.getParentFile() != null && !parent.exists()) {
-      parent = parent.getParentFile();
-    }
-    if (!directory.exists()) {
-      Log.v("Creating directory: " + directory.getName());
-      if (!directory.mkdirs()) {
-        Log.e("Failed to create directory.");
-        return false;
-      }
-    }
-    try {
-      recursiveChmod(parent, mode);
-    } catch (Exception e) {
-      Log.e(e);
-      return false;
-    }
-    return true;
-  }
-
-  public static File getExternalDownload() {
-    try {
-      Class<?> c = Class.forName("android.os.Environment");
-      Method m = c.getDeclaredMethod("getExternalStoragePublicDirectory", String.class);
-      String download = c.getDeclaredField("DIRECTORY_DOWNLOADS").get(null).toString();
-      return (File) m.invoke(null, download);
-    } catch (Exception e) {
-      return new File(Environment.getExternalStorageDirectory(), "Download");
-    }
-  }
-
-  public static boolean rename(File file, String name) {
-    return file.renameTo(new File(file.getParent(), name));
-  }
-
-  public static String readToString(File file) throws IOException {
-    if (file == null || !file.exists()) {
-      return null;
-    }
-    FileReader reader = new FileReader(file);
-    StringBuilder out = new StringBuilder();
-    char[] buffer = new char[1024 * 4];
-    int numRead = 0;
-    while ((numRead = reader.read(buffer)) > -1) {
-      out.append(String.valueOf(buffer, 0, numRead));
-    }
-    reader.close();
-    return out.toString();
-  }
-
-  public static String readFromAssetsFile(Context context, String name) throws IOException {
-    AssetManager am = context.getAssets();
-    BufferedReader reader = new BufferedReader(new InputStreamReader(am.open(name)));
-    String line;
-    StringBuilder builder = new StringBuilder();
-    while ((line = reader.readLine()) != null) {
-      builder.append(line);
-    }
-    reader.close();
-    return builder.toString();
-  }
-
-}
diff --git a/src/com/googlecode/android_scripting/ForegroundService.java b/src/com/googlecode/android_scripting/ForegroundService.java
deleted file mode 100644
index 857e4a71..00000000
--- a/src/com/googlecode/android_scripting/ForegroundService.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package com.googlecode.android_scripting;
-
-import android.app.Notification;
-import android.app.NotificationManager;
-import android.app.Service;
-
-import java.lang.reflect.Method;
-
-public abstract class ForegroundService extends Service {
-  private static final Class<?>[] mStartForegroundSignature =
-      new Class[] { int.class, Notification.class };
-  private static final Class<?>[] mStopForegroundSignature = new Class[] { boolean.class };
-
-  private final int mNotificationId;
-
-  private NotificationManager mNotificationManager;
-  private Method mStartForeground;
-  private Method mStopForeground;
-  private Object[] mStartForegroundArgs = new Object[2];
-  private Object[] mStopForegroundArgs = new Object[1];
-
-  public ForegroundService(int id) {
-    mNotificationId = id;
-  }
-
-  protected abstract Notification createNotification();
-
-  /**
-   * This is a wrapper around the new startForeground method, using the older APIs if it is not
-   * available.
-   */
-  private void startForegroundCompat(Notification notification) {
-    // If we have the new startForeground API, then use it.
-    if (mStartForeground != null) {
-      mStartForegroundArgs[0] = Integer.valueOf(mNotificationId);
-      mStartForegroundArgs[1] = notification;
-      try {
-        mStartForeground.invoke(this, mStartForegroundArgs);
-      } catch (Exception e) {
-        Log.e(e);
-      }
-      return;
-    }
-
-    // Fall back on the old API.
-    startForegroundCompat(notification);
-    if (notification != null) {
-      mNotificationManager.notify(mNotificationId, notification);
-    }
-  }
-  
-  
-
-  /**
-   * This is a wrapper around the new stopForeground method, using the older APIs if it is not
-   * available.
-   */
-  private void stopForegroundCompat() {
-    // If we have the new stopForeground API, then use it.
-    if (mStopForeground != null) {
-      mStopForegroundArgs[0] = Boolean.TRUE;
-      try {
-        mStopForeground.invoke(this, mStopForegroundArgs);
-      } catch (Exception e) {
-        Log.e(e);
-      }
-      return;
-    }
-
-    // Fall back on the old API. Note to cancel BEFORE changing the
-    // foreground state, since we could be killed at that point.
-    mNotificationManager.cancel(mNotificationId);
-    stopForeground(true);
-
-  }
-
-  @Override
-  public void onCreate() {
-    mNotificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
-    try {
-      mStartForeground = getClass().getMethod("startForeground", mStartForegroundSignature);
-      mStopForeground = getClass().getMethod("stopForeground", mStopForegroundSignature);
-    } catch (NoSuchMethodException e) {
-      // Running on an older platform.
-      mStartForeground = mStopForeground = null;
-    }
-    startForegroundCompat(createNotification());
-  }
-
-  @Override
-  public void onDestroy() {
-    // Make sure our notification is gone.
-    stopForegroundCompat();
-  }
-}
diff --git a/src/com/googlecode/android_scripting/FutureActivityTaskExecutor.java b/src/com/googlecode/android_scripting/FutureActivityTaskExecutor.java
deleted file mode 100644
index c7b6fc31..00000000
--- a/src/com/googlecode/android_scripting/FutureActivityTaskExecutor.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting;
-
-import android.content.Context;
-import android.content.Intent;
-
-import com.googlecode.android_scripting.activity.FutureActivity;
-import com.googlecode.android_scripting.future.FutureActivityTask;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicInteger;
-
-public class FutureActivityTaskExecutor {
-
-  private final Context mContext;
-  private final Map<Integer, FutureActivityTask<?>> mTaskMap =
-      new ConcurrentHashMap<Integer, FutureActivityTask<?>>();
-  private final AtomicInteger mIdGenerator = new AtomicInteger(0);
-
-  public FutureActivityTaskExecutor(Context context) {
-    mContext = context;
-  }
-
-  public void execute(FutureActivityTask<?> task) {
-    int id = mIdGenerator.incrementAndGet();
-    mTaskMap.put(id, task);
-    launchHelper(id);
-  }
-
-  public FutureActivityTask<?> getTask(int id) {
-    return mTaskMap.remove(id);
-  }
-
-  private void launchHelper(int id) {
-    Intent helper = new Intent(mContext, FutureActivity.class);
-    helper.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
-    helper.putExtra(Constants.EXTRA_TASK_ID, id);
-    mContext.startActivity(helper);
-  }
-}
diff --git a/src/com/googlecode/android_scripting/IntentBuilders.java b/src/com/googlecode/android_scripting/IntentBuilders.java
deleted file mode 100644
index cdc1fe66..00000000
--- a/src/com/googlecode/android_scripting/IntentBuilders.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Copyright (C) 2009 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting;
-
-import android.app.PendingIntent;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Parcelable;
-
-import com.googlecode.android_scripting.interpreter.Interpreter;
-
-import java.io.File;
-
-public class IntentBuilders {
-  /** An arbitrary value that is used to identify pending intents for executing scripts. */
-  private static final int EXECUTE_SCRIPT_REQUEST_CODE = 0x12f412a;
-
-  private IntentBuilders() {
-    // Utility class.
-  }
-
-  public static Intent buildTriggerServiceIntent() {
-    Intent intent = new Intent();
-    intent.setComponent(Constants.TRIGGER_SERVICE_COMPONENT_NAME);
-    return intent;
-  }
-
-  /**
-   * Builds an intent that will launch a script in the background.
-   * 
-   * @param script
-   *          the script to launch
-   * @return the intent that will launch the script
-   */
-  public static Intent buildStartInBackgroundIntent(File script) {
-    final ComponentName componentName = Constants.SL4A_SERVICE_LAUNCHER_COMPONENT_NAME;
-    Intent intent = new Intent();
-    intent.setComponent(componentName);
-    intent.setAction(Constants.ACTION_LAUNCH_BACKGROUND_SCRIPT);
-    intent.putExtra(Constants.EXTRA_SCRIPT_PATH, script.getAbsolutePath());
-    return intent;
-  }
-
-  /**
-   * Builds an intent that launches a script in a terminal.
-   * 
-   * @param script
-   *          the script to launch
-   * @return the intent that will launch the script
-   */
-  public static Intent buildStartInTerminalIntent(File script) {
-    final ComponentName componentName = Constants.SL4A_SERVICE_LAUNCHER_COMPONENT_NAME;
-    Intent intent = new Intent();
-    intent.setComponent(componentName);
-    intent.setAction(Constants.ACTION_LAUNCH_FOREGROUND_SCRIPT);
-    intent.putExtra(Constants.EXTRA_SCRIPT_PATH, script.getAbsolutePath());
-    return intent;
-  }
-
-  /**
-   * Builds an intent that launches an interpreter.
-   * 
-   * @param interpreterName
-   *          the interpreter to launch
-   * @return the intent that will launch the interpreter
-   */
-  public static Intent buildStartInterpreterIntent(String interpreterName) {
-    final ComponentName componentName = Constants.SL4A_SERVICE_LAUNCHER_COMPONENT_NAME;
-    Intent intent = new Intent();
-    intent.setComponent(componentName);
-    intent.setAction(Constants.ACTION_LAUNCH_INTERPRETER);
-    intent.putExtra(Constants.EXTRA_INTERPRETER_NAME, interpreterName);
-    return intent;
-  }
-
-  /**
-   * Builds an intent that creates a shortcut to launch the provided interpreter.
-   * 
-   * @param interpreter
-   *          the interpreter to link to
-   * @param iconResource
-   *          the icon resource to associate with the shortcut
-   * @return the intent that will create the shortcut
-   */
-  public static Intent buildInterpreterShortcutIntent(Interpreter interpreter,
-      Parcelable iconResource) {
-    Intent intent = new Intent();
-    intent.putExtra(Intent.EXTRA_SHORTCUT_INTENT,
-        buildStartInterpreterIntent(interpreter.getName()));
-    intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, interpreter.getNiceName());
-    intent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, iconResource);
-    return intent;
-  }
-
-  /**
-   * Builds an intent that creates a shortcut to launch the provided script in the background.
-   * 
-   * @param script
-   *          the script to link to
-   * @param iconResource
-   *          the icon resource to associate with the shortcut
-   * @return the intent that will create the shortcut
-   */
-  public static Intent buildBackgroundShortcutIntent(File script, Parcelable iconResource) {
-    Intent intent = new Intent();
-    intent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, buildStartInBackgroundIntent(script));
-    intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, script.getName());
-    intent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, iconResource);
-    return intent;
-  }
-
-  /**
-   * Builds an intent that creates a shortcut to launch the provided script in a terminal.
-   * 
-   * @param script
-   *          the script to link to
-   * @param iconResource
-   *          the icon resource to associate with the shortcut
-   * @return the intent that will create the shortcut
-   */
-  public static Intent buildTerminalShortcutIntent(File script, Parcelable iconResource) {
-    Intent intent = new Intent();
-    intent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, buildStartInTerminalIntent(script));
-    intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, script.getName());
-    intent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, iconResource);
-    return intent;
-  }
-
-  /**
-   * Creates a pending intent that can be used to start the trigger service.
-   * 
-   * @param context
-   *          the context under whose authority to launch the intent
-   * 
-   * @return {@link PendingIntent} object for running the trigger service
-   */
-  public static PendingIntent buildTriggerServicePendingIntent(Context context) {
-    final Intent intent = buildTriggerServiceIntent();
-    return PendingIntent.getService(context, EXECUTE_SCRIPT_REQUEST_CODE, intent,
-        PendingIntent.FLAG_UPDATE_CURRENT);
-  }
-}
diff --git a/src/com/googlecode/android_scripting/IoUtils.java b/src/com/googlecode/android_scripting/IoUtils.java
deleted file mode 100644
index 1378b001..00000000
--- a/src/com/googlecode/android_scripting/IoUtils.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-public class IoUtils {
-  private static final int BUFFER_SIZE = 1024 * 8;
-
-  private IoUtils() {
-    // Utility class.
-  }
-
-  public static int copy(InputStream input, OutputStream output) throws Exception, IOException {
-    byte[] buffer = new byte[BUFFER_SIZE];
-
-    BufferedInputStream in = new BufferedInputStream(input, BUFFER_SIZE);
-    BufferedOutputStream out = new BufferedOutputStream(output, BUFFER_SIZE);
-    int count = 0, n = 0;
-    try {
-      while ((n = in.read(buffer, 0, BUFFER_SIZE)) != -1) {
-        out.write(buffer, 0, n);
-        count += n;
-      }
-      out.flush();
-    } finally {
-      try {
-        out.close();
-      } catch (IOException e) {
-        Log.e(e.getMessage(), e);
-      }
-      try {
-        in.close();
-      } catch (IOException e) {
-        Log.e(e.getMessage(), e);
-      }
-    }
-    return count;
-  }
-
-}
diff --git a/src/com/googlecode/android_scripting/Log.java b/src/com/googlecode/android_scripting/Log.java
deleted file mode 100644
index d56048a6..00000000
--- a/src/com/googlecode/android_scripting/Log.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Copyright (C) 2009 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting;
-
-import android.app.AlertDialog;
-import android.app.Notification;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.widget.Toast;
-
-public class Log {
-  private Log() {
-    // Utility class.
-  }
-
-  private static String getTag() {
-    StackTraceElement[] stackTraceElements = Thread.currentThread().getStackTrace();
-    String fullClassName = stackTraceElements[4].getClassName();
-    String className = fullClassName.substring(fullClassName.lastIndexOf(".") + 1);
-    int lineNumber = stackTraceElements[4].getLineNumber();
-    return "sl4a." + className + ":" + lineNumber;
-  }
-
-  private static void toast(Context context, String message) {
-    Toast.makeText(context, message, Toast.LENGTH_SHORT).show();
-  }
-
-  @SuppressWarnings("deprecation")
-public static void notify(Context context, String title, String contentTitle, String message) {
-    android.util.Log.v(getTag(), String.format("%s %s", contentTitle, message));
-
-    String packageName = context.getPackageName();
-    int iconId = context.getResources().getIdentifier("stat_sys_warning", "drawable", packageName);
-    NotificationManager notificationManager =
-        (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
-    Notification note = new Notification(iconId > 0 ? iconId : -1, title, 0);
-    note.setLatestEventInfo(context, contentTitle, message, PendingIntent.getService(context, 0,
-        null, 0));
-    note.contentView.getLayoutId();
-    notificationManager.notify(NotificationIdFactory.create(), note);
-  }
-
-  public static void showDialog(final Context context, final String title, final String message) {
-    android.util.Log.v(getTag(), String.format("%s %s", title, message));
-
-    MainThread.run(context, new Runnable() {
-      @Override
-      public void run() {
-        AlertDialog.Builder builder = new AlertDialog.Builder(context);
-        builder.setTitle(title);
-        builder.setMessage(message);
-
-        DialogInterface.OnClickListener buttonListener = new DialogInterface.OnClickListener() {
-          @Override
-          public void onClick(DialogInterface dialog, int which) {
-            dialog.dismiss();
-          }
-        };
-        builder.setPositiveButton("Ok", buttonListener);
-        builder.show();
-      }
-    });
-  }
-
-  public static void v(String message) {
-    android.util.Log.v(getTag(), message);
-  }
-
-  public static void v(String message, Throwable e) {
-    android.util.Log.v(getTag(), message, e);
-  }
-
-  public static void v(Context context, String message) {
-    toast(context, message);
-    android.util.Log.v(getTag(), message);
-  }
-
-  public static void v(Context context, String message, Throwable e) {
-    toast(context, message);
-    android.util.Log.v(getTag(), message, e);
-  }
-
-  public static void e(Throwable e) {
-    android.util.Log.e(getTag(), "Error", e);
-  }
-
-  public static void e(String message) {
-    android.util.Log.e(getTag(), message);
-  }
-
-  public static void e(String message, Throwable e) {
-    android.util.Log.e(getTag(), message, e);
-  }
-
-  public static void e(Context context, String message) {
-    toast(context, message);
-    android.util.Log.e(getTag(), message);
-  }
-
-  public static void e(Context context, String message, Throwable e) {
-    toast(context, message);
-    android.util.Log.e(getTag(), message, e);
-  }
-
-  public static void w(Throwable e) {
-    android.util.Log.w(getTag(), "Warning", e);
-  }
-
-  public static void w(String message) {
-    android.util.Log.w(getTag(), message);
-  }
-
-  public static void w(String message, Throwable e) {
-    android.util.Log.w(getTag(), message, e);
-  }
-
-  public static void w(Context context, String message) {
-    toast(context, message);
-    android.util.Log.w(getTag(), message);
-  }
-
-  public static void w(Context context, String message, Throwable e) {
-    toast(context, message);
-    android.util.Log.w(getTag(), message, e);
-  }
-
-  public static void d(String message) {
-    android.util.Log.d(getTag(), message);
-  }
-
-  public static void d(String message, Throwable e) {
-    android.util.Log.d(getTag(), message, e);
-  }
-
-  public static void d(Context context, String message) {
-    toast(context, message);
-    android.util.Log.d(getTag(), message);
-  }
-
-  public static void d(Context context, String message, Throwable e) {
-    toast(context, message);
-    android.util.Log.d(getTag(), message, e);
-  }
-
-  public static void i(String message) {
-    android.util.Log.i(getTag(), message);
-  }
-
-  public static void i(String message, Throwable e) {
-    android.util.Log.i(getTag(), message, e);
-  }
-
-  public static void i(Context context, String message) {
-    toast(context, message);
-    android.util.Log.i(getTag(), message);
-  }
-
-  public static void i(Context context, String message, Throwable e) {
-    toast(context, message);
-    android.util.Log.i(getTag(), message, e);
-  }
-}
diff --git a/src/com/googlecode/android_scripting/MainThread.java b/src/com/googlecode/android_scripting/MainThread.java
deleted file mode 100644
index 37f72335..00000000
--- a/src/com/googlecode/android_scripting/MainThread.java
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2010 Google Inc. All Rights Reserved.
-
-package com.googlecode.android_scripting;
-
-import android.content.Context;
-import android.os.Handler;
-
-import com.googlecode.android_scripting.future.FutureResult;
-
-import java.util.concurrent.Callable;
-
-public class MainThread {
-
-  private MainThread() {
-    // Utility class.
-  }
-
-  /**
-   * Executed in the main thread, returns the result of an execution. Anything that runs here should
-   * finish quickly to avoid hanging the UI thread.
-   */
-  public static <T> T run(Context context, final Callable<T> task) {
-    final FutureResult<T> result = new FutureResult<T>();
-    Handler handler = new Handler(context.getMainLooper());
-    handler.post(new Runnable() {
-      @Override
-      public void run() {
-        try {
-          result.set(task.call());
-        } catch (Exception e) {
-          Log.e(e);
-          result.set(null);
-        }
-      }
-    });
-    try {
-      return result.get();
-    } catch (InterruptedException e) {
-      Log.e(e);
-    }
-    return null;
-  }
-
-  public static void run(Context context, final Runnable task) {
-    Handler handler = new Handler(context.getMainLooper());
-    handler.post(new Runnable() {
-      @Override
-      public void run() {
-        task.run();
-      }
-    });
-  }
-}
diff --git a/src/com/googlecode/android_scripting/NotificationIdFactory.java b/src/com/googlecode/android_scripting/NotificationIdFactory.java
deleted file mode 100644
index 9f49b91a..00000000
--- a/src/com/googlecode/android_scripting/NotificationIdFactory.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting;
-
-import java.util.concurrent.atomic.AtomicInteger;
-
-/**
- * Creates unique ids to identify the notifications created by the android scripting service and the
- * trigger service.
- * 
- * @author Felix Arends (felix.arends@gmail.com)
- * 
- */
-public final class NotificationIdFactory {
-  private static final AtomicInteger mNextId = new AtomicInteger(0);
-
-  public static int create() {
-    return mNextId.incrementAndGet();
-  }
-
-  private NotificationIdFactory() {
-  }
-}
diff --git a/src/com/googlecode/android_scripting/Process.java b/src/com/googlecode/android_scripting/Process.java
deleted file mode 100644
index 9a0f1b6d..00000000
--- a/src/com/googlecode/android_scripting/Process.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting;
-
-import com.googlecode.android_scripting.interpreter.InterpreterConstants;
-import com.hipipal.sl4alib.StreamGobbler;
-
-import java.io.File;
-import java.io.FileDescriptor;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.concurrent.atomic.AtomicInteger;
-
-public class Process {
-
-  private static final int DEFAULT_BUFFER_SIZE = 8192;
-
-  private final List<String> mArguments;
-  private final Map<String, String> mEnvironment;
-
-  private static final int PID_INIT_VALUE = -1;
-
-  private File mBinary;
-  private String mName;
-  private long mStartTime;
-  private long mEndTime;
-
-  protected final AtomicInteger mPid;
-  protected FileDescriptor mFd;
-  protected OutputStream mOut;
-  protected InputStream mIn;
-  protected File mLog;
-
-  public Process() {
-    mArguments = new ArrayList<String>();
-    mEnvironment = new HashMap<String, String>();
-    mPid = new AtomicInteger(PID_INIT_VALUE);
-  }
-
-  public void addArgument(String argument) {
-    mArguments.add(argument);
-  }
-
-  public void addAllArguments(List<String> arguments) {
-    mArguments.addAll(arguments);
-  }
-
-  public void putAllEnvironmentVariables(Map<String, String> environment) {
-    mEnvironment.putAll(environment);
-  }
-
-  public void putEnvironmentVariable(String key, String value) {
-    mEnvironment.put(key, value);
-  }
-
-  public void setBinary(File binary) {
-    if (!binary.exists()) {
-      throw new RuntimeException("Binary " + binary + " does not exist!");
-    }
-    mBinary = binary;
-  }
-
-  public Integer getPid() {
-    return mPid.get();
-  }
-
-  public FileDescriptor getFd() {
-    return mFd;
-  }
-
-  public OutputStream getOut() {
-    return mOut;
-  }
-
-  public OutputStream getErr() {
-    return getOut();
-  }
-
-  public File getLogFile() {
-    return mLog;
-  }
-
-  public InputStream getIn() {
-    return mIn;
-  }
-
-  public void start(final Runnable shutdownHook) {
-    if (isAlive()) {
-      throw new RuntimeException("Attempted to start process that is already running.");
-    }
-
-    String binaryPath = mBinary.getAbsolutePath();
-    Log.v("Executing " + binaryPath + " with arguments " + mArguments + " and with environment "
-        + mEnvironment.toString());
-
-    int[] pid = new int[1];
-    String[] argumentsArray = mArguments.toArray(new String[mArguments.size()]);
-    mLog = new File(String.format("%s/%s.log", InterpreterConstants.SDCARD_SL4A_ROOT, getName()));
-
-    mFd =
-        Exec.createSubprocess(binaryPath, argumentsArray, getEnvironmentArray(),
-            getWorkingDirectory(), pid);
-    mPid.set(pid[0]);
-    mOut = new FileOutputStream(mFd);
-    mIn = new StreamGobbler(new FileInputStream(mFd), mLog, DEFAULT_BUFFER_SIZE);
-    mStartTime = System.currentTimeMillis();
-
-    new Thread(new Runnable() {
-      public void run() {
-        int result = Exec.waitFor(mPid.get());
-        mEndTime = System.currentTimeMillis();
-        int pid = mPid.getAndSet(PID_INIT_VALUE);
-        Log.v("Process " + pid + " exited with result code " + result + ".");
-        try {
-          mIn.close();
-        } catch (IOException e) {
-          Log.e(e);
-        }
-        try {
-          mOut.close();
-        } catch (IOException e) {
-          Log.e(e);
-        }
-        if (shutdownHook != null) {
-          shutdownHook.run();
-        }
-      }
-    }).start();
-  }
-
-  private String[] getEnvironmentArray() {
-    List<String> environmentVariables = new ArrayList<String>();
-    for (Entry<String, String> entry : mEnvironment.entrySet()) {
-      environmentVariables.add(entry.getKey() + "=" + entry.getValue());
-    }
-    String[] environment = environmentVariables.toArray(new String[environmentVariables.size()]);
-    return environment;
-  }
-
-  public void kill() {
-    if (isAlive()) {
-      android.os.Process.killProcess(mPid.get());
-      Log.v("Killed process " + mPid);
-    }
-  }
-
-  public boolean isAlive() {
-    return (mFd != null && mFd.valid()) && mPid.get() != PID_INIT_VALUE;
-  }
-
-  public String getUptime() {
-    long ms;
-    if (!isAlive()) {
-      ms = mEndTime - mStartTime;
-    } else {
-      ms = System.currentTimeMillis() - mStartTime;
-    }
-    StringBuilder buffer = new StringBuilder();
-    int days = (int) (ms / (1000 * 60 * 60 * 24));
-    int hours = (int) (ms % (1000 * 60 * 60 * 24)) / 3600000;
-    int minutes = (int) (ms % 3600000) / 60000;
-    int seconds = (int) (ms % 60000) / 1000;
-    if (days != 0) {
-      buffer.append(String.format("%02d:%02d:", days, hours));
-    } else if (hours != 0) {
-      buffer.append(String.format("%02d:", hours));
-    }
-    buffer.append(String.format("%02d:%02d", minutes, seconds));
-    return buffer.toString();
-  }
-
-  public String getName() {
-    return mName;
-  }
-
-  public void setName(String name) {
-    mName = name;
-  }
-
-  public String getWorkingDirectory() {
-    return null;
-  }
-}
diff --git a/src/com/googlecode/android_scripting/ScriptLauncher.java b/src/com/googlecode/android_scripting/ScriptLauncher.java
deleted file mode 100644
index ee0e03af..00000000
--- a/src/com/googlecode/android_scripting/ScriptLauncher.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (C) 2009 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting;
-
-import android.app.Service;
-import android.content.Intent;
-
-import com.googlecode.android_scripting.facade.FacadeConfiguration;
-import com.googlecode.android_scripting.facade.FacadeManager;
-import com.googlecode.android_scripting.interpreter.Interpreter;
-import com.googlecode.android_scripting.interpreter.InterpreterConfiguration;
-import com.googlecode.android_scripting.interpreter.InterpreterProcess;
-import com.googlecode.android_scripting.interpreter.html.HtmlActivityTask;
-import com.googlecode.android_scripting.interpreter.html.HtmlInterpreter;
-
-import java.io.File;
-
-import com.hipipal.sl4alib.MNApp;
-
-public class ScriptLauncher {
-
-  private ScriptLauncher() {
-    // Utility class.
-  }
-
-  public static HtmlActivityTask launchHtmlScript(File script, Service service, Intent intent,
-      InterpreterConfiguration config) {
-    if (!script.exists()) {
-      throw new RuntimeException("No such script to launch.");
-    }
-    HtmlInterpreter interpreter =
-        (HtmlInterpreter) config.getInterpreterByName(HtmlInterpreter.HTML);
-    if (interpreter == null) {
-      throw new RuntimeException("HtmlInterpreter is not available.");
-    }
-    final FacadeManager manager =
-        new FacadeManager(FacadeConfiguration.getSdkLevel(), service, intent,
-            FacadeConfiguration.getFacadeClasses());
-    FutureActivityTaskExecutor executor =
-        ((MNApp) service.getApplication()).getTaskExecutor();
-    final HtmlActivityTask task =
-        new HtmlActivityTask(manager, interpreter.getAndroidJsSource(),
-            interpreter.getJsonSource(), script.getAbsolutePath(), true);
-    executor.execute(task);
-    return task;
-  }
-
-  public static InterpreterProcess launchInterpreter(final AndroidProxy proxy, Intent intent,
-      InterpreterConfiguration config, Runnable shutdownHook) {
-    Interpreter interpreter;
-    String interpreterName;
-    interpreterName = intent.getStringExtra(Constants.EXTRA_INTERPRETER_NAME);
-    interpreter = config.getInterpreterByName(interpreterName);
-    InterpreterProcess process = new InterpreterProcess(interpreter, proxy);
-    if (shutdownHook == null) {
-      process.start(new Runnable() {
-        @Override
-        public void run() {
-          proxy.shutdown();
-        }
-      });
-    } else {
-      process.start(shutdownHook);
-    }
-    return process;
-  }
-
-  public static ScriptProcess launchScript(File script, InterpreterConfiguration configuration,
-      final AndroidProxy proxy, Runnable shutdownHook) {
-    if (!script.exists()) {
-      throw new RuntimeException("No such script to launch.");
-    }
-    ScriptProcess process = new ScriptProcess(script, configuration, proxy);
-    if (shutdownHook == null) {
-      process.start(new Runnable() {
-        @Override
-        public void run() {
-          proxy.shutdown();
-        }
-      });
-    } else {
-      process.start(shutdownHook);
-    }
-    return process;
-  }
-}
\ No newline at end of file
diff --git a/src/com/googlecode/android_scripting/ScriptProcess.java b/src/com/googlecode/android_scripting/ScriptProcess.java
deleted file mode 100644
index 7187b096..00000000
--- a/src/com/googlecode/android_scripting/ScriptProcess.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting;
-
-import com.googlecode.android_scripting.interpreter.Interpreter;
-import com.googlecode.android_scripting.interpreter.InterpreterConfiguration;
-import com.googlecode.android_scripting.interpreter.InterpreterProcess;
-
-import java.io.File;
-
-public class ScriptProcess extends InterpreterProcess {
-
-  private final File mScript;
-
-  public ScriptProcess(File script, InterpreterConfiguration configuration, AndroidProxy proxy) {
-    super(configuration.getInterpreterForScript(script.getName()), proxy);
-    mScript = script;
-    String scriptName = script.getName();
-    setName(scriptName);
-    Interpreter interpreter = configuration.getInterpreterForScript(scriptName);
-    setCommand(String.format(interpreter.getScriptCommand(), script.getAbsolutePath()));
-  }
-
-  public String getPath() {
-    return mScript.getPath();
-  }
-
-}
diff --git a/src/com/googlecode/android_scripting/ScriptStorageAdapter.java b/src/com/googlecode/android_scripting/ScriptStorageAdapter.java
deleted file mode 100644
index ce5a0089..00000000
--- a/src/com/googlecode/android_scripting/ScriptStorageAdapter.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (C) 2009 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting;
-
-import com.googlecode.android_scripting.interpreter.Interpreter;
-import com.googlecode.android_scripting.interpreter.InterpreterConfiguration;
-import com.googlecode.android_scripting.interpreter.InterpreterConstants;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * Manages storage and retrieval of scripts on the file system.
- * 
- * @author Damon Kohler (damonkohler@gmail.com)
- */
-public class ScriptStorageAdapter {
-
-  private ScriptStorageAdapter() {
-    // Utility class.
-  }
-
-  /**
-   * Writes data to the script by name and overwrites any existing data.
-   */
-  public static void writeScript(File script, String data) {
-    if (script.getParent() == null) {
-      script = new File(InterpreterConstants.SCRIPTS_ROOT, script.getPath());
-    }
-    try {
-      FileWriter stream = new FileWriter(script, false /* overwrite */);
-      BufferedWriter out = new BufferedWriter(stream);
-      out.write(data);
-      out.close();
-    } catch (IOException e) {
-      Log.e("Failed to write script.", e);
-    }
-  }
-
-  /**
-   * Returns a list of all available script {@link File}s.
-   */
-  public static List<File> listAllScripts(File dir) {
-    if (dir == null) {
-      dir = new File(InterpreterConstants.SCRIPTS_ROOT);
-    }
-    if (dir.exists()) {
-      List<File> scripts = Arrays.asList(dir.listFiles());
-      Collections.sort(scripts, new Comparator<File>() {
-        @Override
-        public int compare(File file1, File file2) {
-          if (file1.isDirectory() && !file2.isDirectory()) {
-            return -1;
-          } else if (!file1.isDirectory() && file2.isDirectory()) {
-            return 1;
-          }
-          return file1.compareTo(file2);
-        }
-      });
-      return scripts;
-    }
-    return new ArrayList<File>();
-  }
-
-  /**
-   * Returns a list of script {@link File}s from the given folder for which there is an interpreter
-   * installed.
-   */
-  public static List<File> listExecutableScripts(File directory, InterpreterConfiguration config) {
-    // NOTE(damonkohler): Creating a LinkedList here is necessary in order to be able to filter it
-    // later.
-    List<File> scripts = new LinkedList<File>(listAllScripts(directory));
-    // Filter out any files that don't have interpreters installed.
-    for (Iterator<File> it = scripts.iterator(); it.hasNext();) {
-      File script = it.next();
-      if (script.isDirectory()) {
-        continue;
-      }
-      Interpreter interpreter = config.getInterpreterForScript(script.getName());
-      if (interpreter == null || !interpreter.isInstalled()) {
-        it.remove();
-      }
-    }
-    return scripts;
-  }
-
-  /**
-   * Returns a list of all (including subfolders) script {@link File}s for which there is an
-   * interpreter installed.
-   */
-  public static List<File> listExecutableScriptsRecursively(File directory,
-      InterpreterConfiguration config) {
-    // NOTE(damonkohler): Creating a LinkedList here is necessary in order to be able to filter it
-    // later.
-    List<File> scripts = new LinkedList<File>();
-    List<File> files = listAllScripts(directory);
-
-    // Filter out any files that don't have interpreters installed.
-    for (Iterator<File> it = files.iterator(); it.hasNext();) {
-      File file = it.next();
-      if (file.isDirectory()) {
-        scripts.addAll(listExecutableScriptsRecursively(file, config));
-      }
-      Interpreter interpreter = config.getInterpreterForScript(file.getName());
-      if (interpreter != null && interpreter.isInstalled()) {
-        scripts.add(file);
-      }
-    }
-    Collections.sort(scripts);
-    return scripts;
-  }
-}
\ No newline at end of file
diff --git a/src/com/googlecode/android_scripting/SimpleServer.java b/src/com/googlecode/android_scripting/SimpleServer.java
deleted file mode 100644
index 126d2709..00000000
--- a/src/com/googlecode/android_scripting/SimpleServer.java
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
- * Copyright (C) 2009 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting;
-
-import com.google.common.collect.Lists;
-
-import java.io.IOException;
-import java.net.Inet4Address;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.NetworkInterface;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.net.SocketException;
-import java.net.UnknownHostException;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-/**
- * A simple server.
- * 
- * @author Damon Kohler (damonkohler@gmail.com)
- */
-public abstract class SimpleServer {
-
-  private final CopyOnWriteArrayList<ConnectionThread> mConnectionThreads =
-      new CopyOnWriteArrayList<ConnectionThread>();
-  private final List<SimpleServerObserver> mObservers = Lists.newArrayList();
-  private volatile boolean mStopServer = false;
-  private ServerSocket mServer;
-  private Thread mServerThread;
-
-  public interface SimpleServerObserver {
-    public void onConnect();
-
-    public void onDisconnect();
-  }
-
-  protected abstract void handleConnection(Socket socket) throws Exception;
-
-  /** Adds an observer. */
-  public void addObserver(SimpleServerObserver observer) {
-    mObservers.add(observer);
-  }
-
-  /** Removes an observer. */
-  public void removeObserver(SimpleServerObserver observer) {
-    mObservers.remove(observer);
-  }
-
-  private void notifyOnConnect() {
-    for (SimpleServerObserver observer : mObservers) {
-      observer.onConnect();
-    }
-  }
-
-  private void notifyOnDisconnect() {
-    for (SimpleServerObserver observer : mObservers) {
-      observer.onDisconnect();
-    }
-  }
-
-  private final class ConnectionThread extends Thread {
-    private final Socket mmSocket;
-
-    private ConnectionThread(Socket socket) {
-      setName("SimpleServer ConnectionThread " + getId());
-      mmSocket = socket;
-    }
-
-    @Override
-    public void run() {
-      Log.v("Server thread " + getId() + " started.");
-      try {
-        handleConnection(mmSocket);
-      } catch (Exception e) {
-        if (!mStopServer) {
-          Log.e("Server error.", e);
-        }
-      } finally {
-        close();
-        mConnectionThreads.remove(this);
-        notifyOnDisconnect();
-        Log.v("Server thread " + getId() + " died.");
-      }
-    }
-
-    private void close() {
-      if (mmSocket != null) {
-        try {
-          mmSocket.close();
-        } catch (IOException e) {
-          Log.e(e.getMessage(), e);
-        }
-      }
-    }
-  }
-
-  /** Returns the number of active connections to this server. */
-  public int getNumberOfConnections() {
-    return mConnectionThreads.size();
-  }
-
-  public static InetAddress getPublicInetAddress() throws UnknownHostException, SocketException {
-
-    InetAddress candidate = null;
-    Enumeration<NetworkInterface> nets = NetworkInterface.getNetworkInterfaces();
-    for (NetworkInterface netint : Collections.list(nets)) {
-      /*if (netint.isLoopback() || !netint.isUp()) { // Ignore if localhost or not active
-        continue;
-      }*/
-      Enumeration<InetAddress> addresses = netint.getInetAddresses();
-      for (InetAddress address : Collections.list(addresses)) {
-        if (address instanceof Inet4Address) {
-          return address; // Prefer ipv4
-        }
-        candidate = address; // Probably an ipv6
-      }
-    }
-    if (candidate != null) {
-      return candidate; // return ipv6 address if no suitable ipv6
-    }
-    return InetAddress.getLocalHost(); // No damn matches. Give up, return local host.
-  }
-
-  /**
-   * Starts the RPC server bound to the localhost address.
-   * 
-   * @param port
-   *          the port to bind to or 0 to pick any unused port
-   * 
-   * @return the port that the server is bound to
-   */
-  public InetSocketAddress startLocal(int port) {
-    InetAddress address;
-    try {
-      address = InetAddress.getLocalHost();
-      mServer = new ServerSocket(port, 5 /* backlog */, address);
-    } catch (Exception e) {
-      Log.e("Failed to start server.", e);
-      return null;
-    }
-    int boundPort = start();
-    return InetSocketAddress.createUnresolved(mServer.getInetAddress().getHostAddress(), boundPort);
-  }
-
-  /**
-   * data Starts the RPC server bound to the public facing address.
-   * 
-   * @param port
-   *          the port to bind to or 0 to pick any unused port
-   * 
-   * @return the port that the server is bound to
-   */
-  public InetSocketAddress startPublic(int port) {
-    InetAddress address;
-    try {
-      // address = getPublicInetAddress();
-      address = null;
-      mServer = new ServerSocket(port, 5 /* backlog */, address);
-    } catch (Exception e) {
-      Log.e("Failed to start server.", e);
-      return null;
-    }
-    int boundPort = start();
-    return InetSocketAddress.createUnresolved(mServer.getInetAddress().getHostAddress(), boundPort);
-  }
-
-  /**
-   * data Starts the RPC server bound to all interfaces
-   * 
-   * @param port
-   *          the port to bind to or 0 to pick any unused port
-   * 
-   * @return the port that the server is bound to
-   */
-  public InetSocketAddress startAllInterfaces(int port) {
-    try {
-      mServer = new ServerSocket(port, 5 /* backlog */);
-    } catch (Exception e) {
-      Log.e("Failed to start server.", e);
-      return null;
-    }
-    int boundPort = start();
-    return InetSocketAddress.createUnresolved(mServer.getInetAddress().getHostAddress(), boundPort);
-  }
-
-  private int start() {
-    mServerThread = new Thread() {
-      @Override
-      public void run() {
-        while (!mStopServer) {
-          try {
-            Socket sock = mServer.accept();
-            if (!mStopServer) {
-              startConnectionThread(sock);
-            } else {
-              sock.close();
-            }
-          } catch (IOException e) {
-            if (!mStopServer) {
-              Log.e("Failed to accept connection.", e);
-            }
-          }
-        }
-      }
-    };
-    mServerThread.start();
-    Log.v("Bound to " + mServer.getInetAddress());
-    return mServer.getLocalPort();
-  }
-
-  private void startConnectionThread(final Socket sock) {
-    ConnectionThread networkThread = new ConnectionThread(sock);
-    mConnectionThreads.add(networkThread);
-    networkThread.start();
-    notifyOnConnect();
-  }
-
-  public void shutdown() {
-    // Stop listening on the server socket to ensure that
-    // beyond this point there are no incoming requests.
-    mStopServer = true;
-    try {
-    	if (mServer!=null) {
-    		mServer.close();
-    	}
-    } catch (IOException e) {
-      Log.e("Failed to close server socket.", e);
-    }
-    // Since the server is not running, the mNetworkThreads set can only
-    // shrink from this point onward. We can just stop all of the running helper
-    // threads. In the worst case, one of the running threads will already have
-    // shut down. Since this is a CopyOnWriteList, we don't have to worry about
-    // concurrency issues while iterating over the set of threads.
-    for (ConnectionThread connectionThread : mConnectionThreads) {
-      connectionThread.close();
-    }
-    for (SimpleServerObserver observer : mObservers) {
-      removeObserver(observer);
-    }
-  }
-}
diff --git a/src/com/googlecode/android_scripting/SingleThreadExecutor.java b/src/com/googlecode/android_scripting/SingleThreadExecutor.java
deleted file mode 100644
index fd3d0449..00000000
--- a/src/com/googlecode/android_scripting/SingleThreadExecutor.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting;
-
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
-public class SingleThreadExecutor extends ThreadPoolExecutor {
-
-  public SingleThreadExecutor() {
-    super(1, 1, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<Runnable>());
-  }
-
-  @Override
-  protected void afterExecute(Runnable r, Throwable t) {
-    if (t != null) {
-      throw new RuntimeException(t);
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/com/googlecode/android_scripting/StringUtils.java b/src/com/googlecode/android_scripting/StringUtils.java
deleted file mode 100644
index b705b7f8..00000000
--- a/src/com/googlecode/android_scripting/StringUtils.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.googlecode.android_scripting;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-public class StringUtils {
-
-  private StringUtils() {
-    // Utility class.
-  }
-
-  public static String join(Collection<String> collection, String delimiter) {
-    StringBuffer buffer = new StringBuffer();
-    Iterator<String> iter = collection.iterator();
-    while (iter.hasNext()) {
-      buffer.append(iter.next());
-      if (iter.hasNext()) {
-        buffer.append(delimiter);
-      }
-    }
-    return buffer.toString();
-  }
-}
diff --git a/src/com/googlecode/android_scripting/Version.java b/src/com/googlecode/android_scripting/Version.java
deleted file mode 100644
index f5907e4d..00000000
--- a/src/com/googlecode/android_scripting/Version.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2009 Google Inc.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting;
-
-import android.content.Context;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-
-public class Version {
-
-  private Version() {
-    // Utility class.
-  }
-
-  public static String getVersion(Context context) {
-    try {
-      PackageInfo info = context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
-      return info.versionName;
-    } catch (PackageManager.NameNotFoundException e) {
-      Log.e("Package name not found", e);
-    }
-    return "?";
-  }
-
-}
diff --git a/src/com/googlecode/android_scripting/activity/FutureActivity.java b/src/com/googlecode/android_scripting/activity/FutureActivity.java
deleted file mode 100644
index ef78e718..00000000
--- a/src/com/googlecode/android_scripting/activity/FutureActivity.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.activity;
-
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.app.Service;
-import android.content.Intent;
-import android.content.pm.ResolveInfo;
-import android.os.Bundle;
-import android.view.ContextMenu;
-import android.view.ContextMenu.ContextMenuInfo;
-import android.view.KeyEvent;
-import android.view.Menu;
-import android.view.View;
-
-import com.googlecode.android_scripting.Constants;
-import com.googlecode.android_scripting.FutureActivityTaskExecutor;
-import com.googlecode.android_scripting.Log;
-import com.googlecode.android_scripting.future.FutureActivityTask;
-import com.googlecode.android_scripting.jsonrpc.RpcReceiver;
-
-import com.hipipal.sl4alib.MNApp;
-
-/**
- * This {@link Activity} is launched by {@link RpcReceiver}s in order to perform operations that a
- * {@link Service} is unable to do. For example: start another activity for result, show dialogs,
- * etc.
- * 
- * @author Damon Kohler (damonkohler@gmail.com)
- */
-public class FutureActivity extends Activity {
-  private FutureActivityTask<?> mTask;
-  
-  private int count = 0;
-
-  @Override
-  protected void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-    Log.v("FutureActivity created.");
-    int id = getIntent().getIntExtra(Constants.EXTRA_TASK_ID, 0);
-    if (id == 0) {
-      throw new RuntimeException("FutureActivityTask ID is not specified.");
-    }
-    // River Modify
-    FutureActivityTaskExecutor taskQueue = ((MNApp) getApplication()).getTaskExecutor();
-    mTask = taskQueue.getTask(id);
-    if (mTask == null) { // TODO: (Robbie) This is now less of a kludge. Would still like to know
-                         // what is happening.
-      Log.w("FutureActivity has no task!");
-      try {
-        Intent intent = new Intent(Intent.ACTION_MAIN); // Should default to main of current app.
-        intent.addCategory(Intent.CATEGORY_LAUNCHER);
-        String packageName = getPackageName();
-        for (ResolveInfo resolve : getPackageManager().queryIntentActivities(intent, 0)) {
-          if (resolve.activityInfo.packageName.equals(packageName)) {
-            intent.setClassName(packageName, resolve.activityInfo.name);
-            break;
-          }
-        }
-        startActivity(intent);
-      } catch (Exception e) {
-        Log.e("Can't find main activity.");
-      }
-    } else {
-      mTask.setActivity(this);
-      mTask.onCreate();
-    }
-  }
-
-  @Override
-  protected void onStart() {
-    super.onStart();
-    if (mTask != null) {
-      mTask.onStart();
-    }
-  }
-
-  @Override
-  protected void onResume() {
-    super.onResume();
-    if (mTask != null) {
-      mTask.onResume();
-    }
-  }
-
-  @Override
-  protected void onPause() {
-    super.onPause();
-    if (mTask != null) {
-      mTask.onPause();
-    }
-  }
-
-  @Override
-  protected void onStop() {
-    super.onStop();
-    if (mTask != null) {
-      mTask.onStop();
-    }
-  }
-
-  @Override
-  protected void onDestroy() {
-    super.onDestroy();
-    if (mTask != null) {
-      mTask.onDestroy();
-    }
-  }
-
-  @Override
-  public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
-    if (mTask != null) {
-      mTask.onCreateContextMenu(menu, v, menuInfo);
-    }
-  }
-
-  @Override
-  public boolean onPrepareOptionsMenu(Menu menu) {
-    super.onPrepareOptionsMenu(menu);
-    if (mTask == null) {
-      return false;
-    } else {
-      return mTask.onPrepareOptionsMenu(menu);
-    }
-  }
-
-  @Override
-  public void onActivityResult(int requestCode, int resultCode, Intent data) {
-    if (mTask != null) {
-      mTask.onActivityResult(requestCode, resultCode, data);
-    }
-  }
-
-	@Override
-	protected void onNewIntent(Intent intent) {
-		super.onNewIntent(intent);
-		if (mTask != null) {
-			mTask.onNewIntent(intent);
-		}
-	}
-  @Override
-  public boolean onKeyDown(int keyCode, KeyEvent event) {
-    if (mTask != null) {
-      return mTask.onKeyDown(keyCode, event);
-    }
-    return false;
-  }
-}
diff --git a/src/com/googlecode/android_scripting/bluetooth/BluetoothDiscoveryHelper.java b/src/com/googlecode/android_scripting/bluetooth/BluetoothDiscoveryHelper.java
deleted file mode 100644
index 7e1fb42c..00000000
--- a/src/com/googlecode/android_scripting/bluetooth/BluetoothDiscoveryHelper.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.bluetooth;
-
-import android.bluetooth.BluetoothAdapter;
-import android.bluetooth.BluetoothDevice;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-
-import java.util.Set;
-
-public class BluetoothDiscoveryHelper {
-
-  public static interface BluetoothDiscoveryListener {
-    public void addBondedDevice(String name, String address);
-
-    public void addDevice(String name, String address);
-
-    public void scanDone();
-  }
-
-  private final Context mContext;
-  private final BluetoothDiscoveryListener mListener;
-  private final BroadcastReceiver mReceiver;
-
-  public BluetoothDiscoveryHelper(Context context, BluetoothDiscoveryListener listener) {
-    mContext = context;
-    mListener = listener;
-    mReceiver = new BluetoothReceiver();
-  }
-
-  private class BluetoothReceiver extends BroadcastReceiver {
-    @Override
-    public void onReceive(Context context, Intent intent) {
-      final String action = intent.getAction();
-
-      if (BluetoothDevice.ACTION_FOUND.equals(action)) {
-        // Get the BluetoothDevice object from the Intent.
-        BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
-        // If it's already paired, skip it, because it's been listed already.
-        if (device.getBondState() != BluetoothDevice.BOND_BONDED) {
-          mListener.addDevice(device.getName(), device.getAddress());
-        }
-      } else if (BluetoothAdapter.ACTION_DISCOVERY_FINISHED.equals(action)) {
-        mListener.scanDone();
-      }
-    }
-  }
-
-  public void startDiscovery() {
-    BluetoothAdapter bluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
-
-    if (bluetoothAdapter.isDiscovering()) {
-      bluetoothAdapter.cancelDiscovery();
-    }
-
-    Set<BluetoothDevice> pairedDevices = bluetoothAdapter.getBondedDevices();
-    for (BluetoothDevice device : pairedDevices) {
-      mListener.addBondedDevice(device.getName(), device.getAddress());
-    }
-
-    final IntentFilter deviceFoundFilter = new IntentFilter(BluetoothDevice.ACTION_FOUND);
-    mContext.registerReceiver(mReceiver, deviceFoundFilter);
-
-    final IntentFilter discoveryFinishedFilter =
-        new IntentFilter(BluetoothAdapter.ACTION_DISCOVERY_FINISHED);
-    mContext.registerReceiver(mReceiver, discoveryFinishedFilter);
-
-    if (!bluetoothAdapter.isEnabled()) {
-      bluetoothAdapter.enable();
-    }
-
-    bluetoothAdapter.startDiscovery();
-  }
-
-  public void cancel() {
-    mContext.unregisterReceiver(mReceiver);
-    mListener.scanDone();
-  }
-}
diff --git a/src/com/googlecode/android_scripting/event/Event.java b/src/com/googlecode/android_scripting/event/Event.java
deleted file mode 100644
index 2f34b9cc..00000000
--- a/src/com/googlecode/android_scripting/event/Event.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.event;
-
-import com.google.common.base.Preconditions;
-
-public class Event {
-
-  private String mName;
-  private Object mData;
-  private double mCreationTime;
-
-  public Event(String name, Object data) {
-    Preconditions.checkNotNull(name);
-    setName(name);
-    setData(data);
-    mCreationTime = System.currentTimeMillis() * 1000;
-  }
-
-  public void setName(String name) {
-    mName = name;
-  }
-
-  public String getName() {
-    return mName;
-  }
-
-  public void setData(Object data) {
-    mData = data;
-  }
-
-  public Object getData() {
-    return mData;
-  }
-
-  public double getCreationTime() {
-    return mCreationTime;
-  }
-
-  public boolean nameEquals(String name) {
-    return mName.equals(name);
-  }
-}
diff --git a/src/com/googlecode/android_scripting/exception/Sl4aException.java b/src/com/googlecode/android_scripting/exception/Sl4aException.java
deleted file mode 100644
index 5cab2be2..00000000
--- a/src/com/googlecode/android_scripting/exception/Sl4aException.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2009 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.exception;
-
-@SuppressWarnings("serial")
-public class Sl4aException extends Exception {
-
-  public Sl4aException(Exception e) {
-    super(e);
-  }
-
-  public Sl4aException(String message) {
-    super(message);
-  }
-
-  public Sl4aException(String message, Exception e) {
-    super(message, e);
-  }
-
-}
diff --git a/src/com/googlecode/android_scripting/facade/ActivityResultFacade.java b/src/com/googlecode/android_scripting/facade/ActivityResultFacade.java
deleted file mode 100644
index 550e537b..00000000
--- a/src/com/googlecode/android_scripting/facade/ActivityResultFacade.java
+++ /dev/null
@@ -1,327 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.facade;
-
-import android.app.Activity;
-import android.content.Intent;
-
-import com.googlecode.android_scripting.Constants;
-import com.googlecode.android_scripting.jsonrpc.RpcReceiver;
-import com.googlecode.android_scripting.rpc.Rpc;
-import com.googlecode.android_scripting.rpc.RpcParameter;
-
-import java.io.Serializable;
-
-/**
- * Allows you to return results to a startActivityForResult call.
- * 
- * @author Alexey Reznichenko (alexey.reznichenko@gmail.com)
- */
-public class ActivityResultFacade extends RpcReceiver {
-
-  private static final String sRpcDescription =
-      "Sets the result of a script execution. Whenever the script APK is called via "
-          + "startActivityForResult(), the resulting intent will contain " + Constants.EXTRA_RESULT
-          + " extra with the given value.";
-  private static final String sCodeDescription =
-      "The result code to propagate back to the originating activity, often RESULT_CANCELED (0) "
-          + "or RESULT_OK (-1)";
-
-  private Activity mActivity = null;
-  private Intent mResult = null;
-  private int mResultCode;
-
-  public ActivityResultFacade(FacadeManager manager) {
-    super(manager);
-  }
-
-  @Rpc(description = sRpcDescription)
-  public synchronized void setResultBoolean(
-      @RpcParameter(name = "resultCode", description = sCodeDescription) Integer resultCode,
-      @RpcParameter(name = "resultValue") Boolean resultValue) {
-    mResult = new Intent();
-    mResult.putExtra(Constants.EXTRA_RESULT, resultValue.booleanValue());
-    mResultCode = resultCode;
-    if (mActivity != null) {
-      setResult();
-    }
-  }
-
-  @Rpc(description = sRpcDescription)
-  public synchronized void setResultByte(
-      @RpcParameter(name = "resultCode", description = sCodeDescription) Integer resultCode,
-      @RpcParameter(name = "resultValue") Byte resultValue) {
-    mResult = new Intent();
-    mResult.putExtra(Constants.EXTRA_RESULT, resultValue.byteValue());
-    mResultCode = resultCode;
-    if (mActivity != null) {
-      setResult();
-    }
-  }
-
-  @Rpc(description = sRpcDescription)
-  public synchronized void setResultShort(
-      @RpcParameter(name = "resultCode", description = sCodeDescription) Integer resultCode,
-      @RpcParameter(name = "resultValue") Short resultValue) {
-    mResult = new Intent();
-    mResult.putExtra(Constants.EXTRA_RESULT, resultValue.shortValue());
-    mResultCode = resultCode;
-    if (mActivity != null) {
-      setResult();
-    }
-  }
-
-  @Rpc(description = sRpcDescription)
-  public synchronized void setResultChar(
-      @RpcParameter(name = "resultCode", description = sCodeDescription) Integer resultCode,
-      @RpcParameter(name = "resultValue") Character resultValue) {
-    mResult = new Intent();
-    mResult.putExtra(Constants.EXTRA_RESULT, resultValue.charValue());
-    mResultCode = resultCode;
-    if (mActivity != null) {
-      setResult();
-    }
-  }
-
-  @Rpc(description = sRpcDescription)
-  public synchronized void setResultInteger(
-      @RpcParameter(name = "resultCode", description = sCodeDescription) Integer resultCode,
-      @RpcParameter(name = "resultValue") Integer resultValue) {
-    mResult = new Intent();
-    mResult.putExtra(Constants.EXTRA_RESULT, resultValue.intValue());
-    mResultCode = resultCode;
-    if (mActivity != null) {
-      setResult();
-    }
-  }
-
-  @Rpc(description = sRpcDescription)
-  public synchronized void setResultLong(
-      @RpcParameter(name = "resultCode", description = sCodeDescription) Integer resultCode,
-      @RpcParameter(name = "resultValue") Long resultValue) {
-    mResult = new Intent();
-    mResult.putExtra(Constants.EXTRA_RESULT, resultValue.longValue());
-    mResultCode = resultCode;
-    if (mActivity != null) {
-      setResult();
-    }
-  }
-
-  @Rpc(description = sRpcDescription)
-  public synchronized void setResultFloat(
-      @RpcParameter(name = "resultCode", description = sCodeDescription) Integer resultCode,
-      @RpcParameter(name = "resultValue") Float resultValue) {
-    mResult = new Intent();
-    mResult.putExtra(Constants.EXTRA_RESULT, resultValue.floatValue());
-    mResultCode = resultCode;
-    if (mActivity != null) {
-      setResult();
-    }
-  }
-
-  @Rpc(description = sRpcDescription)
-  public synchronized void setResultDouble(
-      @RpcParameter(name = "resultCode", description = sCodeDescription) Integer resultCode,
-      @RpcParameter(name = "resultValue") Double resultValue) {
-    mResult = new Intent();
-    mResult.putExtra(Constants.EXTRA_RESULT, resultValue.doubleValue());
-    mResultCode = resultCode;
-    if (mActivity != null) {
-      setResult();
-    }
-  }
-
-  @Rpc(description = sRpcDescription)
-  public synchronized void setResultString(
-      @RpcParameter(name = "resultCode", description = sCodeDescription) Integer resultCode,
-      @RpcParameter(name = "resultValue") String resultValue) {
-    mResult = new Intent();
-    mResult.putExtra(Constants.EXTRA_RESULT, resultValue);
-    mResultCode = resultCode;
-    if (mActivity != null) {
-      setResult();
-    }
-  }
-
-  @Rpc(description = sRpcDescription)
-  public synchronized void setResultBooleanArray(
-      @RpcParameter(name = "resultCode", description = sCodeDescription) Integer resultCode,
-      @RpcParameter(name = "resultValue") Boolean[] resultValue) {
-    mResult = new Intent();
-    boolean[] array = new boolean[resultValue.length];
-    for (int i = 0; i < resultValue.length; i++) {
-      array[i] = resultValue[i];
-    }
-    mResult.putExtra(Constants.EXTRA_RESULT, array);
-    mResultCode = resultCode;
-    if (mActivity != null) {
-      setResult();
-    }
-  }
-
-  @Rpc(description = sRpcDescription)
-  public synchronized void setResultByteArray(
-      @RpcParameter(name = "resultCode", description = sCodeDescription) Integer resultCode,
-      @RpcParameter(name = "resultValue") Byte[] resultValue) {
-    mResult = new Intent();
-    byte[] array = new byte[resultValue.length];
-    for (int i = 0; i < resultValue.length; i++) {
-      array[i] = resultValue[i];
-    }
-    mResult.putExtra(Constants.EXTRA_RESULT, array);
-    mResultCode = resultCode;
-    if (mActivity != null) {
-      setResult();
-    }
-  }
-
-  @Rpc(description = sRpcDescription)
-  public synchronized void setResultShortArray(
-      @RpcParameter(name = "resultCode", description = sCodeDescription) Integer resultCode,
-      @RpcParameter(name = "resultValue") Short[] resultValue) {
-    mResult = new Intent();
-    short[] array = new short[resultValue.length];
-    for (int i = 0; i < resultValue.length; i++) {
-      array[i] = resultValue[i];
-    }
-    mResult.putExtra(Constants.EXTRA_RESULT, array);
-    mResultCode = resultCode;
-    if (mActivity != null) {
-      setResult();
-    }
-  }
-
-  @Rpc(description = sRpcDescription)
-  public synchronized void setResultCharArray(
-      @RpcParameter(name = "resultCode", description = sCodeDescription) Integer resultCode,
-      @RpcParameter(name = "resultValue") Character[] resultValue) {
-    mResult = new Intent();
-    char[] array = new char[resultValue.length];
-    for (int i = 0; i < resultValue.length; i++) {
-      array[i] = resultValue[i];
-    }
-    mResult.putExtra(Constants.EXTRA_RESULT, array);
-    mResultCode = resultCode;
-    if (mActivity != null) {
-      setResult();
-    }
-  }
-
-  @Rpc(description = sRpcDescription)
-  public synchronized void setResultIntegerArray(
-      @RpcParameter(name = "resultCode", description = sCodeDescription) Integer resultCode,
-      @RpcParameter(name = "resultValue") Integer[] resultValue) {
-    mResult = new Intent();
-    int[] array = new int[resultValue.length];
-    for (int i = 0; i < resultValue.length; i++) {
-      array[i] = resultValue[i];
-    }
-    mResult.putExtra(Constants.EXTRA_RESULT, array);
-    mResultCode = resultCode;
-    if (mActivity != null) {
-      setResult();
-    }
-  }
-
-  @Rpc(description = sRpcDescription)
-  public synchronized void setResultLongArray(
-      @RpcParameter(name = "resultCode", description = sCodeDescription) Integer resultCode,
-      @RpcParameter(name = "resultValue") Long[] resultValue) {
-    mResult = new Intent();
-    long[] array = new long[resultValue.length];
-    for (int i = 0; i < resultValue.length; i++) {
-      array[i] = resultValue[i];
-    }
-    mResult.putExtra(Constants.EXTRA_RESULT, array);
-    mResultCode = resultCode;
-    if (mActivity != null) {
-      setResult();
-    }
-  }
-
-  @Rpc(description = sRpcDescription)
-  public synchronized void setResultFloatArray(
-      @RpcParameter(name = "resultCode", description = sCodeDescription) Integer resultCode,
-      @RpcParameter(name = "resultValue") Float[] resultValue) {
-    mResult = new Intent();
-    float[] array = new float[resultValue.length];
-    for (int i = 0; i < resultValue.length; i++) {
-      array[i] = resultValue[i];
-    }
-    mResult.putExtra(Constants.EXTRA_RESULT, array);
-    mResultCode = resultCode;
-    if (mActivity != null) {
-      setResult();
-    }
-  }
-
-  @Rpc(description = sRpcDescription)
-  public synchronized void setResultDoubleArray(
-      @RpcParameter(name = "resultCode", description = sCodeDescription) Integer resultCode,
-      @RpcParameter(name = "resultValue") Double[] resultValue) {
-    mResult = new Intent();
-    double[] array = new double[resultValue.length];
-    for (int i = 0; i < resultValue.length; i++) {
-      array[i] = resultValue[i];
-    }
-    mResult.putExtra(Constants.EXTRA_RESULT, array);
-    mResultCode = resultCode;
-    if (mActivity != null) {
-      setResult();
-    }
-  }
-
-  @Rpc(description = sRpcDescription)
-  public synchronized void setResultStringArray(
-      @RpcParameter(name = "resultCode", description = sCodeDescription) Integer resultCode,
-      @RpcParameter(name = "resultValue") String[] resultValue) {
-    mResult = new Intent();
-    mResult.putExtra(Constants.EXTRA_RESULT, resultValue);
-    mResultCode = resultCode;
-    if (mActivity != null) {
-      setResult();
-    }
-  }
-
-  @Rpc(description = sRpcDescription)
-  public synchronized void setResultSerializable(
-      @RpcParameter(name = "resultCode", description = sCodeDescription) Integer resultCode,
-      @RpcParameter(name = "resultValue") Serializable resultValue) {
-    mResult = new Intent();
-    mResult.putExtra(Constants.EXTRA_RESULT, resultValue);
-    mResultCode = resultCode;
-    if (mActivity != null) {
-      setResult();
-    }
-  }
-
-  public synchronized void setActivity(Activity activity) {
-    mActivity = activity;
-    if (mResult != null) {
-      setResult();
-    }
-  }
-
-  private void setResult() {
-    mActivity.setResult(mResultCode, mResult);
-    mActivity.finish();
-  }
-
-  @Override
-  public void shutdown() {
-  }
-}
diff --git a/src/com/googlecode/android_scripting/facade/AndroidFacade.java b/src/com/googlecode/android_scripting/facade/AndroidFacade.java
deleted file mode 100644
index 3db803c1..00000000
--- a/src/com/googlecode/android_scripting/facade/AndroidFacade.java
+++ /dev/null
@@ -1,750 +0,0 @@
-/*
- * Copyright (C) 2009 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.facade;
-
-import android.annotation.SuppressLint;
-import android.app.AlertDialog;
-import android.app.Notification;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.app.Service;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Looper;
-import android.os.StatFs;
-import android.os.Vibrator;
-import android.text.ClipboardManager;
-import android.text.InputType;
-import android.text.method.PasswordTransformationMethod;
-import android.widget.EditText;
-import android.widget.Toast;
-
-import com.googlecode.android_scripting.FileUtils;
-import com.googlecode.android_scripting.FutureActivityTaskExecutor;
-import com.googlecode.android_scripting.Log;
-import com.googlecode.android_scripting.NotificationIdFactory;
-import com.googlecode.android_scripting.future.FutureActivityTask;
-import com.googlecode.android_scripting.jsonrpc.RpcReceiver;
-import com.googlecode.android_scripting.rpc.Rpc;
-import com.googlecode.android_scripting.rpc.RpcDefault;
-import com.googlecode.android_scripting.rpc.RpcDeprecated;
-import com.googlecode.android_scripting.rpc.RpcOptional;
-import com.googlecode.android_scripting.rpc.RpcParameter;
-import com.hipipal.sl4alib.MNApp;
-import com.zuowuxuxi.util.NUtil;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.TimeZone;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-/**
- * Some general purpose Android routines.<br>
- * <h2>Intents</h2> Intents are returned as a map, in the following form:<br>
- * <ul>
- * <li><b>action</b> - action.
- * <li><b>data</b> - url
- * <li><b>type</b> - mime type
- * <li><b>packagename</b> - name of package. If used, requires classname to be useful (optional)
- * <li><b>classname</b> - name of class. If used, requires packagename to be useful (optional)
- * <li><b>categories</b> - list of categories
- * <li><b>extras</b> - map of extras
- * <li><b>flags</b> - integer flags.
- * </ul>
- * <br>
- * An intent can be built using the {@see #makeIntent} call, but can also be constructed exterally.
- * 
- */
-@SuppressWarnings("deprecation")
-public class AndroidFacade extends RpcReceiver {
-  /**
-   * An instance of this interface is passed to the facade. From this object, the resource IDs can
-   * be obtained.
-   */
-  public interface Resources {
-    int getLogo48();
-  }
-
-  private final Service mService;
-  private final Handler mHandler;
-  private final Intent mIntent;
-  private final FutureActivityTaskExecutor mTaskQueue;
-
-  private final Vibrator mVibrator;
-  private final NotificationManager mNotificationManager;
-
-  private final Resources mResources;
-  private ClipboardManager mClipboard = null;
-
-  @Override
-  public void shutdown() {
-  }
-
-  public AndroidFacade(FacadeManager manager) {
-    super(manager);
-    mService = manager.getService();
-    mIntent = manager.getIntent();
-    // River Modify
-    MNApp application = ((MNApp) mService.getApplication());
-    mTaskQueue = application.getTaskExecutor();
-    mHandler = new Handler(mService.getMainLooper());
-    mVibrator = (Vibrator) mService.getSystemService(Context.VIBRATOR_SERVICE);
-    mNotificationManager =
-        (NotificationManager) mService.getSystemService(Context.NOTIFICATION_SERVICE);
-    mResources = manager.getAndroidFacadeResources();
-
-  }
-
-  ClipboardManager getClipboardManager() {
-    Object clipboard = null;
-    if (mClipboard == null) {
-      try {
-        clipboard = mService.getSystemService(Context.CLIPBOARD_SERVICE);
-      } catch (Exception e) {
-        Looper.prepare(); // Clipboard manager won't work without this on higher SDK levels...
-        clipboard = mService.getSystemService(Context.CLIPBOARD_SERVICE);
-      }
-      mClipboard = (ClipboardManager) clipboard;
-      if (mClipboard == null) {
-        Log.w("Clipboard managed not accessible.");
-      }
-    }
-    return mClipboard;
-  }
-
-  /**
-   * Creates a new AndroidFacade that simplifies the interface to various Android APIs.
-   * 
-   * @param service
-   *          is the {@link Context} the APIs will run under
-   */
-
-  @Rpc(description = "Put text in the clipboard.")
-  public void setClipboard(@RpcParameter(name = "text") String text) {
-    getClipboardManager().setText(text);
-  }
-
-  @Rpc(description = "Read text from the clipboard.", returns = "The text in the clipboard.")
-  public String getClipboard() {
-    CharSequence text = getClipboardManager().getText();
-    return text == null ? null : text.toString();
-  }
-
-  Intent startActivityForResult(final Intent intent) {
-    FutureActivityTask<Intent> task = new FutureActivityTask<Intent>() {
-      @Override
-      public void onCreate() {
-        super.onCreate();
-        try {
-          startActivityForResult(intent, 0);
-        } catch (Exception e) {
-          intent.putExtra("EXCEPTION", e.getMessage());
-          setResult(intent);
-        }
-      }
-
-      @Override
-      public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        setResult(data);
-      }
-    };
-    mTaskQueue.execute(task);
-
-    try {
-      return task.getResult();
-    } catch (Exception e) {
-      throw new RuntimeException(e);
-    } finally {
-      task.finish();
-    }
-  }
-
-  // TODO(damonkohler): Pull this out into proper argument deserialization and support
-  // complex/nested types being passed in.
-  public static void putExtrasFromJsonObject(JSONObject extras, Intent intent) throws JSONException {
-    JSONArray names = extras.names();
-    for (int i = 0; i < names.length(); i++) {
-      String name = names.getString(i);
-      Object data = extras.get(name);
-      if (data == null) {
-        continue;
-      }
-      if (data instanceof Integer) {
-        intent.putExtra(name, (Integer) data);
-      }
-      if (data instanceof Float) {
-        intent.putExtra(name, (Float) data);
-      }
-      if (data instanceof Double) {
-        intent.putExtra(name, (Double) data);
-      }
-      if (data instanceof Long) {
-        intent.putExtra(name, (Long) data);
-      }
-      if (data instanceof String) {
-        intent.putExtra(name, (String) data);
-      }
-      if (data instanceof Boolean) {
-        intent.putExtra(name, (Boolean) data);
-      }
-      // Nested JSONObject
-      if (data instanceof JSONObject) {
-        Bundle nestedBundle = new Bundle();
-        intent.putExtra(name, nestedBundle);
-        putNestedJSONObject((JSONObject) data, nestedBundle);
-      }
-      // Nested JSONArray. Doesn't support mixed types in single array
-      if (data instanceof JSONArray) {
-        // Empty array. No way to tell what type of data to pass on, so skipping
-        if (((JSONArray) data).length() == 0) {
-          Log.e("Empty array not supported in JSONObject, skipping");
-          continue;
-        }
-        // Integer
-        if (((JSONArray) data).get(0) instanceof Integer) {
-          Integer[] integerArrayData = new Integer[((JSONArray) data).length()];
-          for (int j = 0; j < ((JSONArray) data).length(); ++j) {
-            integerArrayData[j] = ((JSONArray) data).getInt(j);
-          }
-          intent.putExtra(name, integerArrayData);
-        }
-        // Double
-        if (((JSONArray) data).get(0) instanceof Double) {
-          Double[] doubleArrayData = new Double[((JSONArray) data).length()];
-          for (int j = 0; j < ((JSONArray) data).length(); ++j) {
-            doubleArrayData[j] = ((JSONArray) data).getDouble(j);
-          }
-          intent.putExtra(name, doubleArrayData);
-        }
-        // Long
-        if (((JSONArray) data).get(0) instanceof Long) {
-          Long[] longArrayData = new Long[((JSONArray) data).length()];
-          for (int j = 0; j < ((JSONArray) data).length(); ++j) {
-            longArrayData[j] = ((JSONArray) data).getLong(j);
-          }
-          intent.putExtra(name, longArrayData);
-        }
-        // String
-        if (((JSONArray) data).get(0) instanceof String) {
-          String[] stringArrayData = new String[((JSONArray) data).length()];
-          for (int j = 0; j < ((JSONArray) data).length(); ++j) {
-            stringArrayData[j] = ((JSONArray) data).getString(j);
-          }
-          intent.putExtra(name, stringArrayData);
-        }
-        // Boolean
-        if (((JSONArray) data).get(0) instanceof Boolean) {
-          Boolean[] booleanArrayData = new Boolean[((JSONArray) data).length()];
-          for (int j = 0; j < ((JSONArray) data).length(); ++j) {
-            booleanArrayData[j] = ((JSONArray) data).getBoolean(j);
-          }
-          intent.putExtra(name, booleanArrayData);
-        }
-      }
-    }
-  }
-
-  // Contributed by Emmanuel T
-  // Nested Array handling contributed by Sergey Zelenev
-  private static void putNestedJSONObject(JSONObject jsonObject, Bundle bundle)
-      throws JSONException {
-    JSONArray names = jsonObject.names();
-    for (int i = 0; i < names.length(); i++) {
-      String name = names.getString(i);
-      Object data = jsonObject.get(name);
-      if (data == null) {
-        continue;
-      }
-      if (data instanceof Integer) {
-        bundle.putInt(name, ((Integer) data).intValue());
-      }
-      if (data instanceof Float) {
-        bundle.putFloat(name, ((Float) data).floatValue());
-      }
-      if (data instanceof Double) {
-        bundle.putDouble(name, ((Double) data).doubleValue());
-      }
-      if (data instanceof Long) {
-        bundle.putLong(name, ((Long) data).longValue());
-      }
-      if (data instanceof String) {
-        bundle.putString(name, (String) data);
-      }
-      if (data instanceof Boolean) {
-        bundle.putBoolean(name, ((Boolean) data).booleanValue());
-      }
-      // Nested JSONObject
-      if (data instanceof JSONObject) {
-        Bundle nestedBundle = new Bundle();
-        bundle.putBundle(name, nestedBundle);
-        putNestedJSONObject((JSONObject) data, nestedBundle);
-      }
-      // Nested JSONArray. Doesn't support mixed types in single array
-      if (data instanceof JSONArray) {
-        // Empty array. No way to tell what type of data to pass on, so skipping
-        if (((JSONArray) data).length() == 0) {
-          Log.e("Empty array not supported in nested JSONObject, skipping");
-          continue;
-        }
-        // Integer
-        if (((JSONArray) data).get(0) instanceof Integer) {
-          int[] integerArrayData = new int[((JSONArray) data).length()];
-          for (int j = 0; j < ((JSONArray) data).length(); ++j) {
-            integerArrayData[j] = ((JSONArray) data).getInt(j);
-          }
-          bundle.putIntArray(name, integerArrayData);
-        }
-        // Double
-        if (((JSONArray) data).get(0) instanceof Double) {
-          double[] doubleArrayData = new double[((JSONArray) data).length()];
-          for (int j = 0; j < ((JSONArray) data).length(); ++j) {
-            doubleArrayData[j] = ((JSONArray) data).getDouble(j);
-          }
-          bundle.putDoubleArray(name, doubleArrayData);
-        }
-        // Long
-        if (((JSONArray) data).get(0) instanceof Long) {
-          long[] longArrayData = new long[((JSONArray) data).length()];
-          for (int j = 0; j < ((JSONArray) data).length(); ++j) {
-            longArrayData[j] = ((JSONArray) data).getLong(j);
-          }
-          bundle.putLongArray(name, longArrayData);
-        }
-        // String
-        if (((JSONArray) data).get(0) instanceof String) {
-          String[] stringArrayData = new String[((JSONArray) data).length()];
-          for (int j = 0; j < ((JSONArray) data).length(); ++j) {
-            stringArrayData[j] = ((JSONArray) data).getString(j);
-          }
-          bundle.putStringArray(name, stringArrayData);
-        }
-        // Boolean
-        if (((JSONArray) data).get(0) instanceof Boolean) {
-          boolean[] booleanArrayData = new boolean[((JSONArray) data).length()];
-          for (int j = 0; j < ((JSONArray) data).length(); ++j) {
-            booleanArrayData[j] = ((JSONArray) data).getBoolean(j);
-          }
-          bundle.putBooleanArray(name, booleanArrayData);
-        }
-      }
-    }
-  }
-
-  void startActivity(final Intent intent) {
-    try {
-      intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-      mService.startActivity(intent);
-    } catch (Exception e) {
-      Log.e("Failed to launch intent.", e);
-    }
-  }
-
-  private Intent buildIntent(String action, String uri, String type, JSONObject extras,
-      String packagename, String classname, JSONArray categories) throws JSONException {
-    Intent intent = new Intent(action);
-    intent.setDataAndType(uri != null ? Uri.parse(uri) : null, type);
-    if (packagename != null && classname != null) {
-      intent.setComponent(new ComponentName(packagename, classname));
-    }
-    if (extras != null) {
-      putExtrasFromJsonObject(extras, intent);
-    }
-    if (categories != null) {
-      for (int i = 0; i < categories.length(); i++) {
-        intent.addCategory(categories.getString(i));
-      }
-    }
-    return intent;
-  }
-
-  // TODO(damonkohler): It's unnecessary to add the complication of choosing between startActivity
-  // and startActivityForResult. It's probably better to just always use the ForResult version.
-  // However, this makes the call always blocking. We'd need to add an extra boolean parameter to
-  // indicate if we should wait for a result.
-  @Rpc(description = "Starts an activity and returns the result.", returns = "A Map representation of the result Intent.")
-  public Intent startActivityForResult(
-      @RpcParameter(name = "action") String action,
-      @RpcParameter(name = "uri") @RpcOptional String uri,
-      @RpcParameter(name = "type", description = "MIME type/subtype of the URI") @RpcOptional String type,
-      @RpcParameter(name = "extras", description = "a Map of extras to add to the Intent") @RpcOptional JSONObject extras,
-      @RpcParameter(name = "packagename", description = "name of package. If used, requires classname to be useful") @RpcOptional String packagename,
-      @RpcParameter(name = "classname", description = "name of class. If used, requires packagename to be useful") @RpcOptional String classname)
-      throws JSONException {
-    final Intent intent = buildIntent(action, uri, type, extras, packagename, classname, null);
-    return startActivityForResult(intent);
-  }
-
-  @Rpc(description = "Starts an activity and returns the result.", returns = "A Map representation of the result Intent.")
-  public Intent startActivityForResultIntent(
-      @RpcParameter(name = "intent", description = "Intent in the format as returned from makeIntent") Intent intent) {
-    return startActivityForResult(intent);
-  }
-
-  private void doStartActivity(final Intent intent, Boolean wait) throws Exception {
-    if (wait == null || wait == false) {
-      startActivity(intent);
-    } else {
-      FutureActivityTask<Intent> task = new FutureActivityTask<Intent>() {
-        private boolean mSecondResume = false;
-
-        @Override
-        public void onCreate() {
-          super.onCreate();
-          startActivity(intent);
-        }
-
-        @Override
-        public void onResume() {
-          if (mSecondResume) {
-            finish();
-          }
-          mSecondResume = true;
-        }
-
-        @Override
-        public void onDestroy() {
-          setResult(null);
-        }
-
-      };
-      mTaskQueue.execute(task);
-
-      try {
-        task.getResult();
-      } catch (Exception e) {
-        throw new RuntimeException(e);
-      }
-    }
-  }
-
-  /**
-   * packagename and classname, if provided, are used in a 'setComponent' call.
-   */
-  @Rpc(description = "Starts an activity.")
-  public void startActivity(
-      @RpcParameter(name = "action") String action,
-      @RpcParameter(name = "uri") @RpcOptional String uri,
-      @RpcParameter(name = "type", description = "MIME type/subtype of the URI") @RpcOptional String type,
-      @RpcParameter(name = "extras", description = "a Map of extras to add to the Intent") @RpcOptional JSONObject extras,
-      @RpcParameter(name = "wait", description = "block until the user exits the started activity") @RpcOptional Boolean wait,
-      @RpcParameter(name = "packagename", description = "name of package. If used, requires classname to be useful") @RpcOptional String packagename,
-      @RpcParameter(name = "classname", description = "name of class. If used, requires packagename to be useful") @RpcOptional String classname)
-      throws Exception {
-    final Intent intent = buildIntent(action, uri, type, extras, packagename, classname, null);
-    doStartActivity(intent, wait);
-  }
-
-  @Rpc(description = "Send a broadcast.")
-  public void sendBroadcast(
-      @RpcParameter(name = "action") String action,
-      @RpcParameter(name = "uri") @RpcOptional String uri,
-      @RpcParameter(name = "type", description = "MIME type/subtype of the URI") @RpcOptional String type,
-      @RpcParameter(name = "extras", description = "a Map of extras to add to the Intent") @RpcOptional JSONObject extras,
-      @RpcParameter(name = "packagename", description = "name of package. If used, requires classname to be useful") @RpcOptional String packagename,
-      @RpcParameter(name = "classname", description = "name of class. If used, requires packagename to be useful") @RpcOptional String classname)
-      throws JSONException {
-    final Intent intent = buildIntent(action, uri, type, extras, packagename, classname, null);
-    try {
-      mService.sendBroadcast(intent);
-    } catch (Exception e) {
-      Log.e("Failed to broadcast intent.", e);
-    }
-  }
-
-  @Rpc(description = "Create an Intent.", returns = "An object representing an Intent")
-  public Intent makeIntent(
-      @RpcParameter(name = "action") String action,
-      @RpcParameter(name = "uri") @RpcOptional String uri,
-      @RpcParameter(name = "type", description = "MIME type/subtype of the URI") @RpcOptional String type,
-      @RpcParameter(name = "extras", description = "a Map of extras to add to the Intent") @RpcOptional JSONObject extras,
-      @RpcParameter(name = "categories", description = "a List of categories to add to the Intent") @RpcOptional JSONArray categories,
-      @RpcParameter(name = "packagename", description = "name of package. If used, requires classname to be useful") @RpcOptional String packagename,
-      @RpcParameter(name = "classname", description = "name of class. If used, requires packagename to be useful") @RpcOptional String classname,
-      @RpcParameter(name = "flags", description = "Intent flags") @RpcOptional Integer flags)
-      throws JSONException {
-    Intent intent = buildIntent(action, uri, type, extras, packagename, classname, categories);
-    intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-    if (flags != null) {
-      intent.setFlags(flags);
-    }
-    return intent;
-  }
-
-  @Rpc(description = "Start Activity using Intent")
-  public void startActivityIntent(
-      @RpcParameter(name = "intent", description = "Intent in the format as returned from makeIntent") Intent intent,
-      @RpcParameter(name = "wait", description = "block until the user exits the started activity") @RpcOptional Boolean wait)
-      throws Exception {
-    doStartActivity(intent, wait);
-  }
-
-  @Rpc(description = "Send Broadcast Intent")
-  public void sendBroadcastIntent(
-      @RpcParameter(name = "intent", description = "Intent in the format as returned from makeIntent") Intent intent)
-      throws Exception {
-    mService.sendBroadcast(intent);
-  }
-
-  @Rpc(description = "Vibrates the phone or a specified duration in milliseconds.")
-  public void vibrate(
-      @RpcParameter(name = "duration", description = "duration in milliseconds") @RpcDefault("300") Integer duration) {
-    mVibrator.vibrate(duration);
-  }
-
-  @Rpc(description = "Displays a short-duration Toast notification.")
-  public void makeToast(@RpcParameter(name = "message") final String message) {
-    mHandler.post(new Runnable() {
-      public void run() {
-        Toast.makeText(mService, message, Toast.LENGTH_SHORT).show();
-      }
-    });
-  }
-
-  private String getInputFromAlertDialog(final String title, final String message,
-      final boolean password) {
-    final FutureActivityTask<String> task = new FutureActivityTask<String>() {
-      @Override
-      public void onCreate() {
-        super.onCreate();
-        final EditText input = new EditText(getActivity());
-        if (password) {
-          input.setInputType(InputType.TYPE_TEXT_VARIATION_PASSWORD);
-          input.setTransformationMethod(new PasswordTransformationMethod());
-        }
-        AlertDialog.Builder alert = new AlertDialog.Builder(getActivity());
-        alert.setTitle(title);
-        alert.setMessage(message);
-        alert.setView(input);
-        alert.setPositiveButton("Ok", new DialogInterface.OnClickListener() {
-          @Override
-          public void onClick(DialogInterface dialog, int whichButton) {
-            dialog.dismiss();
-            setResult(input.getText().toString());
-            finish();
-          }
-        });
-        alert.setOnCancelListener(new DialogInterface.OnCancelListener() {
-          @Override
-          public void onCancel(DialogInterface dialog) {
-            dialog.dismiss();
-            setResult(null);
-            finish();
-          }
-        });
-        alert.show();
-      }
-    };
-    mTaskQueue.execute(task);
-
-    try {
-      return task.getResult();
-    } catch (Exception e) {
-      Log.e("Failed to display dialog.", e);
-      throw new RuntimeException(e);
-    }
-  }
-
-  @Rpc(description = "Queries the user for a text input.")
-  @RpcDeprecated(value = "dialogGetInput", release = "r3")
-  public String getInput(
-      @RpcParameter(name = "title", description = "title of the input box") @RpcDefault("SL4A Input") final String title,
-      @RpcParameter(name = "message", description = "message to display above the input box") @RpcDefault("Please enter value:") final String message) {
-    return getInputFromAlertDialog(title, message, false);
-  }
-
-  @Rpc(description = "Queries the user for a password.")
-  @RpcDeprecated(value = "dialogGetPassword", release = "r3")
-  public String getPassword(
-      @RpcParameter(name = "title", description = "title of the input box") @RpcDefault("SL4A Password Input") final String title,
-      @RpcParameter(name = "message", description = "message to display above the input box") @RpcDefault("Please enter password:") final String message) {
-    return getInputFromAlertDialog(title, message, true);
-  }
-
-  @Rpc(description = "Displays a notification that will be canceled when the user clicks on it.")
-  public void notify(@RpcParameter(name = "title", description = "title") String title,
-      @RpcParameter(name = "message") String message) {
-    Notification notification =
-        new Notification(mResources.getLogo48(), message, System.currentTimeMillis());
-    // This contentIntent is a noop.
-    PendingIntent contentIntent = PendingIntent.getService(mService, 0, new Intent(), 0);
-    notification.setLatestEventInfo(mService, title, message, contentIntent);
-    notification.flags = Notification.FLAG_AUTO_CANCEL;
-
-    // Get a unique notification id from the application.
-    final int notificationId = NotificationIdFactory.create();
-    mNotificationManager.notify(notificationId, notification);
-  }
-
-  @Rpc(description = "Returns the status of network connection.")
-  public boolean getNetworkStatus() {
-	return NUtil.netCheckin(mService.getApplicationContext());
-  }
-
-  
-  @Rpc(description = "Returns the intent that launched the script.")
-  public Object getIntent() {
-    return mIntent;
-  }
-
-  @Rpc(description = "Launches an activity that sends an e-mail message to a given recipient.")
-  public void sendEmail(
-      @RpcParameter(name = "to", description = "A comma separated list of recipients.") final String to,
-      @RpcParameter(name = "subject") final String subject,
-      @RpcParameter(name = "body") final String body,
-      @RpcParameter(name = "attachmentUri") @RpcOptional final String attachmentUri) {
-    final Intent intent = new Intent(android.content.Intent.ACTION_SEND);
-    intent.setType("plain/text");
-    intent.putExtra(android.content.Intent.EXTRA_EMAIL, to.split(","));
-    intent.putExtra(android.content.Intent.EXTRA_SUBJECT, subject);
-    intent.putExtra(android.content.Intent.EXTRA_TEXT, body);
-    if (attachmentUri != null) {
-      intent.putExtra(android.content.Intent.EXTRA_STREAM, Uri.parse(attachmentUri));
-    }
-    startActivity(intent);
-  }
-
-  @Rpc(description = "Returns package version code.")
-  public int getPackageVersionCode(@RpcParameter(name = "packageName") final String packageName) {
-    int result = -1;
-    PackageInfo pInfo = null;
-    try {
-      pInfo =
-          mService.getPackageManager().getPackageInfo(packageName, PackageManager.GET_META_DATA);
-    } catch (NameNotFoundException e) {
-      pInfo = null;
-    }
-    if (pInfo != null) {
-      result = pInfo.versionCode;
-    }
-    return result;
-  }
-
-  @Rpc(description = "Returns package version name.")
-  public String getPackageVersion(@RpcParameter(name = "packageName") final String packageName) {
-    PackageInfo packageInfo = null;
-    try {
-      packageInfo =
-          mService.getPackageManager().getPackageInfo(packageName, PackageManager.GET_META_DATA);
-    } catch (NameNotFoundException e) {
-      return null;
-    }
-    if (packageInfo != null) {
-      return packageInfo.versionName;
-    }
-    return null;
-  }
-
-  @Rpc(description = "Checks if version of SL4A is greater than or equal to the specified version.")
-  public boolean requiredVersion(@RpcParameter(name = "requiredVersion") final Integer version) {
-    boolean result = false;
-    int packageVersion = getPackageVersionCode("com.googlecode.android_scripting");
-    if (version > -1) {
-      result = (packageVersion >= version);
-    }
-    return result;
-  }
-
-  @Rpc(description = "Writes message to logcat.")
-  public void log(@RpcParameter(name = "message") String message) {
-    android.util.Log.v("SCRIPT", message);
-  }
-
-  /**
-   * 
-   * Map returned:
-   * 
-   * <pre>
-   *   TZ = Timezone
-   *     id = Timezone ID
-   *     display = Timezone display name
-   *     offset = Offset from UTC (in ms)
-   *   SDK = SDK Version
-   *   download = default download path
-   *   appcache = Location of application cache 
-   *   sdcard = Space on sdcard
-   *     availblocks = Available blocks
-   *     blockcount = Total Blocks
-   *     blocksize = size of block.
-   * </pre>
-   */
-  @SuppressLint("SdCardPath")
-@Rpc(description = "A map of various useful environment details")
-  public Map<String, Object> environment() {
-    Map<String, Object> result = new HashMap<String, Object>();
-    Map<String, Object> zone = new HashMap<String, Object>();
-    Map<String, Object> space = new HashMap<String, Object>();
-    TimeZone tz = TimeZone.getDefault();
-    zone.put("id", tz.getID());
-    zone.put("display", tz.getDisplayName());
-    zone.put("offset", tz.getOffset((new Date()).getTime()));
-    result.put("TZ", zone);
-    result.put("SDK", android.os.Build.VERSION.SDK);
-    result.put("download", FileUtils.getExternalDownload().getAbsolutePath());
-    result.put("appcache", mService.getCacheDir().getAbsolutePath());
-    try {
-      StatFs fs = new StatFs("/sdcard");
-      space.put("availblocks", fs.getAvailableBlocks());
-      space.put("blocksize", fs.getBlockSize());
-      space.put("blockcount", fs.getBlockCount());
-    } catch (Exception e) {
-      space.put("exception", e.toString());
-    }
-    result.put("sdcard", space);
-    return result;
-  }
-
-  @Rpc(description = "Get list of constants (static final fields) for a class")
-  public Bundle getConstants(
-      @RpcParameter(name = "classname", description = "Class to get constants from") String classname)
-      throws Exception {
-    Bundle result = new Bundle();
-    int flags = Modifier.FINAL | Modifier.PUBLIC | Modifier.STATIC;
-    Class<?> clazz = Class.forName(classname);
-    for (Field field : clazz.getFields()) {
-      if ((field.getModifiers() & flags) == flags) {
-        Class<?> type = field.getType();
-        String name = field.getName();
-        if (type == int.class) {
-          result.putInt(name, field.getInt(null));
-        } else if (type == long.class) {
-          result.putLong(name, field.getLong(null));
-        } else if (type == double.class) {
-          result.putDouble(name, field.getDouble(null));
-        } else if (type == char.class) {
-          result.putChar(name, field.getChar(null));
-        } else if (type instanceof Object) {
-          result.putString(name, field.get(null).toString());
-        }
-      }
-    }
-    return result;
-  }
-}
diff --git a/src/com/googlecode/android_scripting/facade/ApplicationManagerFacade.java b/src/com/googlecode/android_scripting/facade/ApplicationManagerFacade.java
deleted file mode 100644
index b25d2789..00000000
--- a/src/com/googlecode/android_scripting/facade/ApplicationManagerFacade.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package com.googlecode.android_scripting.facade;
-
-import android.app.ActivityManager;
-import android.app.Service;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-
-import com.googlecode.android_scripting.jsonrpc.RpcReceiver;
-import com.googlecode.android_scripting.rpc.Rpc;
-import com.googlecode.android_scripting.rpc.RpcParameter;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * Facade for managing Applications.
- * 
- */
-public class ApplicationManagerFacade extends RpcReceiver {
-
-  private final AndroidFacade mAndroidFacade;
-  private final ActivityManager mActivityManager;
-  private final PackageManager mPackageManager;
-
-  public ApplicationManagerFacade(FacadeManager manager) {
-    super(manager);
-    Service service = manager.getService();
-    mAndroidFacade = manager.getReceiver(AndroidFacade.class);
-    mActivityManager = (ActivityManager) service.getSystemService(Context.ACTIVITY_SERVICE);
-    mPackageManager = service.getPackageManager();
-  }
-
-  @Rpc(description = "Returns a list of all launchable application class names.")
-  public Map<String, String> getLaunchableApplications() {
-    Intent intent = new Intent(Intent.ACTION_MAIN);
-    intent.addCategory(Intent.CATEGORY_LAUNCHER);
-    List<ResolveInfo> resolveInfos = mPackageManager.queryIntentActivities(intent, 0);
-    Map<String, String> applications = new HashMap<String, String>();
-    for (ResolveInfo info : resolveInfos) {
-      applications.put(info.loadLabel(mPackageManager).toString(), info.activityInfo.name);
-    }
-    return applications;
-  }
-
-  @Rpc(description = "Start activity with the given class name.")
-  public void launch(@RpcParameter(name = "className") String className) {
-    Intent intent = new Intent(Intent.ACTION_MAIN);
-    String packageName = className.substring(0, className.lastIndexOf("."));
-    intent.setClassName(packageName, className);
-    mAndroidFacade.startActivity(intent);
-  }
-
-  @Rpc(description = "Returns a list of packages running activities or services.", returns = "List of packages running activities.")
-  public List<String> getRunningPackages() {
-    Set<String> runningPackages = new HashSet<String>();
-    List<ActivityManager.RunningAppProcessInfo> appProcesses =
-        mActivityManager.getRunningAppProcesses();
-    for (ActivityManager.RunningAppProcessInfo info : appProcesses) {
-      runningPackages.addAll(Arrays.asList(info.pkgList));
-    }
-    List<ActivityManager.RunningServiceInfo> serviceProcesses =
-        mActivityManager.getRunningServices(Integer.MAX_VALUE);
-    for (ActivityManager.RunningServiceInfo info : serviceProcesses) {
-      runningPackages.add(info.service.getPackageName());
-    }
-    return new ArrayList<String>(runningPackages);
-  }
-
-  @SuppressWarnings("deprecation")
-@Rpc(description = "Force stops a package.")
-  public void forceStopPackage(
-      @RpcParameter(name = "packageName", description = "name of package") String packageName) {
-    mActivityManager.restartPackage(packageName);
-  }
-
-  @Override
-  public void shutdown() {
-  }
-}
diff --git a/src/com/googlecode/android_scripting/facade/BatteryManagerFacade.java b/src/com/googlecode/android_scripting/facade/BatteryManagerFacade.java
deleted file mode 100644
index de90c7d5..00000000
--- a/src/com/googlecode/android_scripting/facade/BatteryManagerFacade.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.facade;
-
-import android.app.Service;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.os.BatteryManager;
-import android.os.Bundle;
-
-import com.googlecode.android_scripting.Log;
-import com.googlecode.android_scripting.jsonrpc.RpcReceiver;
-import com.googlecode.android_scripting.rpc.Rpc;
-import com.googlecode.android_scripting.rpc.RpcMinSdk;
-import com.googlecode.android_scripting.rpc.RpcStartEvent;
-import com.googlecode.android_scripting.rpc.RpcStopEvent;
-
-import java.lang.reflect.Field;
-
-/**
- * Exposes Batterymanager API. Note that in order to use any of the batteryGet* functions, you need
- * to batteryStartMonitoring, and then wait for a "battery" event. Sleeping for a second will
- * usually work just as well.
- * 
- * @author Alexey Reznichenko (alexey.reznichenko@gmail.com)
- * @author Robbie Matthews (rjmatthews62@gmail.com)
- */
-public class BatteryManagerFacade extends RpcReceiver {
-
-  private final Service mService;
-  private final EventFacade mEventFacade;
-  private final int mSdkVersion;
-
-  private BatteryStateListener mReceiver;
-
-  private volatile Bundle mBatteryData = null;
-  private volatile Integer mBatteryStatus = null;
-  private volatile Integer mBatteryHealth = null;
-  private volatile Integer mPlugType = null;
-
-  private volatile Boolean mBatteryPresent = null;
-  private volatile Integer mBatteryLevel = null;
-  private volatile Integer mBatteryMaxLevel = null;
-  private volatile Integer mBatteryVoltage = null;
-  private volatile Integer mBatteryTemperature = null;
-  private volatile String mBatteryTechnology = null;
-
-  public BatteryManagerFacade(FacadeManager manager) {
-    super(manager);
-    mService = manager.getService();
-    mSdkVersion = manager.getSdkLevel();
-    mEventFacade = manager.getReceiver(EventFacade.class);
-    mReceiver = null;
-    mBatteryData = null;
-  }
-
-  private class BatteryStateListener extends BroadcastReceiver {
-
-    private final EventFacade mmEventFacade;
-
-    private BatteryStateListener(EventFacade facade) {
-      mmEventFacade = facade;
-    }
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-      mBatteryStatus = intent.getIntExtra("status", 1);
-      mBatteryHealth = intent.getIntExtra("health", 1);
-      mPlugType = intent.getIntExtra("plugged", -1);
-      if (mSdkVersion >= 5) {
-        mBatteryPresent =
-            intent.getBooleanExtra(getBatteryManagerFieldValue("EXTRA_PRESENT"), false);
-        mBatteryLevel = intent.getIntExtra(getBatteryManagerFieldValue("EXTRA_LEVEL"), -1);
-        mBatteryMaxLevel = intent.getIntExtra(getBatteryManagerFieldValue("EXTRA_SCALE"), 0);
-        mBatteryVoltage = intent.getIntExtra(getBatteryManagerFieldValue("EXTRA_VOLTAGE"), -1);
-        mBatteryTemperature =
-            intent.getIntExtra(getBatteryManagerFieldValue("EXTRA_TEMPERATURE"), -1);
-        mBatteryTechnology = intent.getStringExtra(getBatteryManagerFieldValue("EXTRA_TECHNOLOGY"));
-      }
-      Bundle data = new Bundle();
-      data.putInt("status", mBatteryStatus);
-      data.putInt("health", mBatteryHealth);
-      data.putInt("plugged", mPlugType);
-      if (mSdkVersion >= 5) {
-        data.putBoolean("battery_present", mBatteryPresent);
-        if (mBatteryMaxLevel == null || mBatteryMaxLevel == 100 || mBatteryMaxLevel == 0) {
-          data.putInt("level", mBatteryLevel);
-        } else {
-          data.putInt("level", (int) (mBatteryLevel * 100.0 / mBatteryMaxLevel));
-        }
-        data.putInt("voltage", mBatteryVoltage);
-        data.putInt("temperature", mBatteryTemperature);
-        data.putString("technology", mBatteryTechnology);
-      }
-      mBatteryData = data;
-      mmEventFacade.postEvent("battery", mBatteryData.clone());
-    }
-  }
-
-  private String getBatteryManagerFieldValue(String name) {
-    try {
-      Field f = BatteryManager.class.getField(name);
-      return f.get(null).toString();
-    } catch (Exception e) {
-      Log.e(e);
-    }
-    return null;
-  }
-
-  @Rpc(description = "Returns the most recently recorded battery data.")
-  public Bundle readBatteryData() {
-    return mBatteryData;
-  }
-
-  /**
-   * throws "battery" events
-   */
-  @Rpc(description = "Starts tracking battery state.")
-  @RpcStartEvent("battery")
-  public void batteryStartMonitoring() {
-    if (mReceiver == null) {
-      IntentFilter filter = new IntentFilter();
-      filter.addAction(Intent.ACTION_BATTERY_CHANGED);
-      mReceiver = new BatteryStateListener(mEventFacade);
-      mService.registerReceiver(mReceiver, filter);
-    }
-  }
-
-  @Rpc(description = "Stops tracking battery state.")
-  @RpcStopEvent("battery")
-  public void batteryStopMonitoring() {
-    if (mReceiver != null) {
-      mService.unregisterReceiver(mReceiver);
-      mReceiver = null;
-    }
-    mBatteryData = null;
-  }
-
-  @Override
-  public void shutdown() {
-    batteryStopMonitoring();
-  }
-
-  @Rpc(description = "Returns  the most recently received battery status data:" + "\n1 - unknown;"
-      + "\n2 - charging;" + "\n3 - discharging;" + "\n4 - not charging;" + "\n5 - full;")
-  public Integer batteryGetStatus() {
-    return mBatteryStatus;
-  }
-
-  @Rpc(description = "Returns the most recently received battery health data:" + "\n1 - unknown;"
-      + "\n2 - good;" + "\n3 - overheat;" + "\n4 - dead;" + "\n5 - over voltage;"
-      + "\n6 - unspecified failure;")
-  public Integer batteryGetHealth() {
-    return mBatteryHealth;
-  }
-
-  /** Power source is an AC charger. */
-  public static final int BATTERY_PLUGGED_AC = 1;
-  /** Power source is a USB port. */
-  public static final int BATTERY_PLUGGED_USB = 2;
-
-  @Rpc(description = "Returns the most recently received plug type data:" + "\n-1 - unknown"
-      + "\n0 - unplugged;" + "\n1 - power source is an AC charger"
-      + "\n2 - power source is a USB port")
-  public Integer batteryGetPlugType() {
-    return mPlugType;
-  }
-
-  @Rpc(description = "Returns the most recently received battery presence data.")
-  @RpcMinSdk(5)
-  public Boolean batteryCheckPresent() {
-    return mBatteryPresent;
-  }
-
-  @Rpc(description = "Returns the most recently received battery level (percentage).")
-  @RpcMinSdk(5)
-  public Integer batteryGetLevel() {
-    if (mBatteryMaxLevel == null || mBatteryMaxLevel == 100 || mBatteryMaxLevel == 0) {
-      return mBatteryLevel;
-    } else {
-      return (int) (mBatteryLevel * 100.0 / mBatteryMaxLevel);
-    }
-  }
-
-  @Rpc(description = "Returns the most recently received battery voltage.")
-  @RpcMinSdk(5)
-  public Integer batteryGetVoltage() {
-    return mBatteryVoltage;
-  }
-
-  @Rpc(description = "Returns the most recently received battery temperature.")
-  @RpcMinSdk(5)
-  public Integer batteryGetTemperature() {
-    return mBatteryTemperature;
-  }
-
-  @Rpc(description = "Returns the most recently received battery technology data.")
-  @RpcMinSdk(5)
-  public String batteryGetTechnology() {
-    return mBatteryTechnology;
-  }
-
-}
diff --git a/src/com/googlecode/android_scripting/facade/BluetoothFacade.java b/src/com/googlecode/android_scripting/facade/BluetoothFacade.java
deleted file mode 100644
index 2ededecf..00000000
--- a/src/com/googlecode/android_scripting/facade/BluetoothFacade.java
+++ /dev/null
@@ -1,531 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.facade;
-
-import android.bluetooth.BluetoothAdapter;
-import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothServerSocket;
-import android.bluetooth.BluetoothSocket;
-import android.content.Intent;
-
-import com.googlecode.android_scripting.Constants;
-import com.googlecode.android_scripting.Log;
-import com.googlecode.android_scripting.MainThread;
-import com.googlecode.android_scripting.jsonrpc.RpcReceiver;
-import com.googlecode.android_scripting.rpc.Rpc;
-import com.googlecode.android_scripting.rpc.RpcDefault;
-import com.googlecode.android_scripting.rpc.RpcMinSdk;
-import com.googlecode.android_scripting.rpc.RpcOptional;
-import com.googlecode.android_scripting.rpc.RpcParameter;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.Callable;
-
-import org.apache.commons.codec.binary.Base64Codec;
-
-/**
- * Bluetooth functions.
- * 
- */
-// Discovery functions added by Eden Sayag
-
-@RpcMinSdk(5)
-public class BluetoothFacade extends RpcReceiver {
-
-  // UUID for SL4A.
-  private static final String DEFAULT_UUID = "457807c0-4897-11df-9879-0800200c9a66";
-  private static final String SDP_NAME = "SL4A";
-
-  private Map<String, BluetoothConnection> connections = new HashMap<String, BluetoothConnection>();
-  private AndroidFacade mAndroidFacade;
-  private BluetoothAdapter mBluetoothAdapter;
-
-  public BluetoothFacade(FacadeManager manager) {
-    super(manager);
-    mAndroidFacade = manager.getReceiver(AndroidFacade.class);
-    mBluetoothAdapter = MainThread.run(manager.getService(), new Callable<BluetoothAdapter>() {
-      @Override
-      public BluetoothAdapter call() throws Exception {
-        return BluetoothAdapter.getDefaultAdapter();
-      }
-    });
-  }
-
-  @Rpc(description = "Returns active Bluetooth connections.")
-  public Map<String, String> bluetoothActiveConnections() {
-    Map<String, String> out = new HashMap<String, String>();
-    for (Map.Entry<String, BluetoothConnection> entry : connections.entrySet()) {
-      if (entry.getValue().isConnected()) {
-        out.put(entry.getKey(), entry.getValue().getRemoteBluetoothAddress());
-      }
-    }
-
-    return out;
-  }
-
-  private BluetoothConnection getConnection(String connID) throws IOException {
-    BluetoothConnection conn = null;
-    if (connID.trim().length() > 0) {
-      conn = connections.get(connID);
-    } else if (connections.size() == 1) {
-      conn = (BluetoothConnection) connections.values().toArray()[0];
-    }
-    if (conn == null) {
-      throw new IOException("Bluetooth not ready for this connID.");
-    }
-    return conn;
-  }
-
-  @Rpc(description = "Send bytes over the currently open Bluetooth connection.")
-  public void bluetoothWriteBinary(
-      @RpcParameter(name = "base64", description = "A base64 encoded String of the bytes to be sent.") String base64,
-      @RpcParameter(name = "connID", description = "Connection id") @RpcDefault("") @RpcOptional String connID)
-      throws IOException {
-    BluetoothConnection conn = getConnection(connID);
-    try {
-      conn.write(Base64Codec.decodeBase64(base64));
-    } catch (IOException e) {
-      connections.remove(conn.getUUID());
-      throw e;
-    }
-  }
-
-  @Rpc(description = "Read up to bufferSize bytes and return a chunked, base64 encoded string.")
-  public String bluetoothReadBinary(
-      @RpcParameter(name = "bufferSize") @RpcDefault("4096") Integer bufferSize,
-      @RpcParameter(name = "connID", description = "Connection id") @RpcDefault("") @RpcOptional String connID)
-      throws IOException {
-
-    BluetoothConnection conn = getConnection(connID);
-    try {
-      return Base64Codec.encodeBase64String(conn.readBinary(bufferSize));
-    } catch (IOException e) {
-      connections.remove(conn.getUUID());
-      throw e;
-    }
-  }
-
-  private String addConnection(BluetoothConnection conn) {
-    String uuid = UUID.randomUUID().toString();
-    connections.put(uuid, conn);
-    conn.setUUID(uuid);
-    return uuid;
-  }
-
-  @Rpc(description = "Connect to a device over Bluetooth. Blocks until the connection is established or fails.", returns = "True if the connection was established successfully.")
-  public String bluetoothConnect(
-      @RpcParameter(name = "uuid", description = "The UUID passed here must match the UUID used by the server device.") @RpcDefault(DEFAULT_UUID) String uuid,
-      @RpcParameter(name = "address", description = "The user will be presented with a list of discovered devices to choose from if an address is not provided.") @RpcOptional String address)
-      throws IOException {
-    if (address == null) {
-      Intent deviceChooserIntent = new Intent();
-      deviceChooserIntent.setComponent(Constants.BLUETOOTH_DEVICE_LIST_COMPONENT_NAME);
-      Intent result = mAndroidFacade.startActivityForResult(deviceChooserIntent);
-      if (result != null && result.hasExtra(Constants.EXTRA_DEVICE_ADDRESS)) {
-        address = result.getStringExtra(Constants.EXTRA_DEVICE_ADDRESS);
-      } else {
-        return null;
-      }
-    }
-    BluetoothDevice mDevice;
-    BluetoothSocket mSocket;
-    BluetoothConnection conn;
-    mDevice = mBluetoothAdapter.getRemoteDevice(address);
-    mSocket = mDevice.createRfcommSocketToServiceRecord(UUID.fromString(uuid));
-    // Always cancel discovery because it will slow down a connection.
-    mBluetoothAdapter.cancelDiscovery();
-    mSocket.connect();
-    conn = new BluetoothConnection(mSocket);
-    return addConnection(conn);
-  }
-
-  @Rpc(description = "Listens for and accepts a Bluetooth connection. Blocks until the connection is established or fails.")
-  public String bluetoothAccept(
-      @RpcParameter(name = "uuid") @RpcDefault(DEFAULT_UUID) String uuid,
-      @RpcParameter(name = "timeout", description = "How long to wait for a new connection, 0 is wait for ever") @RpcDefault("0") Integer timeout)
-      throws IOException {
-    BluetoothServerSocket mServerSocket;
-    mServerSocket =
-        mBluetoothAdapter.listenUsingRfcommWithServiceRecord(SDP_NAME, UUID.fromString(uuid));
-    BluetoothSocket mSocket = mServerSocket.accept(timeout.intValue());
-    BluetoothConnection conn = new BluetoothConnection(mSocket, mServerSocket);
-    return addConnection(conn);
-  }
-
-  @Rpc(description = "Requests that the device be discoverable for Bluetooth connections.")
-  public void bluetoothMakeDiscoverable(
-      @RpcParameter(name = "duration", description = "period of time, in seconds, during which the device should be discoverable") @RpcDefault("300") Integer duration) {
-    if (mBluetoothAdapter.getScanMode() != BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE) {
-      Intent discoverableIntent = new Intent(BluetoothAdapter.ACTION_REQUEST_DISCOVERABLE);
-      discoverableIntent.putExtra(BluetoothAdapter.EXTRA_DISCOVERABLE_DURATION, duration);
-      // Use startActivityForResult to make this a synchronous call.
-      mAndroidFacade.startActivityForResult(discoverableIntent);
-    }
-  }
-
-  @Rpc(description = "Sends ASCII characters over the currently open Bluetooth connection.")
-  public void bluetoothWrite(@RpcParameter(name = "ascii") String ascii,
-      @RpcParameter(name = "connID", description = "Connection id") @RpcDefault("") String connID)
-      throws IOException {
-    BluetoothConnection conn = getConnection(connID);
-    try {
-      conn.write(ascii);
-    } catch (IOException e) {
-      connections.remove(conn.getUUID());
-      throw e;
-    }
-  }
-
-  @Rpc(description = "Returns True if the next read is guaranteed not to block.")
-  public Boolean bluetoothReadReady(
-      @RpcParameter(name = "connID", description = "Connection id") @RpcDefault("") @RpcOptional String connID)
-      throws IOException {
-    BluetoothConnection conn = getConnection(connID);
-    try {
-      return conn.readReady();
-    } catch (IOException e) {
-      connections.remove(conn.getUUID());
-      throw e;
-    }
-  }
-
-  @Rpc(description = "Read up to bufferSize ASCII characters.")
-  public String bluetoothRead(
-      @RpcParameter(name = "bufferSize") @RpcDefault("4096") Integer bufferSize,
-      @RpcParameter(name = "connID", description = "Connection id") @RpcOptional @RpcDefault("") String connID)
-      throws IOException {
-    BluetoothConnection conn = getConnection(connID);
-    try {
-      return conn.read(bufferSize);
-    } catch (IOException e) {
-      connections.remove(conn.getUUID());
-      throw e;
-    }
-  }
-
-  @Rpc(description = "Read the next line.")
-  public String bluetoothReadLine(
-      @RpcParameter(name = "connID", description = "Connection id") @RpcOptional @RpcDefault("") String connID)
-      throws IOException {
-    BluetoothConnection conn = getConnection(connID);
-    try {
-      return conn.readLine();
-    } catch (IOException e) {
-      connections.remove(conn.getUUID());
-      throw e;
-    }
-  }
-
-  @Rpc(description = "Queries a remote device for it's name or null if it can't be resolved")
-  public String bluetoothGetRemoteDeviceName(
-      @RpcParameter(name = "address", description = "Bluetooth Address For Target Device") String address) {
-    try {
-      BluetoothDevice mDevice;
-      mDevice = mBluetoothAdapter.getRemoteDevice(address);
-      return mDevice.getName();
-    } catch (Exception e) {
-      return null;
-    }
-  }
-
-  @Rpc(description = "Gets the Bluetooth Visible device name")
-  public String bluetoothGetLocalName() {
-    return mBluetoothAdapter.getName();
-  }
-
-  @Rpc(description = "Sets the Bluetooth Visible device name, returns True on success")
-  public boolean bluetoothSetLocalName(
-      @RpcParameter(name = "name", description = "New local name") String name) {
-    return mBluetoothAdapter.setName(name);
-  }
-
-  @Rpc(description = "Gets the scan mode for the local dongle.\r\n" + "Return values:\r\n"
-      + "\t-1 when Bluetooth is disabled.\r\n" + "\t0 if non discoverable and non connectable.\r\n"
-      + "\r1 connectable non discoverable." + "\r3 connectable and discoverable.")
-  public int bluetoothGetScanMode() {
-    if (mBluetoothAdapter.getState() == BluetoothAdapter.STATE_OFF
-        || mBluetoothAdapter.getState() == BluetoothAdapter.STATE_TURNING_OFF) {
-      return -1;
-    }
-
-    switch (mBluetoothAdapter.getScanMode()) {
-    case BluetoothAdapter.SCAN_MODE_NONE:
-      return 0;
-    case BluetoothAdapter.SCAN_MODE_CONNECTABLE:
-      return 1;
-    case BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE:
-      return 3;
-    default:
-      return mBluetoothAdapter.getScanMode() - 20;
-    }
-  }
-
-  @Rpc(description = "Returns the name of the connected device.")
-  public String bluetoothGetConnectedDeviceName(
-      @RpcParameter(name = "connID", description = "Connection id") @RpcOptional @RpcDefault("") String connID)
-      throws IOException {
-    BluetoothConnection conn = getConnection(connID);
-    return conn.getConnectedDeviceName();
-  }
-
-  @Rpc(description = "Checks Bluetooth state.", returns = "True if Bluetooth is enabled.")
-  public Boolean checkBluetoothState() {
-    return mBluetoothAdapter.isEnabled();
-  }
-
-  @Rpc(description = "Toggle Bluetooth on and off.", returns = "True if Bluetooth is enabled.")
-  public Boolean toggleBluetoothState(
-      @RpcParameter(name = "enabled") @RpcOptional Boolean enabled,
-      @RpcParameter(name = "prompt", description = "Prompt the user to confirm changing the Bluetooth state.") @RpcDefault("true") Boolean prompt) {
-    if (enabled == null) {
-      enabled = !checkBluetoothState();
-    }
-    if (enabled) {
-      if (prompt) {
-        Intent intent = new Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE);
-        // TODO(damonkohler): Use the result to determine if this was successful. At any rate, keep
-        // using startActivityForResult in order to synchronize this call.
-        mAndroidFacade.startActivityForResult(intent);
-      } else {
-        // TODO(damonkohler): Make this synchronous as well.
-        mBluetoothAdapter.enable();
-      }
-    } else {
-      // TODO(damonkohler): Add support for prompting on disable.
-      // TODO(damonkohler): Make this synchronous as well.
-      shutdown();
-      mBluetoothAdapter.disable();
-    }
-    return enabled;
-  }
-
-  @Rpc(description = "Stops Bluetooth connection.")
-  public void bluetoothStop(
-      @RpcParameter(name = "connID", description = "Connection id") @RpcOptional @RpcDefault("") String connID) {
-    BluetoothConnection conn;
-    try {
-      conn = getConnection(connID);
-    } catch (IOException e) {
-      // TODO Auto-generated catch block
-      e.printStackTrace();
-      return;
-    }
-    if (conn == null) {
-      return;
-    }
-
-    conn.stop();
-    connections.remove(conn.getUUID());
-  }
-
-  @Rpc(description = "Returns the hardware address of the local Bluetooth adapter. ")
-  public String bluetoothGetLocalAddress() {
-    return mBluetoothAdapter.getAddress();
-  }
-
-  @Rpc(description = "Start the remote device discovery process. ", returns = "true on success, false on error")
-  public Boolean bluetoothDiscoveryStart() {
-    return mBluetoothAdapter.startDiscovery();
-  }
-
-  @Rpc(description = "Cancel the current device discovery process.", returns = "true on success, false on error")
-  public Boolean bluetoothDiscoveryCancel() {
-    return mBluetoothAdapter.cancelDiscovery();
-  }
-
-  @Rpc(description = "Return true if the local Bluetooth adapter is currently in the device discovery process. ")
-  public Boolean bluetoothIsDiscovering() {
-    return mBluetoothAdapter.isDiscovering();
-  }
-
-  @Override
-  public void shutdown() {
-    for (Map.Entry<String, BluetoothConnection> entry : connections.entrySet()) {
-      entry.getValue().stop();
-    }
-    connections.clear();
-  }
-}
-
-class BluetoothConnection {
-  private BluetoothSocket mSocket;
-  private BluetoothDevice mDevice;
-  private OutputStream mOutputStream;
-  private InputStream mInputStream;
-  private BufferedReader mReader;
-  private BluetoothServerSocket mServerSocket;
-  private String UUID;
-
-  public BluetoothConnection(BluetoothSocket mSocket) throws IOException {
-    this(mSocket, null);
-  }
-
-  public BluetoothConnection(BluetoothSocket mSocket, BluetoothServerSocket mServerSocket)
-      throws IOException {
-    this.mSocket = mSocket;
-    mOutputStream = mSocket.getOutputStream();
-    mInputStream = mSocket.getInputStream();
-    mDevice = mSocket.getRemoteDevice();
-    mReader = new BufferedReader(new InputStreamReader(mInputStream, "ASCII"));
-    this.mServerSocket = mServerSocket;
-  }
-
-  public void setUUID(String UUID) {
-    this.UUID = UUID;
-  }
-
-  public String getUUID() {
-    return UUID;
-  }
-
-  public String getRemoteBluetoothAddress() {
-    return mDevice.getAddress();
-  }
-
-  public boolean isConnected() {
-    if (mSocket == null) {
-      return false;
-    }
-    try {
-      mSocket.getRemoteDevice();
-      mInputStream.available();
-      mReader.ready();
-      return true;
-    } catch (Exception e) {
-      return false;
-    }
-  }
-
-  public void write(byte[] out) throws IOException {
-    if (mOutputStream != null) {
-      mOutputStream.write(out);
-    } else {
-      throw new IOException("Bluetooth not ready.");
-    }
-  }
-
-  public void write(String out) throws IOException {
-    this.write(out.getBytes());
-  }
-
-  public Boolean readReady() throws IOException {
-    if (mReader != null) {
-      return mReader.ready();
-    }
-    throw new IOException("Bluetooth not ready.");
-  }
-
-  public byte[] readBinary() throws IOException {
-    return this.readBinary(4096);
-  }
-
-  public byte[] readBinary(int bufferSize) throws IOException {
-    if (mReader != null) {
-      byte[] buffer = new byte[bufferSize];
-      int bytesRead = mInputStream.read(buffer);
-      if (bytesRead == -1) {
-        Log.e("Read failed.");
-        throw new IOException("Read failed.");
-      }
-      byte[] truncatedBuffer = new byte[bytesRead];
-      System.arraycopy(buffer, 0, truncatedBuffer, 0, bytesRead);
-      return truncatedBuffer;
-    }
-
-    throw new IOException("Bluetooth not ready.");
-
-  }
-
-  public String read() throws IOException {
-    return this.read(4096);
-  }
-
-  public String read(int bufferSize) throws IOException {
-    if (mReader != null) {
-      char[] buffer = new char[bufferSize];
-      int bytesRead = mReader.read(buffer);
-      if (bytesRead == -1) {
-        Log.e("Read failed.");
-        throw new IOException("Read failed.");
-      }
-      return new String(buffer, 0, bytesRead);
-    }
-    throw new IOException("Bluetooth not ready.");
-  }
-
-  public String readLine() throws IOException {
-    if (mReader != null) {
-      return mReader.readLine();
-    }
-    throw new IOException("Bluetooth not ready.");
-  }
-
-  public String getConnectedDeviceName() {
-    return mDevice.getName();
-  }
-
-  public void stop() {
-    if (mSocket != null) {
-      try {
-        mSocket.close();
-      } catch (IOException e) {
-        Log.e(e);
-      }
-    }
-    mSocket = null;
-    if (mServerSocket != null) {
-      try {
-        mServerSocket.close();
-      } catch (IOException e) {
-        Log.e(e);
-      }
-    }
-    mServerSocket = null;
-
-    if (mInputStream != null) {
-      try {
-        mInputStream.close();
-      } catch (IOException e) {
-        Log.e(e);
-      }
-    }
-    mInputStream = null;
-    if (mOutputStream != null) {
-      try {
-        mOutputStream.close();
-      } catch (IOException e) {
-        Log.e(e);
-      }
-    }
-    mOutputStream = null;
-    if (mReader != null) {
-      try {
-        mReader.close();
-      } catch (IOException e) {
-        Log.e(e);
-      }
-    }
-    mReader = null;
-  }
-}
diff --git a/src/com/googlecode/android_scripting/facade/CameraFacade.java b/src/com/googlecode/android_scripting/facade/CameraFacade.java
deleted file mode 100644
index 5f5a15ba..00000000
--- a/src/com/googlecode/android_scripting/facade/CameraFacade.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.facade;
-
-import android.app.Service;
-
-import android.content.Intent;
-import android.hardware.Camera;
-import android.hardware.Camera.AutoFocusCallback;
-import android.hardware.Camera.Parameters;
-import android.hardware.Camera.PictureCallback;
-import android.net.Uri;
-import android.os.Bundle;
-import android.provider.MediaStore;
-import android.view.SurfaceHolder;
-import android.view.SurfaceView;
-import android.view.WindowManager;
-import android.view.SurfaceHolder.Callback;
-
-import com.googlecode.android_scripting.FileUtils;
-import com.googlecode.android_scripting.FutureActivityTaskExecutor;
-import com.googlecode.android_scripting.Log;
-import com.googlecode.android_scripting.future.FutureActivityTask;
-import com.googlecode.android_scripting.jsonrpc.RpcReceiver;
-import com.googlecode.android_scripting.rpc.Rpc;
-import com.googlecode.android_scripting.rpc.RpcDefault;
-import com.googlecode.android_scripting.rpc.RpcParameter;
-
-import com.hipipal.sl4alib.MNApp;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.lang.reflect.Method;
-import java.util.concurrent.CountDownLatch;
-
-/**
- * Access Camera functions.
- * 
- */
-public class CameraFacade extends RpcReceiver {
-
-  private final Service mService;
-  private final Parameters mParameters;
-
-  private class BooleanResult {
-    boolean mmResult = false;
-  }
-
-  public CameraFacade(FacadeManager manager) {
-    super(manager);
-    mService = manager.getService();
-    Camera camera = Camera.open();
-    try {
-      mParameters = camera.getParameters();
-    } finally {
-      camera.release();
-    }
-  }
-
-  @Rpc(description = "Take a picture and save it to the specified path.", returns = "A map of Booleans autoFocus and takePicture where True indicates success.")
-  public Bundle cameraCapturePicture(@RpcParameter(name = "targetPath") final String targetPath,
-      @RpcParameter(name = "useAutoFocus") @RpcDefault("true") Boolean useAutoFocus)
-      throws InterruptedException {
-    final BooleanResult autoFocusResult = new BooleanResult();
-    final BooleanResult takePictureResult = new BooleanResult();
-
-    Camera camera = Camera.open();
-    camera.setParameters(mParameters);
-
-    try {
-      Method method = camera.getClass().getMethod("setDisplayOrientation", int.class);
-      method.invoke(camera, 90);
-    } catch (Exception e) {
-      Log.e(e);
-    }
-
-    try {
-      FutureActivityTask<SurfaceHolder> previewTask = setPreviewDisplay(camera);
-      camera.startPreview();
-      if (useAutoFocus) {
-        autoFocus(autoFocusResult, camera);
-      }
-      takePicture(new File(targetPath), takePictureResult, camera);
-      previewTask.finish();
-    } catch (Exception e) {
-      Log.e(e);
-    } finally {
-      camera.release();
-    }
-
-    Bundle result = new Bundle();
-    result.putBoolean("autoFocus", autoFocusResult.mmResult);
-    result.putBoolean("takePicture", takePictureResult.mmResult);
-    return result;
-  }
-
-  private FutureActivityTask<SurfaceHolder> setPreviewDisplay(Camera camera) throws IOException,
-      InterruptedException {
-    FutureActivityTask<SurfaceHolder> task = new FutureActivityTask<SurfaceHolder>() {
-      @SuppressWarnings("deprecation")
-	@Override
-      public void onCreate() {
-        super.onCreate();
-        final SurfaceView view = new SurfaceView(getActivity());
-        getActivity().setContentView(view);
-        getActivity().getWindow().setSoftInputMode(
-            WindowManager.LayoutParams.SOFT_INPUT_STATE_UNCHANGED);
-        view.getHolder().setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
-        view.getHolder().addCallback(new Callback() {
-          @Override
-          public void surfaceDestroyed(SurfaceHolder holder) {
-          }
-
-          @Override
-          public void surfaceCreated(SurfaceHolder holder) {
-            setResult(view.getHolder());
-          }
-
-          @Override
-          public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
-          }
-        });
-      }
-    };
-    FutureActivityTaskExecutor taskQueue =
-        ((MNApp) mService.getApplication()).getTaskExecutor();
-    taskQueue.execute(task);
-    camera.setPreviewDisplay(task.getResult());
-    return task;
-  }
-
-  private void takePicture(final File file, final BooleanResult takePictureResult,
-      final Camera camera) throws InterruptedException {
-    final CountDownLatch latch = new CountDownLatch(1);
-    camera.takePicture(null, null, new PictureCallback() {
-      @Override
-      public void onPictureTaken(byte[] data, Camera camera) {
-        if (!FileUtils.makeDirectories(file.getParentFile(), 0755)) {
-          takePictureResult.mmResult = false;
-          return;
-        }
-        try {
-          FileOutputStream output = new FileOutputStream(file);
-          output.write(data);
-          output.close();
-          takePictureResult.mmResult = true;
-        } catch (FileNotFoundException e) {
-          Log.e("Failed to save picture.", e);
-          takePictureResult.mmResult = false;
-          return;
-        } catch (IOException e) {
-          Log.e("Failed to save picture.", e);
-          takePictureResult.mmResult = false;
-          return;
-        } finally {
-          latch.countDown();
-        }
-      }
-    });
-    latch.await();
-  }
-
-  private void autoFocus(final BooleanResult result, final Camera camera)
-      throws InterruptedException {
-    final CountDownLatch latch = new CountDownLatch(1);
-    {
-      camera.autoFocus(new AutoFocusCallback() {
-        @Override
-        public void onAutoFocus(boolean success, Camera camera) {
-          result.mmResult = success;
-          latch.countDown();
-        }
-      });
-      latch.await();
-    }
-  }
-
-  @Override
-  public void shutdown() {
-    // Nothing to clean up.
-  }
-
-  @Rpc(description = "Starts the image capture application to take a picture and saves it to the specified path.")
-  public void cameraInteractiveCapturePicture(
-      @RpcParameter(name = "targetPath") final String targetPath) {
-    Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
-    File file = new File(targetPath);
-    intent.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(file));
-    AndroidFacade facade = mManager.getReceiver(AndroidFacade.class);
-    facade.startActivityForResult(intent);
-  }
-}
diff --git a/src/com/googlecode/android_scripting/facade/CommonIntentsFacade.java b/src/com/googlecode/android_scripting/facade/CommonIntentsFacade.java
deleted file mode 100644
index 3eb535ae..00000000
--- a/src/com/googlecode/android_scripting/facade/CommonIntentsFacade.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.googlecode.android_scripting.facade;
-
-import android.app.SearchManager;
-import android.content.Intent;
-import android.net.Uri;
-import android.provider.Contacts.People;
-
-import com.googlecode.android_scripting.jsonrpc.RpcReceiver;
-import com.googlecode.android_scripting.rpc.Rpc;
-import com.googlecode.android_scripting.rpc.RpcOptional;
-import com.googlecode.android_scripting.rpc.RpcParameter;
-
-import java.io.File;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-/**
- * A selection of commonly used intents. <br>
- * <br>
- * These can be used to trigger some common tasks.
- * 
- */
-@SuppressWarnings("deprecation")
-public class CommonIntentsFacade extends RpcReceiver {
-
-  private final AndroidFacade mAndroidFacade;
-
-  public CommonIntentsFacade(FacadeManager manager) {
-    super(manager);
-    mAndroidFacade = manager.getReceiver(AndroidFacade.class);
-  }
-
-  @Override
-  public void shutdown() {
-  }
-
-  @Rpc(description = "Display content to be picked by URI (e.g. contacts)", returns = "A map of result values.")
-  public Intent pick(@RpcParameter(name = "uri") String uri) throws JSONException {
-    return mAndroidFacade.startActivityForResult(Intent.ACTION_PICK, uri, null, null, null, null);
-  }
-
-  @Rpc(description = "Starts the barcode scanner.", returns = "A Map representation of the result Intent.")
-  public Intent scanBarcode() throws JSONException {
-    return mAndroidFacade.startActivityForResult("com.google.zxing.client.android.SCAN", null,
-        null, null, null, null);
-  }
-
-  private void view(Uri uri, String type) {
-    Intent intent = new Intent(Intent.ACTION_VIEW);
-    intent.setDataAndType(uri, type);
-    mAndroidFacade.startActivity(intent);
-  }
-
-  @Rpc(description = "Start activity with view action by URI (i.e. browser, contacts, etc.).")
-  public void view(
-      @RpcParameter(name = "uri") String uri,
-      @RpcParameter(name = "type", description = "MIME type/subtype of the URI") @RpcOptional String type,
-      @RpcParameter(name = "extras", description = "a Map of extras to add to the Intent") @RpcOptional JSONObject extras)
-      throws Exception {
-    mAndroidFacade.startActivity(Intent.ACTION_VIEW, uri, type, extras, true, null, null);
-  }
-
-  @Rpc(description = "Opens a map search for query (e.g. pizza, 123 My Street).")
-  public void viewMap(@RpcParameter(name = "query, e.g. pizza, 123 My Street") String query)
-      throws Exception {
-    view("geo:0,0?q=" + query, null, null);
-  }
-
-  @Rpc(description = "Opens the list of contacts.")
-  public void viewContacts() throws JSONException {
-    view(People.CONTENT_URI, null);
-  }
-
-  @Rpc(description = "Opens the browser to display a local HTML file.")
-  public void viewHtml(
-      @RpcParameter(name = "path", description = "the path to the HTML file") String path)
-      throws JSONException {
-    File file = new File(path);
-    view(Uri.fromFile(file), "text/html");
-  }
-
-  @Rpc(description = "Starts a search for the given query.")
-  public void search(@RpcParameter(name = "query") String query) {
-    Intent intent = new Intent(Intent.ACTION_SEARCH);
-    intent.putExtra(SearchManager.QUERY, query);
-    mAndroidFacade.startActivity(intent);
-  }
-}
diff --git a/src/com/googlecode/android_scripting/facade/ContactsFacade.java b/src/com/googlecode/android_scripting/facade/ContactsFacade.java
deleted file mode 100644
index f37e3abe..00000000
--- a/src/com/googlecode/android_scripting/facade/ContactsFacade.java
+++ /dev/null
@@ -1,305 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.facade;
-
-import android.app.Service;
-import android.content.ContentResolver;
-import android.content.ContentUris;
-import android.content.Intent;
-import android.database.Cursor;
-import android.net.Uri;
-import android.provider.Contacts.People;
-import android.provider.Contacts.PhonesColumns;
-
-import com.googlecode.android_scripting.jsonrpc.RpcReceiver;
-import com.googlecode.android_scripting.rpc.Rpc;
-import com.googlecode.android_scripting.rpc.RpcOptional;
-import com.googlecode.android_scripting.rpc.RpcParameter;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-/**
- * Provides access to contacts related functionality.
- * 
- * @author MeanEYE.rcf (meaneye.rcf@gmail.com
- */
-@SuppressWarnings("deprecation")
-public class ContactsFacade extends RpcReceiver {
-  private static final Uri CONTACTS_URI = Uri.parse("content://contacts/people");
-  private final ContentResolver mContentResolver;
-  private final Service mService;
-  private final CommonIntentsFacade mCommonIntentsFacade;
-  public Uri mPhoneContent = null;
-  public String mContactId;
-  public String mPrimary;
-  public String mPhoneNumber;
-  public String mHasPhoneNumber;
-
-  public ContactsFacade(FacadeManager manager) {
-    super(manager);
-    mService = manager.getService();
-    mContentResolver = mService.getContentResolver();
-    mCommonIntentsFacade = manager.getReceiver(CommonIntentsFacade.class);
-    try {
-      // Backward compatibility... get contract stuff using reflection
-      Class<?> phone = Class.forName("android.provider.ContactsContract$CommonDataKinds$Phone");
-      mPhoneContent = (Uri) phone.getField("CONTENT_URI").get(null);
-      mContactId = (String) phone.getField("CONTACT_ID").get(null);
-      mPrimary = (String) phone.getField("IS_PRIMARY").get(null);
-      mPhoneNumber = (String) phone.getField("NUMBER").get(null);
-      mHasPhoneNumber = (String) phone.getField("HAS_PHONE_NUMBER").get(null);
-    } catch (Exception e) {
-    }
-  }
-
-  private Uri buildUri(Integer id) {
-    Uri uri = ContentUris.withAppendedId(People.CONTENT_URI, id);
-    return uri;
-  }
-
-  @Rpc(description = "Displays a list of contacts to pick from.", returns = "A map of result values.")
-  public Intent pickContact() throws JSONException {
-    return mCommonIntentsFacade.pick("content://contacts/people");
-  }
-
-  @Rpc(description = "Displays a list of phone numbers to pick from.", returns = "The selected phone number.")
-  public String pickPhone() throws JSONException {
-    String result = null;
-    Intent data = mCommonIntentsFacade.pick("content://contacts/phones");
-    if (data != null) {
-      Uri phoneData = data.getData();
-      Cursor cursor = mService.getContentResolver().query(phoneData, null, null, null, null);
-      if (cursor != null) {
-        if (cursor.moveToFirst()) {
-          result = cursor.getString(cursor.getColumnIndexOrThrow(PhonesColumns.NUMBER));
-        }
-        cursor.close();
-      }
-    }
-    return result;
-  }
-
-  @Rpc(description = "Returns a List of all possible attributes for contacts.")
-  public List<String> contactsGetAttributes() {
-    List<String> result = new ArrayList<String>();
-    Cursor cursor = mContentResolver.query(CONTACTS_URI, null, null, null, null);
-    if (cursor != null) {
-      String[] columns = cursor.getColumnNames();
-      for (int i = 0; i < columns.length; i++) {
-        result.add(columns[i]);
-      }
-      cursor.close();
-    }
-    return result;
-  }
-
-  // TODO(MeanEYE.rcf): Add ability to narrow selection by providing named pairs of attributes.
-  @Rpc(description = "Returns a List of all contact IDs.")
-  public List<Integer> contactsGetIds() {
-    List<Integer> result = new ArrayList<Integer>();
-    String[] columns = { "_id" };
-    Cursor cursor = mContentResolver.query(CONTACTS_URI, columns, null, null, null);
-    if (cursor != null) {
-      while (cursor.moveToNext()) {
-        result.add(cursor.getInt(0));
-      }
-      cursor.close();
-    }
-    return result;
-  }
-
-  @Rpc(description = "Returns a List of all contacts.", returns = "a List of contacts as Maps")
-  public List<JSONObject> contactsGet(
-      @RpcParameter(name = "attributes") @RpcOptional JSONArray attributes) throws JSONException {
-    List<JSONObject> result = new ArrayList<JSONObject>();
-    String[] columns;
-    if (attributes == null || attributes.length() == 0) {
-      // In case no attributes are specified we set the default ones.
-      columns = new String[] { "_id", "name", "primary_phone", "primary_email", "type" };
-    } else {
-      // Convert selected attributes list into usable string list.
-      columns = new String[attributes.length()];
-      for (int i = 0; i < attributes.length(); i++) {
-        columns[i] = attributes.getString(i);
-      }
-    }
-    List<String> queryList = new ArrayList<String>();
-    for (String s : columns) {
-      queryList.add(s);
-    }
-    if (!queryList.contains("_id")) {
-      queryList.add("_id");
-    }
-
-    String[] query = queryList.toArray(new String[queryList.size()]);
-    Cursor cursor = mContentResolver.query(CONTACTS_URI, query, null, null, null);
-    if (cursor != null) {
-      int idIndex = cursor.getColumnIndex("_id");
-      while (cursor.moveToNext()) {
-        String id = cursor.getString(idIndex);
-        JSONObject message = new JSONObject();
-        for (int i = 0; i < columns.length; i++) {
-          String key = columns[i];
-          String value = cursor.getString(cursor.getColumnIndex(key));
-          if (mPhoneNumber != null) {
-            if (key.equals("primary_phone")) {
-              value = findPhone(id);
-            }
-          }
-          message.put(key, value);
-        }
-        result.add(message);
-      }
-      cursor.close();
-    }
-    return result;
-  }
-
-  private String findPhone(String id) {
-    String result = null;
-    if (id == null || id.equals("")) {
-      return result;
-    }
-    try {
-      if (Integer.parseInt(id) > 0) {
-        Cursor pCur =
-            mContentResolver.query(mPhoneContent, new String[] { mPhoneNumber }, mContactId
-                + " = ? and " + mPrimary + "=1", new String[] { id }, null);
-        if (pCur != null) {
-          pCur.getColumnNames();
-          while (pCur.moveToNext()) {
-            result = pCur.getString(0);
-            break;
-          }
-        }
-        pCur.close();
-      }
-    } catch (Exception e) {
-      return null;
-    }
-    return result;
-  }
-
-  @Rpc(description = "Returns contacts by ID.")
-  public JSONObject contactsGetById(@RpcParameter(name = "id") Integer id,
-      @RpcParameter(name = "attributes") @RpcOptional JSONArray attributes) throws JSONException {
-    JSONObject result = null;
-    Uri uri = buildUri(id);
-    String[] columns;
-    if (attributes == null || attributes.length() == 0) {
-      // In case no attributes are specified we set the default ones.
-      columns = new String[] { "_id", "name", "primary_phone", "primary_email", "type" };
-    } else {
-      // Convert selected attributes list into usable string list.
-      columns = new String[attributes.length()];
-      for (int i = 0; i < attributes.length(); i++) {
-        columns[i] = attributes.getString(i);
-      }
-    }
-    Cursor cursor = mContentResolver.query(uri, columns, null, null, null);
-    if (cursor != null) {
-      result = new JSONObject();
-      cursor.moveToFirst();
-      for (int i = 0; i < columns.length; i++) {
-        result.put(columns[i], cursor.getString(i));
-      }
-      cursor.close();
-    }
-    return result;
-  }
-
-  // TODO(MeanEYE.rcf): Add ability to narrow selection by providing named pairs of attributes.
-  @Rpc(description = "Returns the number of contacts.")
-  public Integer contactsGetCount() {
-    Integer result = 0;
-    Cursor cursor = mContentResolver.query(CONTACTS_URI, null, null, null, null);
-    if (cursor != null) {
-      result = cursor.getCount();
-      cursor.close();
-    }
-    return result;
-  }
-
-  private String[] jsonToArray(JSONArray array) throws JSONException {
-    String[] result = null;
-    if (array != null && array.length() > 0) {
-      result = new String[array.length()];
-      for (int i = 0; i < array.length(); i++) {
-        result[i] = array.getString(i);
-      }
-    }
-    return result;
-  }
-
-  /**
-   * Exactly as per <a href=
-   * "http://developer.android.com/reference/android/content/ContentResolver.html#query%28android.net.Uri,%20java.lang.String[],%20java.lang.String,%20java.lang.String[],%20java.lang.String%29"
-   * >ContentResolver.query</a>
-   */
-  @Rpc(description = "Content Resolver Query", returns = "result of query as Maps")
-  public List<JSONObject> queryContent(
-      @RpcParameter(name = "uri", description = "The URI, using the content:// scheme, for the content to retrieve.") String uri,
-      @RpcParameter(name = "attributes", description = "A list of which columns to return. Passing null will return all columns") @RpcOptional JSONArray attributes,
-      @RpcParameter(name = "selection", description = "A filter declaring which rows to return") @RpcOptional String selection,
-      @RpcParameter(name = "selectionArgs", description = "You may include ?s in selection, which will be replaced by the values from selectionArgs") @RpcOptional JSONArray selectionArgs,
-      @RpcParameter(name = "order", description = "How to order the rows") @RpcOptional String order)
-      throws JSONException {
-    List<JSONObject> result = new ArrayList<JSONObject>();
-    String[] columns = jsonToArray(attributes);
-    String[] args = jsonToArray(selectionArgs);
-    Cursor cursor = mContentResolver.query(Uri.parse(uri), columns, selection, args, order);
-    if (cursor != null) {
-      String[] names = cursor.getColumnNames();
-      while (cursor.moveToNext()) {
-        JSONObject message = new JSONObject();
-        for (int i = 0; i < cursor.getColumnCount(); i++) {
-          String key = names[i];
-          String value = cursor.getString(i);
-          message.put(key, value);
-        }
-        result.add(message);
-      }
-      cursor.close();
-    }
-    return result;
-  }
-
-  @Rpc(description = "Content Resolver Query Attributes", returns = "a list of available columns for a given content uri")
-  public JSONArray queryAttributes(
-      @RpcParameter(name = "uri", description = "The URI, using the content:// scheme, for the content to retrieve.") String uri)
-      throws JSONException {
-    JSONArray result = new JSONArray();
-    Cursor cursor = mContentResolver.query(Uri.parse(uri), null, "1=0", null, null);
-    if (cursor != null) {
-      String[] names = cursor.getColumnNames();
-      for (String name : names) {
-        result.put(name);
-      }
-      cursor.close();
-    }
-    return result;
-  }
-
-  @Override
-  public void shutdown() {
-  }
-}
diff --git a/src/com/googlecode/android_scripting/facade/EventFacade.java b/src/com/googlecode/android_scripting/facade/EventFacade.java
deleted file mode 100644
index 7d2340db..00000000
--- a/src/com/googlecode/android_scripting/facade/EventFacade.java
+++ /dev/null
@@ -1,374 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.facade;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.os.Bundle;
-
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Multimap;
-import com.google.common.collect.Multimaps;
-import com.googlecode.android_scripting.event.Event;
-import com.googlecode.android_scripting.future.FutureResult;
-import com.googlecode.android_scripting.jsonrpc.JsonBuilder;
-import com.googlecode.android_scripting.jsonrpc.RpcReceiver;
-import com.googlecode.android_scripting.rpc.Rpc;
-import com.googlecode.android_scripting.rpc.RpcDefault;
-import com.googlecode.android_scripting.rpc.RpcDeprecated;
-import com.googlecode.android_scripting.rpc.RpcName;
-import com.googlecode.android_scripting.rpc.RpcOptional;
-import com.googlecode.android_scripting.rpc.RpcParameter;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Queue;
-import java.util.Set;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.TimeUnit;
-
-import org.json.JSONException;
-
-/**
- * Manage the event queue. <br>
- * <br>
- * <b>Usage Notes:</b><br>
- * EventFacade APIs interact with the Event Queue (a data buffer containing up to 1024 event
- * entries).<br>
- * Events are automatically entered into the Event Queue following API calls such as startSensing()
- * and startLocating().<br>
- * The Event Facade provides control over how events are entered into (and removed from) the Event
- * Queue.<br>
- * The Event Queue provides a useful means of recording background events (such as sensor data) when
- * the phone is busy with foreground activities.
- * 
- * @author Felix Arends (felix.arends@gmail.com)
- * 
- */
-public class EventFacade extends RpcReceiver {
-  /**
-   * The maximum length of the event queue. Old events will be discarded when this limit is
-   * exceeded.
-   */
-  private static final int MAX_QUEUE_SIZE = 1024;
-  private final Queue<Event> mEventQueue = new ConcurrentLinkedQueue<Event>();
-  private final CopyOnWriteArrayList<EventObserver> mGlobalEventObservers =
-      new CopyOnWriteArrayList<EventObserver>();
-  private final Multimap<String, EventObserver> mNamedEventObservers = Multimaps
-      .synchronizedListMultimap(ArrayListMultimap.<String, EventObserver> create());
-  private EventServer mEventServer = null;
-  private final HashMap<String, BroadcastListener> mBroadcastListeners =
-      new HashMap<String, BroadcastListener>();
-  private final Context mContext;
-
-  public EventFacade(FacadeManager manager) {
-    super(manager);
-    mContext = manager.getService().getApplicationContext();
-  }
-
-  /**
-   * Example (python): droid.eventClearBuffer()
-   */
-  @Rpc(description = "Clears all events from the event buffer.")
-  public void eventClearBuffer() {
-    mEventQueue.clear();
-  }
-
-  /**
-   * Registers a listener for a new broadcast signal
-   */
-  @Rpc(description = "Registers a listener for a new broadcast signal")
-  public boolean eventRegisterForBroadcast(
-      @RpcParameter(name = "category") String category,
-      @RpcParameter(name = "enqueue", description = "Should this events be added to the event queue or only dispatched") @RpcDefault(value = "true") Boolean enqueue) {
-    if (mBroadcastListeners.containsKey(category)) {
-      return false;
-    }
-
-    BroadcastListener b = new BroadcastListener(this, enqueue.booleanValue());
-    IntentFilter c = new IntentFilter(category);
-    mContext.registerReceiver(b, c);
-    mBroadcastListeners.put(category, b);
-
-    return true;
-  }
-
-  @Rpc(description = "Stop listening for a broadcast signal")
-  public void eventUnregisterForBroadcast(@RpcParameter(name = "category") String category) {
-    if (!mBroadcastListeners.containsKey(category)) {
-      return;
-    }
-
-    mContext.unregisterReceiver(mBroadcastListeners.get(category));
-    mBroadcastListeners.remove(category);
-  }
-
-  @Rpc(description = "Lists all the broadcast signals we are listening for")
-  public Set<String> eventGetBrodcastCategories() {
-    return mBroadcastListeners.keySet();
-  }
-
-  /**
-   * Actual data returned in the map will depend on the type of event.
-   * 
-   * <pre>
-   * Example (python):
-   *     import android, time
-   *     droid = android.Android()
-   *     droid.startSensing()
-   *     time.sleep(1)
-   *     droid.eventClearBuffer()
-   *     time.sleep(1)
-   *     e = eventPoll(1).result
-   *     event_entry_number = 0
-   *     x = e[event_entry_ number]['data']['xforce']
-   * </pre>
-   * 
-   * e has the format:<br>
-   * [{u'data': {u'accuracy': 0, u'pitch': -0.48766891956329345, u'xmag': -5.6875, u'azimuth':
-   * 0.3312483489513397, u'zforce': 8.3492730000000002, u'yforce': 4.5628165999999997, u'time':
-   * 1297072704.813, u'ymag': -11.125, u'zmag': -42.375, u'roll': -0.059393649548292161, u'xforce':
-   * 0.42223078000000003}, u'name': u'sensors', u'time': 1297072704813000L}]<br>
-   * x has the string value of the x force data (0.42223078000000003) at the time of the event
-   * entry. </pre>
-   */
-
-  @Rpc(description = "Returns and removes the oldest n events (i.e. location or sensor update, etc.) from the event buffer.", returns = "A List of Maps of event properties.")
-  public List<Event> eventPoll(
-      @RpcParameter(name = "number_of_events") @RpcDefault("1") Integer number_of_events) {
-    List<Event> events = Lists.newArrayList();
-    for (int i = 0; i < number_of_events; i++) {
-      Event event = mEventQueue.poll();
-      if (event == null) {
-        break;
-      }
-      events.add(event);
-    }
-    return events;
-  }
-
-  @Rpc(description = "Blocks until an event with the supplied name occurs. The returned event is not removed from the buffer.", returns = "Map of event properties.")
-  public Event eventWaitFor(
-      @RpcParameter(name = "eventName") final String eventName,
-      @RpcParameter(name = "timeout", description = "the maximum time to wait (in ms)") @RpcOptional Integer timeout)
-      throws InterruptedException {
-    synchronized (mEventQueue) { // First check to make sure it isn't already there
-      for (Event event : mEventQueue) {
-        if (event.getName().equals(eventName)) {
-          return event;
-        }
-      }
-    }
-    final FutureResult<Event> futureEvent = new FutureResult<Event>();
-    addNamedEventObserver(eventName, new EventObserver() {
-      @Override
-      public void onEventReceived(Event event) {
-        if (event.getName().equals(eventName)) {
-          synchronized (futureEvent) {
-            if (!futureEvent.isDone()) {
-              futureEvent.set(event);
-              removeEventObserver(this);
-            }
-          }
-        }
-      }
-    });
-    if (timeout != null) {
-      return futureEvent.get(timeout, TimeUnit.MILLISECONDS);
-    } else {
-      return futureEvent.get();
-    }
-  }
-
-  @Rpc(description = "Blocks until an event occurs. The returned event is removed from the buffer.", returns = "Map of event properties.")
-  public Event eventWait(
-      @RpcParameter(name = "timeout", description = "the maximum time to wait") @RpcOptional Integer timeout)
-      throws InterruptedException {
-    Event result = null;
-    final FutureResult<Event> futureEvent = new FutureResult<Event>();
-    synchronized (mEventQueue) { // Anything in queue?
-      if (mEventQueue.size() > 0) {
-        return mEventQueue.poll(); // return it.
-      }
-    }
-    EventObserver observer = new EventObserver() {
-      @Override
-      public void onEventReceived(Event event) { // set up observer for any events.
-        synchronized (futureEvent) {
-          if (!futureEvent.isDone()) {
-            futureEvent.set(event);
-            removeEventObserver(this);
-          }
-          mEventQueue.remove(event);
-        }
-      }
-    };
-    addGlobalEventObserver(observer);
-    if (timeout != null) {
-      result = futureEvent.get(timeout, TimeUnit.MILLISECONDS);
-    } else {
-      result = futureEvent.get();
-    }
-    removeEventObserver(observer); // Make quite sure this goes away.
-    return result;
-  }
-
-  /**
-   * <pre>
-   * Example:
-   *   import android
-   *   from datetime import datetime
-   *   droid = android.Android()
-   *   t = datetime.now()
-   *   droid.eventPost('Some Event', t)
-   * </pre>
-   */
-  @Rpc(description = "Post an event to the event queue.")
-  public void eventPost(
-      @RpcParameter(name = "name", description = "Name of event") String name,
-      @RpcParameter(name = "data", description = "Data contained in event.") String data,
-      @RpcParameter(name = "enqueue", description = "Set to False if you don't want your events to be added to the event queue, just dispatched.") @RpcOptional @RpcDefault("false") Boolean enqueue) {
-    postEvent(name, data, enqueue.booleanValue());
-  }
-
-  /**
-   * Post an event and queue it
-   */
-  public void postEvent(String name, Object data) {
-    postEvent(name, data, true);
-  }
-
-  /**
-   * Posts an event with to the event queue.
-   */
-  public void postEvent(String name, Object data, boolean enqueue) {
-    Event event = new Event(name, data);
-    if (enqueue != false) {
-      mEventQueue.add(event);
-      if (mEventQueue.size() > MAX_QUEUE_SIZE) {
-        mEventQueue.remove();
-      }
-    }
-    synchronized (mNamedEventObservers) {
-      for (EventObserver observer : mNamedEventObservers.get(name)) {
-        observer.onEventReceived(event);
-      }
-    }
-    synchronized (mGlobalEventObservers) {
-      for (EventObserver observer : mGlobalEventObservers) {
-        observer.onEventReceived(event);
-      }
-    }
-  }
-
-  @RpcDeprecated(value = "eventPost", release = "r4")
-  @Rpc(description = "Post an event to the event queue.")
-  @RpcName(name = "postEvent")
-  public void rpcPostEvent(@RpcParameter(name = "name") String name,
-      @RpcParameter(name = "data") String data) {
-    postEvent(name, data);
-  }
-
-  @RpcDeprecated(value = "eventPoll", release = "r4")
-  @Rpc(description = "Returns and removes the oldest event (i.e. location or sensor update, etc.) from the event buffer.", returns = "Map of event properties.")
-  public Event receiveEvent() {
-    return mEventQueue.poll();
-  }
-
-  @RpcDeprecated(value = "eventWaitFor", release = "r4")
-  @Rpc(description = "Blocks until an event with the supplied name occurs. The returned event is not removed from the buffer.", returns = "Map of event properties.")
-  public Event waitForEvent(
-      @RpcParameter(name = "eventName") final String eventName,
-      @RpcParameter(name = "timeout", description = "the maximum time to wait") @RpcOptional Integer timeout)
-      throws InterruptedException {
-    return eventWaitFor(eventName, timeout);
-  }
-
-  @Rpc(description = "Opens up a socket where you can read for events posted")
-  public int startEventDispatcher(
-      @RpcParameter(name = "port", description = "Port to use") @RpcDefault("0") @RpcOptional() Integer port) {
-    if (mEventServer == null) {
-      mEventServer = new EventServer(port);
-      addGlobalEventObserver(mEventServer);
-    }
-    return mEventServer.getAddress().getPort();
-  }
-
-  @Rpc(description = "Stops the event server, you can't read in the port anymore")
-  public void stopEventDispatcher() throws RuntimeException {
-    if (mEventServer == null) {
-      throw new RuntimeException("Not running");
-    }
-    mEventServer.shutdown();
-    removeEventObserver(mEventServer);
-    mEventServer = null;
-    return;
-  }
-
-  @Override
-  public void shutdown() {
-    try {
-      stopEventDispatcher();
-    } catch (Exception err) {
-    }
-    // let others (like webviews) know we're going down
-    postEvent("sl4a", "{\"shutdown\": \"event-facade\"}");
-  }
-
-  public void addNamedEventObserver(String eventName, EventObserver observer) {
-    mNamedEventObservers.put(eventName, observer);
-  }
-
-  public void addGlobalEventObserver(EventObserver observer) {
-    mGlobalEventObservers.add(observer);
-  }
-
-  public void removeEventObserver(EventObserver observer) {
-    mNamedEventObservers.removeAll(observer);
-    mGlobalEventObservers.remove(observer);
-  }
-
-  public interface EventObserver {
-    public void onEventReceived(Event event);
-  }
-
-  public class BroadcastListener extends android.content.BroadcastReceiver {
-    private EventFacade mParent;
-    private boolean mEnQueue;
-
-    public BroadcastListener(EventFacade parent, boolean enqueue) {
-      mParent = parent;
-      mEnQueue = enqueue;
-    }
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-      Bundle data = (Bundle) intent.getExtras().clone();
-      data.putString("action", intent.getAction());
-      try {
-        mParent.eventPost("sl4a", JsonBuilder.build(data).toString(), mEnQueue);
-      } catch (JSONException e) {
-        // TODO Auto-generated catch block
-        e.printStackTrace();
-      }
-    }
-
-  }
-}
diff --git a/src/com/googlecode/android_scripting/facade/EventServer.java b/src/com/googlecode/android_scripting/facade/EventServer.java
deleted file mode 100644
index 432980a6..00000000
--- a/src/com/googlecode/android_scripting/facade/EventServer.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (C) 2001 Naranjo Manuel Francisco <manuel@aircable.net>
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.googlecode.android_scripting.facade;
-
-import com.googlecode.android_scripting.Log;
-import com.googlecode.android_scripting.SimpleServer;
-import com.googlecode.android_scripting.event.Event;
-import com.googlecode.android_scripting.jsonrpc.JsonBuilder;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.util.Vector;
-import java.util.concurrent.CountDownLatch;
-
-import org.json.JSONException;
-
-/**
- * An Event Forwarding server that forwards events from the rpc queue in realtime to listener
- * clients.
- * 
- * @author Manuel Naranjo (manuel@aircable.net)
- * @see com.googlecode.android_scripting.SimpleServer
- */
-public class EventServer extends SimpleServer implements EventFacade.EventObserver {
-  private static final Vector<Listener> mListeners = new Vector<Listener>();
-  private InetSocketAddress address = null;
-
-  public EventServer() {
-    this(0);
-  }
-
-  public EventServer(int port) {
-    address = startAllInterfaces(port);
-  }
-
-  public InetSocketAddress getAddress() {
-    return address;
-  }
-
-  @Override
-  public void shutdown() {
-    onEventReceived(new Event("sl4a", "{\"shutdown\": \"event-server\"}"));
-    for (Listener listener : mListeners) {
-      mListeners.remove(listener);
-      listener.lock.countDown();
-    }
-    super.shutdown();
-  }
-
-  @Override
-  protected void handleConnection(Socket socket) throws IOException {
-    Listener l = new Listener(socket);
-    Log.v("Adding EventServer listener " + socket.getPort());
-    mListeners.add(l);
-    // we are running in the socket accept thread
-    // wait until the event dispatcher gets us the events
-    // or we die, what ever happens first
-    try {
-      l.lock.await();
-    } catch (InterruptedException e) {
-      e.printStackTrace();
-    }
-    try {
-      l.sock.close();
-    } catch (IOException e) {
-      e.printStackTrace();
-    }
-    Log.v("Ending EventServer listener " + socket.getPort());
-  }
-
-  @Override
-  public void onEventReceived(Event event) {
-    Object result = null;
-    try {
-      result = JsonBuilder.build(event);
-    } catch (JSONException e) {
-      return;
-    }
-
-    Log.v("EventServer dispatching " + result);
-
-    for (Listener listener : mListeners) {
-      if (!listener.out.checkError()) {
-        listener.out.write(result + "\n");
-        listener.out.flush();
-      } else {
-        // let the socket accept thread we're done
-        mListeners.remove(listener);
-        listener.lock.countDown();
-      }
-    }
-  }
-
-  private class Listener {
-    private Socket sock;
-    private PrintWriter out;
-    private CountDownLatch lock = new CountDownLatch(1);
-
-    public Listener(Socket l) throws IOException {
-      sock = l;
-      out = new PrintWriter(l.getOutputStream(), true);
-    }
-  }
-}
diff --git a/src/com/googlecode/android_scripting/facade/EyesFreeFacade.java b/src/com/googlecode/android_scripting/facade/EyesFreeFacade.java
deleted file mode 100644
index 3b797556..00000000
--- a/src/com/googlecode/android_scripting/facade/EyesFreeFacade.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2009 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.facade;
-
-import android.app.Service;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-
-import com.googlecode.android_scripting.jsonrpc.RpcReceiver;
-import com.googlecode.android_scripting.rpc.Rpc;
-import com.googlecode.android_scripting.rpc.RpcParameter;
-
-import java.util.List;
-
-/**
- * Provides Text To Speech services for API 3 or less.
- */
-
-public class EyesFreeFacade extends RpcReceiver {
-
-  private final Service mService;
-  private final PackageManager mPackageManager;
-
-  public EyesFreeFacade(FacadeManager manager) {
-    super(manager);
-    mService = manager.getService();
-    mPackageManager = mService.getPackageManager();
-  }
-
-  @Rpc(description = "Speaks the provided message via TTS.")
-  public void ttsSpeak(@RpcParameter(name = "message") String message) {
-    Intent intent = new Intent("com.google.tts.makeBagel");
-    intent.putExtra("message", message);
-    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-    List<ResolveInfo> infos = mPackageManager.queryIntentActivities(intent, 0);
-    if (infos.size() > 0) {
-      mService.startActivity(intent);
-    } else {
-      throw new RuntimeException("Eyes-Free is not installed.");
-    }
-  }
-
-  @Override
-  public void shutdown() {
-  }
-}
diff --git a/src/com/googlecode/android_scripting/facade/FacadeConfiguration.java b/src/com/googlecode/android_scripting/facade/FacadeConfiguration.java
deleted file mode 100644
index 5afd4112..00000000
--- a/src/com/googlecode/android_scripting/facade/FacadeConfiguration.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.facade;
-
-import com.google.common.collect.Maps;
-import com.googlecode.android_scripting.Log;
-import com.googlecode.android_scripting.facade.ui.UiFacade;
-import com.googlecode.android_scripting.jsonrpc.RpcReceiver;
-import com.googlecode.android_scripting.rpc.MethodDescriptor;
-import com.googlecode.android_scripting.rpc.RpcDeprecated;
-import com.googlecode.android_scripting.rpc.RpcMinSdk;
-import com.googlecode.android_scripting.rpc.RpcStartEvent;
-import com.googlecode.android_scripting.rpc.RpcStopEvent;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.TreeMap;
-
-/**
- * Encapsulates the list of supported facades and their construction.
- * 
- * @author Damon Kohler (damonkohler@gmail.com)
- * @author Igor Karp (igor.v.karp@gmail.com)
- */
-@SuppressWarnings("deprecation")
-public class FacadeConfiguration {
-  private final static Set<Class<? extends RpcReceiver>> sFacadeClassList;
-  private final static SortedMap<String, MethodDescriptor> sRpcs =
-      new TreeMap<String, MethodDescriptor>();
-
-  private static int sSdkLevel;
-
-  static {
-
-    if (android.os.Build.VERSION.SDK == null) {
-      sSdkLevel = 8; // For documentation purposes.
-    } else {
-      try {
-        sSdkLevel = Integer.parseInt(android.os.Build.VERSION.SDK);
-      } catch (NumberFormatException e) {
-        Log.e(e);
-      }
-    }
-
-    sFacadeClassList = new HashSet<Class<? extends RpcReceiver>>();
-    sFacadeClassList.add(AndroidFacade.class);
-    sFacadeClassList.add(ApplicationManagerFacade.class);
-    sFacadeClassList.add(CameraFacade.class);
-    sFacadeClassList.add(CommonIntentsFacade.class);
-    sFacadeClassList.add(ContactsFacade.class);
-    sFacadeClassList.add(EventFacade.class);
-    sFacadeClassList.add(LocationFacade.class);
-    sFacadeClassList.add(PhoneFacade.class);
-    sFacadeClassList.add(MediaRecorderFacade.class);
-    sFacadeClassList.add(SensorManagerFacade.class);
-    sFacadeClassList.add(SettingsFacade.class);
-    sFacadeClassList.add(SmsFacade.class);
-    sFacadeClassList.add(SpeechRecognitionFacade.class);
-    sFacadeClassList.add(ToneGeneratorFacade.class);
-    sFacadeClassList.add(WakeLockFacade.class);
-    sFacadeClassList.add(WifiFacade.class);
-    sFacadeClassList.add(UiFacade.class);
-    sFacadeClassList.add(BatteryManagerFacade.class);
-    sFacadeClassList.add(ActivityResultFacade.class);
-    sFacadeClassList.add(MediaPlayerFacade.class);
-    sFacadeClassList.add(PreferencesFacade.class);
-    sFacadeClassList.add(QPyInterfaceFacade.class);
-
-    if (sSdkLevel >= 4) {
-      sFacadeClassList.add(TextToSpeechFacade.class);
-    } else {
-      sFacadeClassList.add(EyesFreeFacade.class);
-    }
-
-    if (sSdkLevel >= 5) {
-      sFacadeClassList.add(BluetoothFacade.class);
-    }
-
-    if (sSdkLevel >= 7) {
-      sFacadeClassList.add(SignalStrengthFacade.class);
-    }
-
-    if (sSdkLevel >= 8) {
-      sFacadeClassList.add(WebCamFacade.class);
-    }
-
-    for (Class<? extends RpcReceiver> recieverClass : sFacadeClassList) {
-      for (MethodDescriptor rpcMethod : MethodDescriptor.collectFrom(recieverClass)) {
-        sRpcs.put(rpcMethod.getName(), rpcMethod);
-      }
-    }
-  }
-
-  private FacadeConfiguration() {
-    // Utility class.
-  }
-
-  public static int getSdkLevel() {
-    return sSdkLevel;
-  }
-
-  /** Returns a list of {@link MethodDescriptor} objects for all facades. */
-  public static List<MethodDescriptor> collectMethodDescriptors() {
-    return new ArrayList<MethodDescriptor>(sRpcs.values());
-  }
-
-  /**
-   * Returns a list of not deprecated {@link MethodDescriptor} objects for facades supported by the
-   * current SDK version.
-   */
-  public static List<MethodDescriptor> collectSupportedMethodDescriptors() {
-    List<MethodDescriptor> list = new ArrayList<MethodDescriptor>();
-    for (MethodDescriptor descriptor : sRpcs.values()) {
-      Method method = descriptor.getMethod();
-      if (method.isAnnotationPresent(RpcDeprecated.class)) {
-        continue;
-      } else if (method.isAnnotationPresent(RpcMinSdk.class)) {
-        int requiredSdkLevel = method.getAnnotation(RpcMinSdk.class).value();
-        if (sSdkLevel < requiredSdkLevel) {
-          continue;
-        }
-      }
-      list.add(descriptor);
-    }
-    return list;
-  }
-
-  public static Map<String, MethodDescriptor> collectStartEventMethodDescriptors() {
-    Map<String, MethodDescriptor> map = Maps.newHashMap();
-    for (MethodDescriptor descriptor : sRpcs.values()) {
-      Method method = descriptor.getMethod();
-      if (method.isAnnotationPresent(RpcStartEvent.class)) {
-        String eventName = method.getAnnotation(RpcStartEvent.class).value();
-        if (map.containsKey(eventName)) {
-          throw new RuntimeException("Duplicate start event method descriptor found.");
-        }
-        map.put(eventName, descriptor);
-      }
-    }
-    return map;
-  }
-
-  public static Map<String, MethodDescriptor> collectStopEventMethodDescriptors() {
-    Map<String, MethodDescriptor> map = Maps.newHashMap();
-    for (MethodDescriptor descriptor : sRpcs.values()) {
-      Method method = descriptor.getMethod();
-      if (method.isAnnotationPresent(RpcStopEvent.class)) {
-        String eventName = method.getAnnotation(RpcStopEvent.class).value();
-        if (map.containsKey(eventName)) {
-          throw new RuntimeException("Duplicate stop event method descriptor found.");
-        }
-        map.put(eventName, descriptor);
-      }
-    }
-    return map;
-  }
-
-  /** Returns a method by name. */
-  public static MethodDescriptor getMethodDescriptor(String name) {
-    return sRpcs.get(name);
-  }
-
-  public static Collection<Class<? extends RpcReceiver>> getFacadeClasses() {
-    return sFacadeClassList;
-  }
-}
\ No newline at end of file
diff --git a/src/com/googlecode/android_scripting/facade/FacadeManager.java b/src/com/googlecode/android_scripting/facade/FacadeManager.java
deleted file mode 100644
index 52555f41..00000000
--- a/src/com/googlecode/android_scripting/facade/FacadeManager.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.googlecode.android_scripting.facade;
-
-import android.app.Service;
-import android.content.Intent;
-
-import com.googlecode.android_scripting.Log;
-import com.googlecode.android_scripting.exception.Sl4aException;
-import com.googlecode.android_scripting.jsonrpc.RpcReceiver;
-import com.googlecode.android_scripting.jsonrpc.RpcReceiverManager;
-import com.googlecode.android_scripting.rpc.RpcDeprecated;
-import com.googlecode.android_scripting.rpc.RpcMinSdk;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.Collection;
-
-public class FacadeManager extends RpcReceiverManager {
-
-  private final Service mService;
-  private final Intent mIntent;
-  private int mSdkLevel;
-
-  public FacadeManager(int sdkLevel, Service service, Intent intent,
-      Collection<Class<? extends RpcReceiver>> classList) {
-    super(classList);
-    mSdkLevel = sdkLevel;
-    mService = service;
-    mIntent = intent;
-  }
-
-  public int getSdkLevel() {
-    return mSdkLevel;
-  }
-
-  public Service getService() {
-    return mService;
-  }
-
-  public Intent getIntent() {
-    return mIntent;
-  }
-
-  @Override
-  public Object invoke(Class<? extends RpcReceiver> clazz, Method method, Object[] args)
-      throws Exception {
-    try {
-      if (method.isAnnotationPresent(RpcDeprecated.class)) {
-        String replacedBy = method.getAnnotation(RpcDeprecated.class).value();
-        String title = method.getName() + " is deprecated";
-        Log.notify(mService, title, title, String.format("Please use %s instead.", replacedBy));
-      } else if (method.isAnnotationPresent(RpcMinSdk.class)) {
-        int requiredSdkLevel = method.getAnnotation(RpcMinSdk.class).value();
-        if (mSdkLevel < requiredSdkLevel) {
-          throw new Sl4aException(String.format("%s requires API level %d, current level is %d",
-              method.getName(), requiredSdkLevel, mSdkLevel));
-        }
-      }
-      return super.invoke(clazz, method, args);
-    } catch (InvocationTargetException e) {
-      if (e.getCause() instanceof SecurityException) {
-        Log.notify(mService, "RPC invoke failed...", mService.getPackageName(), e.getCause()
-            .getMessage());
-      }
-      throw e;
-    }
-  }
-
-  public AndroidFacade.Resources getAndroidFacadeResources() {
-    return new AndroidFacade.Resources() {
-      @Override
-      public int getLogo48() {
-        // TODO(Alexey): As an alternative, ask application for resource ids.
-        String packageName = mService.getApplication().getPackageName();
-        return mService.getResources().getIdentifier("script_logo_48", "drawable", packageName);
-      }
-    };
-  }
-}
diff --git a/src/com/googlecode/android_scripting/facade/FacadeManagerFactory.java b/src/com/googlecode/android_scripting/facade/FacadeManagerFactory.java
deleted file mode 100644
index 4bde6002..00000000
--- a/src/com/googlecode/android_scripting/facade/FacadeManagerFactory.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.googlecode.android_scripting.facade;
-
-import android.app.Service;
-import android.content.Intent;
-
-import com.googlecode.android_scripting.jsonrpc.RpcReceiver;
-import com.googlecode.android_scripting.jsonrpc.RpcReceiverManager;
-import com.googlecode.android_scripting.jsonrpc.RpcReceiverManagerFactory;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-public class FacadeManagerFactory implements RpcReceiverManagerFactory {
-
-  private final int mSdkLevel;
-  private final Service mService;
-  private final Intent mIntent;
-  private final Collection<Class<? extends RpcReceiver>> mClassList;
-  private final List<RpcReceiverManager> mFacadeManagers;
-
-  public FacadeManagerFactory(int sdkLevel, Service service, Intent intent,
-      Collection<Class<? extends RpcReceiver>> classList) {
-    mSdkLevel = sdkLevel;
-    mService = service;
-    mIntent = intent;
-    mClassList = classList;
-    mFacadeManagers = new ArrayList<RpcReceiverManager>();
-  }
-
-  public FacadeManager create() {
-    FacadeManager facadeManager = new FacadeManager(mSdkLevel, mService, mIntent, mClassList);
-    mFacadeManagers.add(facadeManager);
-    return facadeManager;
-  }
-
-  @Override
-  public List<RpcReceiverManager> getRpcReceiverManagers() {
-    return mFacadeManagers;
-  }
-}
diff --git a/src/com/googlecode/android_scripting/facade/JpegProvider.java b/src/com/googlecode/android_scripting/facade/JpegProvider.java
deleted file mode 100644
index 0c35ad35..00000000
--- a/src/com/googlecode/android_scripting/facade/JpegProvider.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.googlecode.android_scripting.facade;
-
-interface JpegProvider {
-  public byte[] getJpeg();
-}
\ No newline at end of file
diff --git a/src/com/googlecode/android_scripting/facade/LocationFacade.java b/src/com/googlecode/android_scripting/facade/LocationFacade.java
deleted file mode 100644
index 0f97f70c..00000000
--- a/src/com/googlecode/android_scripting/facade/LocationFacade.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.facade;
-
-import android.app.Service;
-import android.content.Context;
-import android.location.Address;
-import android.location.Geocoder;
-import android.location.Location;
-import android.location.LocationListener;
-import android.location.LocationManager;
-import android.os.Bundle;
-
-import com.google.common.collect.Maps;
-import com.googlecode.android_scripting.jsonrpc.RpcReceiver;
-import com.googlecode.android_scripting.rpc.Rpc;
-import com.googlecode.android_scripting.rpc.RpcDefault;
-import com.googlecode.android_scripting.rpc.RpcParameter;
-import com.googlecode.android_scripting.rpc.RpcStartEvent;
-import com.googlecode.android_scripting.rpc.RpcStopEvent;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-/**
- * This facade exposes the LocationManager related functionality.<br>
- * <br>
- * <b>Overview</b><br>
- * Once activated by 'startLocating' the LocationFacade attempts to return location data collected
- * via GPS or the cell network. If neither are available the last known location may be retrieved.
- * If both are available the format of the returned data is:<br>
- * {u'network': {u'altitude': 0, u'provider': u'network', u'longitude': -0.38509020000000002,
- * u'time': 1297079691231L, u'latitude': 52.410557300000001, u'speed': 0, u'accuracy': 75}, u'gps':
- * {u'altitude': 51, u'provider': u'gps', u'longitude': -0.38537094593048096, u'time':
- * 1297079709000L, u'latitude': 52.41076922416687, u'speed': 0, u'accuracy': 24}}<br>
- * If neither are available {} is returned. <br>
- * Example (python):<br>
- * 
- * <pre>
- * import android, time
- * droid = android.Android()
- * droid.startLocating()
- * time.sleep(15)
- * loc = droid.readLocation().result
- * if loc = {}:
- *   loc = getLastKnownLocation().result
- * if loc != {}:
- *   try:
- *     n = loc['gps']
- *   except KeyError:
- *     n = loc['network'] 
- *   la = n['latitude'] 
- *   lo = n['longitude']
- *   address = droid.geocode(la, lo).result
- * droid.stopLocating()
- * </pre>
- * 
- * The address format is:<br>
- * [{u'thoroughfare': u'Some Street', u'locality': u'Some Town', u'sub_admin_area': u'Some Borough',
- * u'admin_area': u'Some City', u'feature_name': u'House Numbers', u'country_code': u'GB',
- * u'country_name': u'United Kingdom', u'postal_code': u'ST1 1'}]
- * 
- * @author Damon Kohler (damonkohler@gmail.com)
- * @author Felix Arends (felix.arends@gmail.com)
- */
-public class LocationFacade extends RpcReceiver {
-  private final EventFacade mEventFacade;
-  private final Service mService;
-  private final Map<String, Location> mLocationUpdates;
-  private final LocationManager mLocationManager;
-  private final Geocoder mGeocoder;
-
-  private final LocationListener mLocationListener = new LocationListener() {
-    @Override
-    public synchronized void onLocationChanged(Location location) {
-      mLocationUpdates.put(location.getProvider(), location);
-      Map<String, Location> copy = Maps.newHashMap();
-      for (Entry<String, Location> entry : mLocationUpdates.entrySet()) {
-        copy.put(entry.getKey(), entry.getValue());
-      }
-      mEventFacade.postEvent("location", copy);
-    }
-
-    @Override
-    public void onProviderDisabled(String provider) {
-    }
-
-    @Override
-    public void onProviderEnabled(String provider) {
-    }
-
-    @Override
-    public void onStatusChanged(String provider, int status, Bundle extras) {
-    }
-  };
-
-  public LocationFacade(FacadeManager manager) {
-    super(manager);
-    mService = manager.getService();
-    mEventFacade = manager.getReceiver(EventFacade.class);
-    mGeocoder = new Geocoder(mService);
-    mLocationManager = (LocationManager) mService.getSystemService(Context.LOCATION_SERVICE);
-    mLocationUpdates = new HashMap<String, Location>();
-  }
-
-  @Override
-  public void shutdown() {
-    stopLocating();
-  }
-
-  @Rpc(description = "Returns availables providers on the phone")
-  public List<String> locationProviders() {
-    return mLocationManager.getAllProviders();
-  }
-
-  @Rpc(description = "Ask if provider is enabled")
-  public boolean locationProviderEnabled(
-      @RpcParameter(name = "provider", description = "Name of location provider") String provider) {
-    return mLocationManager.isProviderEnabled(provider);
-  }
-
-  @Rpc(description = "Starts collecting location data.")
-  @RpcStartEvent("location")
-  public void startLocating(
-      @RpcParameter(name = "minDistance", description = "minimum time between updates in milliseconds") @RpcDefault("60000") Integer minUpdateTime,
-      @RpcParameter(name = "minUpdateDistance", description = "minimum distance between updates in meters") @RpcDefault("30") Integer minUpdateDistance) {
-    for (String provider : mLocationManager.getAllProviders()) {
-      mLocationManager.requestLocationUpdates(provider, minUpdateTime, minUpdateDistance,
-          mLocationListener, mService.getMainLooper());
-    }
-  }
-
-  @Rpc(description = "Returns the current location as indicated by all available providers.", returns = "A map of location information by provider.")
-  public Map<String, Location> readLocation() {
-    return mLocationUpdates;
-  }
-
-  @Rpc(description = "Stops collecting location data.")
-  @RpcStopEvent("location")
-  public synchronized void stopLocating() {
-    mLocationManager.removeUpdates(mLocationListener);
-    mLocationUpdates.clear();
-  }
-
-  @Rpc(description = "Returns the last known location of the device.", returns = "A map of location information by provider.")
-  public Map<String, Location> getLastKnownLocation() {
-    Map<String, Location> location = new HashMap<String, Location>();
-    for (String provider : mLocationManager.getAllProviders()) {
-      location.put(provider, mLocationManager.getLastKnownLocation(provider));
-    }
-    return location;
-  }
-
-  @Rpc(description = "Returns a list of addresses for the given latitude and longitude.", returns = "A list of addresses.")
-  public List<Address> geocode(
-      @RpcParameter(name = "latitude") Double latitude,
-      @RpcParameter(name = "longitude") Double longitude,
-      @RpcParameter(name = "maxResults", description = "maximum number of results") @RpcDefault("1") Integer maxResults)
-      throws IOException {
-    return mGeocoder.getFromLocation(latitude, longitude, maxResults);
-  }
-}
diff --git a/src/com/googlecode/android_scripting/facade/MediaPlayerFacade.java b/src/com/googlecode/android_scripting/facade/MediaPlayerFacade.java
deleted file mode 100644
index 64689258..00000000
--- a/src/com/googlecode/android_scripting/facade/MediaPlayerFacade.java
+++ /dev/null
@@ -1,245 +0,0 @@
-package com.googlecode.android_scripting.facade;
-
-import android.app.Service;
-import android.media.MediaPlayer;
-import android.net.Uri;
-
-import com.googlecode.android_scripting.jsonrpc.RpcReceiver;
-import com.googlecode.android_scripting.rpc.Rpc;
-import com.googlecode.android_scripting.rpc.RpcDefault;
-import com.googlecode.android_scripting.rpc.RpcParameter;
-
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Map;
-import java.util.Set;
-import java.util.Map.Entry;
-
-/**
- * This facade exposes basic mediaPlayer functionality.
- * 
- * <br>
- * <br>
- * <b>Usage Notes:</b><br>
- * mediaPlayerFacade maintains a list of media streams, identified by a user supplied tag. If the
- * tag is null or blank, this tag defaults to "default"<br>
- * Basic operation is: mediaPlayOpen("file:///sdcard/MP3/sample.mp3","mytag",true)<br>
- * This will look for a media file at /sdcard/MP3/sample.mp3. Other urls should work. If the file
- * exists and is playable, this will return a true otherwise it will return a false.
- * 
- * <br>
- * If play=true, then the media file will play immediately, otherwise it will wait for a
- * {@link #mediaPlayStart mediaPlayerStart} command.
- * 
- * <br>
- * When done with the resource, use {@link #mediaPlayClose mediaPlayClose}
- * 
- * <br>
- * You can get information about the loaded media with {@link #mediaPlayInfo mediaPlayInfo} This
- * returns a map with the following elements:
- * <ul>
- * <li>"tag" - user supplied tag identifying this mediaPlayer.
- * <li>"loaded" - true if loaded, false if not. If false, no other elements are returned.
- * <li>"duration" - length of the media in milliseconds.
- * <li>"position" - current position of playback in milliseconds. Controlled by
- * {@link #mediaPlaySeek mediaPlaySeek}
- * <li>"isplaying" - shows whether media is playing. Controlled by {@link #mediaPlayPause
- * mediaPlayPause} and {@link #mediaPlayStart mediaPlayStart}
- * <li>"url" - the url used to open this media.
- * <li>"looping" - whether media will loop. Controlled by {@link #mediaPlaySetLooping
- * mediaPlaySetLooping}
- * </ul>
- * <br>
- * You can use {@link #mediaPlayList mediaPlayList} to get a list of the loaded tags. <br>
- * {@link #mediaIsPlaying mediaIsPlaying} will return true if the media is playing.<br>
- * 
- * <b>Events:</b><br>
- * A playing media will throw a <b>"media"</b> event on completion.
- * 
- * NB: In remote mode, a media file will continue playing after the script has finished unless an
- * explicit {@link #mediaPlayClose mediaPlayClose} event is called.
- * 
- * @author Robbie Matthews (rjmatthews62@gmail.com)
- */
-
-public class MediaPlayerFacade extends RpcReceiver implements MediaPlayer.OnCompletionListener {
-
-  private final Service mService;
-  static private final Map<String, MediaPlayer> mPlayers = new Hashtable<String, MediaPlayer>();
-  static private final Map<String, String> mUrls = new Hashtable<String, String>();
-
-  private final EventFacade mEventFacade;
-
-  public MediaPlayerFacade(FacadeManager manager) {
-    super(manager);
-    mService = manager.getService();
-    mEventFacade = manager.getReceiver(EventFacade.class);
-  }
-
-  private String getDefault(String tag) {
-    return (tag == null || tag.equals("")) ? "default" : tag;
-  }
-
-  private MediaPlayer getPlayer(String tag) {
-    tag = getDefault(tag);
-    return mPlayers.get(tag);
-  }
-
-  private String getUrl(String tag) {
-    tag = getDefault(tag);
-    return mUrls.get(tag);
-  }
-
-  private void putMp(String tag, MediaPlayer player, String url) {
-    tag = getDefault(tag);
-    mPlayers.put(tag, player);
-    mUrls.put(tag, url);
-  }
-
-  private void removeMp(String tag) {
-    tag = getDefault(tag);
-    MediaPlayer player = mPlayers.get(tag);
-    if (player != null) {
-      player.stop();
-      player.release();
-    }
-    mPlayers.remove(tag);
-    mUrls.remove(tag);
-  }
-
-  @Rpc(description = "Open a media file", returns = "true if play successful")
-  public synchronized boolean mediaPlay(
-      @RpcParameter(name = "url", description = "url of media resource") String url,
-      @RpcParameter(name = "tag", description = "string identifying resource") @RpcDefault(value = "default") String tag,
-      @RpcParameter(name = "play", description = "start playing immediately") @RpcDefault(value = "true") Boolean play) {
-    removeMp(tag);
-    MediaPlayer player = getPlayer(tag);
-    player = MediaPlayer.create(mService, Uri.parse(url));
-    if (player != null) {
-      putMp(tag, player, url);
-      player.setOnCompletionListener(this);
-      if (play) {
-        player.start();
-      }
-    }
-    return player != null;
-  }
-
-  @Rpc(description = "pause playing media file", returns = "true if successful")
-  public synchronized boolean mediaPlayPause(
-      @RpcParameter(name = "tag", description = "string identifying resource") @RpcDefault(value = "default") String tag) {
-    MediaPlayer player = getPlayer(tag);
-    if (player == null) {
-      return false;
-    }
-    player.pause();
-    return true;
-  }
-
-  @Rpc(description = "start playing media file", returns = "true if successful")
-  public synchronized boolean mediaPlayStart(
-      @RpcParameter(name = "tag", description = "string identifying resource") @RpcDefault(value = "default") String tag) {
-    MediaPlayer player = getPlayer(tag);
-    if (player == null) {
-      return false;
-    }
-    player.start();
-    return mediaIsPlaying(tag);
-  }
-
-  @Rpc(description = "Close media file", returns = "true if successful")
-  public synchronized boolean mediaPlayClose(
-      @RpcParameter(name = "tag", description = "string identifying resource") @RpcDefault(value = "default") String tag) {
-    removeMp(tag);
-    return true;
-  }
-
-  @Rpc(description = "Checks if media file is playing.", returns = "true if playing")
-  public synchronized boolean mediaIsPlaying(
-      @RpcParameter(name = "tag", description = "string identifying resource") @RpcDefault(value = "default") String tag) {
-    MediaPlayer player = getPlayer(tag);
-    return (player == null) ? false : player.isPlaying();
-  }
-
-  @Rpc(description = "Information on current media", returns = "Media Information")
-  public synchronized Map<String, Object> mediaPlayInfo(
-      @RpcParameter(name = "tag", description = "string identifying resource") @RpcDefault(value = "default") String tag) {
-    Map<String, Object> result = new HashMap<String, Object>();
-    MediaPlayer player = getPlayer(tag);
-    result.put("tag", getDefault(tag));
-    if (player == null) {
-      result.put("loaded", false);
-    } else {
-      result.put("loaded", true);
-      result.put("duration", player.getDuration());
-      result.put("position", player.getCurrentPosition());
-      result.put("isplaying", player.isPlaying());
-      result.put("url", getUrl(tag));
-      result.put("looping", player.isLooping());
-    }
-    return result;
-  }
-
-  @Rpc(description = "Lists currently loaded media", returns = "List of Media Tags")
-  public Set<String> mediaPlayList() {
-    return mPlayers.keySet();
-  }
-
-  @Rpc(description = "Set Looping", returns = "True if successful")
-  public synchronized boolean mediaPlaySetLooping(
-      @RpcParameter(name = "enabled") @RpcDefault(value = "true") Boolean enabled,
-      @RpcParameter(name = "tag", description = "string identifying resource") @RpcDefault(value = "default") String tag) {
-    MediaPlayer player = getPlayer(tag);
-    if (player == null) {
-      return false;
-    }
-    player.setLooping(enabled);
-    return true;
-  }
-
-  @Rpc(description = "Seek To Position", returns = "New Position (in ms)")
-  public synchronized int mediaPlaySeek(
-      @RpcParameter(name = "msec", description = "Position in millseconds") Integer msec,
-      @RpcParameter(name = "tag", description = "string identifying resource") @RpcDefault(value = "default") String tag) {
-    MediaPlayer player = getPlayer(tag);
-    if (player == null) {
-      return 0;
-    }
-    player.seekTo(msec);
-    return player.getCurrentPosition();
-  }
-
-  @Override
-  public synchronized void shutdown() {
-    for (String key : mPlayers.keySet()) {
-      MediaPlayer player = mPlayers.get(key);
-      if (player != null) {
-        player.stop();
-        player.release();
-        player = null;
-      }
-    }
-    mPlayers.clear();
-    mUrls.clear();
-  }
-
-  @Override
-  public void onCompletion(MediaPlayer player) {
-    String tag = getTag(player);
-    if (tag != null) {
-      Map<String, Object> data = new HashMap<String, Object>();
-      data.put("action", "complete");
-      data.put("tag", tag);
-      mEventFacade.postEvent("media", data);
-    }
-  }
-
-  private String getTag(MediaPlayer player) {
-    for (Entry<String, MediaPlayer> m : mPlayers.entrySet()) {
-      if (m.getValue() == player) {
-        return m.getKey();
-      }
-    }
-    return null;
-  }
-}
diff --git a/src/com/googlecode/android_scripting/facade/MediaRecorderFacade.java b/src/com/googlecode/android_scripting/facade/MediaRecorderFacade.java
deleted file mode 100644
index e83e5e01..00000000
--- a/src/com/googlecode/android_scripting/facade/MediaRecorderFacade.java
+++ /dev/null
@@ -1,283 +0,0 @@
-/*
- * Copyright (C) 2009 Google Inc.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.facade;
-
-import android.app.Service;
-import android.content.Intent;
-import android.media.MediaRecorder;
-import android.net.Uri;
-import android.provider.MediaStore;
-import android.view.SurfaceHolder;
-import android.view.SurfaceHolder.Callback;
-import android.view.SurfaceView;
-import android.view.WindowManager;
-
-import com.googlecode.android_scripting.FutureActivityTaskExecutor;
-import com.googlecode.android_scripting.Log;
-import com.googlecode.android_scripting.future.FutureActivityTask;
-import com.googlecode.android_scripting.jsonrpc.RpcReceiver;
-import com.googlecode.android_scripting.rpc.Rpc;
-import com.googlecode.android_scripting.rpc.RpcDefault;
-import com.googlecode.android_scripting.rpc.RpcOptional;
-import com.googlecode.android_scripting.rpc.RpcParameter;
-
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-import com.hipipal.sl4alib.MNApp;
-/**
- * A facade for recording media.
- * 
- * Guidance notes: Use e.g. '/sdcard/file.ext' for your media destination file. A file extension of
- * mpg will use the default settings for format and codec (often h263 which won't work with common
- * PC media players). A file extension of mp4 or 3gp will use the appropriate format with the (more
- * common) h264 codec. A video player such as QQPlayer (from the android market) plays both codecs
- * and uses the composition matrix (embedded in the video file) to correct for image rotation. Many
- * PC based media players ignore this matrix. Standard video sizes may be specified.
- * 
- * @author Felix Arends (felix.arends@gmail.com)
- * @author Damon Kohler (damonkohler@gmail.com)
- * @author John Karwatzki (jokar49@gmail.com)
- */
-public class MediaRecorderFacade extends RpcReceiver {
-
-  private final MediaRecorder mMediaRecorder = new MediaRecorder();
-  private final Service mService;
-
-  public MediaRecorderFacade(FacadeManager manager) {
-    super(manager);
-    mService = manager.getService();
-  }
-
-  @Rpc(description = "Records audio from the microphone and saves it to the given location.")
-  public void recorderStartMicrophone(@RpcParameter(name = "targetPath") String targetPath)
-      throws IOException {
-    startAudioRecording(targetPath, MediaRecorder.AudioSource.MIC);
-  }
-
-  @Rpc(description = "Records video from the camera and saves it to the given location. "
-      + "\nDuration specifies the maximum duration of the recording session. "
-      + "\nIf duration is 0 this method will return and the recording will only be stopped "
-      + "\nwhen recorderStop is called or when a scripts exits. "
-      + "\nOtherwise it will block for the time period equal to the duration argument."
-      + "\nvideoSize: 0=160x120, 1=320x240, 2=352x288, 3=640x480, 4=800x480.")
-  public void recorderStartVideo(@RpcParameter(name = "targetPath") String targetPath,
-      @RpcParameter(name = "duration") @RpcDefault("0") Integer duration,
-      @RpcParameter(name = "videoSize") @RpcDefault("1") Integer videoSize) throws Exception {
-    int ms = convertSecondsToMilliseconds(duration);
-    startVideoRecording(new File(targetPath), ms, videoSize);
-  }
-
-  private void startVideoRecording(File file, int milliseconds, int videoSize) throws Exception {
-    mMediaRecorder.setVideoSource(MediaRecorder.VideoSource.CAMERA);
-
-    int audioSource = MediaRecorder.AudioSource.MIC;
-    try {
-      Field source = Class.forName("android.media.MediaRecorder$AudioSource").getField("CAMCORDER");
-      source.getInt(null);
-    } catch (Exception e) {
-      Log.e(e);
-    }
-    int xSize;
-    int ySize;
-    switch (videoSize) {
-    case 0:
-      xSize = 160;
-      ySize = 120;
-      break;
-    case 1:
-      xSize = 320;
-      ySize = 240;
-      break;
-    case 2:
-      xSize = 352;
-      ySize = 288;
-      break;
-    case 3:
-      xSize = 640;
-      ySize = 480;
-      break;
-    case 4:
-      xSize = 800;
-      ySize = 480;
-      break;
-    default:
-      xSize = 320;
-      ySize = 240;
-      break;
-    }
-
-    mMediaRecorder.setAudioSource(audioSource);
-    String extension = file.toString().split("\\.")[1];
-    if (extension.equals("mp4")) {
-      mMediaRecorder.setOutputFormat(MediaRecorder.OutputFormat.MPEG_4);
-      mMediaRecorder.setAudioEncoder(MediaRecorder.AudioEncoder.AMR_NB);
-      mMediaRecorder.setVideoSize(xSize, ySize);
-      mMediaRecorder.setVideoEncoder(MediaRecorder.VideoEncoder.H264);
-    } else if (extension.equals("3gp")) {
-      mMediaRecorder.setOutputFormat(MediaRecorder.OutputFormat.THREE_GPP);
-      mMediaRecorder.setAudioEncoder(MediaRecorder.AudioEncoder.AMR_NB);
-      mMediaRecorder.setVideoSize(xSize, ySize);
-      mMediaRecorder.setVideoEncoder(MediaRecorder.VideoEncoder.H264);
-    } else {
-
-      mMediaRecorder.setOutputFormat(MediaRecorder.OutputFormat.DEFAULT);
-      mMediaRecorder.setAudioEncoder(MediaRecorder.AudioEncoder.DEFAULT);
-      mMediaRecorder.setVideoSize(xSize, ySize);
-      mMediaRecorder.setVideoEncoder(MediaRecorder.VideoEncoder.DEFAULT);
-    }
-
-    mMediaRecorder.setOutputFile(file.getAbsolutePath());
-    if (milliseconds > 0) {
-      mMediaRecorder.setMaxDuration(milliseconds);
-    }
-    FutureActivityTask<Exception> prepTask = prepare();
-    mMediaRecorder.start();
-    if (milliseconds > 0) {
-      new CountDownLatch(1).await(milliseconds, TimeUnit.MILLISECONDS);
-    }
-    prepTask.finish();
-  }
-
-  @Rpc(description = "Records video (and optionally audio) from the camera and saves it to the given location. "
-      + "\nDuration specifies the maximum duration of the recording session. "
-      + "\nIf duration is not provided this method will return immediately and the recording will only be stopped "
-      + "\nwhen recorderStop is called or when a scripts exits. "
-      + "\nOtherwise it will block for the time period equal to the duration argument.")
-  public void recorderCaptureVideo(@RpcParameter(name = "targetPath") String targetPath,
-      @RpcParameter(name = "duration") @RpcOptional Integer duration,
-      @RpcParameter(name = "recordAudio") @RpcDefault("true") Boolean recordAudio) throws Exception {
-    int ms = convertSecondsToMilliseconds(duration);
-    startVideoRecording(new File(targetPath), ms, recordAudio);
-  }
-
-  private void startVideoRecording(File file, int milliseconds, boolean withAudio) throws Exception {
-    mMediaRecorder.setVideoSource(MediaRecorder.VideoSource.CAMERA);
-    if (withAudio) {
-      int audioSource = MediaRecorder.AudioSource.MIC;
-      try {
-        Field source =
-            Class.forName("android.media.MediaRecorder$AudioSource").getField("CAMCORDER");
-        audioSource = source.getInt(null);
-      } catch (Exception e) {
-        Log.e(e);
-      }
-      mMediaRecorder.setAudioSource(audioSource);
-      mMediaRecorder.setOutputFormat(MediaRecorder.OutputFormat.DEFAULT);
-      mMediaRecorder.setAudioEncoder(MediaRecorder.AudioEncoder.DEFAULT);
-    } else {
-      mMediaRecorder.setOutputFormat(MediaRecorder.OutputFormat.DEFAULT);
-    }
-    mMediaRecorder.setVideoEncoder(MediaRecorder.VideoEncoder.DEFAULT);
-    mMediaRecorder.setOutputFile(file.getAbsolutePath());
-    if (milliseconds > 0) {
-      mMediaRecorder.setMaxDuration(milliseconds);
-    }
-    FutureActivityTask<Exception> prepTask = prepare();
-    mMediaRecorder.start();
-    if (milliseconds > 0) {
-      new CountDownLatch(1).await(milliseconds, TimeUnit.MILLISECONDS);
-    }
-    prepTask.finish();
-  }
-
-  private void startAudioRecording(String targetPath, int source) throws IOException {
-    mMediaRecorder.setAudioSource(source);
-    mMediaRecorder.setOutputFormat(MediaRecorder.OutputFormat.DEFAULT);
-    mMediaRecorder.setAudioEncoder(MediaRecorder.AudioEncoder.DEFAULT);
-    mMediaRecorder.setOutputFile(targetPath);
-    mMediaRecorder.prepare();
-    mMediaRecorder.start();
-  }
-
-  @Rpc(description = "Stops a previously started recording.")
-  public void recorderStop() {
-    mMediaRecorder.stop();
-    mMediaRecorder.reset();
-  }
-
-  @Rpc(description = "Starts the video capture application to record a video and saves it to the specified path.")
-  public void startInteractiveVideoRecording(@RpcParameter(name = "path") final String path) {
-    Intent intent = new Intent(MediaStore.ACTION_VIDEO_CAPTURE);
-    File file = new File(path);
-    intent.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(file));
-    AndroidFacade facade = mManager.getReceiver(AndroidFacade.class);
-    facade.startActivityForResult(intent);
-  }
-
-  @Override
-  public void shutdown() {
-    mMediaRecorder.release();
-  }
-
-  // TODO(damonkohler): This shares a lot of code with the CameraFacade. It's probably worth moving
-  // it there.
-  private FutureActivityTask<Exception> prepare() throws Exception {
-    FutureActivityTask<Exception> task = new FutureActivityTask<Exception>() {
-      @SuppressWarnings("deprecation")
-	@Override
-      public void onCreate() {
-        super.onCreate();
-        final SurfaceView view = new SurfaceView(getActivity());
-        getActivity().setContentView(view);
-        getActivity().getWindow().setSoftInputMode(
-            WindowManager.LayoutParams.SOFT_INPUT_STATE_UNCHANGED);
-        view.getHolder().setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
-        view.getHolder().addCallback(new Callback() {
-          @Override
-          public void surfaceDestroyed(SurfaceHolder holder) {
-          }
-
-          @Override
-          public void surfaceCreated(SurfaceHolder holder) {
-            try {
-              mMediaRecorder.setPreviewDisplay(view.getHolder().getSurface());
-              mMediaRecorder.prepare();
-              setResult(null);
-            } catch (IOException e) {
-              setResult(e);
-            }
-          }
-
-          @Override
-          public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
-          }
-        });
-      }
-    };
-
-    FutureActivityTaskExecutor taskExecutor =
-        ((MNApp) mService.getApplication()).getTaskExecutor();
-    taskExecutor.execute(task);
-
-    Exception e = task.getResult();
-    if (e != null) {
-      throw e;
-    }
-    return task;
-  }
-
-  private int convertSecondsToMilliseconds(Integer seconds) {
-    if (seconds == null) {
-      return 0;
-    }
-    return (int) (seconds * 1000L);
-  }
-}
diff --git a/src/com/googlecode/android_scripting/facade/MjpegServer.java b/src/com/googlecode/android_scripting/facade/MjpegServer.java
deleted file mode 100644
index a79c1ffe..00000000
--- a/src/com/googlecode/android_scripting/facade/MjpegServer.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.facade;
-
-import java.io.OutputStream;
-import java.net.Socket;
-
-import com.googlecode.android_scripting.SimpleServer;
-
-class MjpegServer extends SimpleServer {
-
-  private final JpegProvider mProvider;
-
-  public MjpegServer(JpegProvider provider) {
-    mProvider = provider;
-  }
-
-  @Override
-  protected void handleConnection(Socket socket) throws Exception {
-    byte[] data = mProvider.getJpeg();
-    if (data == null) {
-      return;
-    }
-    OutputStream outputStream = socket.getOutputStream();
-    outputStream.write((
-        "HTTP/1.0 200 OK\r\n" +
-        "Server: SL4A\r\n" +
-        "Connection: close\r\n" +
-        "Max-Age: 0\r\n" +
-        "Expires: 0\r\n" +
-        "Cache-Control: no-cache, private\r\n" + 
-        "Pragma: no-cache\r\n" + 
-        "Content-Type: multipart/x-mixed-replace; boundary=--BoundaryString\r\n\r\n").getBytes());
-    while (true) {
-      data = mProvider.getJpeg();
-      if (data == null) {
-        return;
-      }
-      outputStream.write("--BoundaryString\r\n".getBytes());
-      outputStream.write("Content-type: image/jpg\r\n".getBytes());
-      outputStream.write(("Content-Length: " + data.length + "\r\n\r\n").getBytes());
-      outputStream.write(data);
-      outputStream.write("\r\n\r\n".getBytes());
-      outputStream.flush();
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/com/googlecode/android_scripting/facade/PhoneFacade.java b/src/com/googlecode/android_scripting/facade/PhoneFacade.java
deleted file mode 100644
index f6e52334..00000000
--- a/src/com/googlecode/android_scripting/facade/PhoneFacade.java
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.facade;
-
-import android.app.Service;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.Bundle;
-import android.provider.Contacts.PhonesColumns;
-import android.telephony.CellLocation;
-import android.telephony.NeighboringCellInfo;
-import android.telephony.PhoneStateListener;
-import android.telephony.TelephonyManager;
-
-import com.googlecode.android_scripting.MainThread;
-import com.googlecode.android_scripting.jsonrpc.RpcReceiver;
-import com.googlecode.android_scripting.rpc.Rpc;
-import com.googlecode.android_scripting.rpc.RpcParameter;
-import com.googlecode.android_scripting.rpc.RpcStartEvent;
-import com.googlecode.android_scripting.rpc.RpcStopEvent;
-
-import java.io.UnsupportedEncodingException;
-import java.lang.reflect.Field;
-import java.net.URLEncoder;
-import java.util.List;
-import java.util.concurrent.Callable;
-
-/**
- * Exposes TelephonyManager functionality.
- * 
- * @author Damon Kohler (damonkohler@gmail.com)
- * @author Felix Arends (felix.arends@gmail.com)
- */
-@SuppressWarnings("deprecation")
-public class PhoneFacade extends RpcReceiver {
-
-  private final AndroidFacade mAndroidFacade;
-  private final EventFacade mEventFacade;
-  private final TelephonyManager mTelephonyManager;
-  private final Bundle mPhoneState;
-  private final Service mService;
-  private PhoneStateListener mPhoneStateListener;
-
-  public PhoneFacade(FacadeManager manager) {
-    super(manager);
-    mService = manager.getService();
-    mTelephonyManager = (TelephonyManager) mService.getSystemService(Context.TELEPHONY_SERVICE);
-    mAndroidFacade = manager.getReceiver(AndroidFacade.class);
-    mEventFacade = manager.getReceiver(EventFacade.class);
-    mPhoneState = new Bundle();
-    mPhoneStateListener = MainThread.run(mService, new Callable<PhoneStateListener>() {
-      @Override
-      public PhoneStateListener call() throws Exception {
-        return new PhoneStateListener() {
-          @Override
-          public void onCallStateChanged(int state, String incomingNumber) {
-            mPhoneState.putString("incomingNumber", incomingNumber);
-            switch (state) {
-            case TelephonyManager.CALL_STATE_IDLE:
-              mPhoneState.putString("state", "idle");
-              break;
-            case TelephonyManager.CALL_STATE_OFFHOOK:
-              mPhoneState.putString("state", "offhook");
-              break;
-            case TelephonyManager.CALL_STATE_RINGING:
-              mPhoneState.putString("state", "ringing");
-              break;
-            }
-            mEventFacade.postEvent("phone", mPhoneState.clone());
-          }
-        };
-      }
-    });
-  }
-
-  @Override
-  public void shutdown() {
-    stopTrackingPhoneState();
-  }
-
-  @Rpc(description = "Starts tracking phone state.")
-  @RpcStartEvent("phone")
-  public void startTrackingPhoneState() {
-    mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_CALL_STATE);
-  }
-
-  @Rpc(description = "Returns the current phone state and incoming number.", returns = "A Map of \"state\" and \"incomingNumber\"")
-  public Bundle readPhoneState() {
-    return mPhoneState;
-  }
-
-  @Rpc(description = "Stops tracking phone state.")
-  @RpcStopEvent("phone")
-  public void stopTrackingPhoneState() {
-    mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE);
-  }
-
-  @Rpc(description = "Calls a contact/phone number by URI.")
-  public void phoneCall(@RpcParameter(name = "uri") final String uriString) throws Exception {
-    Uri uri = Uri.parse(uriString);
-    if (uri.getScheme().equals("content")) {
-      String phoneNumberColumn = PhonesColumns.NUMBER;
-      String selectWhere = null;
-      if ((FacadeManager.class.cast(mManager)).getSdkLevel() >= 5) {
-        Class<?> contactsContract_Data_class =
-            Class.forName("android.provider.ContactsContract$Data");
-        Field RAW_CONTACT_ID_field = contactsContract_Data_class.getField("RAW_CONTACT_ID");
-        selectWhere = RAW_CONTACT_ID_field.get(null).toString() + "=" + uri.getLastPathSegment();
-        Field CONTENT_URI_field = contactsContract_Data_class.getField("CONTENT_URI");
-        uri = Uri.parse(CONTENT_URI_field.get(null).toString());
-        Class<?> ContactsContract_CommonDataKinds_Phone_class =
-            Class.forName("android.provider.ContactsContract$CommonDataKinds$Phone");
-        Field NUMBER_field = ContactsContract_CommonDataKinds_Phone_class.getField("NUMBER");
-        phoneNumberColumn = NUMBER_field.get(null).toString();
-      }
-      ContentResolver resolver = mService.getContentResolver();
-      Cursor c = resolver.query(uri, new String[] { phoneNumberColumn }, selectWhere, null, null);
-      String number = "";
-      if (c.moveToFirst()) {
-        number = c.getString(c.getColumnIndexOrThrow(phoneNumberColumn));
-      }
-      c.close();
-      phoneCallNumber(number);
-    } else {
-      mAndroidFacade.startActivity(Intent.ACTION_CALL, uriString, null, null, null, null, null);
-    }
-  }
-
-  @Rpc(description = "Calls a phone number.")
-  public void phoneCallNumber(@RpcParameter(name = "phone number") final String number)
-      throws Exception {
-    phoneCall("tel:" + URLEncoder.encode(number, "ASCII"));
-  }
-
-  @Rpc(description = "Dials a contact/phone number by URI.")
-  public void phoneDial(@RpcParameter(name = "uri") final String uri) throws Exception {
-    mAndroidFacade.startActivity(Intent.ACTION_DIAL, uri, null, null, null, null, null);
-  }
-
-  @Rpc(description = "Dials a phone number.")
-  public void phoneDialNumber(@RpcParameter(name = "phone number") final String number)
-      throws Exception, UnsupportedEncodingException {
-    phoneDial("tel:" + URLEncoder.encode(number, "ASCII"));
-  }
-
-  @Rpc(description = "Returns the current cell location.")
-  public CellLocation getCellLocation() {
-    return mTelephonyManager.getCellLocation();
-  }
-
-  @Rpc(description = "Returns the numeric name (MCC+MNC) of current registered operator.")
-  public String getNetworkOperator() {
-    return mTelephonyManager.getNetworkOperator();
-  }
-
-  @Rpc(description = "Returns the alphabetic name of current registered operator.")
-  public String getNetworkOperatorName() {
-    return mTelephonyManager.getNetworkOperatorName();
-  }
-
-  @Rpc(description = "Returns a the radio technology (network type) currently in use on the device.")
-  public String getNetworkType() {
-    // TODO(damonkohler): API level 5 has many more types.
-    switch (mTelephonyManager.getNetworkType()) {
-    case TelephonyManager.NETWORK_TYPE_EDGE:
-      return "edge";
-    case TelephonyManager.NETWORK_TYPE_GPRS:
-      return "gprs";
-    case TelephonyManager.NETWORK_TYPE_UMTS:
-      return "umts";
-    case TelephonyManager.NETWORK_TYPE_UNKNOWN:
-      return "unknown";
-    default:
-      return null;
-    }
-  }
-
-  @Rpc(description = "Returns the device phone type.")
-  public String getPhoneType() {
-    // TODO(damonkohler): API level 4 includes CDMA.
-    switch (mTelephonyManager.getPhoneType()) {
-    case TelephonyManager.PHONE_TYPE_GSM:
-      return "gsm";
-    case TelephonyManager.PHONE_TYPE_NONE:
-      return "none";
-    default:
-      return null;
-    }
-  }
-
-  @Rpc(description = "Returns the ISO country code equivalent for the SIM provider's country code.")
-  public String getSimCountryIso() {
-    return mTelephonyManager.getSimCountryIso();
-  }
-
-  @Rpc(description = "Returns the MCC+MNC (mobile country code + mobile network code) of the provider of the SIM. 5 or 6 decimal digits.")
-  public String getSimOperator() {
-    return mTelephonyManager.getSimOperator();
-  }
-
-  @Rpc(description = "Returns the Service Provider Name (SPN).")
-  public String getSimOperatorName() {
-    return mTelephonyManager.getSimOperatorName();
-  }
-
-  @Rpc(description = "Returns the serial number of the SIM, if applicable. Return null if it is unavailable.")
-  public String getSimSerialNumber() {
-    return mTelephonyManager.getSimSerialNumber();
-  }
-
-  @Rpc(description = "Returns the state of the device SIM card.")
-  public String getSimState() {
-    switch (mTelephonyManager.getSimState()) {
-    case TelephonyManager.SIM_STATE_UNKNOWN:
-      return "uknown";
-    case TelephonyManager.SIM_STATE_ABSENT:
-      return "absent";
-    case TelephonyManager.SIM_STATE_PIN_REQUIRED:
-      return "pin_required";
-    case TelephonyManager.SIM_STATE_PUK_REQUIRED:
-      return "puk_required";
-    case TelephonyManager.SIM_STATE_NETWORK_LOCKED:
-      return "network_locked";
-    case TelephonyManager.SIM_STATE_READY:
-      return "ready";
-    default:
-      return null;
-    }
-  }
-
-  @Rpc(description = "Returns the unique subscriber ID, for example, the IMSI for a GSM phone. Return null if it is unavailable.")
-  public String getSubscriberId() {
-    return mTelephonyManager.getSubscriberId();
-  }
-
-  @Rpc(description = "Retrieves the alphabetic identifier associated with the voice mail number.")
-  public String getVoiceMailAlphaTag() {
-    return mTelephonyManager.getVoiceMailAlphaTag();
-  }
-
-  @Rpc(description = "Returns the voice mail number. Return null if it is unavailable.")
-  public String getVoiceMailNumber() {
-    return mTelephonyManager.getVoiceMailNumber();
-  }
-
-  @Rpc(description = "Returns true if the device is considered roaming on the current network, for GSM purposes.")
-  public Boolean checkNetworkRoaming() {
-    return mTelephonyManager.isNetworkRoaming();
-  }
-
-  @Rpc(description = "Returns the unique device ID, for example, the IMEI for GSM and the MEID for CDMA phones. Return null if device ID is not available.")
-  public String getDeviceId() {
-    return mTelephonyManager.getDeviceId();
-  }
-
-  @Rpc(description = "Returns the software version number for the device, for example, the IMEI/SV for GSM phones. Return null if the software version is not available.")
-  public String getDeviceSoftwareVersion() {
-    return mTelephonyManager.getDeviceSoftwareVersion();
-  }
-
-  @Rpc(description = "Returns the phone number string for line 1, for example, the MSISDN for a GSM phone. Return null if it is unavailable.")
-  public String getLine1Number() {
-    return mTelephonyManager.getLine1Number();
-  }
-
-  @Rpc(description = "Returns the neighboring cell information of the device.")
-  public List<NeighboringCellInfo> getNeighboringCellInfo() {
-    return mTelephonyManager.getNeighboringCellInfo();
-  }
-}
diff --git a/src/com/googlecode/android_scripting/facade/PreferencesFacade.java b/src/com/googlecode/android_scripting/facade/PreferencesFacade.java
deleted file mode 100644
index dd788f8e..00000000
--- a/src/com/googlecode/android_scripting/facade/PreferencesFacade.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package com.googlecode.android_scripting.facade;
-
-import android.app.Service;
-import android.content.SharedPreferences;
-import android.content.SharedPreferences.Editor;
-import android.preference.PreferenceManager;
-
-import com.googlecode.android_scripting.jsonrpc.RpcReceiver;
-import com.googlecode.android_scripting.rpc.Rpc;
-import com.googlecode.android_scripting.rpc.RpcOptional;
-import com.googlecode.android_scripting.rpc.RpcParameter;
-
-import java.io.IOException;
-import java.util.Map;
-
-/**
- * This facade allows access to the Preferences interface.
- * 
- * <br>
- * <b>Notes:</b> <br>
- * <b>filename</b> - Filename indicates which preference file to refer to. If no filename is
- * supplied (the default) then the SharedPreferences uses is the default for the SL4A application.<br>
- * <b>prefPutValue</b> - uses "MODE_PRIVATE" when writing to preferences. Save values to the default
- * shared preferences is explicitly disallowed.<br>
- * <br>
- * See <a
- * href=http://developer.android.com/reference/java/util/prefs/Preferences.html>Preferences</a> and
- * <a href=http://developer.android.com/guide/topics/data/data-storage.html#pref>Shared
- * Preferences</a> in the android documentation on how preferences work.
- * 
- * @author Robbie Matthews (rjmatthews62@gmail.com)
- */
-
-public class PreferencesFacade extends RpcReceiver {
-
-  private Service mService;
-
-  public PreferencesFacade(FacadeManager manager) {
-    super(manager);
-    mService = manager.getService();
-  }
-
-  @Rpc(description = "Read a value from shared preferences")
-  public Object prefGetValue(
-      @RpcParameter(name = "key") String key,
-      @RpcParameter(name = "filename", description = "Desired preferences file. If not defined, uses the default Shared Preferences.") @RpcOptional String filename) {
-    SharedPreferences p = getPref(filename);
-    return p.getAll().get(key);
-  }
-
-  @Rpc(description = "Write a value to shared preferences")
-  public void prefPutValue(
-      @RpcParameter(name = "key") String key,
-      @RpcParameter(name = "value") Object value,
-      @RpcParameter(name = "filename", description = "Desired preferences file. If not defined, uses the default Shared Preferences.") @RpcOptional String filename)
-      throws IOException {
-    if (filename == null || filename.equals("")) {
-      throw new IOException("Can't write to default preferences.");
-    }
-    SharedPreferences p = getPref(filename);
-    Editor e = p.edit();
-    if (value instanceof Boolean) {
-      e.putBoolean(key, (Boolean) value);
-    } else if (value instanceof Long) {
-      e.putLong(key, (Long) value);
-    } else if (value instanceof Integer) {
-      e.putLong(key, (Integer) value);
-    } else if (value instanceof Float) {
-      e.putFloat(key, (Float) value);
-    } else if (value instanceof Double) { // TODO: Not sure if this is a good idea
-      e.putFloat(key, ((Double) value).floatValue());
-    } else {
-      e.putString(key, value.toString());
-    }
-    e.commit();
-  }
-
-  @Rpc(description = "Get list of Shared Preference Values", returns = "Map of key,value")
-  public Map<String, ?> prefGetAll(
-      @RpcParameter(name = "filename", description = "Desired preferences file. If not defined, uses the default Shared Preferences.") @RpcOptional String filename) {
-    return getPref(filename).getAll();
-  }
-
-  private SharedPreferences getPref(String filename) {
-    if (filename == null || filename.equals("")) {
-      return PreferenceManager.getDefaultSharedPreferences(mService);
-    }
-    return mService.getSharedPreferences(filename, 0);
-
-  }
-
-  @Override
-  public void shutdown() {
-
-  }
-}
diff --git a/src/com/googlecode/android_scripting/facade/QPyInterfaceFacade.java b/src/com/googlecode/android_scripting/facade/QPyInterfaceFacade.java
deleted file mode 100644
index e0c57e54..00000000
--- a/src/com/googlecode/android_scripting/facade/QPyInterfaceFacade.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.googlecode.android_scripting.facade;
-
-import android.app.Service;
-import android.content.Context;
-import android.content.Intent;
-import android.net.wifi.ScanResult;
-import android.net.wifi.WifiInfo;
-import android.net.wifi.WifiManager;
-import android.net.wifi.WifiManager.WifiLock;
-import android.os.Bundle;
-
-import com.googlecode.android_scripting.jsonrpc.RpcReceiver;
-import com.googlecode.android_scripting.jsonrpc.RpcReceiverManager;
-import com.googlecode.android_scripting.rpc.Rpc;
-import com.googlecode.android_scripting.rpc.RpcOptional;
-import com.googlecode.android_scripting.rpc.RpcParameter;
-import com.zuowuxuxi.util.NAction;
-import com.zuowuxuxi.util.NUtil;
-
-import java.util.List;
-
-/**
- * Wifi functions.
- * 
- */
-public class QPyInterfaceFacade extends RpcReceiver {
-	  private final Service mService;
-
-	public QPyInterfaceFacade(FacadeManager manager) {
-		super(manager);
-	    mService = manager.getService();
-	    
-	}
-
-	@Override
-	public void shutdown() {
-		// TODO Auto-generated method stub
-	}
-	
-	@Rpc(description = "Execute QPython script throught SL4A", returns = "True if the operation succeeded.")
-	public Boolean executeQPy(@RpcParameter(name = "QPython script path")  @RpcOptional String path) {
-		
-    	String extPlgPlusName = com.zuowuxuxi.config.CONF.EXT_PLG_PLUS;
-
-		//if (NUtil.checkAppInstalledByName(mService.getApplicationContext(), extPlgPlusName)) {
-		Intent intent = new Intent();
-		intent.setClassName(extPlgPlusName, extPlgPlusName+".MPyApi");
-		intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-		intent.setAction(extPlgPlusName+".action.MPyApi");
-		
-		Bundle mBundle = new Bundle(); 
-		mBundle.putString("app", NAction.getCode(mService.getApplicationContext()));
-		mBundle.putString("act", "onPyApi");
-		mBundle.putString("flag", "SL4A");
-		mBundle.putString("param", "fileapi");
-		mBundle.putString("pyfile", path);
-
-		intent.putExtras(mBundle);
-		
-		mService.getApplicationContext().startActivity(intent);
-
-		//} 
-
-		return true;
-	}
-
-}
\ No newline at end of file
diff --git a/src/com/googlecode/android_scripting/facade/SensorManagerFacade.java b/src/com/googlecode/android_scripting/facade/SensorManagerFacade.java
deleted file mode 100644
index b98f936d..00000000
--- a/src/com/googlecode/android_scripting/facade/SensorManagerFacade.java
+++ /dev/null
@@ -1,496 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.facade;
-
-import android.content.Context;
-import android.hardware.Sensor;
-import android.hardware.SensorEvent;
-import android.hardware.SensorEventListener;
-import android.hardware.SensorManager;
-import android.os.Bundle;
-
-import com.googlecode.android_scripting.jsonrpc.RpcReceiver;
-import com.googlecode.android_scripting.rpc.Rpc;
-import com.googlecode.android_scripting.rpc.RpcDefault;
-import com.googlecode.android_scripting.rpc.RpcDeprecated;
-import com.googlecode.android_scripting.rpc.RpcParameter;
-import com.googlecode.android_scripting.rpc.RpcStartEvent;
-import com.googlecode.android_scripting.rpc.RpcStopEvent;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Exposes the SensorManager related functionality. <br>
- * <br>
- * <b>Guidance notes</b> <br>
- * For reasons of economy the sensors on smart phones are usually low cost and, therefore, low
- * accuracy (usually represented by 10 bit data). The floating point data values obtained from
- * sensor readings have up to 16 decimal places, the majority of which are noise. On many phones the
- * accelerometer is limited (by the phone manufacturer) to a maximum reading of 2g. The magnetometer
- * (which also provides orientation readings) is strongly affected by the presence of ferrous metals
- * and can give large errors in vehicles, on board ship etc.
- * 
- * Following a startSensingTimed(A,B) api call sensor events are entered into the Event Queue (see
- * EventFacade). For the A parameter: 1 = All Sensors, 2 = Accelerometer, 3 = Magnetometer and 4 =
- * Light. The B parameter is the minimum delay between recordings in milliseconds. To avoid
- * duplicate readings the minimum delay should be 20 milliseconds. The light sensor will probably be
- * much slower (taking about 1 second to register a change in light level). Note that if the light
- * level is constant no sensor events will be registered by the light sensor.
- * 
- * Following a startSensingThreshold(A,B,C) api call sensor events greater than a given threshold
- * are entered into the Event Queue. For the A parameter: 1 = Orientation, 2 = Accelerometer, 3 =
- * Magnetometer and 4 = Light. The B parameter is the integer value of the required threshold level.
- * For orientation sensing the integer threshold value is in milliradians. Since orientation events
- * can exceed the threshold value for long periods only crossing and return events are recorded. The
- * C parameter is the required axis (XYZ) of the sensor: 0 = No axis, 1 = X, 2 = Y, 3 = X+Y, 4 = Z,
- * 5= X+Z, 6 = Y+Z, 7 = X+Y+Z. For orientation X = azimuth, Y = pitch and Z = roll. <br>
- * 
- * <br>
- * <b>Example (python)</b>
- * 
- * <pre>
- * import android, time
- * droid = android.Android()
- * droid.startSensingTimed(1, 250)
- * time.sleep(1)
- * s1 = droid.readSensors().result
- * s2 = droid.sensorsGetAccuracy().result
- * s3 = droid.sensorsGetLight().result
- * s4 = droid.sensorsReadAccelerometer().result
- * s5 = droid.sensorsReadMagnetometer().result
- * s6 = droid.sensorsReadOrientation().result
- * droid.stopSensing()
- * </pre>
- * 
- * Returns:<br>
- * s1 = {u'accuracy': 3, u'pitch': -0.47323511242866517, u'xmag': 1.75, u'azimuth':
- * -0.26701245009899138, u'zforce': 8.4718560000000007, u'yforce': 4.2495484000000001, u'time':
- * 1297160391.2820001, u'ymag': -8.9375, u'zmag': -41.0625, u'roll': -0.031366908922791481,
- * u'xforce': 0.23154590999999999}<br>
- * s2 = 3 (Highest accuracy)<br>
- * s3 = None ---(not available on many phones)<br>
- * s4 = [0.23154590999999999, 4.2495484000000001, 8.4718560000000007] ----(x, y, z accelerations)<br>
- * s5 = [1.75, -8.9375, -41.0625] -----(x, y, z magnetic readings)<br>
- * s6 = [-0.26701245009899138, -0.47323511242866517, -0.031366908922791481] ---(azimuth, pitch, roll
- * in radians)<br>
- * 
- * @author Damon Kohler (damonkohler@gmail.com)
- * @author Felix Arends (felix.arends@gmail.com)
- * @author Alexey Reznichenko (alexey.reznichenko@gmail.com)
- * @author Robbie Mathews (rjmatthews62@gmail.com)
- * @author John Karwatzki (jokar49@gmail.com)
- */
-public class SensorManagerFacade extends RpcReceiver {
-  private final EventFacade mEventFacade;
-  private final SensorManager mSensorManager;
-
-  private volatile Bundle mSensorReadings;
-
-  private volatile Integer mAccuracy;
-  private volatile Integer mSensorNumber;
-  private volatile Integer mXAxis = 0;
-  private volatile Integer mYAxis = 0;
-  private volatile Integer mZAxis = 0;
-  private volatile Integer mThreshing = 0;
-  private volatile Integer mThreshOrientation = 0;
-  private volatile Integer mXCrossed = 0;
-  private volatile Integer mYCrossed = 0;
-  private volatile Integer mZCrossed = 0;
-
-  private volatile Float mThreshold;
-  private volatile Float mXForce;
-  private volatile Float mYForce;
-  private volatile Float mZForce;
-
-  private volatile Float mXMag;
-  private volatile Float mYMag;
-  private volatile Float mZMag;
-
-  private volatile Float mLight;
-
-  private volatile Double mAzimuth;
-  private volatile Double mPitch;
-  private volatile Double mRoll;
-
-  private volatile Long mLastTime;
-  private volatile Long mDelayTime;
-
-  private SensorEventListener mSensorListener;
-
-  public SensorManagerFacade(FacadeManager manager) {
-    super(manager);
-    mEventFacade = manager.getReceiver(EventFacade.class);
-    mSensorManager = (SensorManager) manager.getService().getSystemService(Context.SENSOR_SERVICE);
-  }
-
-  @Rpc(description = "Starts recording sensor data to be available for polling.")
-  @RpcStartEvent("sensors")
-  public void startSensingTimed(
-      @RpcParameter(name = "sensorNumber", description = "1 = All, 2 = Accelerometer, 3 = Magnetometer and 4 = Light") Integer sensorNumber,
-      @RpcParameter(name = "delayTime", description = "Minimum time between readings in milliseconds") Integer delayTime) {
-    mSensorNumber = sensorNumber;
-    if (delayTime < 20) {
-      delayTime = 20;
-    }
-    mDelayTime = (long) (delayTime);
-    mLastTime = System.currentTimeMillis();
-    if (mSensorListener == null) {
-      mSensorListener = new SensorValuesCollector();
-      mSensorReadings = new Bundle();
-      switch (mSensorNumber) {
-      case 1:
-        for (Sensor sensor : mSensorManager.getSensorList(Sensor.TYPE_ALL)) {
-          mSensorManager.registerListener(mSensorListener, sensor,
-              SensorManager.SENSOR_DELAY_FASTEST);
-        }
-        break;
-      case 2:
-        for (Sensor sensor : mSensorManager.getSensorList(Sensor.TYPE_ACCELEROMETER)) {
-          mSensorManager.registerListener(mSensorListener, sensor,
-              SensorManager.SENSOR_DELAY_FASTEST);
-        }
-        break;
-      case 3:
-        for (Sensor sensor : mSensorManager.getSensorList(Sensor.TYPE_MAGNETIC_FIELD)) {
-          mSensorManager.registerListener(mSensorListener, sensor,
-              SensorManager.SENSOR_DELAY_FASTEST);
-        }
-        break;
-      case 4:
-        for (Sensor sensor : mSensorManager.getSensorList(Sensor.TYPE_LIGHT)) {
-          mSensorManager.registerListener(mSensorListener, sensor,
-              SensorManager.SENSOR_DELAY_FASTEST);
-        }
-      }
-    }
-  }
-
-  @Rpc(description = "Records to the Event Queue sensor data exceeding a chosen threshold.")
-  @RpcStartEvent("threshold")
-  public void startSensingThreshold(
-
-      @RpcParameter(name = "sensorNumber", description = "1 = Orientation, 2 = Accelerometer, 3 = Magnetometer and 4 = Light") Integer sensorNumber,
-      @RpcParameter(name = "threshold", description = "Threshold level for chosen sensor (integer)") Integer threshold,
-      @RpcParameter(name = "axis", description = "0 = No axis, 1 = X, 2 = Y, 3 = X+Y, 4 = Z, 5= X+Z, 6 = Y+Z, 7 = X+Y+Z") Integer axis) {
-    mSensorNumber = sensorNumber;
-    mXAxis = axis & 1;
-    mYAxis = axis & 2;
-    mZAxis = axis & 4;
-    if (mSensorNumber == 1) {
-      mThreshing = 0;
-      mThreshOrientation = 1;
-      mThreshold = ((float) threshold) / ((float) 1000);
-    } else {
-      mThreshing = 1;
-      mThreshold = (float) threshold;
-    }
-    startSensingTimed(mSensorNumber, 20);
-  }
-
-  @Rpc(description = "Returns the most recently recorded sensor data.")
-  public Bundle readSensors() {
-    if (mSensorReadings == null) {
-      return null;
-    }
-    synchronized (mSensorReadings) {
-      return new Bundle(mSensorReadings);
-    }
-  }
-
-  @Rpc(description = "Stops collecting sensor data.")
-  @RpcStopEvent("sensors")
-  public void stopSensing() {
-    mSensorManager.unregisterListener(mSensorListener);
-    mSensorListener = null;
-    mSensorReadings = null;
-    mThreshing = 0;
-    mThreshOrientation = 0;
-  }
-
-  @Rpc(description = "Returns the most recently received accuracy value.")
-  public Integer sensorsGetAccuracy() {
-    return mAccuracy;
-  }
-
-  @Rpc(description = "Returns the most recently received light value.")
-  public Float sensorsGetLight() {
-    return mLight;
-  }
-
-  @Rpc(description = "Returns the most recently received accelerometer values.", returns = "a List of Floats [(acceleration on the) X axis, Y axis, Z axis].")
-  public List<Float> sensorsReadAccelerometer() {
-    synchronized (mSensorReadings) {
-      return Arrays.asList(mXForce, mYForce, mZForce);
-    }
-  }
-
-  @Rpc(description = "Returns the most recently received magnetic field values.", returns = "a List of Floats [(magnetic field value for) X axis, Y axis, Z axis].")
-  public List<Float> sensorsReadMagnetometer() {
-    synchronized (mSensorReadings) {
-      return Arrays.asList(mXMag, mYMag, mZMag);
-    }
-  }
-
-  @Rpc(description = "Returns the most recently received orientation values.", returns = "a List of Doubles [azimuth, pitch, roll].")
-  public List<Double> sensorsReadOrientation() {
-    synchronized (mSensorReadings) {
-      return Arrays.asList(mAzimuth, mPitch, mRoll);
-    }
-  }
-
-  @Rpc(description = "Starts recording sensor data to be available for polling.")
-  @RpcDeprecated(value = "startSensingTimed or startSensingThreshhold", release = "4")
-  public void startSensing(
-      @RpcParameter(name = "sampleSize", description = "number of samples for calculating average readings") @RpcDefault("5") Integer sampleSize) {
-    if (mSensorListener == null) {
-      startSensingTimed(1, 220);
-    }
-  }
-
-  @Override
-  public void shutdown() {
-    stopSensing();
-  }
-
-  private class SensorValuesCollector implements SensorEventListener {
-    private final static int MATRIX_SIZE = 9;
-
-    private final RollingAverage mmAzimuth;
-    private final RollingAverage mmPitch;
-    private final RollingAverage mmRoll;
-
-    private float[] mmGeomagneticValues;
-    private float[] mmGravityValues;
-    private float[] mmR;
-    private float[] mmOrientation;
-
-    public SensorValuesCollector() {
-      mmAzimuth = new RollingAverage();
-      mmPitch = new RollingAverage();
-      mmRoll = new RollingAverage();
-    }
-
-    private void postEvent() {
-      mSensorReadings.putDouble("time", System.currentTimeMillis() / 1000.0);
-      mEventFacade.postEvent("sensors", mSensorReadings.clone());
-    }
-
-    @Override
-    public void onAccuracyChanged(Sensor sensor, int accuracy) {
-      if (mSensorReadings == null) {
-        return;
-      }
-      synchronized (mSensorReadings) {
-        mSensorReadings.putInt("accuracy", accuracy);
-        mAccuracy = accuracy;
-
-      }
-    }
-
-    @Override
-    public void onSensorChanged(SensorEvent event) {
-      if (mSensorReadings == null) {
-        return;
-      }
-      synchronized (mSensorReadings) {
-        switch (event.sensor.getType()) {
-        case Sensor.TYPE_ACCELEROMETER:
-          mXForce = event.values[0];
-          mYForce = event.values[1];
-          mZForce = event.values[2];
-          if (mThreshing == 0) {
-            mSensorReadings.putFloat("xforce", mXForce);
-            mSensorReadings.putFloat("yforce", mYForce);
-            mSensorReadings.putFloat("zforce", mZForce);
-            if ((mSensorNumber == 2) && (System.currentTimeMillis() > (mDelayTime + mLastTime))) {
-              mLastTime = System.currentTimeMillis();
-              postEvent();
-            }
-          }
-          if ((mThreshing == 1) && (mSensorNumber == 2)) {
-            if ((Math.abs(mXForce) > mThreshold) && (mXAxis == 1)) {
-              mSensorReadings.putFloat("xforce", mXForce);
-              postEvent();
-            }
-
-            if ((Math.abs(mYForce) > mThreshold) && (mYAxis == 2)) {
-              mSensorReadings.putFloat("yforce", mYForce);
-              postEvent();
-            }
-
-            if ((Math.abs(mZForce) > mThreshold) && (mZAxis == 4)) {
-              mSensorReadings.putFloat("zforce", mZForce);
-              postEvent();
-            }
-          }
-
-          mmGravityValues = event.values.clone();
-          break;
-        case Sensor.TYPE_MAGNETIC_FIELD:
-          mXMag = event.values[0];
-          mYMag = event.values[1];
-          mZMag = event.values[2];
-          if (mThreshing == 0) {
-            mSensorReadings.putFloat("xMag", mXMag);
-            mSensorReadings.putFloat("yMag", mYMag);
-            mSensorReadings.putFloat("zMag", mZMag);
-            if ((mSensorNumber == 3) && (System.currentTimeMillis() > (mDelayTime + mLastTime))) {
-              mLastTime = System.currentTimeMillis();
-              postEvent();
-            }
-          }
-          if ((mThreshing == 1) && (mSensorNumber == 3)) {
-            if ((Math.abs(mXMag) > mThreshold) && (mXAxis == 1)) {
-              mSensorReadings.putFloat("xforce", mXMag);
-              postEvent();
-            }
-            if ((Math.abs(mYMag) > mThreshold) && (mYAxis == 2)) {
-              mSensorReadings.putFloat("yforce", mYMag);
-              postEvent();
-            }
-            if ((Math.abs(mZMag) > mThreshold) && (mZAxis == 4)) {
-              mSensorReadings.putFloat("zforce", mZMag);
-              postEvent();
-            }
-          }
-          mmGeomagneticValues = event.values.clone();
-          break;
-        case Sensor.TYPE_LIGHT:
-          mLight = event.values[0];
-          if (mThreshing == 0) {
-            mSensorReadings.putFloat("light", mLight);
-            if ((mSensorNumber == 4) && (System.currentTimeMillis() > (mDelayTime + mLastTime))) {
-              mLastTime = System.currentTimeMillis();
-              postEvent();
-            }
-          }
-          if ((mThreshing == 1) && (mSensorNumber == 4)) {
-            if (mLight > mThreshold) {
-              mSensorReadings.putFloat("light", mLight);
-              postEvent();
-            }
-          }
-          break;
-
-        }
-        if (mSensorNumber == 1) {
-          if (mmGeomagneticValues != null && mmGravityValues != null) {
-            if (mmR == null) {
-              mmR = new float[MATRIX_SIZE];
-            }
-            if (SensorManager.getRotationMatrix(mmR, null, mmGravityValues, mmGeomagneticValues)) {
-              if (mmOrientation == null) {
-                mmOrientation = new float[3];
-              }
-              SensorManager.getOrientation(mmR, mmOrientation);
-              mmAzimuth.add(mmOrientation[0]);
-              mmPitch.add(mmOrientation[1]);
-              mmRoll.add(mmOrientation[2]);
-
-              mAzimuth = mmAzimuth.get();
-              mPitch = mmPitch.get();
-              mRoll = mmRoll.get();
-              if (mThreshOrientation == 0) {
-                mSensorReadings.putDouble("azimuth", mAzimuth);
-                mSensorReadings.putDouble("pitch", mPitch);
-                mSensorReadings.putDouble("roll", mRoll);
-                if ((mSensorNumber == 1) && (System.currentTimeMillis() > (mDelayTime + mLastTime))) {
-                  mLastTime = System.currentTimeMillis();
-                  postEvent();
-                }
-              }
-              if ((mThreshOrientation == 1) && (mSensorNumber == 1)) {
-                if ((mXAxis == 1) && (mXCrossed == 0)) {
-                  if (Math.abs(mAzimuth) > ((double) mThreshold)) {
-                    mSensorReadings.putDouble("azimuth", mAzimuth);
-                    postEvent();
-                    mXCrossed = 1;
-                  }
-                }
-                if ((mXAxis == 1) && (mXCrossed == 1)) {
-                  if (Math.abs(mAzimuth) < ((double) mThreshold)) {
-                    mSensorReadings.putDouble("azimuth", mAzimuth);
-                    postEvent();
-                    mXCrossed = 0;
-                  }
-                }
-                if ((mYAxis == 2) && (mYCrossed == 0)) {
-                  if (Math.abs(mPitch) > ((double) mThreshold)) {
-                    mSensorReadings.putDouble("pitch", mPitch);
-                    postEvent();
-                    mYCrossed = 1;
-                  }
-                }
-                if ((mYAxis == 2) && (mYCrossed == 1)) {
-                  if (Math.abs(mPitch) < ((double) mThreshold)) {
-                    mSensorReadings.putDouble("pitch", mPitch);
-                    postEvent();
-                    mYCrossed = 0;
-                  }
-                }
-                if ((mZAxis == 4) && (mZCrossed == 0)) {
-                  if (Math.abs(mRoll) > ((double) mThreshold)) {
-                    mSensorReadings.putDouble("roll", mRoll);
-                    postEvent();
-                    mZCrossed = 1;
-                  }
-                }
-                if ((mZAxis == 4) && (mZCrossed == 1)) {
-                  if (Math.abs(mRoll) < ((double) mThreshold)) {
-                    mSensorReadings.putDouble("roll", mRoll);
-                    postEvent();
-                    mZCrossed = 0;
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-
-  static class RollingAverage {
-    private final int mmSampleSize;
-    private final double mmData[];
-    private int mmIndex = 0;
-    private boolean mmFilled = false;
-    private double mmSum = 0.0;
-
-    public RollingAverage() {
-      mmSampleSize = 5;
-      mmData = new double[mmSampleSize];
-    }
-
-    public void add(double value) {
-      mmSum -= mmData[mmIndex];
-      mmData[mmIndex] = value;
-      mmSum += mmData[mmIndex];
-      ++mmIndex;
-      mmIndex %= mmSampleSize;
-      mmFilled = (!mmFilled) ? mmIndex == 0 : mmFilled;
-    }
-
-    public double get() throws IllegalStateException {
-      if (!mmFilled && mmIndex == 0) {
-        throw new IllegalStateException("No values to average.");
-      }
-      return (mmFilled) ? (mmSum / mmSampleSize) : (mmSum / mmIndex);
-    }
-  }
-}
diff --git a/src/com/googlecode/android_scripting/facade/SettingsFacade.java b/src/com/googlecode/android_scripting/facade/SettingsFacade.java
deleted file mode 100644
index e7ef55ba..00000000
--- a/src/com/googlecode/android_scripting/facade/SettingsFacade.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- * Copyright (C) 2009 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.facade;
-
-import android.app.Service;
-
-import android.content.Context;
-import android.content.Intent;
-import android.media.AudioManager;
-import android.os.PowerManager;
-import android.provider.Settings.SettingNotFoundException;
-import android.view.WindowManager;
-
-import com.googlecode.android_scripting.FutureActivityTaskExecutor;
-import com.googlecode.android_scripting.Log;
-import com.googlecode.android_scripting.future.FutureActivityTask;
-import com.googlecode.android_scripting.jsonrpc.RpcReceiver;
-import com.googlecode.android_scripting.rpc.Rpc;
-import com.googlecode.android_scripting.rpc.RpcOptional;
-import com.googlecode.android_scripting.rpc.RpcParameter;
-
-import java.lang.reflect.Method;
-
-import com.hipipal.sl4alib.MNApp;
-
-/**
- * Exposes phone settings functionality.
- * 
- * @author Frank Spychalski (frank.spychalski@gmail.com)
- */
-public class SettingsFacade extends RpcReceiver {
-
-  public static int AIRPLANE_MODE_OFF = 0;
-  public static int AIRPLANE_MODE_ON = 1;
-
-  private final Service mService;
-  private final AudioManager mAudio;
-  private final PowerManager mPower;
-
-  /**
-   * Creates a new SettingsFacade.
-   * 
-   * @param service
-   *          is the {@link Context} the APIs will run under
-   */
-  public SettingsFacade(FacadeManager manager) {
-    super(manager);
-    mService = manager.getService();
-    mAudio = (AudioManager) mService.getSystemService(Context.AUDIO_SERVICE);
-    mPower = (PowerManager) mService.getSystemService(Context.POWER_SERVICE);
-  }
-
-  @Rpc(description = "Sets the screen timeout to this number of seconds.", returns = "The original screen timeout.")
-  public Integer setScreenTimeout(@RpcParameter(name = "value") Integer value) {
-    Integer oldValue = getScreenTimeout();
-    android.provider.Settings.System.putInt(mService.getContentResolver(),
-        android.provider.Settings.System.SCREEN_OFF_TIMEOUT, value * 1000);
-    return oldValue;
-  }
-
-  @Rpc(description = "Returns the current screen timeout in seconds.", returns = "the current screen timeout in seconds.")
-  public Integer getScreenTimeout() {
-    try {
-      return android.provider.Settings.System.getInt(mService.getContentResolver(),
-          android.provider.Settings.System.SCREEN_OFF_TIMEOUT) / 1000;
-    } catch (SettingNotFoundException e) {
-      return 0;
-    }
-  }
-
-  @SuppressWarnings("deprecation")
-@Rpc(description = "Checks the airplane mode setting.", returns = "True if airplane mode is enabled.")
-  public Boolean checkAirplaneMode() {
-    try {
-      return android.provider.Settings.System.getInt(mService.getContentResolver(),
-          android.provider.Settings.System.AIRPLANE_MODE_ON) == AIRPLANE_MODE_ON;
-    } catch (SettingNotFoundException e) {
-      return false;
-    }
-  }
-
-  @SuppressWarnings("deprecation")
-@Rpc(description = "Toggles airplane mode on and off.", returns = "True if airplane mode is enabled.")
-  public Boolean toggleAirplaneMode(@RpcParameter(name = "enabled") @RpcOptional Boolean enabled) {
-    if (enabled == null) {
-      enabled = !checkAirplaneMode();
-    }
-    android.provider.Settings.System.putInt(mService.getContentResolver(),
-        android.provider.Settings.System.AIRPLANE_MODE_ON, enabled ? AIRPLANE_MODE_ON
-            : AIRPLANE_MODE_OFF);
-    Intent intent = new Intent(Intent.ACTION_AIRPLANE_MODE_CHANGED);
-    intent.putExtra("state", enabled);
-    mService.sendBroadcast(intent);
-    return enabled;
-  }
-
-  @Rpc(description = "Checks the ringer silent mode setting.", returns = "True if ringer silent mode is enabled.")
-  public Boolean checkRingerSilentMode() {
-    return mAudio.getRingerMode() == AudioManager.RINGER_MODE_SILENT;
-  }
-
-  @Rpc(description = "Toggles ringer silent mode on and off.", returns = "True if ringer silent mode is enabled.")
-  public Boolean toggleRingerSilentMode(@RpcParameter(name = "enabled") @RpcOptional Boolean enabled) {
-    if (enabled == null) {
-      enabled = !checkRingerSilentMode();
-    }
-    mAudio.setRingerMode(enabled ? AudioManager.RINGER_MODE_SILENT
-        : AudioManager.RINGER_MODE_NORMAL);
-    return enabled;
-  }
-
-  @SuppressWarnings("deprecation")
-@Rpc(description = "Toggles vibrate mode on and off. If ringer=true then set Ringer setting, else set Notification setting", returns = "True if vibrate mode is enabled.")
-  public Boolean toggleVibrateMode(@RpcParameter(name = "enabled") @RpcOptional Boolean enabled,
-      @RpcParameter(name = "ringer") @RpcOptional Boolean ringer) {
-    int atype = ringer ? AudioManager.VIBRATE_TYPE_RINGER : AudioManager.VIBRATE_TYPE_NOTIFICATION;
-    int asetting = enabled ? AudioManager.VIBRATE_SETTING_ON : AudioManager.VIBRATE_SETTING_OFF;
-    mAudio.setVibrateSetting(atype, asetting);
-    return enabled;
-  }
-
-  @SuppressWarnings("deprecation")
-@Rpc(description = "Checks Vibration setting. If ringer=true then query Ringer setting, else query Notification setting", returns = "True if vibrate mode is enabled.")
-  public Boolean getVibrateMode(@RpcParameter(name = "ringer") @RpcOptional Boolean ringer) {
-    int atype = ringer ? AudioManager.VIBRATE_TYPE_RINGER : AudioManager.VIBRATE_TYPE_NOTIFICATION;
-    return mAudio.shouldVibrate(atype);
-  }
-
-  @Rpc(description = "Returns the maximum ringer volume.")
-  public int getMaxRingerVolume() {
-    return mAudio.getStreamMaxVolume(AudioManager.STREAM_RING);
-  }
-
-  @Rpc(description = "Returns the current ringer volume.")
-  public int getRingerVolume() {
-    return mAudio.getStreamVolume(AudioManager.STREAM_RING);
-  }
-
-  @Rpc(description = "Sets the ringer volume.")
-  public void setRingerVolume(@RpcParameter(name = "volume") Integer volume) {
-    mAudio.setStreamVolume(AudioManager.STREAM_RING, volume, 0);
-  }
-
-  @Rpc(description = "Returns the maximum media volume.")
-  public int getMaxMediaVolume() {
-    return mAudio.getStreamMaxVolume(AudioManager.STREAM_MUSIC);
-  }
-
-  @Rpc(description = "Returns the current media volume.")
-  public int getMediaVolume() {
-    return mAudio.getStreamVolume(AudioManager.STREAM_MUSIC);
-  }
-
-  @Rpc(description = "Sets the media volume.")
-  public void setMediaVolume(@RpcParameter(name = "volume") Integer volume) {
-    mAudio.setStreamVolume(AudioManager.STREAM_MUSIC, volume, 0);
-  }
-
-  @Rpc(description = "Returns the screen backlight brightness.", returns = "the current screen brightness between 0 and 255")
-  public Integer getScreenBrightness() {
-    try {
-      return android.provider.Settings.System.getInt(mService.getContentResolver(),
-          android.provider.Settings.System.SCREEN_BRIGHTNESS);
-    } catch (SettingNotFoundException e) {
-      return 0;
-    }
-  }
-
-  @Rpc(description = "Sets the the screen backlight brightness.", returns = "the original screen brightness.")
-  public Integer setScreenBrightness(
-      @RpcParameter(name = "value", description = "brightness value between 0 and 255") Integer value) {
-    if (value < 0) {
-      value = 0;
-    } else if (value > 255) {
-      value = 255;
-    }
-    final int brightness = value;
-    Integer oldValue = getScreenBrightness();
-    android.provider.Settings.System.putInt(mService.getContentResolver(),
-        android.provider.Settings.System.SCREEN_BRIGHTNESS, brightness);
-
-    FutureActivityTask<Object> task = new FutureActivityTask<Object>() {
-      @Override
-      public void onCreate() {
-        super.onCreate();
-        WindowManager.LayoutParams lp = getActivity().getWindow().getAttributes();
-        lp.screenBrightness = brightness * 1.0f / 255;
-        getActivity().getWindow().setAttributes(lp);
-        setResult(null);
-        finish();
-      }
-    };
-
-    FutureActivityTaskExecutor taskExecutor =
-        ((MNApp) mService.getApplication()).getTaskExecutor();
-    taskExecutor.execute(task);
-
-    return oldValue;
-  }
-
-  @Rpc(description = "Checks if the screen is on or off (requires API level 7).", returns = "True if the screen is currently on.")
-  public Boolean checkScreenOn() throws Exception {
-    Class<?> powerManagerClass = mPower.getClass();
-    Boolean result = null;
-    try {
-      Method isScreenOn = powerManagerClass.getMethod("isScreenOn");
-      result = (Boolean) isScreenOn.invoke(mPower);
-    } catch (Exception e) {
-      Log.e(e);
-      throw new UnsupportedOperationException("This feature is only available after Eclair.");
-    }
-    return result;
-  }
-
-  @Override
-  public void shutdown() {
-    // Nothing to do yet.
-  }
-}
diff --git a/src/com/googlecode/android_scripting/facade/SignalStrengthFacade.java b/src/com/googlecode/android_scripting/facade/SignalStrengthFacade.java
deleted file mode 100644
index 02703d71..00000000
--- a/src/com/googlecode/android_scripting/facade/SignalStrengthFacade.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.googlecode.android_scripting.facade;
-
-import android.app.Service;
-import android.content.Context;
-import android.os.Bundle;
-import android.telephony.PhoneStateListener;
-import android.telephony.SignalStrength;
-import android.telephony.TelephonyManager;
-
-import com.googlecode.android_scripting.MainThread;
-import com.googlecode.android_scripting.jsonrpc.RpcReceiver;
-import com.googlecode.android_scripting.rpc.Rpc;
-import com.googlecode.android_scripting.rpc.RpcMinSdk;
-import com.googlecode.android_scripting.rpc.RpcStartEvent;
-import com.googlecode.android_scripting.rpc.RpcStopEvent;
-
-import java.util.concurrent.Callable;
-
-/**
- * Exposes SignalStrength functionality.
- * 
- * @author Joerg Zieren (joerg.zieren@gmail.com)
- */
-@RpcMinSdk(7)
-public class SignalStrengthFacade extends RpcReceiver {
-  private final Service mService;
-  private final TelephonyManager mTelephonyManager;
-  private final EventFacade mEventFacade;
-  private final PhoneStateListener mPhoneStateListener;
-  private Bundle mSignalStrengths;
-
-  public SignalStrengthFacade(FacadeManager manager) {
-    super(manager);
-    mService = manager.getService();
-    mEventFacade = manager.getReceiver(EventFacade.class);
-    mTelephonyManager =
-        (TelephonyManager) manager.getService().getSystemService(Context.TELEPHONY_SERVICE);
-    mPhoneStateListener = MainThread.run(mService, new Callable<PhoneStateListener>() {
-      @Override
-      public PhoneStateListener call() throws Exception {
-        return new PhoneStateListener() {
-          @Override
-          public void onSignalStrengthsChanged(SignalStrength signalStrength) {
-            mSignalStrengths = new Bundle();
-            mSignalStrengths.putInt("gsm_signal_strength", signalStrength.getGsmSignalStrength());
-            mSignalStrengths.putInt("gsm_bit_error_rate", signalStrength.getGsmBitErrorRate());
-            mSignalStrengths.putInt("cdma_dbm", signalStrength.getCdmaDbm());
-            mSignalStrengths.putInt("cdma_ecio", signalStrength.getCdmaEcio());
-            mSignalStrengths.putInt("evdo_dbm", signalStrength.getEvdoDbm());
-            mSignalStrengths.putInt("evdo_ecio", signalStrength.getEvdoEcio());
-            mEventFacade.postEvent("signal_strengths", mSignalStrengths.clone());
-          }
-        };
-      }
-    });
-  }
-
-  @Rpc(description = "Starts tracking signal strengths.")
-  @RpcStartEvent("signal_strengths")
-  public void startTrackingSignalStrengths() {
-    mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_SIGNAL_STRENGTHS);
-  }
-
-  @Rpc(description = "Returns the current signal strengths.", returns = "A map of \"gsm_signal_strength\"")
-  public Bundle readSignalStrengths() {
-    return mSignalStrengths;
-  }
-
-  @Rpc(description = "Stops tracking signal strength.")
-  @RpcStopEvent("signal_strengths")
-  public void stopTrackingSignalStrengths() {
-    mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE);
-  }
-
-  @Override
-  public void shutdown() {
-    stopTrackingSignalStrengths();
-  }
-}
diff --git a/src/com/googlecode/android_scripting/facade/SmsFacade.java b/src/com/googlecode/android_scripting/facade/SmsFacade.java
deleted file mode 100644
index b733259e..00000000
--- a/src/com/googlecode/android_scripting/facade/SmsFacade.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.facade;
-
-import android.app.Service;
-import android.content.ContentResolver;
-import android.content.ContentUris;
-import android.content.ContentValues;
-import android.database.Cursor;
-import android.net.Uri;
-import android.telephony.gsm.SmsManager;
-
-import com.googlecode.android_scripting.Log;
-import com.googlecode.android_scripting.jsonrpc.RpcReceiver;
-import com.googlecode.android_scripting.rpc.Rpc;
-import com.googlecode.android_scripting.rpc.RpcDefault;
-import com.googlecode.android_scripting.rpc.RpcOptional;
-import com.googlecode.android_scripting.rpc.RpcParameter;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-/**
- * Provides access to SMS related functionality.
- * 
- * @author MeanEYE.rcf (meaneye.rcf@gmail.com)
- */
-@SuppressWarnings("deprecation")
-public class SmsFacade extends RpcReceiver {
-
-  private final Service mService;
-  private final ContentResolver mContentResolver;
-  private final SmsManager mSms;
-
-  public SmsFacade(FacadeManager manager) {
-    super(manager);
-    mService = manager.getService();
-    mContentResolver = mService.getContentResolver();
-    mSms = SmsManager.getDefault();
-  }
-
-  String buildSelectionClause(boolean unreadOnly) {
-    if (unreadOnly) {
-      return "read = 0";
-    }
-    return "";
-  }
-
-  private Uri buildFolderUri(String folder) {
-    Uri.Builder builder = Uri.parse("content://sms").buildUpon();
-    builder.appendPath(folder);
-    Uri uri = builder.build();
-    Log.v("Built SMS URI: " + uri);
-    return uri;
-  }
-
-  private Uri buildMessageUri(Integer id) {
-    Uri.Builder builder = Uri.parse("content://sms").buildUpon();
-    ContentUris.appendId(builder, id);
-    Uri uri = builder.build();
-    return uri;
-  }
-
-  @Rpc(description = "Sends an SMS.")
-  public void smsSend(
-      @RpcParameter(name = "destinationAddress", description = "typically a phone number") String destinationAddress,
-      @RpcParameter(name = "text") String text) {
-    mSms.sendTextMessage(destinationAddress, null, text, null, null);
-  }
-
-  @Rpc(description = "Returns the number of messages.")
-  public Integer smsGetMessageCount(@RpcParameter(name = "unreadOnly") Boolean unreadOnly,
-      @RpcParameter(name = "folder") @RpcDefault("inbox") String folder) {
-    Uri uri = buildFolderUri(folder);
-    Integer result = 0;
-    String selection = buildSelectionClause(unreadOnly);
-    Cursor cursor = mContentResolver.query(uri, null, selection, null, null);
-    if (cursor != null) {
-      result = cursor.getCount();
-      cursor.close();
-    } else {
-      result = 0;
-    }
-    return result;
-  }
-
-  @Rpc(description = "Returns a List of all message IDs.")
-  public List<Integer> smsGetMessageIds(@RpcParameter(name = "unreadOnly") Boolean unreadOnly,
-      @RpcParameter(name = "folder") @RpcDefault("inbox") String folder) {
-    Uri uri = buildFolderUri(folder);
-    List<Integer> result = new ArrayList<Integer>();
-    String selection = buildSelectionClause(unreadOnly);
-    String[] columns = { "_id" };
-    Cursor cursor = mContentResolver.query(uri, columns, selection, null, null);
-    while (cursor != null && cursor.moveToNext()) {
-      result.add(cursor.getInt(0));
-    }
-    cursor.close();
-    return result;
-  }
-
-  @Rpc(description = "Returns a List of all messages.", returns = "a List of messages as Maps")
-  public List<JSONObject> smsGetMessages(@RpcParameter(name = "unreadOnly") Boolean unreadOnly,
-      @RpcParameter(name = "folder") @RpcDefault("inbox") String folder,
-      @RpcParameter(name = "attributes") @RpcOptional JSONArray attributes) throws JSONException {
-    List<JSONObject> result = new ArrayList<JSONObject>();
-    Uri uri = buildFolderUri(folder);
-    String selection = buildSelectionClause(unreadOnly);
-    String[] columns;
-    if (attributes == null || attributes.length() == 0) {
-      // In case no attributes are specified we set the default ones.
-      columns = new String[] { "_id", "address", "date", "body", "read" };
-    } else {
-      // Convert selected attributes list into usable string list.
-      columns = new String[attributes.length()];
-      for (int i = 0; i < attributes.length(); i++) {
-        columns[i] = attributes.getString(i);
-      }
-    }
-    Cursor cursor = mContentResolver.query(uri, columns, selection, null, null);
-    while (cursor != null && cursor.moveToNext()) {
-      JSONObject message = new JSONObject();
-      for (int i = 0; i < columns.length; i++) {
-        message.put(columns[i], cursor.getString(i));
-      }
-      result.add(message);
-    }
-    cursor.close();
-    return result;
-  }
-
-  @Rpc(description = "Returns message attributes.")
-  public JSONObject smsGetMessageById(
-      @RpcParameter(name = "id", description = "message ID") Integer id,
-      @RpcParameter(name = "attributes") @RpcOptional JSONArray attributes) throws JSONException {
-    JSONObject result = new JSONObject();
-    Uri uri = buildMessageUri(id);
-    String[] columns;
-    if (attributes == null || attributes.length() == 0) {
-      // In case no attributes are specified we set the default ones.
-      columns = new String[] { "_id", "address", "date", "body", "read" };
-    } else {
-      // Convert selected attributes list into usable string list.
-      columns = new String[attributes.length()];
-      for (int i = 0; i < attributes.length(); i++) {
-        columns[i] = attributes.getString(i);
-      }
-    }
-    Cursor cursor = mContentResolver.query(uri, columns, null, null, null);
-    if (cursor != null) {
-      cursor.moveToFirst();
-      for (int i = 0; i < columns.length; i++) {
-        result.put(columns[i], cursor.getString(i));
-      }
-      cursor.close();
-    } else {
-      result = null;
-    }
-    return result;
-  }
-
-  @Rpc(description = "Returns a List of all possible message attributes.")
-  public List<String> smsGetAttributes() {
-    List<String> result = new ArrayList<String>();
-    Cursor cursor = mContentResolver.query(Uri.parse("content://sms"), null, null, null, null);
-    if (cursor != null) {
-      String[] columns = cursor.getColumnNames();
-      for (int i = 0; i < columns.length; i++) {
-        result.add(columns[i]);
-      }
-      cursor.close();
-    } else {
-      result = null;
-    }
-    return result;
-  }
-
-  @Rpc(description = "Deletes a message.", returns = "True if the message was deleted")
-  public Boolean smsDeleteMessage(@RpcParameter(name = "id") Integer id) {
-    Uri uri = buildMessageUri(id);
-    Boolean result = false;
-    result = mContentResolver.delete(uri, null, null) > 0;
-    return result;
-  }
-
-  @Rpc(description = "Marks messages as read.", returns = "number of messages marked read")
-  public Integer smsMarkMessageRead(
-      @RpcParameter(name = "ids", description = "List of message IDs to mark as read.") JSONArray ids,
-      @RpcParameter(name = "read") Boolean read) throws JSONException {
-    Integer result = 0;
-    ContentValues values = new ContentValues();
-    values.put("read", read);
-    for (int i = 0; i < ids.length(); i++) {
-      Uri uri = buildMessageUri(ids.getInt(i));
-      result += mContentResolver.update(uri, values, null, null);
-    }
-    return result;
-  }
-
-  @Override
-  public void shutdown() {
-  }
-}
\ No newline at end of file
diff --git a/src/com/googlecode/android_scripting/facade/SpeechRecognitionFacade.java b/src/com/googlecode/android_scripting/facade/SpeechRecognitionFacade.java
deleted file mode 100644
index 63a9d737..00000000
--- a/src/com/googlecode/android_scripting/facade/SpeechRecognitionFacade.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (C) 2009 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.facade;
-
-import android.content.Intent;
-import android.speech.RecognizerIntent;
-
-import com.googlecode.android_scripting.jsonrpc.RpcReceiver;
-import com.googlecode.android_scripting.rpc.Rpc;
-import com.googlecode.android_scripting.rpc.RpcOptional;
-import com.googlecode.android_scripting.rpc.RpcParameter;
-
-import java.util.ArrayList;
-
-/**
- * A facade containing RPC implementations related to the speech-to-text functionality of Android.
- * 
- * @author Felix Arends (felix.arends@gmail.com)
- * 
- */
-public class SpeechRecognitionFacade extends RpcReceiver {
-  private final AndroidFacade mAndroidFacade;
-
-  /**
-   * @param activityLauncher
-   *          a helper object that launches activities in a blocking manner
-   */
-  public SpeechRecognitionFacade(FacadeManager manager) {
-    super(manager);
-    mAndroidFacade = manager.getReceiver(AndroidFacade.class);
-  }
-
-  @Rpc(description = "Recognizes user's speech and returns the most likely result.", returns = "An empty string in case the speech cannot be recongnized.")
-  public String recognizeSpeech(
-      @RpcParameter(name = "prompt", description = "text prompt to show to the user when asking them to speak") @RpcOptional final String prompt,
-      @RpcParameter(name = "language", description = "language override to inform the recognizer that it should expect speech in a language different than the one set in the java.util.Locale.getDefault()") @RpcOptional final String language,
-      @RpcParameter(name = "languageModel", description = "informs the recognizer which speech model to prefer (see android.speech.RecognizeIntent)") @RpcOptional final String languageModel) {
-    final Intent recognitionIntent =
-        new Intent(android.speech.RecognizerIntent.ACTION_RECOGNIZE_SPEECH);
-
-    // Setup intent parameters (if provided).
-    if (language != null) {
-      recognitionIntent.putExtra(RecognizerIntent.EXTRA_LANGUAGE, "");
-    }
-    if (languageModel != null) {
-      recognitionIntent.putExtra(RecognizerIntent.EXTRA_LANGUAGE_MODEL, "");
-    }
-    if (prompt != null) {
-      recognitionIntent.putExtra(RecognizerIntent.EXTRA_PROMPT, "");
-    }
-
-    // Run the activity an retrieve the result.
-    final Intent data = mAndroidFacade.startActivityForResult(recognitionIntent);
-
-    if (data.hasExtra(android.speech.RecognizerIntent.EXTRA_RESULTS)) {
-      // The result consists of an array-list containing one entry for each
-      // possible result. The most likely result is the first entry.
-      ArrayList<String> results =
-          data.getStringArrayListExtra(android.speech.RecognizerIntent.EXTRA_RESULTS);
-      return results.get(0);
-    }
-
-    return "";
-  }
-
-  @Override
-  public void shutdown() {
-  }
-}
diff --git a/src/com/googlecode/android_scripting/facade/TextToSpeechFacade.java b/src/com/googlecode/android_scripting/facade/TextToSpeechFacade.java
deleted file mode 100644
index 9ffb8e5e..00000000
--- a/src/com/googlecode/android_scripting/facade/TextToSpeechFacade.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (C) 2009 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.facade;
-
-import android.os.SystemClock;
-import android.speech.tts.TextToSpeech;
-import android.speech.tts.TextToSpeech.OnInitListener;
-
-import com.googlecode.android_scripting.jsonrpc.RpcReceiver;
-import com.googlecode.android_scripting.rpc.Rpc;
-import com.googlecode.android_scripting.rpc.RpcMinSdk;
-import com.googlecode.android_scripting.rpc.RpcParameter;
-
-import java.util.concurrent.CountDownLatch;
-
-/**
- * Provides Text To Speech services for API 4 or more.
- */
-
-@RpcMinSdk(4)
-public class TextToSpeechFacade extends RpcReceiver {
-
-  private final TextToSpeech mTts;
-  private final CountDownLatch mOnInitLock;
-
-  public TextToSpeechFacade(FacadeManager manager) {
-    super(manager);
-    mOnInitLock = new CountDownLatch(1);
-    mTts = new TextToSpeech(manager.getService(), new OnInitListener() {
-      @Override
-      public void onInit(int arg0) {
-        mOnInitLock.countDown();
-      }
-    });
-  }
-
-  @Override
-  public void shutdown() {
-    while (mTts.isSpeaking()) {
-      SystemClock.sleep(100);
-    }
-    mTts.shutdown();
-  }
-
-  @Rpc(description = "Speaks the provided message via TTS.")
-  public void ttsSpeak(@RpcParameter(name = "message") String message) throws InterruptedException {
-    mOnInitLock.await();
-    if (message != null) {
-      mTts.speak(message, TextToSpeech.QUEUE_ADD, null);
-    }
-  }
-
-  @Rpc(description = "Returns True if speech is currently in progress.")
-  public Boolean ttsIsSpeaking() throws InterruptedException {
-    mOnInitLock.await();
-    return mTts.isSpeaking();
-  }
-
-}
diff --git a/src/com/googlecode/android_scripting/facade/ToneGeneratorFacade.java b/src/com/googlecode/android_scripting/facade/ToneGeneratorFacade.java
deleted file mode 100644
index 05b079fd..00000000
--- a/src/com/googlecode/android_scripting/facade/ToneGeneratorFacade.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package com.googlecode.android_scripting.facade;
-
-import android.media.AudioManager;
-import android.media.ToneGenerator;
-
-import com.googlecode.android_scripting.jsonrpc.RpcReceiver;
-import com.googlecode.android_scripting.rpc.Rpc;
-import com.googlecode.android_scripting.rpc.RpcDefault;
-import com.googlecode.android_scripting.rpc.RpcParameter;
-
-/**
- * Generate DTMF tones.
- * 
- */
-public class ToneGeneratorFacade extends RpcReceiver {
-
-  private final ToneGenerator mToneGenerator;
-
-  public ToneGeneratorFacade(FacadeManager manager) {
-    super(manager);
-    mToneGenerator = new ToneGenerator(AudioManager.STREAM_MUSIC, 100);
-  }
-
-  @Rpc(description = "Generate DTMF tones for the given phone number.")
-  public void generateDtmfTones(
-      @RpcParameter(name = "phoneNumber") String phoneNumber,
-      @RpcParameter(name = "toneDuration", description = "duration of each tone in milliseconds") @RpcDefault("100") Integer toneDuration)
-      throws InterruptedException {
-    try {
-      for (int i = 0; i < phoneNumber.length(); i++) {
-        switch (phoneNumber.charAt(i)) {
-        case '0':
-          mToneGenerator.startTone(ToneGenerator.TONE_DTMF_0);
-          Thread.sleep(toneDuration);
-          break;
-        case '1':
-          mToneGenerator.startTone(ToneGenerator.TONE_DTMF_1);
-          Thread.sleep(toneDuration);
-          break;
-        case '2':
-          mToneGenerator.startTone(ToneGenerator.TONE_DTMF_2);
-          Thread.sleep(toneDuration);
-          break;
-        case '3':
-          mToneGenerator.startTone(ToneGenerator.TONE_DTMF_3);
-          Thread.sleep(toneDuration);
-          break;
-        case '4':
-          mToneGenerator.startTone(ToneGenerator.TONE_DTMF_4);
-          Thread.sleep(toneDuration);
-          break;
-        case '5':
-          mToneGenerator.startTone(ToneGenerator.TONE_DTMF_5);
-          Thread.sleep(toneDuration);
-          break;
-        case '6':
-          mToneGenerator.startTone(ToneGenerator.TONE_DTMF_6);
-          Thread.sleep(toneDuration);
-          break;
-        case '7':
-          mToneGenerator.startTone(ToneGenerator.TONE_DTMF_7);
-          Thread.sleep(toneDuration);
-          break;
-        case '8':
-          mToneGenerator.startTone(ToneGenerator.TONE_DTMF_8);
-          Thread.sleep(toneDuration);
-          break;
-        case '9':
-          mToneGenerator.startTone(ToneGenerator.TONE_DTMF_9);
-          Thread.sleep(toneDuration);
-          break;
-        case '*':
-          mToneGenerator.startTone(ToneGenerator.TONE_DTMF_S);
-          Thread.sleep(toneDuration);
-          break;
-        case '#':
-          mToneGenerator.startTone(ToneGenerator.TONE_DTMF_P);
-          Thread.sleep(toneDuration);
-          break;
-        default:
-          throw new RuntimeException("Cannot generate tone for '" + phoneNumber.charAt(i) + "'");
-        }
-      }
-    } finally {
-      mToneGenerator.stopTone();
-    }
-  }
-
-  @Override
-  public void shutdown() {
-  }
-}
diff --git a/src/com/googlecode/android_scripting/facade/WakeLockFacade.java b/src/com/googlecode/android_scripting/facade/WakeLockFacade.java
deleted file mode 100644
index 57154982..00000000
--- a/src/com/googlecode/android_scripting/facade/WakeLockFacade.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.facade;
-
-import android.annotation.SuppressLint;
-import android.app.Service;
-import android.content.Context;
-import android.os.PowerManager;
-import android.os.PowerManager.WakeLock;
-
-import com.googlecode.android_scripting.jsonrpc.RpcReceiver;
-import com.googlecode.android_scripting.rpc.Rpc;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-
-/**
- * A facade exposing some of the functionality of the PowerManager, in particular wake locks.
- * 
- * @author Felix Arends (felixarends@gmail.com)
- * @author Damon Kohler (damonkohler@gmail.com)
- */
-public class WakeLockFacade extends RpcReceiver {
-
-  private final static String WAKE_LOCK_TAG =
-      "com.googlecode.android_scripting.facade.PowerManagerFacade";
-
-  private enum WakeLockType {
-    FULL, PARTIAL, BRIGHT, DIM
-  }
-
-  private class WakeLockManager {
-    private final PowerManager mmPowerManager;
-    private final Map<WakeLockType, WakeLock> mmLocks = new HashMap<WakeLockType, WakeLock>();
-
-    @SuppressWarnings("deprecation")
-	public WakeLockManager(Service service) {
-      mmPowerManager = (PowerManager) service.getSystemService(Context.POWER_SERVICE);
-      addWakeLock(WakeLockType.PARTIAL, PowerManager.PARTIAL_WAKE_LOCK);
-      addWakeLock(WakeLockType.FULL, PowerManager.FULL_WAKE_LOCK | PowerManager.ON_AFTER_RELEASE);
-      addWakeLock(WakeLockType.BRIGHT, PowerManager.SCREEN_BRIGHT_WAKE_LOCK
-          | PowerManager.ON_AFTER_RELEASE);
-      addWakeLock(WakeLockType.DIM, PowerManager.SCREEN_DIM_WAKE_LOCK
-          | PowerManager.ON_AFTER_RELEASE);
-    }
-
-    private void addWakeLock(WakeLockType type, int flags) {
-      WakeLock full = mmPowerManager.newWakeLock(flags, WAKE_LOCK_TAG);
-      full.setReferenceCounted(false);
-      mmLocks.put(type, full);
-    }
-
-    @SuppressLint("Wakelock")
-	public void acquire(WakeLockType type) {
-      mmLocks.get(type).acquire();
-      for (Entry<WakeLockType, WakeLock> entry : mmLocks.entrySet()) {
-        if (entry.getKey() != type) {
-          entry.getValue().release();
-        }
-      }
-    }
-
-    public void release() {
-      for (Entry<WakeLockType, WakeLock> entry : mmLocks.entrySet()) {
-        entry.getValue().release();
-      }
-    }
-  }
-
-  private final WakeLockManager mManager;
-
-  public WakeLockFacade(FacadeManager manager) {
-    super(manager);
-    mManager = new WakeLockManager(manager.getService());
-  }
-
-  @Rpc(description = "Acquires a full wake lock (CPU on, screen bright, keyboard bright).")
-  public void wakeLockAcquireFull() {
-    mManager.acquire(WakeLockType.FULL);
-  }
-
-  @Rpc(description = "Acquires a partial wake lock (CPU on).")
-  public void wakeLockAcquirePartial() {
-    mManager.acquire(WakeLockType.PARTIAL);
-  }
-
-  @Rpc(description = "Acquires a bright wake lock (CPU on, screen bright).")
-  public void wakeLockAcquireBright() {
-    mManager.acquire(WakeLockType.BRIGHT);
-  }
-
-  @Rpc(description = "Acquires a dim wake lock (CPU on, screen dim).")
-  public void wakeLockAcquireDim() {
-    mManager.acquire(WakeLockType.DIM);
-  }
-
-  @Rpc(description = "Releases the wake lock.")
-  public void wakeLockRelease() {
-    mManager.release();
-  }
-
-  @Override
-  public void shutdown() {
-    wakeLockRelease();
-  }
-}
diff --git a/src/com/googlecode/android_scripting/facade/WebCamFacade.java b/src/com/googlecode/android_scripting/facade/WebCamFacade.java
deleted file mode 100644
index 17989fe5..00000000
--- a/src/com/googlecode/android_scripting/facade/WebCamFacade.java
+++ /dev/null
@@ -1,392 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.facade;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.InetSocketAddress;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.Executor;
-
-import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
-import android.app.Service;
-import android.graphics.ImageFormat;
-import android.graphics.Rect;
-import android.graphics.YuvImage;
-import android.hardware.Camera;
-import android.hardware.Camera.Parameters;
-import android.hardware.Camera.PreviewCallback;
-import android.hardware.Camera.Size;
-import android.os.Build;
-import android.util.Base64;
-import android.view.SurfaceHolder;
-import android.view.SurfaceView;
-import android.view.WindowManager;
-import android.view.SurfaceHolder.Callback;
-
-import com.googlecode.android_scripting.FutureActivityTaskExecutor;
-import com.googlecode.android_scripting.Log;
-import com.googlecode.android_scripting.SingleThreadExecutor;
-import com.googlecode.android_scripting.SimpleServer.SimpleServerObserver;
-import com.googlecode.android_scripting.future.FutureActivityTask;
-import com.googlecode.android_scripting.jsonrpc.RpcReceiver;
-import com.googlecode.android_scripting.rpc.Rpc;
-import com.googlecode.android_scripting.rpc.RpcDefault;
-import com.googlecode.android_scripting.rpc.RpcMinSdk;
-import com.googlecode.android_scripting.rpc.RpcOptional;
-import com.googlecode.android_scripting.rpc.RpcParameter;
-
-import com.hipipal.sl4alib.MNApp;
-/**
- * Manages access to camera streaming.
- * <br>
- * <h3>Usage Notes</h3>
- * <br><b>webCamStart</b> and <b>webCamStop</b> are used to start and stop an Mpeg stream on a given port. <b>webcamAdjustQuality</b> is used to ajust the quality of the streaming video.
- * <br><b>cameraStartPreview</b> is used to get access to the camera preview screen. It will generate "preview" events as images become available.
- * <br>The preview has two modes: data or file. If you pass a non-blank, writable file path to the <b>cameraStartPreview</b> it will store jpg images in that folder. 
- * It is up to the caller to clean up these files after the fact. If no file element is provided, 
- * the event will include the image data as a base64 encoded string. 
- * <h3>Event details</h3>
- * <br>The data element of the preview event will be a map, with the following elements defined.
- * <ul>
- * <li><b>format</b> - currently always "jpeg"
- * <li><b>width</b> - image width (in pixels)
- * <li><b>height</b> - image height (in pixels)
- * <li><b>quality</b> - JPEG quality. Number from 1-100
- * <li><b>filename</b> - Name of file where image was saved. Only relevant if filepath defined.
- * <li><b>error</b> - included if there was an IOException saving file, ie, disk full or path write protected.
- * <li><b>encoding</b> - Data encoding. If filepath defined, will be "file" otherwise "base64"
- * <li><b>data</b> - Base64 encoded image data.
- * </ul>
- *<br>Note that "filename", "error" and "data" are mutual exclusive.
- *<br>
- *<br>The webcam and preview modes use the same resources, so you can't use them both at the same time. Stop one mode before starting the other.
- *
- * @author Damon Kohler (damonkohler@gmail.com) (probably)
- * @author Robbie Matthews (rjmatthews62@gmail.com)
- *
- */
-@RpcMinSdk(8)
-public class WebCamFacade extends RpcReceiver {
-
-  private final Service mService;
-  private final Executor mJpegCompressionExecutor = new SingleThreadExecutor();
-  private final ByteArrayOutputStream mJpegCompressionBuffer = new ByteArrayOutputStream();
-
-  private volatile byte[] mJpegData;
-
-  private CountDownLatch mJpegDataReady;
-  private boolean mStreaming;
-  private int mPreviewHeight;
-  private int mPreviewWidth;
-  private int mJpegQuality;
-
-  private MjpegServer mJpegServer;
-  private FutureActivityTask<SurfaceHolder> mPreviewTask;
-  private Camera mCamera;
-  private Parameters mParameters;
-  private final EventFacade mEventFacade;
-  private boolean mPreview;
-  private File mDest;
-  
-  private final PreviewCallback mPreviewCallback = new PreviewCallback() {
-    @Override
-    public void onPreviewFrame(final byte[] data, final Camera camera) {
-      mJpegCompressionExecutor.execute(new Runnable() {
-        @Override
-        public void run() {
-          mJpegData = compressYuvToJpeg(data);
-          mJpegDataReady.countDown();
-          if (mStreaming) {
-            camera.setOneShotPreviewCallback(mPreviewCallback);
-          }
-        }
-      });
-    }
-  };
-
-  private final PreviewCallback mPreviewEvent = new PreviewCallback() {
-    @Override
-    public void onPreviewFrame(final byte[] data, final Camera camera) {
-      mJpegCompressionExecutor.execute(new Runnable() {
-        @SuppressLint("NewApi")
-		@Override
-        public void run() {
-          mJpegData = compressYuvToJpeg(data);
-          Map<String,Object> map = new HashMap<String, Object>(); 
-          map.put("format", "jpeg");
-          map.put("width", mPreviewWidth);
-          map.put("height", mPreviewHeight);
-          map.put("quality", mJpegQuality);
-          if (mDest!=null) {
-            try {
-              File dest=File.createTempFile("prv",".jpg",mDest);
-              OutputStream output = new FileOutputStream(dest);
-              output.write(mJpegData);
-              output.close();
-              map.put("encoding","file");
-              map.put("filename",dest.toString());
-            } catch (IOException e) {
-              map.put("error", e.toString());
-            }
-          }
-          else {
-            map.put("encoding","Base64");
-            map.put("data", Base64.encodeToString(mJpegData, Base64.DEFAULT));
-          }
-          mEventFacade.postEvent("preview", map);
-          if (mPreview) {
-            camera.setOneShotPreviewCallback(mPreviewEvent);
-          }
-        }
-      });
-    }
-  };
-  
-  public WebCamFacade(FacadeManager manager) {
-    super(manager);
-    mService = manager.getService();
-    mJpegDataReady = new CountDownLatch(1);
-    mEventFacade = manager.getReceiver(EventFacade.class);
-  }
-
-  @SuppressLint("NewApi")
-@TargetApi(Build.VERSION_CODES.FROYO)
-private byte[] compressYuvToJpeg(final byte[] yuvData) {
-    mJpegCompressionBuffer.reset();
-    YuvImage yuvImage =
-        new YuvImage(yuvData, ImageFormat.NV21, mPreviewWidth, mPreviewHeight, null);
-    yuvImage.compressToJpeg(new Rect(0, 0, mPreviewWidth, mPreviewHeight), mJpegQuality,
-        mJpegCompressionBuffer);
-    return mJpegCompressionBuffer.toByteArray();
-  }
-
-  @Rpc(description = "Starts an MJPEG stream and returns a Tuple of address and port for the stream.")
-  public InetSocketAddress webcamStart(
-      @RpcParameter(name = "resolutionLevel", description = "increasing this number provides higher resolution") @RpcDefault("0") Integer resolutionLevel,
-      @RpcParameter(name = "jpegQuality", description = "a number from 0-100") @RpcDefault("20") Integer jpegQuality,
-      @RpcParameter(name = "port", description = "If port is specified, the webcam service will bind to port, otherwise it will pick any available port.") @RpcDefault("0") Integer port)
-      throws Exception {
-    try {
-      openCamera(resolutionLevel, jpegQuality);
-      return startServer(port);
-    } catch (Exception e) {
-      webcamStop();
-      throw e;
-    }
-  }
-
-  private InetSocketAddress startServer(Integer port) {
-    mJpegServer = new MjpegServer(new JpegProvider() {
-      @Override
-      public byte[] getJpeg() {
-        try {
-          mJpegDataReady.await();
-        } catch (InterruptedException e) {
-          Log.e(e);
-        }
-        return mJpegData;
-      }
-    });
-    mJpegServer.addObserver(new SimpleServerObserver() {
-      @Override
-      public void onDisconnect() {
-        if (mJpegServer.getNumberOfConnections() == 0 && mStreaming) {
-          stopStream();
-        }
-      }
-
-      @Override
-      public void onConnect() {
-        if (!mStreaming) {
-          startStream();
-        }
-      }
-    });
-    return mJpegServer.startPublic(port);
-  }
-
-  private void stopServer() {
-    if (mJpegServer != null) {
-      mJpegServer.shutdown();
-      mJpegServer = null;
-    }
-  }
-
-  @Rpc(description = "Adjusts the quality of the webcam stream while it is running.")
-  public void webcamAdjustQuality(
-      @RpcParameter(name = "resolutionLevel", description = "increasing this number provides higher resolution") @RpcDefault("0") Integer resolutionLevel,
-      @RpcParameter(name = "jpegQuality", description = "a number from 0-100") @RpcDefault("20") Integer jpegQuality)
-      throws Exception {
-    if (mStreaming == false) {
-      throw new IllegalStateException("Webcam not streaming.");
-    }
-    stopStream();
-    releaseCamera();
-    openCamera(resolutionLevel, jpegQuality);
-    startStream();
-  }
-
-  private void openCamera(Integer resolutionLevel, Integer jpegQuality) throws IOException,
-      InterruptedException {
-    mCamera = Camera.open();
-    mParameters = mCamera.getParameters();
-    mParameters.setPictureFormat(ImageFormat.JPEG);
-    mParameters.setPreviewFormat(ImageFormat.JPEG);
-    List<Size> supportedPreviewSizes = mParameters.getSupportedPreviewSizes();
-    Collections.sort(supportedPreviewSizes, new Comparator<Size>() {
-      @Override
-      public int compare(Size o1, Size o2) {
-        return o1.width - o2.width;
-      }
-    });
-    Size previewSize =
-        supportedPreviewSizes.get(Math.min(resolutionLevel, supportedPreviewSizes.size() - 1));
-    mPreviewHeight = previewSize.height;
-    mPreviewWidth = previewSize.width;
-    mParameters.setPreviewSize(mPreviewWidth, mPreviewHeight);
-    mJpegQuality = Math.min(Math.max(jpegQuality, 0), 100);
-    mCamera.setParameters(mParameters);
-    // TODO(damonkohler): Rotate image based on orientation.
-    mPreviewTask = createPreviewTask();
-    mCamera.startPreview();
-  }
-
-  private void startStream() {
-    mStreaming = true;
-    mCamera.setOneShotPreviewCallback(mPreviewCallback);
-  }
-
-  private void stopStream() {
-    mJpegDataReady = new CountDownLatch(1);
-    mStreaming = false;
-    if (mPreviewTask != null) {
-      mPreviewTask.finish();
-      mPreviewTask = null;
-    }
-  }
-
-  private void releaseCamera() {
-    if (mCamera != null) {
-      mCamera.release();
-      mCamera = null;
-    }
-    mParameters = null;
-  }
-
-  @Rpc(description = "Stops the webcam stream.")
-  public void webcamStop() {
-    stopServer();
-    stopStream();
-    releaseCamera();
-  }
-
-  private FutureActivityTask<SurfaceHolder> createPreviewTask() throws IOException,
-      InterruptedException {
-    FutureActivityTask<SurfaceHolder> task = new FutureActivityTask<SurfaceHolder>() {
-      @SuppressWarnings("deprecation")
-	@Override
-      public void onCreate() {
-        super.onCreate();
-        final SurfaceView view = new SurfaceView(getActivity());
-        getActivity().setContentView(view);
-        getActivity().getWindow().setSoftInputMode(
-            WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
-        view.getHolder().setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
-        view.getHolder().addCallback(new Callback() {
-          @Override
-          public void surfaceDestroyed(SurfaceHolder holder) {
-          }
-
-          @Override
-          public void surfaceCreated(SurfaceHolder holder) {
-            setResult(view.getHolder());
-          }
-
-          @Override
-          public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
-          }
-        });
-      }
-    };
-    FutureActivityTaskExecutor taskExecutor =
-        ((MNApp) mService.getApplication()).getTaskExecutor();
-    taskExecutor.execute(task);
-    mCamera.setPreviewDisplay(task.getResult());
-    return task;
-  }
-
-  @Rpc(description = "Start Preview Mode. Throws 'preview' events.",returns="True if successful")
-  public boolean cameraStartPreview(
-          @RpcParameter(name = "resolutionLevel", description = "increasing this number provides higher resolution") @RpcDefault("0") Integer resolutionLevel,
-          @RpcParameter(name = "jpegQuality", description = "a number from 0-100") @RpcDefault("20") Integer jpegQuality,
-          @RpcParameter(name = "filepath", description = "Path to store jpeg files.") @RpcOptional String filepath)
-      throws InterruptedException {
-    mDest=null;
-    if (filepath!=null && (filepath.length()>0)) {
-      mDest = new File(filepath);
-      if (!mDest.exists()) mDest.mkdirs();
-      if (!(mDest.isDirectory() && mDest.canWrite())) {
-        return false;
-      }
-    }
-      
-    try {
-      openCamera(resolutionLevel, jpegQuality);
-    } catch (IOException e) {
-      Log.e(e);
-      return false;
-    }
-    startPreview();
-    return true;
-  }
-
-  @Rpc(description = "Stop the preview mode.")
-  public void cameraStopPreview() {
-    stopPreview();
-  }
-
-  private void startPreview() {
-    mPreview = true;
-    mCamera.setOneShotPreviewCallback(mPreviewEvent);
-  }
-  
-  private void stopPreview() {
-    mPreview = false;
-    if (mPreviewTask!=null)
-    {
-      mPreviewTask.finish();
-      mPreviewTask=null;
-    }
-    releaseCamera();
-  }
-
-  @Override
-  public void shutdown() {
-    mPreview=false;
-    webcamStop();
-  }
-}
diff --git a/src/com/googlecode/android_scripting/facade/WifiFacade.java b/src/com/googlecode/android_scripting/facade/WifiFacade.java
deleted file mode 100644
index 24b5c014..00000000
--- a/src/com/googlecode/android_scripting/facade/WifiFacade.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package com.googlecode.android_scripting.facade;
-
-import android.app.Service;
-import android.content.Context;
-import android.net.wifi.ScanResult;
-import android.net.wifi.WifiInfo;
-import android.net.wifi.WifiManager;
-import android.net.wifi.WifiManager.WifiLock;
-
-import com.googlecode.android_scripting.jsonrpc.RpcReceiver;
-import com.googlecode.android_scripting.rpc.Rpc;
-import com.googlecode.android_scripting.rpc.RpcOptional;
-import com.googlecode.android_scripting.rpc.RpcParameter;
-
-import java.util.List;
-
-/**
- * Wifi functions.
- * 
- */
-public class WifiFacade extends RpcReceiver {
-
-  private final Service mService;
-  private final WifiManager mWifi;
-  private WifiLock mLock;
-
-  public WifiFacade(FacadeManager manager) {
-    super(manager);
-    mService = manager.getService();
-    mWifi = (WifiManager) mService.getSystemService(Context.WIFI_SERVICE);
-    mLock = null;
-  }
-
-  private void makeLock(int wifiMode) {
-    if (mLock == null) {
-      mLock = mWifi.createWifiLock(wifiMode, "sl4a");
-      mLock.acquire();
-    }
-  }
-
-  @Rpc(description = "Returns the list of access points found during the most recent Wifi scan.")
-  public List<ScanResult> wifiGetScanResults() {
-    return mWifi.getScanResults();
-  }
-
-  @Rpc(description = "Acquires a full Wifi lock.")
-  public void wifiLockAcquireFull() {
-    makeLock(WifiManager.WIFI_MODE_FULL);
-  }
-
-  @Rpc(description = "Acquires a scan only Wifi lock.")
-  public void wifiLockAcquireScanOnly() {
-    makeLock(WifiManager.WIFI_MODE_SCAN_ONLY);
-  }
-
-  @Rpc(description = "Releases a previously acquired Wifi lock.")
-  public void wifiLockRelease() {
-    if (mLock != null) {
-      mLock.release();
-      mLock = null;
-    }
-  }
-
-  @Rpc(description = "Starts a scan for Wifi access points.", returns = "True if the scan was initiated successfully.")
-  public Boolean wifiStartScan() {
-    return mWifi.startScan();
-  }
-
-  @Rpc(description = "Checks Wifi state.", returns = "True if Wifi is enabled.")
-  public Boolean checkWifiState() {
-    return mWifi.getWifiState() == WifiManager.WIFI_STATE_ENABLED;
-  }
-
-  @Rpc(description = "Toggle Wifi on and off.", returns = "True if Wifi is enabled.")
-  public Boolean toggleWifiState(@RpcParameter(name = "enabled") @RpcOptional Boolean enabled) {
-    if (enabled == null) {
-      enabled = !checkWifiState();
-    }
-    mWifi.setWifiEnabled(enabled);
-    return enabled;
-  }
-
-  @Rpc(description = "Disconnects from the currently active access point.", returns = "True if the operation succeeded.")
-  public Boolean wifiDisconnect() {
-    return mWifi.disconnect();
-  }
-
-  @Rpc(description = "Returns information about the currently active access point.")
-  public WifiInfo wifiGetConnectionInfo() {
-    return mWifi.getConnectionInfo();
-  }
-
-  @Rpc(description = "Reassociates with the currently active access point.", returns = "True if the operation succeeded.")
-  public Boolean wifiReassociate() {
-    return mWifi.reassociate();
-  }
-
-  @Rpc(description = "Reconnects to the currently active access point.", returns = "True if the operation succeeded.")
-  public Boolean wifiReconnect() {
-    return mWifi.reconnect();
-  }
-
-  @Override
-  public void shutdown() {
-    wifiLockRelease();
-  }
-}
diff --git a/src/com/googlecode/android_scripting/facade/ui/AlertDialogTask.java b/src/com/googlecode/android_scripting/facade/ui/AlertDialogTask.java
deleted file mode 100644
index da085b6c..00000000
--- a/src/com/googlecode/android_scripting/facade/ui/AlertDialogTask.java
+++ /dev/null
@@ -1,295 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.facade.ui;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.AlertDialog.Builder;
-import android.content.DialogInterface;
-import android.text.method.PasswordTransformationMethod;
-import android.widget.EditText;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-
-/**
- * Wrapper class for alert dialog running in separate thread.
- * 
- * @author MeanEYE.rcf (meaneye.rcf@gmail.com)
- */
-class AlertDialogTask extends DialogTask {
-
-  private final String mTitle;
-  private final String mMessage;
-
-  private final List<String> mItems;
-  private final Set<Integer> mSelectedItems;
-  private final Map<String, Object> mResultMap;
-  private InputType mInputType;
-  private int mEditInputType = 0;
-
-  private String mPositiveButtonText;
-  private String mNegativeButtonText;
-  private String mNeutralButtonText;
-
-  private EditText mEditText;
-  private String mDefaultText;
-
-  private enum InputType {
-    DEFAULT, MENU, SINGLE_CHOICE, MULTI_CHOICE, PLAIN_TEXT, PASSWORD;
-  }
-
-  public AlertDialogTask(String title, String message) {
-    mTitle = title;
-    mMessage = message;
-    mInputType = InputType.DEFAULT;
-    mItems = new ArrayList<String>();
-    mSelectedItems = new TreeSet<Integer>();
-    mResultMap = new HashMap<String, Object>();
-  }
-
-  public void setPositiveButtonText(String text) {
-    mPositiveButtonText = text;
-  }
-
-  public void setNegativeButtonText(String text) {
-    mNegativeButtonText = text;
-  }
-
-  public void setNeutralButtonText(String text) {
-    mNeutralButtonText = text;
-  }
-
-  /**
-   * Set list items.
-   * 
-   * @param items
-   */
-  public void setItems(JSONArray items) {
-    mItems.clear();
-    for (int i = 0; i < items.length(); i++) {
-      try {
-        mItems.add(items.getString(i));
-      } catch (JSONException e) {
-        throw new RuntimeException(e);
-      }
-    }
-    mInputType = InputType.MENU;
-  }
-
-  /**
-   * Set single choice items.
-   * 
-   * @param items
-   *          a list of items as {@link String}s to display
-   * @param selected
-   *          the index of the item that is selected by default
-   */
-  public void setSingleChoiceItems(JSONArray items, int selected) {
-    setItems(items);
-    mSelectedItems.clear();
-    mSelectedItems.add(selected);
-    mInputType = InputType.SINGLE_CHOICE;
-  }
-
-  /**
-   * Set multi choice items.
-   * 
-   * @param items
-   *          a list of items as {@link String}s to display
-   * @param selected
-   *          a list of indices for items that should be selected by default
-   * @throws JSONException
-   */
-  public void setMultiChoiceItems(JSONArray items, JSONArray selected) throws JSONException {
-    setItems(items);
-    mSelectedItems.clear();
-    if (selected != null) {
-      for (int i = 0; i < selected.length(); i++) {
-        mSelectedItems.add(selected.getInt(i));
-      }
-    }
-    mInputType = InputType.MULTI_CHOICE;
-  }
-
-  /**
-   * Returns the list of selected items.
-   */
-  public Set<Integer> getSelectedItems() {
-    return mSelectedItems;
-  }
-
-  public void setTextInput(String defaultText) {
-    mDefaultText = defaultText;
-    mInputType = InputType.PLAIN_TEXT;
-    setEditInputType("text");
-  }
-
-  public void setEditInputType(String editInputType) {
-    String[] list = editInputType.split("\\|");
-    Map<String, Integer> types = ViewInflater.getInputTypes();
-    mEditInputType = 0;
-    for (String flag : list) {
-      Integer v = types.get(flag.trim());
-      if (v != null) {
-        mEditInputType |= v;
-      }
-    }
-    if (mEditInputType == 0) {
-      mEditInputType = android.text.InputType.TYPE_CLASS_TEXT;
-    }
-  }
-
-  public void setPasswordInput() {
-    mInputType = InputType.PASSWORD;
-  }
-
-  @Override
-  public void onCreate() {
-    super.onCreate();
-    AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-    if (mTitle != null) {
-      builder.setTitle(mTitle);
-    }
-    // Can't display both a message and items. We'll elect to show the items instead.
-    if (mMessage != null && mItems.isEmpty()) {
-      builder.setMessage(mMessage);
-    }
-    switch (mInputType) {
-    // Add single choice menu items to dialog.
-    case SINGLE_CHOICE:
-      builder.setSingleChoiceItems(getItemsAsCharSequenceArray(), mSelectedItems.iterator().next(),
-          new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int item) {
-              mSelectedItems.clear();
-              mSelectedItems.add(item);
-            }
-          });
-      break;
-    // Add multiple choice items to the dialog.
-    case MULTI_CHOICE:
-      boolean[] selectedItems = new boolean[mItems.size()];
-      for (int i : mSelectedItems) {
-        selectedItems[i] = true;
-      }
-      builder.setMultiChoiceItems(getItemsAsCharSequenceArray(), selectedItems,
-          new DialogInterface.OnMultiChoiceClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int item, boolean isChecked) {
-              if (isChecked) {
-                mSelectedItems.add(item);
-              } else {
-                mSelectedItems.remove(item);
-              }
-            }
-          });
-      break;
-    // Add standard, menu-like, items to dialog.
-    case MENU:
-      builder.setItems(getItemsAsCharSequenceArray(), new DialogInterface.OnClickListener() {
-        public void onClick(DialogInterface dialog, int item) {
-          Map<String, Integer> result = new HashMap<String, Integer>();
-          result.put("item", item);
-          dismissDialog();
-          setResult(result);
-        }
-      });
-      break;
-    case PLAIN_TEXT:
-      mEditText = new EditText(getActivity());
-      if (mDefaultText != null) {
-        mEditText.setText(mDefaultText);
-      }
-      mEditText.setInputType(mEditInputType);
-      builder.setView(mEditText);
-      break;
-    case PASSWORD:
-      mEditText = new EditText(getActivity());
-      mEditText.setInputType(android.text.InputType.TYPE_TEXT_VARIATION_PASSWORD);
-      mEditText.setTransformationMethod(new PasswordTransformationMethod());
-      builder.setView(mEditText);
-      break;
-    default:
-      // No input type specified.
-    }
-    configureButtons(builder, getActivity());
-    addOnCancelListener(builder, getActivity());
-    mDialog = builder.show();
-    mShowLatch.countDown();
-  }
-
-  private CharSequence[] getItemsAsCharSequenceArray() {
-    return mItems.toArray(new CharSequence[mItems.size()]);
-  }
-
-  private Builder addOnCancelListener(final AlertDialog.Builder builder, final Activity activity) {
-    return builder.setOnCancelListener(new DialogInterface.OnCancelListener() {
-      @Override
-      public void onCancel(DialogInterface dialog) {
-        mResultMap.put("canceled", true);
-        setResult();
-      }
-    });
-  }
-
-  private void configureButtons(final AlertDialog.Builder builder, final Activity activity) {
-    DialogInterface.OnClickListener buttonListener = new DialogInterface.OnClickListener() {
-      @Override
-      public void onClick(DialogInterface dialog, int which) {
-        switch (which) {
-        case DialogInterface.BUTTON_POSITIVE:
-          mResultMap.put("which", "positive");
-          break;
-        case DialogInterface.BUTTON_NEGATIVE:
-          mResultMap.put("which", "negative");
-          break;
-        case DialogInterface.BUTTON_NEUTRAL:
-          mResultMap.put("which", "neutral");
-
-          break;
-        }
-        setResult();
-      }
-    };
-    if (mNegativeButtonText != null) {
-      builder.setNegativeButton(mNegativeButtonText, buttonListener);
-    }
-    if (mPositiveButtonText != null) {
-      builder.setPositiveButton(mPositiveButtonText, buttonListener);
-    }
-    if (mNeutralButtonText != null) {
-      builder.setNeutralButton(mNeutralButtonText, buttonListener);
-    }
-  }
-
-  private void setResult() {
-    dismissDialog();
-    if (mInputType == InputType.PLAIN_TEXT || mInputType == InputType.PASSWORD) {
-      mResultMap.put("value", mEditText.getText().toString());
-    }
-    setResult(mResultMap);
-  }
-
-}
diff --git a/src/com/googlecode/android_scripting/facade/ui/DatePickerDialogTask.java b/src/com/googlecode/android_scripting/facade/ui/DatePickerDialogTask.java
deleted file mode 100644
index 26b916d1..00000000
--- a/src/com/googlecode/android_scripting/facade/ui/DatePickerDialogTask.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.facade.ui;
-
-import android.app.DatePickerDialog;
-import android.content.DialogInterface;
-import android.util.AndroidRuntimeException;
-import android.widget.DatePicker;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-/**
- * Wrapper class for date picker dialog running in separate thread.
- * 
- * @author MeanEYE.rcf (meaneye.rcf@gmail.com)
- */
-public class DatePickerDialogTask extends DialogTask {
-  public static int mYear;
-  public static int mMonth;
-  public static int mDay;
-
-  public DatePickerDialogTask(int year, int month, int day) {
-    mYear = year;
-    mMonth = month - 1;
-    mDay = day;
-  }
-
-  @Override
-  public void onCreate() {
-    super.onCreate();
-    mDialog = new DatePickerDialog(getActivity(), new DatePickerDialog.OnDateSetListener() {
-      @Override
-      public void onDateSet(DatePicker view, int year, int month, int day) {
-        JSONObject result = new JSONObject();
-        try {
-          result.put("which", "positive");
-          result.put("year", year);
-          result.put("month", month + 1);
-          result.put("day", day);
-          setResult(result);
-        } catch (JSONException e) {
-          throw new AndroidRuntimeException(e);
-        }
-      }
-    }, mYear, mMonth, mDay);
-    mDialog.setOnCancelListener(new DialogInterface.OnCancelListener() {
-      @Override
-      public void onCancel(DialogInterface view) {
-        JSONObject result = new JSONObject();
-        try {
-          result.put("which", "neutral");
-          result.put("year", mYear);
-          result.put("month", mMonth + 1);
-          result.put("day", mDay);
-          setResult(result);
-        } catch (JSONException e) {
-          throw new AndroidRuntimeException(e);
-        }
-      }
-    });
-    mDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
-      @Override
-      public void onDismiss(DialogInterface dialog) {
-        JSONObject result = new JSONObject();
-        try {
-          result.put("which", "negative");
-          result.put("year", mYear);
-          result.put("month", mMonth + 1);
-          result.put("day", mDay);
-          setResult(result);
-        } catch (JSONException e) {
-          throw new AndroidRuntimeException(e);
-        }
-      }
-    });
-    mDialog.show();
-    mShowLatch.countDown();
-  }
-}
diff --git a/src/com/googlecode/android_scripting/facade/ui/DialogTask.java b/src/com/googlecode/android_scripting/facade/ui/DialogTask.java
deleted file mode 100644
index ea35e912..00000000
--- a/src/com/googlecode/android_scripting/facade/ui/DialogTask.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.facade.ui;
-
-import android.app.Dialog;
-
-import com.googlecode.android_scripting.facade.EventFacade;
-import com.googlecode.android_scripting.future.FutureActivityTask;
-
-import java.util.concurrent.CountDownLatch;
-
-abstract class DialogTask extends FutureActivityTask<Object> {
-
-  protected Dialog mDialog;
-  private EventFacade mEventFacade;
-
-  public EventFacade getEventFacade() {
-    return mEventFacade;
-  }
-
-  public void setEventFacade(EventFacade mEventFacade) {
-    this.mEventFacade = mEventFacade;
-  }
-
-  @Override
-  protected void setResult(Object object) {
-    super.setResult(object);
-    EventFacade eventFacade = getEventFacade();
-    if (eventFacade != null) {
-      eventFacade.postEvent("dialog", object);
-    }
-  }
-
-  protected final CountDownLatch mShowLatch = new CountDownLatch(1);
-
-  /**
-   * Returns the wrapped {@link Dialog}.
-   */
-  public Dialog getDialog() {
-    return mDialog;
-  }
-
-  /**
-   * Dismiss the {@link Dialog} and close {@link Sl4aActivity}.
-   */
-  public void dismissDialog() {
-    if (mDialog != null) {
-      mDialog.dismiss();
-      finish();
-    }
-    mDialog = null;
-  }
-
-  /**
-   * Returns the {@link CountDownLatch} that is counted down when the dialog is shown.
-   */
-  public CountDownLatch getShowLatch() {
-    return mShowLatch;
-  }
-}
diff --git a/src/com/googlecode/android_scripting/facade/ui/FullScreenTask.java b/src/com/googlecode/android_scripting/facade/ui/FullScreenTask.java
deleted file mode 100644
index 1474f10d..00000000
--- a/src/com/googlecode/android_scripting/facade/ui/FullScreenTask.java
+++ /dev/null
@@ -1,239 +0,0 @@
-package com.googlecode.android_scripting.facade.ui;
-
-import android.os.Handler;
-import android.view.KeyEvent;
-import android.view.Menu;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup.LayoutParams;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.Button;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import com.googlecode.android_scripting.facade.EventFacade;
-import com.googlecode.android_scripting.future.FutureActivityTask;
-import com.hipipal.sl4alib.R;
-
-import java.io.StringReader;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.CountDownLatch;
-
-import org.json.JSONArray;
-import org.xmlpull.v1.XmlPullParser;
-
-public class FullScreenTask extends FutureActivityTask<Object> implements OnClickListener,
-    OnItemClickListener {
-  private EventFacade mEventFacade;
-  private UiFacade mUiFacade;
-  public View mView = null;
-  protected ViewInflater mInflater = new ViewInflater();
-  protected String mLayout;
-  protected final CountDownLatch mShowLatch = new CountDownLatch(1);
-  protected Handler mHandler = null;
-  private List<Integer> mOverrideKeys;
-
-  public FullScreenTask(String layout) {
-    super();
-    mLayout = layout;
-  }
-
-  @Override
-  public void onCreate() {
-    // super.onCreate();
-    if (mHandler == null) {
-      mHandler = new Handler();
-    }
-    mInflater.getErrors().clear();
-    try {
-      if (mView == null) {
-        StringReader sr = new StringReader(mLayout);
-        XmlPullParser xml = ViewInflater.getXml(sr);
-        mView = mInflater.inflate(getActivity(), xml);
-      }
-    } catch (Exception e) {
-      mInflater.getErrors().add(e.toString());
-      mView = defaultView();
-      mInflater.setIdList(R.id.class);
-    }
-    getActivity().setContentView(mView);
-    getActivity().setTitle("SL4A Title");
-    mInflater.setClickListener(mView, this, this);
-    mShowLatch.countDown();
-  }
-
-  @Override
-  public void onDestroy() {
-    mEventFacade.postEvent("screen", "destroy");
-    super.onDestroy();
-  }
-
-  /** default view in case of errors */
-  @SuppressWarnings("deprecation")
-protected View defaultView() {
-    LinearLayout result = new LinearLayout(getActivity());
-    result.setOrientation(LinearLayout.VERTICAL);
-    TextView text = new TextView(getActivity());
-    text.setText("Sample Layout");
-    result.addView(text, LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT);
-    Button b = new Button(getActivity());
-    b.setText("OK");
-    result.addView(b, LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT);
-    return result;
-  }
-
-  public EventFacade getEventFacade() {
-    return mEventFacade;
-  }
-
-  public void setEventFacade(EventFacade eventFacade) {
-    mEventFacade = eventFacade;
-  }
-
-  public void setUiFacade(UiFacade uiFacade) {
-    mUiFacade = uiFacade;
-  }
-
-  public CountDownLatch getShowLatch() {
-    return mShowLatch;
-  }
-
-  public Map<String, Map<String, String>> getViewAsMap() {
-    return mInflater.getViewAsMap(mView);
-  }
-
-  private View getViewByName(String idName) {
-    View result = null;
-    int id = mInflater.getId(idName);
-    if (id != 0) {
-      result = mView.findViewById(id);
-    }
-    return result;
-  }
-
-  public Map<String, String> getViewDetail(String idName) {
-    Map<String, String> result = new HashMap<String, String>();
-    result.put("error", "id not found (" + idName + ")");
-    View v = getViewByName(idName);
-    if (v != null) {
-      result = mInflater.getViewInfo(v);
-    }
-    return result;
-  }
-
-  public String setViewProperty(String idName, String property, String value) {
-    View v = getViewByName(idName);
-    mInflater.getErrors().clear();
-    if (v != null) {
-      SetProperty p = new SetProperty(v, property, value);
-      mHandler.post(p);
-      try {
-        p.mLatch.await();
-      } catch (InterruptedException e) {
-        mInflater.getErrors().add(e.toString());
-      }
-    } else {
-      return "View " + idName + " not found.";
-    }
-    if (mInflater.getErrors().size() == 0) {
-      return "OK";
-    }
-    return mInflater.getErrors().get(0);
-  }
-
-  public String setList(String id, JSONArray items) {
-    View v = getViewByName(id);
-    mInflater.getErrors().clear();
-    if (v != null) {
-      SetList p = new SetList(v, items);
-      mHandler.post(p);
-      try {
-        p.mLatch.await();
-      } catch (InterruptedException e) {
-        mInflater.getErrors().add(e.toString());
-      }
-    } else {
-      return "View " + id + " not found.";
-    }
-    if (mInflater.getErrors().size() == 0) {
-      return "OK";
-    }
-    return mInflater.getErrors().get(0);
-  }
-
-  @Override
-  public void onClick(View view) {
-    mEventFacade.postEvent("click", mInflater.getViewInfo(view));
-  }
-
-  private class SetProperty implements Runnable {
-    View mView;
-    String mProperty;
-    String mValue;
-    CountDownLatch mLatch = new CountDownLatch(1);
-
-    SetProperty(View view, String property, String value) {
-      mView = view;
-      mProperty = property;
-      mValue = value;
-    }
-
-    @Override
-    public void run() {
-      // TODO Auto-generated method stub
-      mInflater.setProperty(mView, mProperty, mValue);
-      mView.invalidate();
-      mLatch.countDown();
-    }
-  }
-
-  private class SetList implements Runnable {
-    View mView;
-    JSONArray mItems;
-    CountDownLatch mLatch = new CountDownLatch(1);
-
-    SetList(View view, JSONArray items) {
-      mView = view;
-      mItems = items;
-      mView.invalidate();
-      mLatch.countDown();
-    }
-
-    @Override
-    public void run() {
-      mInflater.setListAdapter(mView, mItems);
-    }
-  }
-
-  @Override
-  public boolean onKeyDown(int keyCode, KeyEvent event) {
-    Map<String, String> data = new HashMap<String, String>();
-    data.put("key", String.valueOf(keyCode));
-    data.put("action", String.valueOf(event.getAction()));
-    mEventFacade.postEvent("key", data);
-    boolean overrideKey =
-        (keyCode == KeyEvent.KEYCODE_BACK)
-            || (mOverrideKeys == null ? false : mOverrideKeys.contains(keyCode));
-    return overrideKey;
-  }
-
-  @Override
-  public boolean onPrepareOptionsMenu(Menu menu) {
-    return mUiFacade.onPrepareOptionsMenu(menu);
-  }
-
-  @Override
-  public void onItemClick(AdapterView<?> aview, View aitem, int position, long id) {
-    Map<String, String> data = mInflater.getViewInfo(aview);
-    data.put("position", String.valueOf(position));
-    mEventFacade.postEvent("itemclick", data);
-  }
-
-  public void setOverrideKeys(List<Integer> overrideKeys) {
-    mOverrideKeys = overrideKeys;
-  }
-
-}
diff --git a/src/com/googlecode/android_scripting/facade/ui/NFCBeamTask.java b/src/com/googlecode/android_scripting/facade/ui/NFCBeamTask.java
deleted file mode 100644
index baeb8eee..00000000
--- a/src/com/googlecode/android_scripting/facade/ui/NFCBeamTask.java
+++ /dev/null
@@ -1,639 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.facade.ui;
-
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import com.googlecode.android_scripting.activity.FutureActivity;
-import com.hipipal.sl4alib.R;
-import com.zuowuxuxi.base._WBase;
-
-import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.PendingIntent;
-import android.app.AlertDialog.Builder;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.DialogInterface.OnClickListener;
-import android.content.IntentFilter.MalformedMimeTypeException;
-import android.nfc.NdefMessage;
-import android.nfc.NdefRecord;
-import android.nfc.NfcAdapter;
-import android.nfc.NfcAdapter.CreateNdefMessageCallback;
-import android.nfc.NfcAdapter.OnNdefPushCompleteCallback;
-import android.nfc.NfcEvent;
-import android.os.Build;
-import android.os.Handler;
-import android.os.Message;
-import android.os.Parcelable;
-import android.provider.Settings;
-import android.text.method.PasswordTransformationMethod;
-import android.util.Log;
-import android.view.KeyEvent;
-import android.widget.EditText;
-import android.widget.Toast;
-
-/**
- * Wrapper class for progress dialog running in separate thread
- * 
- * @author MeanEYE.rcf (meaneye.rcf@gmail.com)
- */
-class NFCBeamTask extends DialogTask implements CreateNdefMessageCallback, OnNdefPushCompleteCallback {
-
-	  private final String TAG = "NFCBeamTask";
-	  private final String mTitle;
-	  private final String mMessage;
-
-	  private final List<String> mItems;
-	  private final Set<Integer> mSelectedItems;
-	  private final Map<String, Object> mResultMap;
-	  private InputType mInputType;
-	  private int mEditInputType = 0;
-
-	  private String mPositiveButtonText;
-	  private String mNegativeButtonText;
-	  private String mNeutralButtonText;
-
-	  private EditText mEditText;
-	  private String mDefaultText;
-
-	  private int beamStat=0;
-	  private enum InputType {
-	    DEFAULT, MENU, SINGLE_CHOICE, MULTI_CHOICE, PLAIN_TEXT, PASSWORD;
-	  }
-
-	  public NFCBeamTask(String title, String message) {
-	    mTitle = title;
-	    mMessage = message;
-	    mInputType = InputType.DEFAULT;
-	    mItems = new ArrayList<String>();
-	    mSelectedItems = new TreeSet<Integer>();
-	    mResultMap = new HashMap<String, Object>();
-	  }
-
-	  public void setPositiveButtonText(String text) {
-	    mPositiveButtonText = text;
-	  }
-
-	  public void setNegativeButtonText(String text) {
-	    mNegativeButtonText = text;
-	  }
-
-	  public void setNeutralButtonText(String text) {
-	    mNeutralButtonText = text;
-	  }
-
-	  /**
-	   * Set list items.
-	   * 
-	   * @param items
-	   */
-	  public void setItems(JSONArray items) {
-	    mItems.clear();
-	    for (int i = 0; i < items.length(); i++) {
-	      try {
-	        mItems.add(items.getString(i));
-	      } catch (JSONException e) {
-	        throw new RuntimeException(e);
-	      }
-	    }
-	    mInputType = InputType.MENU;
-	  }
-
-	  /**
-	   * Set single choice items.
-	   * 
-	   * @param items
-	   *          a list of items as {@link String}s to display
-	   * @param selected
-	   *          the index of the item that is selected by default
-	   */
-	  public void setSingleChoiceItems(JSONArray items, int selected) {
-	    setItems(items);
-	    mSelectedItems.clear();
-	    mSelectedItems.add(selected);
-	    mInputType = InputType.SINGLE_CHOICE;
-	  }
-
-	  /**
-	   * Set multi choice items.
-	   * 
-	   * @param items
-	   *          a list of items as {@link String}s to display
-	   * @param selected
-	   *          a list of indices for items that should be selected by default
-	   * @throws JSONException
-	   */
-	  public void setMultiChoiceItems(JSONArray items, JSONArray selected) throws JSONException {
-	    setItems(items);
-	    mSelectedItems.clear();
-	    if (selected != null) {
-	      for (int i = 0; i < selected.length(); i++) {
-	        mSelectedItems.add(selected.getInt(i));
-	      }
-	    }
-	    mInputType = InputType.MULTI_CHOICE;
-	  }
-
-	  /**
-	   * Returns the list of selected items.
-	   */
-	  public Set<Integer> getSelectedItems() {
-	    return mSelectedItems;
-	  }
-
-	  public void setTextInput(String defaultText) {
-	    mDefaultText = defaultText;
-	    mInputType = InputType.PLAIN_TEXT;
-	    setEditInputType("text");
-	  }
-
-	  public void setEditInputType(String editInputType) {
-	    String[] list = editInputType.split("\\|");
-	    Map<String, Integer> types = ViewInflater.getInputTypes();
-	    mEditInputType = 0;
-	    for (String flag : list) {
-	      Integer v = types.get(flag.trim());
-	      if (v != null) {
-	        mEditInputType |= v;
-	      }
-	    }
-	    if (mEditInputType == 0) {
-	      mEditInputType = android.text.InputType.TYPE_CLASS_TEXT;
-	    }
-	  }
-
-	  public void setPasswordInput() {
-	    mInputType = InputType.PASSWORD;
-	  }
-
-  
-	NfcAdapter _nfcAdapter;
-	private PendingIntent _nfcPendingIntent;
-	IntentFilter[] _readTagFilters;
-    protected _WBase WBase;
-    protected int dialogIndex;
-
-    private String content = "QPython NFC";
-    
-    @SuppressLint("NewApi")
-	public boolean initNFCBeam() {
-    	Log.d(TAG, "initNFCBeam");
-    	mhandler = new Handler() {
-    		@Override
-    		public void handleMessage(Message msg) {
-    			//Toast.makeText(getActivity().getApplicationContext(), "Master has sent content", Toast.LENGTH_SHORT).show();
-    			
-    			setResult("master","ok");
-    		}
-    	};
-    	
-    	WBase = new _WBase(getActivity().getApplicationContext(), getActivity());
-    	dialogIndex = 1;
-
-    	_nfcAdapter = NfcAdapter.getDefaultAdapter(getActivity().getApplicationContext());
-	
-    	if (_nfcAdapter == null) {
-			Toast.makeText(getActivity().getApplicationContext(), "NFC is not available, please upgrade your mobile", Toast.LENGTH_SHORT).show();
-
-    		/*WBase.setTxtDialogParam(R.drawable.alert_dialog_icon,
-				"NFC is not available, please update your mobile",
-				new OnClickListener() {
-					@Override
-					public void onClick(DialogInterface arg0, int arg1) {
-					}
-			});
-    		getActivity().showDialog(_WBase.DIALOG_NOTIFY_MESSAGE + dialogIndex);
-    		dialogIndex++;*/
-    	} else {
-
-			if (!_nfcAdapter.isEnabled()) {
-				Toast.makeText(getActivity().getApplicationContext(), "NFC is closed, please enable it with beam", Toast.LENGTH_SHORT).show();
-
-/*				WBase.setTxtDialogParam(R.drawable.alert_dialog_icon,
-						"NFC is closed, please enable it with beam",
-						new OnClickListener() {
-							@Override
-							public void onClick(DialogInterface arg0, int arg1) {
-								getActivity().startActivity(new Intent(
-										Settings.ACTION_NFC_SETTINGS));
-							}
-						});
-				getActivity().showDialog(_WBase.DIALOG_NOTIFY_MESSAGE + dialogIndex);
-				dialogIndex++;*/
-			} else {
-				launchNFC();
-				return true;
-			}
-    	}
-    	return false;
-    }
-    
-    public void setBeamType(int stat) {
-    	beamStat = stat;
-    }
-    @SuppressLint("NewApi")
-	public void launchNFC() {
-    	Log.d(TAG, "launchNFC:"+beamStat);
-    	if (beamStat == 0) {
-			_nfcAdapter.setNdefPushMessageCallback(this, getActivity());
-			_nfcAdapter.setOnNdefPushCompleteCallback(this, getActivity());
-
-			// start NFC Connection
-			/*_nfcPendingIntent = PendingIntent.getActivity(getActivity().getApplicationContext(), 0,
-					new Intent(getActivity().getApplicationContext(), FutureActivity.class)
-							.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP), 0);
-
-			IntentFilter ndefDetected = new IntentFilter(
-					NfcAdapter.ACTION_NDEF_DISCOVERED);
-			try {
-				ndefDetected.addDataType("application/com.hipipal.qpy.nfc");
-			} catch (MalformedMimeTypeException e) {
-				throw new RuntimeException("Could not add MIME type.", e);
-			}
-
-			_readTagFilters = new IntentFilter[] { ndefDetected };*/
-    	} else if (beamStat == 1) {
-			//_nfcAdapter.setNdefPushMessageCallback(this, getActivity());
-			//_nfcAdapter.setOnNdefPushCompleteCallback(this, getActivity());
-
-			// start NFC Connection
-			_nfcPendingIntent = PendingIntent.getActivity(getActivity().getApplicationContext(), 0,
-					new Intent(getActivity().getApplicationContext(), FutureActivity.class)
-							.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP), 0);
-
-			IntentFilter ndefDetected = new IntentFilter(
-					NfcAdapter.ACTION_NDEF_DISCOVERED);
-			try {
-				ndefDetected.addDataType("application/com.hipipal.qpy.nfc");
-			} catch (MalformedMimeTypeException e) {
-				throw new RuntimeException("Could not add MIME type.", e);
-			}
-
-			_readTagFilters = new IntentFilter[] { ndefDetected };
-    	}
-    }
-    
-
-    @TargetApi(Build.VERSION_CODES.GINGERBREAD)
-    @SuppressLint("NewApi")
-    @Override
-    public void onCreate() {
-    	super.onCreate();
-    	if (initNFCBeam()) {
-
-		    AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-		    if (mTitle != null) {
-		      builder.setTitle(mTitle);
-		    }
-		    // Can't display both a message and items. We'll elect to show the items instead.
-		    if (mMessage != null && mItems.isEmpty()) {
-		      builder.setMessage(mMessage);
-		    }
-		    switch (mInputType) {
-		    // Add single choice menu items to dialog.
-		    case SINGLE_CHOICE:
-		      builder.setSingleChoiceItems(getItemsAsCharSequenceArray(), mSelectedItems.iterator().next(),
-		          new DialogInterface.OnClickListener() {
-		            @Override
-		            public void onClick(DialogInterface dialog, int item) {
-		              mSelectedItems.clear();
-		              mSelectedItems.add(item);
-		            }
-		          });
-		      break;
-		    // Add multiple choice items to the dialog.
-		    case MULTI_CHOICE:
-		      boolean[] selectedItems = new boolean[mItems.size()];
-		      for (int i : mSelectedItems) {
-		        selectedItems[i] = true;
-		      }
-		      builder.setMultiChoiceItems(getItemsAsCharSequenceArray(), selectedItems,
-		          new DialogInterface.OnMultiChoiceClickListener() {
-		            @Override
-		            public void onClick(DialogInterface dialog, int item, boolean isChecked) {
-		              if (isChecked) {
-		                mSelectedItems.add(item);
-		              } else {
-		                mSelectedItems.remove(item);
-		              }
-		            }
-		          });
-		      break;
-		    // Add standard, menu-like, items to dialog.
-		    case MENU:
-		      builder.setItems(getItemsAsCharSequenceArray(), new DialogInterface.OnClickListener() {
-		        public void onClick(DialogInterface dialog, int item) {
-		          Map<String, Integer> result = new HashMap<String, Integer>();
-		          result.put("item", item);
-		          dismissDialog();
-		          setResult(result);
-		        }
-		      });
-		      break;
-		    case PLAIN_TEXT:
-		      mEditText = new EditText(getActivity());
-		      if (mDefaultText != null) {
-		        mEditText.setText(mDefaultText);
-		      }
-		      mEditText.setInputType(mEditInputType);
-		      builder.setView(mEditText);
-		      break;
-		    case PASSWORD:
-		      mEditText = new EditText(getActivity());
-		      mEditText.setInputType(android.text.InputType.TYPE_TEXT_VARIATION_PASSWORD);
-		      mEditText.setTransformationMethod(new PasswordTransformationMethod());
-		      builder.setView(mEditText);
-		      break;
-		    default:
-		      // No input type specified.
-		    }
-		    configureButtons(builder, getActivity());
-		    addOnCancelListener(builder, getActivity());
-		    mDialog = builder.show();
-		    mShowLatch.countDown();
-    	} else {
-    		
-    	}
-  	}
-    
-    private CharSequence[] getItemsAsCharSequenceArray() {
-        return mItems.toArray(new CharSequence[mItems.size()]);
-      }
-
-      private Builder addOnCancelListener(final AlertDialog.Builder builder, final Activity activity) {
-        return builder.setOnCancelListener(new DialogInterface.OnCancelListener() {
-          @Override
-          public void onCancel(DialogInterface dialog) {
-            mResultMap.put("canceled", true);
-            setResult("self","canceled");
-          }
-        });
-      }
-
-      private void configureButtons(final AlertDialog.Builder builder, final Activity activity) {
-        DialogInterface.OnClickListener buttonListener = new DialogInterface.OnClickListener() {
-          @Override
-          public void onClick(DialogInterface dialog, int which) {
-            switch (which) {
-            case DialogInterface.BUTTON_POSITIVE:
-              mResultMap.put("which", "positive");
-              break;
-            case DialogInterface.BUTTON_NEGATIVE:
-              mResultMap.put("which", "negative");
-              break;
-            case DialogInterface.BUTTON_NEUTRAL:
-              mResultMap.put("which", "neutral");
-
-              break;
-            }
-            setResult("self","ok");
-          }
-        };
-        if (mNegativeButtonText != null) {
-          builder.setNegativeButton(mNegativeButtonText, buttonListener);
-        }
-        if (mPositiveButtonText != null) {
-          builder.setPositiveButton(mPositiveButtonText, buttonListener);
-        }
-        if (mNeutralButtonText != null) {
-          builder.setNeutralButton(mNeutralButtonText, buttonListener);
-        }
-      }
-
-      private void setResult(String ms, String stat) {
-        dismissDialog();
-        String msg = "";
-        if (mInputType == InputType.PLAIN_TEXT || mInputType == InputType.PASSWORD) {
-        	msg = mEditText.getText().toString();
-        } else {
-        	msg = content;
-        }
-        Log.d(TAG, "setResult:"+mResultMap);
-        JSONObject ret2 = new JSONObject();
-        try {
-			ret2.put("role", ms);
-	        ret2.put("stat", stat);
-	        ret2.put("message", msg);
-	        mResultMap.put("value", ret2.toString());
-
-		} catch (JSONException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-
-        setResult(mResultMap);
-      }
-
-	@SuppressLint("NewApi")
-	@Override
-	public void onPause() {
-		Log.d(TAG, "onPause");
-
-		super.onPause();
-		if (_nfcAdapter!=null && beamStat==1) {
-			_nfcAdapter.disableForegroundDispatch(getActivity());
-		}
-	}
-
-	@SuppressLint("NewApi")
-	public void onResume() {
-		Log.d(TAG, "onResume");
-		super.onResume();
-		if (_nfcAdapter!=null && beamStat==1) {
-			recvMsg();
-
-			_nfcAdapter.enableForegroundDispatch(getActivity(), _nfcPendingIntent, _readTagFilters, null);
-		}
-	}
-
-	@SuppressLint("NewApi")
-	public void recvMsg() {
-		Log.d(TAG, "recvMsg");
-		if (_nfcAdapter == null) {
-
-			Toast.makeText(getActivity().getApplicationContext(), "NFC is not available, please upgrade your mobile", Toast.LENGTH_SHORT).show();
-
-			/*WBase.setTxtDialogParam(R.drawable.alert_dialog_icon,
-					"NFC is not available, please update your mobile",
-					new OnClickListener() {
-						@Override
-						public void onClick(DialogInterface arg0, int arg1) {
-						}
-					});
-			getActivity().showDialog(_WBase.DIALOG_NOTIFY_MESSAGE + dialogIndex);
-			dialogIndex++;*/
-		} else {
-
-			if (!_nfcAdapter.isEnabled()) {
-				Toast.makeText(getActivity().getApplicationContext(), "NFC is closed, please enable it with beam", Toast.LENGTH_SHORT).show();
-
-				/*WBase.setTxtDialogParam(R.drawable.alert_dialog_icon,
-						"NFC is closed, please enable it with beam",
-						new OnClickListener() {
-							@Override
-							public void onClick(DialogInterface arg0, int arg1) {
-								startActivity(new Intent(
-										Settings.ACTION_NFC_SETTINGS));
-							}
-						});
-				getActivity().showDialog(_WBase.DIALOG_NOTIFY_MESSAGE + dialogIndex);
-				dialogIndex++;*/
-			} else {
-				// OK
-				if (getActivity().getIntent().getAction() != null) {
-
-					if (getActivity().getIntent().getAction().equals(
-							NfcAdapter.ACTION_NDEF_DISCOVERED)) {
-						NdefMessage[] msgs = getNdefMessagesFromIntent(getActivity().getIntent());
-						NdefRecord record = msgs[0].getRecords()[0];
-						byte[] payload = record.getPayload();
-
-						String payloadString = new String(payload);
-
-						//Toast.makeText(getActivity().getApplicationContext(), payloadString, Toast.LENGTH_SHORT).show();
-						
-						this.content = payloadString;
-		    			setResult("slave","ok");
-
-					} else {
-
-					}
-				}
-
-				_nfcAdapter.enableForegroundDispatch(getActivity(), _nfcPendingIntent, _readTagFilters, null);
-
-			}
-		}
-	}
-	
-	@SuppressLint("NewApi")
-	NdefMessage[] getNdefMessagesFromIntent(Intent intent) {
-		// Parse the intent
-		NdefMessage[] msgs = null;
-		String action = intent.getAction();
-		if (action.equals(NfcAdapter.ACTION_TAG_DISCOVERED)
-				|| action.equals(NfcAdapter.ACTION_NDEF_DISCOVERED)) {
-			Parcelable[] rawMsgs = intent
-					.getParcelableArrayExtra(NfcAdapter.EXTRA_NDEF_MESSAGES);
-			if (rawMsgs != null) {
-				msgs = new NdefMessage[rawMsgs.length];
-				for (int i = 0; i < rawMsgs.length; i++) {
-					msgs[i] = (NdefMessage) rawMsgs[i];
-				}
-
-			} else {
-				// Unknown tag type
-				byte[] empty = new byte[] {};
-				NdefRecord record = new NdefRecord(NdefRecord.TNF_UNKNOWN,
-						empty, empty, empty);
-				NdefMessage msg = new NdefMessage(new NdefRecord[] { record });
-				msgs = new NdefMessage[] { msg };
-			}
-
-		} else {
-			Log.e(TAG, "Unknown intent.");
-			finish();
-		}
-		return msgs;
-	}
-
-	@SuppressLint("NewApi")
-	@Override
-	public void onNewIntent(Intent intent) {
-		Log.d(TAG, "onNewIntent");
-
-		if (intent.getAction().equals(NfcAdapter.ACTION_NDEF_DISCOVERED)) {
-			NdefMessage[] msgs = getNdefMessagesFromIntent(intent);
-			NdefRecord record = msgs[0].getRecords()[0];
-			byte[] payload = record.getPayload();
-
-			String payloadString = new String(payload);
-
-			//Toast.makeText(getActivity().getApplicationContext(), payloadString, Toast.LENGTH_SHORT).show();
-			
-			this.content = payloadString;
-			setResult("slave","ok");
-
-
-		} else if (intent.getAction().equals(NfcAdapter.ACTION_TAG_DISCOVERED)) {
-			Toast.makeText(getActivity().getApplicationContext(), "This NFC tag has no NDEF data.",
-					Toast.LENGTH_LONG).show();
-		}
-	}
-
-	/*public String getResult() {
-		return content;
-	}*/
-
-	public void setContent(String content) {
-		this.content = content;
-	}
-	Handler mhandler;
-
-	
-	@SuppressLint("NewApi")
-	@Override
-	public void onNdefPushComplete(NfcEvent arg0) {
-		Log.d(TAG, "onNdefPushComplete");
-		//Toast.makeText(getActivity().getApplicationContext(), "Master", Toast.LENGTH_SHORT).show();
-
-		mhandler.sendEmptyMessage(0);
-	}
-
-	@SuppressLint("NewApi")
-	@Override
-	public NdefMessage createNdefMessage(NfcEvent arg0) {
-		String data;
-		if (mEditText!=null) {
-			data = mEditText.getText().toString();
-		} else {
-			data = content;
-		}
-	
-		String mimeType = "application/com.hipipal.qpy.nfc";
-	
-		byte[] mimeBytes = mimeType.getBytes(Charset.forName("UTF-8"));
-		byte[] dataBytes = data.getBytes(Charset.forName("UTF-8"));
-		byte[] id = new byte[0];
-	
-		NdefRecord record = new NdefRecord(NdefRecord.TNF_MIME_MEDIA,
-				mimeBytes, id, dataBytes);
-	
-		NdefMessage message = new NdefMessage(new NdefRecord[] { record });
-	
-		return message;
-	}
-	
-	  public boolean onKeyDown(int keyCode, KeyEvent event) {
-		  getActivity().finish();
-		  return true;
-	  }
-}
diff --git a/src/com/googlecode/android_scripting/facade/ui/ProgressDialogTask.java b/src/com/googlecode/android_scripting/facade/ui/ProgressDialogTask.java
deleted file mode 100644
index 683463f2..00000000
--- a/src/com/googlecode/android_scripting/facade/ui/ProgressDialogTask.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.facade.ui;
-
-import android.app.ProgressDialog;
-
-/**
- * Wrapper class for progress dialog running in separate thread
- * 
- * @author MeanEYE.rcf (meaneye.rcf@gmail.com)
- */
-class ProgressDialogTask extends DialogTask {
-
-  private final int mStyle;
-  private final int mMax;
-  private final String mTitle;
-  private final String mMessage;
-  private final Boolean mCancelable;
-
-  public ProgressDialogTask(int style, int max, String title, String message, boolean cancelable) {
-    mStyle = style;
-    mMax = max;
-    mTitle = title;
-    mMessage = message;
-    mCancelable = cancelable;
-  }
-
-  @Override
-  public void onCreate() {
-    super.onCreate();
-    mDialog = new ProgressDialog(getActivity());
-    ((ProgressDialog) mDialog).setProgressStyle(mStyle);
-    ((ProgressDialog) mDialog).setMax(mMax);
-    mDialog.setCancelable(mCancelable);
-    mDialog.setTitle(mTitle);
-    ((ProgressDialog) mDialog).setMessage(mMessage);
-    mDialog.show();
-    mShowLatch.countDown();
-  }
-}
diff --git a/src/com/googlecode/android_scripting/facade/ui/SeekBarDialogTask.java b/src/com/googlecode/android_scripting/facade/ui/SeekBarDialogTask.java
deleted file mode 100644
index 5643f9d9..00000000
--- a/src/com/googlecode/android_scripting/facade/ui/SeekBarDialogTask.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.facade.ui;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.AlertDialog.Builder;
-import android.content.DialogInterface;
-import android.util.AndroidRuntimeException;
-import android.widget.SeekBar;
-
-import com.googlecode.android_scripting.Log;
-import com.googlecode.android_scripting.facade.EventFacade;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-/**
- * Wrapper class for dialog box with seek bar.
- * 
- * @author MeanEYE.rcf (meaneye.rcf@gmail.com)
- */
-public class SeekBarDialogTask extends DialogTask {
-
-  private SeekBar mSeekBar;
-  private final int mProgress;
-  private final int mMax;
-  private final String mTitle;
-  private final String mMessage;
-  private String mPositiveButtonText;
-  private String mNegativeButtonText;
-
-  public SeekBarDialogTask(int progress, int max, String title, String message) {
-    mProgress = progress;
-    mMax = max;
-    mTitle = title;
-    mMessage = message;
-  }
-
-  public void setPositiveButtonText(String text) {
-    mPositiveButtonText = text;
-  }
-
-  public void setNegativeButtonText(String text) {
-    mNegativeButtonText = text;
-  }
-
-  @Override
-  public void onCreate() {
-    super.onCreate();
-    mSeekBar = new SeekBar(getActivity());
-    mSeekBar.setMax(mMax);
-    mSeekBar.setProgress(mProgress);
-    mSeekBar.setPadding(10, 0, 10, 3);
-    mSeekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
-
-      @Override
-      public void onStopTrackingTouch(SeekBar arg0) {
-      }
-
-      @Override
-      public void onStartTrackingTouch(SeekBar arg0) {
-      }
-
-      @Override
-      public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
-        EventFacade eventFacade = getEventFacade();
-        if (eventFacade != null) {
-          JSONObject result = new JSONObject();
-          try {
-            result.put("which", "seekbar");
-            result.put("progress", mSeekBar.getProgress());
-            result.put("fromuser", fromUser);
-            eventFacade.postEvent("dialog", result);
-          } catch (JSONException e) {
-            Log.e(e);
-          }
-        }
-      }
-    });
-
-    AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-    if (mTitle != null) {
-      builder.setTitle(mTitle);
-    }
-    if (mMessage != null) {
-      builder.setMessage(mMessage);
-    }
-    builder.setView(mSeekBar);
-    configureButtons(builder, getActivity());
-    addOnCancelListener(builder, getActivity());
-    mDialog = builder.show();
-    mShowLatch.countDown();
-  }
-
-  private Builder addOnCancelListener(final AlertDialog.Builder builder, final Activity activity) {
-    return builder.setOnCancelListener(new DialogInterface.OnCancelListener() {
-      @Override
-      public void onCancel(DialogInterface dialog) {
-        JSONObject result = new JSONObject();
-        try {
-          result.put("canceled", true);
-          result.put("progress", mSeekBar.getProgress());
-        } catch (JSONException e) {
-          Log.e(e);
-        }
-        dismissDialog();
-        setResult(result);
-      }
-    });
-  }
-
-  private void configureButtons(final AlertDialog.Builder builder, final Activity activity) {
-    DialogInterface.OnClickListener buttonListener = new DialogInterface.OnClickListener() {
-      @Override
-      public void onClick(DialogInterface dialog, int which) {
-        JSONObject result = new JSONObject();
-        switch (which) {
-        case DialogInterface.BUTTON_POSITIVE:
-          try {
-            result.put("which", "positive");
-            result.put("progress", mSeekBar.getProgress());
-          } catch (JSONException e) {
-            throw new AndroidRuntimeException(e);
-          }
-          break;
-        case DialogInterface.BUTTON_NEGATIVE:
-          try {
-            result.put("which", "negative");
-            result.put("progress", mSeekBar.getProgress());
-          } catch (JSONException e) {
-            throw new AndroidRuntimeException(e);
-          }
-          break;
-        }
-        dismissDialog();
-        setResult(result);
-      }
-    };
-    if (mNegativeButtonText != null) {
-      builder.setNegativeButton(mNegativeButtonText, buttonListener);
-    }
-    if (mPositiveButtonText != null) {
-      builder.setPositiveButton(mPositiveButtonText, buttonListener);
-    }
-  }
-}
diff --git a/src/com/googlecode/android_scripting/facade/ui/TimePickerDialogTask.java b/src/com/googlecode/android_scripting/facade/ui/TimePickerDialogTask.java
deleted file mode 100644
index 21acf86e..00000000
--- a/src/com/googlecode/android_scripting/facade/ui/TimePickerDialogTask.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.facade.ui;
-
-import android.app.TimePickerDialog;
-import android.content.DialogInterface;
-import android.util.AndroidRuntimeException;
-import android.widget.TimePicker;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-/**
- * Wrapper class for time picker dialog running in separate thread.
- * 
- * @author MeanEYE.rcf (meaneye.rcf@gmail.com)
- */
-public class TimePickerDialogTask extends DialogTask {
-  private final int mHour;
-  private final int mMinute;
-  private final boolean mIs24Hour;
-
-  public TimePickerDialogTask(int hour, int minute, boolean is24hour) {
-    mHour = hour;
-    mMinute = minute;
-    mIs24Hour = is24hour;
-  }
-
-  @Override
-  public void onCreate() {
-    super.onCreate();
-    mDialog = new TimePickerDialog(getActivity(), new TimePickerDialog.OnTimeSetListener() {
-      @Override
-      public void onTimeSet(TimePicker view, int hour, int minute) {
-        JSONObject result = new JSONObject();
-        try {
-          result.put("which", "positive");
-          result.put("hour", hour);
-          result.put("minute", minute);
-          setResult(result);
-        } catch (JSONException e) {
-          throw new AndroidRuntimeException(e);
-        }
-      }
-    }, mHour, mMinute, mIs24Hour);
-    mDialog.setOnCancelListener(new DialogInterface.OnCancelListener() {
-      @Override
-      public void onCancel(DialogInterface view) {
-        JSONObject result = new JSONObject();
-        try {
-          result.put("which", "neutral");
-          result.put("hour", mHour);
-          result.put("minute", mMinute);
-          setResult(result);
-        } catch (JSONException e) {
-          throw new AndroidRuntimeException(e);
-        }
-      }
-    });
-    mDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
-      @Override
-      public void onDismiss(DialogInterface dialog) {
-        JSONObject result = new JSONObject();
-        try {
-          result.put("which", "negative");
-          result.put("hour", mHour);
-          result.put("minute", mMinute);
-          setResult(result);
-        } catch (JSONException e) {
-          throw new AndroidRuntimeException(e);
-        }
-      }
-    });
-    mDialog.show();
-    mShowLatch.countDown();
-  }
-}
diff --git a/src/com/googlecode/android_scripting/facade/ui/UiFacade.java b/src/com/googlecode/android_scripting/facade/ui/UiFacade.java
deleted file mode 100644
index 7f67cc97..00000000
--- a/src/com/googlecode/android_scripting/facade/ui/UiFacade.java
+++ /dev/null
@@ -1,771 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.facade.ui;
-
-import android.app.ProgressDialog;
-import android.app.Service;
-import android.util.AndroidRuntimeException;
-import android.util.Log;
-import android.view.ContextMenu;
-import android.view.ContextMenu.ContextMenuInfo;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-
-import com.googlecode.android_scripting.FileUtils;
-import com.googlecode.android_scripting.FutureActivityTaskExecutor;
-import com.googlecode.android_scripting.facade.EventFacade;
-import com.googlecode.android_scripting.facade.FacadeManager;
-import com.googlecode.android_scripting.interpreter.html.HtmlActivityTask;
-import com.googlecode.android_scripting.interpreter.html.HtmlInterpreter;
-import com.googlecode.android_scripting.jsonrpc.RpcReceiver;
-import com.googlecode.android_scripting.rpc.Rpc;
-import com.googlecode.android_scripting.rpc.RpcDefault;
-import com.googlecode.android_scripting.rpc.RpcOptional;
-import com.googlecode.android_scripting.rpc.RpcParameter;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-
-import com.hipipal.sl4alib.MNApp;
-
-/**
- * User Interface Facade. <br>
- * <br>
- * <b>Usage Notes</b><br>
- * <br>
- * The UI facade provides access to a selection of dialog boxes for general user interaction, and
- * also hosts the {@link #webViewShow} call which allows interactive use of html pages.<br>
- * The general use of the dialog functions is as follows:<br>
- * <ol>
- * <li>Create a dialog using one of the following calls:
- * <ul>
- * <li>{@link #dialogCreateInput}
- * <li>{@link #dialogCreateAlert}
- * <li>{@link #dialogCreateDatePicker}
- * <li>{@link #dialogCreateHorizontalProgress}
- * <li>{@link #dialogCreatePassword}
- * <li>{@link #dialogCreateSeekBar}
- * <li>{@link #dialogCreateSpinnerProgress}
- * </ul>
- * <li>Set additional features to your dialog
- * <ul>
- * <li>{@link #dialogSetItems} Set a list of items. Used like a menu.
- * <li>{@link #dialogSetMultiChoiceItems} Set a multichoice list of items.
- * <li>{@link #dialogSetSingleChoiceItems} Set a single choice list of items.
- * <li>{@link #dialogSetPositiveButtonText}
- * <li>{@link #dialogSetNeutralButtonText}
- * <li>{@link #dialogSetNegativeButtonText}
- * <li>{@link #dialogSetMaxProgress} Set max progress for your progress bar.
- * </ul>
- * <li>Display the dialog using {@link #dialogShow}
- * <li>Update dialog information if needed
- * <ul>
- * <li>{@link #dialogSetCurrentProgress}
- * </ul>
- * <li>Get the results
- * <ul>
- * <li>Using {@link #dialogGetResponse}, which will wait until the user performs an action to close
- * the dialog box, or
- * <li>Use eventPoll to wait for a "dialog" event.
- * <li>You can find out which list items were selected using {@link #dialogGetSelectedItems}, which
- * returns an array of numeric indices to your list. For a single choice list, there will only ever
- * be one of these.
- * </ul>
- * <li>Once done, use {@link #dialogDismiss} to remove the dialog.
- * </ol>
- * <br>
- * You can also manipulate menu options. The menu options are available for both {@link #dialogShow}
- * and {@link #fullShow}.
- * <ul>
- * <li>{@link #clearOptionsMenu}
- * <li>{@link #addOptionsMenuItem}
- * </ul>
- * <br>
- * <b>Some notes:</b><br>
- * Not every dialogSet function is relevant to every dialog type, ie, dialogSetMaxProgress obviously
- * only applies to dialogs created with a progress bar. Also, an Alert Dialog may have a message or
- * items, not both. If you set both, items will take priority.<br>
- * In addition to the above functions, {@link #dialogGetInput} and {@link #dialogGetPassword} are
- * convenience functions that create, display and return the relevant dialogs in one call.<br>
- * There is only ever one instance of a dialog. Any dialogCreate call will cause the existing dialog
- * to be destroyed.
- * 
- * @author MeanEYE.rcf (meaneye.rcf@gmail.com)
- */
-public class UiFacade extends RpcReceiver {
-  // This value should not be used for menu groups outside this class.
-  private static final int MENU_GROUP_ID = Integer.MAX_VALUE;
-
-  private final Service mService;
-  private final FutureActivityTaskExecutor mTaskQueue;
-  private DialogTask mDialogTask;
-  private FullScreenTask mFullScreenTask;
-
-  private final List<UiMenuItem> mContextMenuItems;
-  private final List<UiMenuItem> mOptionsMenuItems;
-  private final AtomicBoolean mMenuUpdated;
-
-  private final EventFacade mEventFacade;
-  private List<Integer> mOverrideKeys = Collections.synchronizedList(new ArrayList<Integer>());
-
-  private final String TAG = "UiFacade";
-  public UiFacade(FacadeManager manager) {
-    super(manager);
-    mService = manager.getService();
-    mTaskQueue = ((MNApp) mService.getApplication()).getTaskExecutor();
-    mContextMenuItems = new CopyOnWriteArrayList<UiMenuItem>();
-    mOptionsMenuItems = new CopyOnWriteArrayList<UiMenuItem>();
-    mEventFacade = manager.getReceiver(EventFacade.class);
-    mMenuUpdated = new AtomicBoolean(false);
-  }
-
-  /**
-   * For inputType, see <a
-   * href="http://developer.android.com/reference/android/R.styleable.html#TextView_inputType"
-   * >InputTypes</a>. Some useful ones are text, number, and textUri. Multiple flags can be
-   * supplied, seperated by "|", ie: "textUri|textAutoComplete"
-   */
-  @Rpc(description = "Create a text input dialog.")
-  public void dialogCreateInput(
-      @RpcParameter(name = "title", description = "title of the input box") @RpcDefault("Value") final String title,
-      @RpcParameter(name = "message", description = "message to display above the input box") @RpcDefault("Please enter value:") final String message,
-      @RpcParameter(name = "defaultText", description = "text to insert into the input box") @RpcOptional final String text,
-      @RpcParameter(name = "inputType", description = "type of input data, ie number or text") @RpcOptional final String inputType)
-      throws InterruptedException {
-    dialogDismiss();
-    mDialogTask = new AlertDialogTask(title, message);
-    ((AlertDialogTask) mDialogTask).setTextInput(text);
-    if (inputType != null) {
-      ((AlertDialogTask) mDialogTask).setEditInputType(inputType);
-    }
-  }
-
-  @Rpc(description = "Create a password input dialog.")
-  public void dialogCreatePassword(
-      @RpcParameter(name = "title", description = "title of the input box") @RpcDefault("Password") final String title,
-      @RpcParameter(name = "message", description = "message to display above the input box") @RpcDefault("Please enter password:") final String message) {
-    dialogDismiss();
-    mDialogTask = new AlertDialogTask(title, message);
-    ((AlertDialogTask) mDialogTask).setPasswordInput();
-  }
-
-  /**
-   * The result is the user's input, or None (null) if cancel was hit. <br>
-   * Example (python)
-   * 
-   * <pre>
-   * import android
-   * droid=android.Android()
-   * 
-   * print droid.dialogGetInput("Title","Message","Default").result
-   * </pre>
-   * 
-   */
-  @SuppressWarnings("unchecked")
-  @Rpc(description = "Queries the user for a text input.")
-  public String dialogGetInput(
-      @RpcParameter(name = "title", description = "title of the input box") @RpcDefault("Value") final String title,
-      @RpcParameter(name = "message", description = "message to display above the input box") @RpcDefault("Please enter value:") final String message,
-      @RpcParameter(name = "defaultText", description = "text to insert into the input box") @RpcOptional final String text)
-      throws InterruptedException {
-    dialogCreateInput(title, message, text, "text");
-    dialogSetNegativeButtonText("Cancel");
-    dialogSetPositiveButtonText("Ok");
-    dialogShow();
-    Map<String, Object> response = (Map<String, Object>) dialogGetResponse();
-    if ("positive".equals(response.get("which"))) {
-      return (String) response.get("value");
-    } else {
-      return null;
-    }
-  }
-
-  @SuppressWarnings("unchecked")
-  @Rpc(description = "Queries the user for a password.")
-  public String dialogGetPassword(
-      @RpcParameter(name = "title", description = "title of the password box") @RpcDefault("Password") final String title,
-      @RpcParameter(name = "message", description = "message to display above the input box") @RpcDefault("Please enter password:") final String message)
-      throws InterruptedException {
-    dialogCreatePassword(title, message);
-    dialogSetNegativeButtonText("Cancel");
-    dialogSetPositiveButtonText("Ok");
-    dialogShow();
-    Map<String, Object> response = (Map<String, Object>) dialogGetResponse();
-    if ("positive".equals(response.get("which"))) {
-      return (String) response.get("value");
-    } else {
-      return null;
-    }
-  }
-  
-  
-  
-  
-  @Rpc(description = "Create a qpython beam master.")
-  public String dialogCreateNFCBeamMaster(
-	      @RpcParameter(name = "title", description = "title of the input box") @RpcDefault("QPython BEAM With NFC") final String title,
-	      @RpcParameter(name = "message", description = "message to display above the input box") @RpcDefault("Input message and Beam") final String message,
-	      @RpcParameter(name = "inputType", description = "type of input data, ie number or text") @RpcOptional final String inputType)
-	      throws InterruptedException {
-	    dialogDismiss();
-	    mDialogTask = new NFCBeamTask(title, message);
-	    ((NFCBeamTask) mDialogTask).setBeamType(0);
-
-	    ((NFCBeamTask) mDialogTask).setTextInput("");
-	    if (inputType != null) {
-	      ((NFCBeamTask) mDialogTask).setEditInputType(inputType);
-	    }
-	    
-	    //dialogSetNegativeButtonText("Cancel");
-	    //dialogSetPositiveButtonText("QBeam");
-	    dialogShow();
-	    Map<String, Object> response = (Map<String, Object>) dialogGetResponse();
-	    //if ("positive".equals(response.get("which"))) {
-	      return (String) response.get("value");
-	    //} else {
-	    //  return null;
-	    //}
-	  }
-  
-  @Rpc(description = "Create a qpython beam master to send directory message.")
-  public String NFCBeamMessage(
-	      @RpcParameter(name = "content", description = "message you want to sent") @RpcDefault("Message you want to beam") final String content,
-		  @RpcParameter(name = "title", description = "title of the input box") @RpcDefault("QPython Beam With NFC") final String title,
-	      @RpcParameter(name = "message", description = "message to display above the input box") @RpcDefault("Beam Message") final String message)
-	      throws InterruptedException {
-	    dialogDismiss();
-	    mDialogTask = new NFCBeamTask(title, message);
-	    ((NFCBeamTask) mDialogTask).setContent(content);
-	    ((NFCBeamTask) mDialogTask).setBeamType(0);
-
-	    //((NFCBeamTask) mDialogTask).setTextInput("");
-	    
-	    //dialogSetNegativeButtonText("Cancel");
-	    //dialogSetPositiveButtonText("QBeam");
-	    dialogShow();
-	    Map<String, Object> response = (Map<String, Object>) dialogGetResponse();
-	    Log.d(TAG, "NFCBeamMessage:"+response.get("value"));
-	    //if ("positive".equals(response.get("which"))) {
-	      return (String) response.get("value");
-	    //} else {
-	    //  return null;
-	    //}
-	  }
-
-  @Rpc(description = "Create a qpython beam slave.")
-  public String dialogCreateNFCBeamSlave(
-	      @RpcParameter(name = "title", description = "title of the input box") @RpcDefault("QPython Beam With NFC") final String title,
-	      @RpcParameter(name = "message", description = "message to display above the input box") @RpcDefault("Wait for beam message") final String message)
-	      throws InterruptedException {
-	    dialogDismiss();
-	    mDialogTask = new NFCBeamTask(title, message);
-	    ((NFCBeamTask) mDialogTask).setBeamType(1);
-	    //((NFCBeamTask) mDialogTask).setTextInput("");
-	    
-	    //dialogSetNegativeButtonText("Cancel");
-	    //dialogSetPositiveButtonText("QBeam");
-	    dialogShow();
-	    Map<String, Object> response = (Map<String, Object>) dialogGetResponse();
-	    //if ("positive".equals(response.get("which"))) {
-	      return (String) response.get("value");
-	    //} else {
-	    //  return null;
-	    //}
-	  }
-  
-
-
-  /*public void dialogCreateNFCBeam(@RpcParameter(name = "title") @RpcOptional String title,
-      @RpcParameter(name = "message") @RpcOptional String message) {
-    dialogDismiss(); // Dismiss any existing dialog.
-    mDialogTask = new NFCBeamTask(title, message);
-  }*/
-
-  
-  @Rpc(description = "Create a spinner progress dialog.")
-  public void dialogCreateSpinnerProgress(@RpcParameter(name = "title") @RpcOptional String title,
-      @RpcParameter(name = "message") @RpcOptional String message,
-      @RpcParameter(name = "maximum progress") @RpcDefault("100") Integer max) {
-    dialogDismiss(); // Dismiss any existing dialog.
-    mDialogTask = new ProgressDialogTask(ProgressDialog.STYLE_SPINNER, max, title, message, true);
-  }
-
-  @Rpc(description = "Create a horizontal progress dialog.")
-  public void dialogCreateHorizontalProgress(
-      @RpcParameter(name = "title") @RpcOptional String title,
-      @RpcParameter(name = "message") @RpcOptional String message,
-      @RpcParameter(name = "maximum progress") @RpcDefault("100") Integer max) {
-    dialogDismiss(); // Dismiss any existing dialog.
-    mDialogTask =
-        new ProgressDialogTask(ProgressDialog.STYLE_HORIZONTAL, max, title, message, true);
-  }
-
-  /**
-   * <b>Example (python)</b>
-   * 
-   * <pre>
-   *   import android
-   *   droid=android.Android()
-   *   droid.dialogCreateAlert("I like swords.","Do you like swords?")
-   *   droid.dialogSetPositiveButtonText("Yes")
-   *   droid.dialogSetNegativeButtonText("No")
-   *   droid.dialogShow()
-   *   response=droid.dialogGetResponse().result
-   *   droid.dialogDismiss()
-   *   if response.has_key("which"):
-   *     result=response["which"]
-   *     if result=="positive":
-   *       print "Yay! I like swords too!"
-   *     elif result=="negative":
-   *       print "Oh. How sad."
-   *   elif response.has_key("canceled"): # Yes, I know it's mispelled.
-   *     print "You can't even make up your mind?"
-   *   else:
-   *     print "Unknown response=",response
-   * 
-   *   print "Done"
-   * </pre>
-   */
-  @Rpc(description = "Create alert dialog.")
-  public void dialogCreateAlert(@RpcParameter(name = "title") @RpcOptional String title,
-      @RpcParameter(name = "message") @RpcOptional String message) {
-    dialogDismiss(); // Dismiss any existing dialog.
-    mDialogTask = new AlertDialogTask(title, message);
-  }
-
-  /**
-   * Will produce "dialog" events on change, containing:
-   * <ul>
-   * <li>"progress" - Position chosen, between 0 and max
-   * <li>"which" = "seekbar"
-   * <li>"fromuser" = true/false change is from user input
-   * </ul>
-   * Response will contain a "progress" element.
-   */
-  @Rpc(description = "Create seek bar dialog.")
-  public void dialogCreateSeekBar(
-      @RpcParameter(name = "starting value") @RpcDefault("50") Integer progress,
-      @RpcParameter(name = "maximum value") @RpcDefault("100") Integer max,
-      @RpcParameter(name = "title") String title, @RpcParameter(name = "message") String message) {
-    dialogDismiss(); // Dismiss any existing dialog.
-    mDialogTask = new SeekBarDialogTask(progress, max, title, message);
-  }
-
-  @Rpc(description = "Create time picker dialog.")
-  public void dialogCreateTimePicker(
-      @RpcParameter(name = "hour") @RpcDefault("0") Integer hour,
-      @RpcParameter(name = "minute") @RpcDefault("0") Integer minute,
-      @RpcParameter(name = "is24hour", description = "Use 24 hour clock") @RpcDefault("false") Boolean is24hour) {
-    dialogDismiss(); // Dismiss any existing dialog.
-    mDialogTask = new TimePickerDialogTask(hour, minute, is24hour);
-  }
-
-  @Rpc(description = "Create date picker dialog.")
-  public void dialogCreateDatePicker(@RpcParameter(name = "year") @RpcDefault("1970") Integer year,
-      @RpcParameter(name = "month") @RpcDefault("1") Integer month,
-      @RpcParameter(name = "day") @RpcDefault("1") Integer day) {
-    dialogDismiss(); // Dismiss any existing dialog.
-    mDialogTask = new DatePickerDialogTask(year, month, day);
-  }
-
-  @Rpc(description = "Dismiss dialog.")
-  public void dialogDismiss() {
-    if (mDialogTask != null) {
-      mDialogTask.dismissDialog();
-      mDialogTask = null;
-    }
-  }
-
-  @Rpc(description = "Show dialog.")
-  public void dialogShow() throws InterruptedException {
-    if (mDialogTask != null && mDialogTask.getDialog() == null) {
-      mDialogTask.setEventFacade(mEventFacade);
-      mTaskQueue.execute(mDialogTask);
-      mDialogTask.getShowLatch().await();
-    } else {
-      throw new RuntimeException("No dialog to show.");
-    }
-  }
-
-  @Rpc(description = "Set progress dialog current value.")
-  public void dialogSetCurrentProgress(@RpcParameter(name = "current") Integer current) {
-    if (mDialogTask != null && mDialogTask instanceof ProgressDialogTask) {
-      ((ProgressDialog) mDialogTask.getDialog()).setProgress(current);
-    } else {
-      throw new RuntimeException("No valid dialog to assign value to.");
-    }
-  }
-
-  @Rpc(description = "Set progress dialog maximum value.")
-  public void dialogSetMaxProgress(@RpcParameter(name = "max") Integer max) {
-    if (mDialogTask != null && mDialogTask instanceof ProgressDialogTask) {
-      ((ProgressDialog) mDialogTask.getDialog()).setMax(max);
-    } else {
-      throw new RuntimeException("No valid dialog to set maximum value of.");
-    }
-  }
-
-  @Rpc(description = "Set alert dialog positive button text.")
-  public void dialogSetPositiveButtonText(@RpcParameter(name = "text") String text) {
-    if (mDialogTask != null && mDialogTask instanceof AlertDialogTask) {
-      ((AlertDialogTask) mDialogTask).setPositiveButtonText(text);
-    } else if (mDialogTask != null && mDialogTask instanceof NFCBeamTask) {
-        ((NFCBeamTask) mDialogTask).setPositiveButtonText(text);
-
-    } else if (mDialogTask != null && mDialogTask instanceof SeekBarDialogTask) {
-      ((SeekBarDialogTask) mDialogTask).setPositiveButtonText(text);
-    } else {
-      throw new AndroidRuntimeException("No dialog to add button to.");
-    }
-  }
-
-  @Rpc(description = "Set alert dialog button text.")
-  public void dialogSetNegativeButtonText(@RpcParameter(name = "text") String text) {
-    if (mDialogTask != null && mDialogTask instanceof AlertDialogTask) {
-      ((AlertDialogTask) mDialogTask).setNegativeButtonText(text);
-    } else if (mDialogTask != null && mDialogTask instanceof NFCBeamTask) {
-          ((NFCBeamTask) mDialogTask).setNegativeButtonText(text);
-
-    } else if (mDialogTask != null && mDialogTask instanceof SeekBarDialogTask) {
-      ((SeekBarDialogTask) mDialogTask).setNegativeButtonText(text);
-    } else {
-      throw new AndroidRuntimeException("No dialog to add button to.");
-    }
-  }
-
-  @Rpc(description = "Set alert dialog button text.")
-  public void dialogSetNeutralButtonText(@RpcParameter(name = "text") String text) {
-    if (mDialogTask != null && mDialogTask instanceof AlertDialogTask) {
-      ((AlertDialogTask) mDialogTask).setNeutralButtonText(text);
-    } else {
-      throw new AndroidRuntimeException("No dialog to add button to.");
-    }
-  }
-
-  // TODO(damonkohler): Make RPC layer translate between JSONArray and List<Object>.
-  /**
-   * This effectively creates list of options. Clicking on an item will immediately return an "item"
-   * element, which is the index of the selected item.
-   */
-  @Rpc(description = "Set alert dialog list items.")
-  public void dialogSetItems(@RpcParameter(name = "items") JSONArray items) {
-    if (mDialogTask != null && mDialogTask instanceof AlertDialogTask) {
-      ((AlertDialogTask) mDialogTask).setItems(items);
-    } else {
-      throw new AndroidRuntimeException("No dialog to add list to.");
-    }
-  }
-
-  /**
-   * This creates a list of radio buttons. You can select one item out of the list. A response will
-   * not be returned until the dialog is closed, either with the Cancel key or a button
-   * (positive/negative/neutral). Use {@link #dialogGetSelectedItems()} to find out what was
-   * selected.
-   */
-  @Rpc(description = "Set dialog single choice items and selected item.")
-  public void dialogSetSingleChoiceItems(
-      @RpcParameter(name = "items") JSONArray items,
-      @RpcParameter(name = "selected", description = "selected item index") @RpcDefault("0") Integer selected) {
-    if (mDialogTask != null && mDialogTask instanceof AlertDialogTask) {
-      ((AlertDialogTask) mDialogTask).setSingleChoiceItems(items, selected);
-    } else {
-      throw new AndroidRuntimeException("No dialog to add list to.");
-    }
-  }
-
-  /**
-   * This creates a list of check boxes. You can select multiple items out of the list. A response
-   * will not be returned until the dialog is closed, either with the Cancel key or a button
-   * (positive/negative/neutral). Use {@link #dialogGetSelectedItems()} to find out what was
-   * selected.
-   */
-
-  @Rpc(description = "Set dialog multiple choice items and selection.")
-  public void dialogSetMultiChoiceItems(
-      @RpcParameter(name = "items") JSONArray items,
-      @RpcParameter(name = "selected", description = "list of selected items") @RpcOptional JSONArray selected)
-      throws JSONException {
-    if (mDialogTask != null && mDialogTask instanceof AlertDialogTask) {
-      ((AlertDialogTask) mDialogTask).setMultiChoiceItems(items, selected);
-    } else {
-      throw new AndroidRuntimeException("No dialog to add list to.");
-    }
-  }
-
-  @Rpc(description = "Returns dialog response.")
-  public Object dialogGetResponse() {
-    try {
-      return mDialogTask.getResult();
-    } catch (Exception e) {
-      throw new AndroidRuntimeException(e);
-    }
-  }
-
-  @Rpc(description = "This method provides list of items user selected.", returns = "Selected items")
-  public Set<Integer> dialogGetSelectedItems() {
-    if (mDialogTask != null && mDialogTask instanceof AlertDialogTask) {
-      return ((AlertDialogTask) mDialogTask).getSelectedItems();
-    } else {
-      throw new AndroidRuntimeException("No dialog to add list to.");
-    }
-  }
-
-  /**
-   * See <a href=http://code.google.com/p/android-scripting/wiki/UsingWebView>wiki page</a> for more
-   * detail.
-   */
-  @Rpc(description = "Display a WebView with the given URL.")
-  public void webViewShow(
-      @RpcParameter(name = "url") String url,
-      @RpcParameter(name = "wait", description = "block until the user exits the WebView") @RpcOptional Boolean wait)
-      throws IOException {
-    String jsonSrc = FileUtils.readFromAssetsFile(mService, HtmlInterpreter.JSON_FILE);
-    String AndroidJsSrc = FileUtils.readFromAssetsFile(mService, HtmlInterpreter.ANDROID_JS_FILE);
-    HtmlActivityTask task = new HtmlActivityTask(mManager, AndroidJsSrc, jsonSrc, url, false);
-    mTaskQueue.execute(task);
-    if (wait != null && wait) {
-      try {
-        task.getResult();
-      } catch (InterruptedException e) {
-        throw new RuntimeException(e);
-      }
-    }
-  }
-
-  /**
-   * Context menus are used primarily with {@link #webViewShow}
-   */
-  @Rpc(description = "Adds a new item to context menu.")
-  public void addContextMenuItem(
-      @RpcParameter(name = "label", description = "label for this menu item") String label,
-      @RpcParameter(name = "event", description = "event that will be generated on menu item click") String event,
-      @RpcParameter(name = "eventData") @RpcOptional Object data) {
-    mContextMenuItems.add(new UiMenuItem(label, event, data, null));
-  }
-
-  /**
-   * <b>Example (python)</b>
-   * 
-   * <pre>
-   * import android
-   * droid=android.Android()
-   * 
-   * droid.addOptionsMenuItem("Silly","silly",None,"star_on")
-   * droid.addOptionsMenuItem("Sensible","sensible","I bet.","star_off")
-   * droid.addOptionsMenuItem("Off","off",None,"ic_menu_revert")
-   * 
-   * print "Hit menu to see extra options."
-   * print "Will timeout in 10 seconds if you hit nothing."
-   * 
-   * while True: # Wait for events from the menu.
-   *   response=droid.eventWait(10000).result
-   *   if response==None:
-   *     break
-   *   print response
-   *   if response["name"]=="off":
-   *     break
-   * print "And done."
-   * 
-   * </pre>
-   */
-  @Rpc(description = "Adds a new item to options menu.")
-  public void addOptionsMenuItem(
-      @RpcParameter(name = "label", description = "label for this menu item") String label,
-      @RpcParameter(name = "event", description = "event that will be generated on menu item click") String event,
-      @RpcParameter(name = "eventData") @RpcOptional Object data,
-      @RpcParameter(name = "iconName", description = "Android system menu icon, see http://developer.android.com/reference/android/R.drawable.html") @RpcOptional String iconName) {
-    mOptionsMenuItems.add(new UiMenuItem(label, event, data, iconName));
-    mMenuUpdated.set(true);
-  }
-
-  @Rpc(description = "Removes all items previously added to context menu.")
-  public void clearContextMenu() {
-    mContextMenuItems.clear();
-  }
-
-  @Rpc(description = "Removes all items previously added to options menu.")
-  public void clearOptionsMenu() {
-    mOptionsMenuItems.clear();
-    mMenuUpdated.set(true);
-  }
-
-  public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
-    for (UiMenuItem item : mContextMenuItems) {
-      MenuItem menuItem = menu.add(item.mmTitle);
-      menuItem.setOnMenuItemClickListener(item.mmListener);
-    }
-  }
-
-  public boolean onPrepareOptionsMenu(Menu menu) {
-    if (mMenuUpdated.getAndSet(false)) {
-      menu.removeGroup(MENU_GROUP_ID);
-      for (UiMenuItem item : mOptionsMenuItems) {
-        MenuItem menuItem = menu.add(MENU_GROUP_ID, Menu.NONE, Menu.NONE, item.mmTitle);
-        if (item.mmIcon != null) {
-          menuItem.setIcon(mService.getResources()
-              .getIdentifier(item.mmIcon, "drawable", "android"));
-        }
-        menuItem.setOnMenuItemClickListener(item.mmListener);
-      }
-      return true;
-    }
-    return true;
-  }
-
-  /**
-   * See <a href=http://code.google.com/p/android-scripting/wiki/FullScreenUI>wiki page</a> for more
-   * detail.
-   */
-  @Rpc(description = "Show Full Screen.")
-  public List<String> fullShow(
-      @RpcParameter(name = "layout", description = "String containing View layout") String layout)
-      throws InterruptedException {
-    if (mFullScreenTask != null) {
-      fullDismiss();
-    }
-    mFullScreenTask = new FullScreenTask(layout);
-    mFullScreenTask.setEventFacade(mEventFacade);
-    mFullScreenTask.setUiFacade(this);
-    mFullScreenTask.setOverrideKeys(mOverrideKeys);
-    mTaskQueue.execute(mFullScreenTask);
-    mFullScreenTask.getShowLatch().await();
-    return mFullScreenTask.mInflater.getErrors();
-  }
-
-  @Rpc(description = "Dismiss Full Screen.")
-  public void fullDismiss() {
-    if (mFullScreenTask != null) {
-      mFullScreenTask.finish();
-      mFullScreenTask = null;
-    }
-  }
-
-  @Rpc(description = "Get Fullscreen Properties")
-  public Map<String, Map<String, String>> fullQuery() {
-    if (mFullScreenTask == null) {
-      throw new RuntimeException("No screen displayed.");
-    }
-    return mFullScreenTask.getViewAsMap();
-  }
-
-  @Rpc(description = "Get fullscreen properties for a specific widget")
-  public Map<String, String> fullQueryDetail(
-      @RpcParameter(name = "id", description = "id of layout widget") String id) {
-    if (mFullScreenTask == null) {
-      throw new RuntimeException("No screen displayed.");
-    }
-    return mFullScreenTask.getViewDetail(id);
-  }
-
-  @Rpc(description = "Set fullscreen widget property")
-  public String fullSetProperty(
-      @RpcParameter(name = "id", description = "id of layout widget") String id,
-      @RpcParameter(name = "property", description = "name of property to set") String property,
-      @RpcParameter(name = "value", description = "value to set property to") String value) {
-    if (mFullScreenTask == null) {
-      throw new RuntimeException("No screen displayed.");
-    }
-    return mFullScreenTask.setViewProperty(id, property, value);
-  }
-
-  @Rpc(description = "Attach a list to a fullscreen widget")
-  public String fullSetList(
-      @RpcParameter(name = "id", description = "id of layout widget") String id,
-      @RpcParameter(name = "list", description = "List to set") JSONArray items) {
-    if (mFullScreenTask == null) {
-      throw new RuntimeException("No screen displayed.");
-    }
-    return mFullScreenTask.setList(id, items);
-  }
-
-  /**
-   * This will override the default behaviour of keys while in the fullscreen mode. ie:
-   * 
-   * <pre>
-   *   droid.fullKeyOverride([24,25],True)
-   * </pre>
-   * 
-   * This will override the default behaviour of the volume keys (codes 24 and 25) so that they do
-   * not actually adjust the volume. <br>
-   * Returns a list of currently overridden keycodes.
-   */
-  @Rpc(description = "Override default key actions")
-  public JSONArray fullKeyOverride(
-      @RpcParameter(name = "keycodes", description = "List of keycodes to override") JSONArray keycodes,
-      @RpcParameter(name = "enable", description = "Turn overriding or off") @RpcDefault(value = "true") Boolean enable)
-      throws JSONException {
-    for (int i = 0; i < keycodes.length(); i++) {
-      int value = (int) keycodes.getLong(i);
-      if (value > 0) {
-        if (enable) {
-          if (!mOverrideKeys.contains(value)) {
-            mOverrideKeys.add(value);
-          }
-        } else {
-          int index = mOverrideKeys.indexOf(value);
-          if (index >= 0) {
-            mOverrideKeys.remove(index);
-          }
-        }
-      }
-    }
-    if (mFullScreenTask != null) {
-      mFullScreenTask.setOverrideKeys(mOverrideKeys);
-    }
-    return new JSONArray(mOverrideKeys);
-  }
-
-  @Override
-  public void shutdown() {
-    fullDismiss();
-    HtmlActivityTask.shutdown();
-  }
-
-  private class UiMenuItem {
-
-    private final String mmTitle;
-    private final String mmEvent;
-    private final Object mmEventData;
-    private final String mmIcon;
-    private final MenuItem.OnMenuItemClickListener mmListener;
-
-    public UiMenuItem(String title, String event, Object data, String icon) {
-      mmTitle = title;
-      mmEvent = event;
-      mmEventData = data;
-      mmIcon = icon;
-      mmListener = new MenuItem.OnMenuItemClickListener() {
-        @Override
-        public boolean onMenuItemClick(MenuItem item) {
-          // TODO(damonkohler): Does mmEventData need to be cloned somehow?
-          mEventFacade.postEvent(mmEvent, mmEventData);
-          return true;
-        }
-      };
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/com/googlecode/android_scripting/facade/ui/ViewInflater.java b/src/com/googlecode/android_scripting/facade/ui/ViewInflater.java
deleted file mode 100644
index 7b1fb24b..00000000
--- a/src/com/googlecode/android_scripting/facade/ui/ViewInflater.java
+++ /dev/null
@@ -1,1009 +0,0 @@
-package com.googlecode.android_scripting.facade.ui;
-
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Typeface;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
-import android.text.InputType;
-import android.text.method.DigitsKeyListener;
-import android.util.DisplayMetrics;
-import android.view.Gravity;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewGroup.LayoutParams;
-import android.view.ViewGroup.MarginLayoutParams;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ArrayAdapter;
-import android.widget.ListAdapter;
-import android.widget.RelativeLayout;
-import android.widget.Spinner;
-import android.widget.SpinnerAdapter;
-import android.widget.TableLayout;
-import android.widget.TextView;
-
-import com.googlecode.android_scripting.Log;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import org.json.JSONArray;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-import org.xmlpull.v1.XmlPullParserFactory;
-
-public class ViewInflater {
-  private static XmlPullParserFactory mFactory;
-  public static final String ANDROID = "http://schemas.android.com/apk/res/android";
-  public static final int BASESEQ = 0x7f0f0000;
-  private int mNextSeq = BASESEQ;
-  private final Map<String, Integer> mIdList = new HashMap<String, Integer>();
-  private final List<String> mErrors = new ArrayList<String>();
-  private Context mContext;
-  private DisplayMetrics mMetrics;
-  private static final Map<String, Integer> mInputTypes = new HashMap<String, Integer>();
-  public static final Map<String, String> mColorNames = new HashMap<String, String>();
-  public static final Map<String, Integer> mRelative = new HashMap<String, Integer>();
-  static {
-    mColorNames.put("aliceblue", "#f0f8ff");
-    mColorNames.put("antiquewhite", "#faebd7");
-    mColorNames.put("aqua", "#00ffff");
-    mColorNames.put("aquamarine", "#7fffd4");
-    mColorNames.put("azure", "#f0ffff");
-    mColorNames.put("beige", "#f5f5dc");
-    mColorNames.put("bisque", "#ffe4c4");
-    mColorNames.put("black", "#000000");
-    mColorNames.put("blanchedalmond", "#ffebcd");
-    mColorNames.put("blue", "#0000ff");
-    mColorNames.put("blueviolet", "#8a2be2");
-    mColorNames.put("brown", "#a52a2a");
-    mColorNames.put("burlywood", "#deb887");
-    mColorNames.put("cadetblue", "#5f9ea0");
-    mColorNames.put("chartreuse", "#7fff00");
-    mColorNames.put("chocolate", "#d2691e");
-    mColorNames.put("coral", "#ff7f50");
-    mColorNames.put("cornflowerblue", "#6495ed");
-    mColorNames.put("cornsilk", "#fff8dc");
-    mColorNames.put("crimson", "#dc143c");
-    mColorNames.put("cyan", "#00ffff");
-    mColorNames.put("darkblue", "#00008b");
-    mColorNames.put("darkcyan", "#008b8b");
-    mColorNames.put("darkgoldenrod", "#b8860b");
-    mColorNames.put("darkgray", "#a9a9a9");
-    mColorNames.put("darkgrey", "#a9a9a9");
-    mColorNames.put("darkgreen", "#006400");
-    mColorNames.put("darkkhaki", "#bdb76b");
-    mColorNames.put("darkmagenta", "#8b008b");
-    mColorNames.put("darkolivegreen", "#556b2f");
-    mColorNames.put("darkorange", "#ff8c00");
-    mColorNames.put("darkorchid", "#9932cc");
-    mColorNames.put("darkred", "#8b0000");
-    mColorNames.put("darksalmon", "#e9967a");
-    mColorNames.put("darkseagreen", "#8fbc8f");
-    mColorNames.put("darkslateblue", "#483d8b");
-    mColorNames.put("darkslategray", "#2f4f4f");
-    mColorNames.put("darkslategrey", "#2f4f4f");
-    mColorNames.put("darkturquoise", "#00ced1");
-    mColorNames.put("darkviolet", "#9400d3");
-    mColorNames.put("deeppink", "#ff1493");
-    mColorNames.put("deepskyblue", "#00bfff");
-    mColorNames.put("dimgray", "#696969");
-    mColorNames.put("dimgrey", "#696969");
-    mColorNames.put("dodgerblue", "#1e90ff");
-    mColorNames.put("firebrick", "#b22222");
-    mColorNames.put("floralwhite", "#fffaf0");
-    mColorNames.put("forestgreen", "#228b22");
-    mColorNames.put("fuchsia", "#ff00ff");
-    mColorNames.put("gainsboro", "#dcdcdc");
-    mColorNames.put("ghostwhite", "#f8f8ff");
-    mColorNames.put("gold", "#ffd700");
-    mColorNames.put("goldenrod", "#daa520");
-    mColorNames.put("gray", "#808080");
-    mColorNames.put("grey", "#808080");
-    mColorNames.put("green", "#008000");
-    mColorNames.put("greenyellow", "#adff2f");
-    mColorNames.put("honeydew", "#f0fff0");
-    mColorNames.put("hotpink", "#ff69b4");
-    mColorNames.put("indianred ", "#cd5c5c");
-    mColorNames.put("indigo ", "#4b0082");
-    mColorNames.put("ivory", "#fffff0");
-    mColorNames.put("khaki", "#f0e68c");
-    mColorNames.put("lavender", "#e6e6fa");
-    mColorNames.put("lavenderblush", "#fff0f5");
-    mColorNames.put("lawngreen", "#7cfc00");
-    mColorNames.put("lemonchiffon", "#fffacd");
-    mColorNames.put("lightblue", "#add8e6");
-    mColorNames.put("lightcoral", "#f08080");
-    mColorNames.put("lightcyan", "#e0ffff");
-    mColorNames.put("lightgoldenrodyellow", "#fafad2");
-    mColorNames.put("lightgray", "#d3d3d3");
-    mColorNames.put("lightgrey", "#d3d3d3");
-    mColorNames.put("lightgreen", "#90ee90");
-    mColorNames.put("lightpink", "#ffb6c1");
-    mColorNames.put("lightsalmon", "#ffa07a");
-    mColorNames.put("lightseagreen", "#20b2aa");
-    mColorNames.put("lightskyblue", "#87cefa");
-    mColorNames.put("lightslategray", "#778899");
-    mColorNames.put("lightslategrey", "#778899");
-    mColorNames.put("lightsteelblue", "#b0c4de");
-    mColorNames.put("lightyellow", "#ffffe0");
-    mColorNames.put("lime", "#00ff00");
-    mColorNames.put("limegreen", "#32cd32");
-    mColorNames.put("linen", "#faf0e6");
-    mColorNames.put("magenta", "#ff00ff");
-    mColorNames.put("maroon", "#800000");
-    mColorNames.put("mediumaquamarine", "#66cdaa");
-    mColorNames.put("mediumblue", "#0000cd");
-    mColorNames.put("mediumorchid", "#ba55d3");
-    mColorNames.put("mediumpurple", "#9370d8");
-    mColorNames.put("mediumseagreen", "#3cb371");
-    mColorNames.put("mediumslateblue", "#7b68ee");
-    mColorNames.put("mediumspringgreen", "#00fa9a");
-    mColorNames.put("mediumturquoise", "#48d1cc");
-    mColorNames.put("mediumvioletred", "#c71585");
-    mColorNames.put("midnightblue", "#191970");
-    mColorNames.put("mintcream", "#f5fffa");
-    mColorNames.put("mistyrose", "#ffe4e1");
-    mColorNames.put("moccasin", "#ffe4b5");
-    mColorNames.put("navajowhite", "#ffdead");
-    mColorNames.put("navy", "#000080");
-    mColorNames.put("oldlace", "#fdf5e6");
-    mColorNames.put("olive", "#808000");
-    mColorNames.put("olivedrab", "#6b8e23");
-    mColorNames.put("orange", "#ffa500");
-    mColorNames.put("orangered", "#ff4500");
-    mColorNames.put("orchid", "#da70d6");
-    mColorNames.put("palegoldenrod", "#eee8aa");
-    mColorNames.put("palegreen", "#98fb98");
-    mColorNames.put("paleturquoise", "#afeeee");
-    mColorNames.put("palevioletred", "#d87093");
-    mColorNames.put("papayawhip", "#ffefd5");
-    mColorNames.put("peachpuff", "#ffdab9");
-    mColorNames.put("peru", "#cd853f");
-    mColorNames.put("pink", "#ffc0cb");
-    mColorNames.put("plum", "#dda0dd");
-    mColorNames.put("powderblue", "#b0e0e6");
-    mColorNames.put("purple", "#800080");
-    mColorNames.put("red", "#ff0000");
-    mColorNames.put("rosybrown", "#bc8f8f");
-    mColorNames.put("royalblue", "#4169e1");
-    mColorNames.put("saddlebrown", "#8b4513");
-    mColorNames.put("salmon", "#fa8072");
-    mColorNames.put("sandybrown", "#f4a460");
-    mColorNames.put("seagreen", "#2e8b57");
-    mColorNames.put("seashell", "#fff5ee");
-    mColorNames.put("sienna", "#a0522d");
-    mColorNames.put("silver", "#c0c0c0");
-    mColorNames.put("skyblue", "#87ceeb");
-    mColorNames.put("slateblue", "#6a5acd");
-    mColorNames.put("slategray", "#708090");
-    mColorNames.put("slategrey", "#708090");
-    mColorNames.put("snow", "#fffafa");
-    mColorNames.put("springgreen", "#00ff7f");
-    mColorNames.put("steelblue", "#4682b4");
-    mColorNames.put("tan", "#d2b48c");
-    mColorNames.put("teal", "#008080");
-    mColorNames.put("thistle", "#d8bfd8");
-    mColorNames.put("tomato", "#ff6347");
-    mColorNames.put("turquoise", "#40e0d0");
-    mColorNames.put("violet", "#ee82ee");
-    mColorNames.put("wheat", "#f5deb3");
-    mColorNames.put("white", "#ffffff");
-    mColorNames.put("whitesmoke", "#f5f5f5");
-    mColorNames.put("yellow", "#ffff00");
-    mColorNames.put("yellowgreen", "#9acd32");
-
-    mRelative.put("above", RelativeLayout.ABOVE);
-    mRelative.put("alignBaseline", RelativeLayout.ALIGN_BASELINE);
-    mRelative.put("alignBottom", RelativeLayout.ALIGN_BOTTOM);
-    mRelative.put("alignLeft", RelativeLayout.ALIGN_LEFT);
-    mRelative.put("alignParentBottom", RelativeLayout.ALIGN_PARENT_BOTTOM);
-    mRelative.put("alignParentLeft", RelativeLayout.ALIGN_PARENT_LEFT);
-    mRelative.put("alignParentRight", RelativeLayout.ALIGN_PARENT_RIGHT);
-    mRelative.put("alignParentTop", RelativeLayout.ALIGN_PARENT_TOP);
-    mRelative.put("alignRight", RelativeLayout.ALIGN_PARENT_RIGHT);
-    mRelative.put("alignTop", RelativeLayout.ALIGN_TOP);
-    // mRelative.put("alignWithParentIfMissing",RelativeLayout.); // No idea what this translates
-    // to.
-    mRelative.put("below", RelativeLayout.BELOW);
-    mRelative.put("centerHorizontal", RelativeLayout.CENTER_HORIZONTAL);
-    mRelative.put("centerInParent", RelativeLayout.CENTER_IN_PARENT);
-    mRelative.put("centerVertical", RelativeLayout.CENTER_VERTICAL);
-    mRelative.put("toLeftOf", RelativeLayout.LEFT_OF);
-    mRelative.put("toRightOf", RelativeLayout.RIGHT_OF);
-  }
-
-  public static XmlPullParserFactory getFactory() throws XmlPullParserException {
-    if (mFactory == null) {
-      mFactory = XmlPullParserFactory.newInstance();
-      mFactory.setNamespaceAware(true);
-    }
-    return mFactory;
-  }
-
-  public static XmlPullParser getXml() throws XmlPullParserException {
-    return getFactory().newPullParser();
-  }
-
-  public static XmlPullParser getXml(InputStream is) throws XmlPullParserException {
-    XmlPullParser xml = getXml();
-    xml.setInput(is, null);
-    return xml;
-  }
-
-  public static XmlPullParser getXml(Reader ir) throws XmlPullParserException {
-    XmlPullParser xml = getXml();
-    xml.setInput(ir);
-    return xml;
-  }
-
-  public View inflate(Activity context, XmlPullParser xml) throws XmlPullParserException,
-      IOException, IllegalArgumentException, IllegalAccessException, InvocationTargetException {
-    int event;
-    mContext = context;
-    mErrors.clear();
-    mMetrics = new DisplayMetrics();
-    context.getWindowManager().getDefaultDisplay().getMetrics(mMetrics);
-    do {
-      event = xml.next();
-      if (event == XmlPullParser.END_DOCUMENT) {
-        return null;
-      }
-    } while (event != XmlPullParser.START_TAG);
-    View view = inflateView(context, xml, null);
-    return view;
-  }
-
-  private void addln(Object msg) {
-    Log.d(msg.toString());
-  }
-
-  @SuppressWarnings("rawtypes")
-  public void setClickListener(View v, android.view.View.OnClickListener listener,
-      OnItemClickListener itemListener) {
-    if (v.isClickable()) {
-
-      if (v instanceof AdapterView) {
-        try {
-          ((AdapterView) v).setOnItemClickListener(itemListener);
-        } catch (RuntimeException e) {
-          // Ignore this, not all controls support OnItemClickListener
-        }
-      }
-      try {
-        v.setOnClickListener(listener);
-      } catch (RuntimeException e) {
-        // And not all controls support OnClickListener.
-      }
-    }
-    if (v instanceof ViewGroup) {
-      ViewGroup vg = (ViewGroup) v;
-      for (int i = 0; i < vg.getChildCount(); i++) {
-        setClickListener(vg.getChildAt(i), listener, itemListener);
-      }
-    }
-  }
-
-  private View inflateView(Context context, XmlPullParser xml, ViewGroup root)
-      throws IllegalArgumentException, IllegalAccessException, InvocationTargetException,
-      XmlPullParserException, IOException {
-    View view = buildView(context, xml, root);
-    if (view == null) {
-      return view;
-    }
-    int event;
-    while ((event = xml.next()) != XmlPullParser.END_DOCUMENT) {
-      switch (event) {
-      case XmlPullParser.START_TAG:
-        if (view == null || view instanceof ViewGroup) {
-          inflateView(context, xml, (ViewGroup) view);
-        } else {
-          skipTag(xml); // Not really a view, probably, skip it.
-        }
-        break;
-      case XmlPullParser.END_TAG:
-        return view;
-      }
-    }
-    return view;
-  }
-
-  private void skipTag(XmlPullParser xml) throws XmlPullParserException, IOException {
-    int depth = xml.getDepth();
-    int event;
-    while ((event = xml.next()) != XmlPullParser.END_DOCUMENT) {
-      if (event == XmlPullParser.END_TAG && xml.getDepth() <= depth) {
-        break;
-      }
-    }
-  }
-
-  private View buildView(Context context, XmlPullParser xml, ViewGroup root)
-      throws IllegalArgumentException, IllegalAccessException, InvocationTargetException {
-    View view = viewClass(context, xml.getName());
-    if (view != null) {
-      getLayoutParams(view, root); // Make quite sure every view has a layout param.
-      for (int i = 0; i < xml.getAttributeCount(); i++) {
-        String ns = xml.getAttributeNamespace(i);
-        String attr = xml.getAttributeName(i);
-        if (ANDROID.equals(ns)) {
-          setProperty(view, root, attr, xml.getAttributeValue(i));
-        }
-      }
-      if (root != null) {
-        root.addView(view);
-      }
-    }
-
-    return view;
-  }
-
-  @SuppressWarnings("deprecation")
-private int getLayoutValue(String value) {
-    if (value == null) {
-      return 0;
-    }
-    if (value.equals("match_parent")) {
-      return LayoutParams.FILL_PARENT;
-    }
-    if (value.equals("wrap_content")) {
-      return LayoutParams.WRAP_CONTENT;
-    }
-    if (value.equals("fill_parent")) {
-      return LayoutParams.FILL_PARENT;
-    }
-    return (int) getFontSize(value);
-  }
-
-  private float getFontSize(String value) {
-    int i;
-    float size;
-    String unit = "px";
-    for (i = 0; i < value.length(); i++) {
-      char c = value.charAt(i);
-      if (!(Character.isDigit(c) || c == '.')) {
-        break;
-      }
-    }
-    size = Float.parseFloat(value.substring(0, i));
-    if (i < value.length()) {
-      unit = value.substring(i).trim();
-    }
-    if (unit.equals("px")) {
-      return size;
-    }
-    if (unit.equals("sp")) {
-      return mMetrics.scaledDensity * size;
-    }
-    if (unit.equals("dp") || unit.equals("dip")) {
-      return mMetrics.density * size;
-    }
-    float inches = mMetrics.ydpi * size;
-    if (unit.equals("in")) {
-      return inches;
-    }
-    if (unit.equals("pt")) {
-      return inches / 72;
-    }
-    if (unit.equals("mm")) {
-      return (float) (inches / 2.54);
-    }
-    return 0;
-  }
-
-  private int calcId(String value) {
-    if (value == null) {
-      return 0;
-    }
-    if (value.startsWith("@+id/")) {
-      return tryGetId(value.substring(5));
-    }
-    if (value.startsWith("@id/")) {
-      return tryGetId(value.substring(4));
-    }
-    try {
-      return Integer.parseInt(value);
-    } catch (NumberFormatException e) {
-      return 0;
-    }
-  }
-
-  @SuppressLint("UseValueOf")
-private int tryGetId(String value) {
-    Integer id = mIdList.get(value);
-    if (id == null) {
-      id = new Integer(mNextSeq++);
-      mIdList.put(value, id);
-    }
-    return id;
-  }
-
-  private LayoutParams getLayoutParams(View view, ViewGroup root) {
-    LayoutParams result = view.getLayoutParams();
-    if (result == null) {
-      result = createLayoutParams(root);
-      view.setLayoutParams(result);
-    }
-    return result;
-  }
-
-  private LayoutParams createLayoutParams(ViewGroup root) {
-    LayoutParams result = null;
-    if (root != null) {
-      try {
-        String lookfor = root.getClass().getName() + "$LayoutParams";
-        addln(lookfor);
-        Class<? extends LayoutParams> clazz = Class.forName(lookfor).asSubclass(LayoutParams.class);
-        if (clazz != null) {
-          Constructor<? extends LayoutParams> ct = clazz.getConstructor(int.class, int.class);
-          result = ct.newInstance(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
-        }
-      } catch (Exception e) {
-        result = null;
-      }
-    }
-    if (result == null) {
-      result = new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
-    }
-    return result;
-  }
-
-  public void setProperty(View view, String attr, String value) {
-    try {
-      setProperty(view, (ViewGroup) view.getParent(), attr, value);
-    } catch (Exception e) {
-      mErrors.add(e.toString());
-    }
-  }
-
-  private void setProperty(View view, ViewGroup root, String attr, String value)
-      throws IllegalArgumentException, IllegalAccessException, InvocationTargetException {
-    addln(attr + ":" + value);
-    if (attr.startsWith("layout_")) {
-      setLayoutProperty(view, root, attr, value);
-    } else if (attr.equals("id")) {
-      view.setId(calcId(value));
-    } else if (attr.equals("gravity")) {
-      setInteger(view, attr, getInteger(Gravity.class, value));
-    } else if (attr.equals("width") || attr.equals("height")) {
-      setInteger(view, attr, (int) getFontSize(value));
-    } else if (attr.equals("inputType")) {
-      setInteger(view, attr, getInteger(InputType.class, value));
-    } else if (attr.equals("background")) {
-      setBackground(view, value);
-    } else if (attr.equals("digits") && view instanceof TextView) {
-      ((TextView) view).setKeyListener(DigitsKeyListener.getInstance(value));
-    } else if (attr.startsWith("nextFocus")) {
-      setInteger(view, attr + "Id", calcId(value));
-    } else if (attr.equals("padding")) {
-      int size = (int) getFontSize(value);
-      view.setPadding(size, size, size, size);
-    } else if (attr.equals("stretchColumns")) {
-      setStretchColumns(view, value);
-    } else if (attr.equals("textSize")) {
-      setFloat(view, attr, getFontSize(value));
-    } else if (attr.equals("textColor")) {
-      setInteger(view, attr, getColor(value));
-    } else if (attr.equals("textHighlightColor")) {
-      setInteger(view, "HighlightColor", getColor(value));
-    } else if (attr.equals("textColorHint")) {
-      setInteger(view, "LinkTextColor", getColor(value));
-    } else if (attr.equals("textStyle")) {
-      TextView textview = (TextView) view;
-      int style = getInteger(Typeface.class, value);
-      if (style == 0) {
-        textview.setTypeface(Typeface.DEFAULT);
-      } else {
-        textview.setTypeface(textview.getTypeface(), style);
-      }
-    } else if (attr.equals("typeface")) {
-      TextView textview = (TextView) view;
-      int style = textview.getTypeface().getStyle();
-      textview.setTypeface(Typeface.create(value, style));
-    } else if (attr.equals("src")) {
-      setImage(view, value);
-    } else {
-      setDynamicProperty(view, attr, value);
-    }
-  }
-
-  private void setStretchColumns(View view, String value) {
-    TableLayout table = (TableLayout) view;
-    String[] values = value.split(",");
-    for (String column : values) {
-      table.setColumnStretchable(Integer.parseInt(column), true);
-    }
-  }
-
-  private void setLayoutProperty(View view, ViewGroup root, String attr, String value) {
-    LayoutParams layout = getLayoutParams(view, root);
-    String layoutAttr = attr.substring(7);
-    if (layoutAttr.equals("width")) {
-      layout.width = getLayoutValue(value);
-    } else if (layoutAttr.equals("height")) {
-      layout.height = getLayoutValue(value);
-    } else if (layoutAttr.equals("gravity")) {
-      setIntegerField(layout, "gravity", getInteger(Gravity.class, value));
-    } else {
-      if (layoutAttr.startsWith("margin") && layout instanceof MarginLayoutParams) {
-        int size = (int) getFontSize(value);
-        MarginLayoutParams margins = (MarginLayoutParams) layout;
-        if (layoutAttr.equals("marginBottom")) {
-          margins.bottomMargin = size;
-        } else if (layoutAttr.equals("marginTop")) {
-          margins.topMargin = size;
-        } else if (layoutAttr.equals("marginLeft")) {
-          margins.leftMargin = size;
-        } else if (layoutAttr.equals("marginRight")) {
-          margins.rightMargin = size;
-        }
-      } else if (layout instanceof RelativeLayout.LayoutParams) {
-        int anchor = calcId(value);
-        if (anchor == 0) {
-          anchor = getInteger(RelativeLayout.class, value);
-        }
-        int rule = mRelative.get(layoutAttr);
-        ((RelativeLayout.LayoutParams) layout).addRule(rule, anchor);
-      } else {
-        setIntegerField(layout, layoutAttr, getInteger(layout.getClass(), value));
-      }
-    }
-  }
-
-  @SuppressWarnings("deprecation")
-private void setBackground(View view, String value) {
-    if (value.startsWith("#")) {
-      view.setBackgroundColor(getColor(value));
-    } else if (value.startsWith("@")) {
-      setInteger(view, "backgroundResource", getInteger(view, value));
-    } else {
-      view.setBackgroundDrawable(getDrawable(value));
-    }
-  }
-
-  @SuppressWarnings("deprecation")
-private Drawable getDrawable(String value) {
-    try {
-      Uri uri = Uri.parse(value);
-      if ("file".equals(uri.getScheme())) {
-        BitmapDrawable bd = new BitmapDrawable(uri.getPath());
-        return bd;
-      }
-    } catch (Exception e) {
-      mErrors.add("failed to load drawable " + value);
-    }
-    return null;
-  }
-
-  private void setImage(View view, String value) {
-    if (value.startsWith("@")) {
-      setInteger(view, "imageResource", getInteger(view, value));
-    } else {
-      try {
-        Uri uri = Uri.parse(value);
-        if ("file".equals(uri.getScheme())) {
-          Bitmap bm = BitmapFactory.decodeFile(uri.getPath());
-          Method method = view.getClass().getMethod("setImageBitmap", Bitmap.class);
-          method.invoke(view, bm);
-        } else {
-          mErrors.add("Only 'file' currently supported for images");
-        }
-      } catch (Exception e) {
-        mErrors.add("failed to set image " + value);
-      }
-    }
-  }
-
-  private void setIntegerField(Object target, String fieldName, int value) {
-    try {
-      Field f = target.getClass().getField(fieldName);
-      f.setInt(target, value);
-    } catch (Exception e) {
-      mErrors.add("set field)" + fieldName + " failed. " + e.toString());
-    }
-  }
-
-  /** Expand single digit color to 2 digits. */
-  private int expandColor(String colorValue) {
-    return Integer.parseInt(colorValue + colorValue, 16);
-  }
-
-  @SuppressLint("DefaultLocale")
-private int getColor(String value) {
-    int a = 0xff, r = 0, g = 0, b = 0;
-    if (value.startsWith("#")) {
-      try {
-        value = value.substring(1);
-        if (value.length() == 4) {
-          a = expandColor(value.substring(0, 1));
-          value = value.substring(1);
-        }
-        if (value.length() == 3) {
-          r = expandColor(value.substring(0, 1));
-          g = expandColor(value.substring(1, 2));
-          b = expandColor(value.substring(2, 3));
-        } else {
-          if (value.length() == 8) {
-            a = Integer.parseInt(value.substring(0, 2), 16);
-            value = value.substring(2);
-          }
-          if (value.length() == 6) {
-            r = Integer.parseInt(value.substring(0, 2), 16);
-            g = Integer.parseInt(value.substring(2, 4), 16);
-            b = Integer.parseInt(value.substring(4, 6), 16);
-          }
-        }
-        long result = (a << 24) | (r << 16) | (g << 8) | b;
-        return (int) result;
-      } catch (Exception e) {
-      }
-    } else if (mColorNames.containsKey(value.toLowerCase())) {
-      return getColor(mColorNames.get(value.toLowerCase()));
-    }
-    mErrors.add("Unknown color " + value);
-    return 0;
-  }
-
-  private int getInputType(String value) {
-    int result = 0;
-    Integer v = getInputTypes().get(value);
-    if (v == null) {
-      mErrors.add("Unkown input type " + value);
-    } else {
-      result = v;
-    }
-    return result;
-  }
-
-  private void setInteger(View view, String attr, int value) {
-    String name = "set" + PCase(attr);
-    Method m;
-    try {
-      if ((m = tryMethod(view, name, Context.class, int.class)) != null) {
-        m.invoke(view, mContext, value);
-      } else if ((m = tryMethod(view, name, int.class)) != null) {
-        m.invoke(view, value);
-      }
-    } catch (Exception e) {
-      addln(name + ":" + value + ":" + e.toString());
-    }
-
-  }
-
-  private void setFloat(View view, String attr, float value) {
-    String name = "set" + PCase(attr);
-    Method m;
-    try {
-      if ((m = tryMethod(view, name, Context.class, float.class)) != null) {
-        m.invoke(view, mContext, value);
-      } else if ((m = tryMethod(view, name, float.class)) != null) {
-        m.invoke(view, value);
-      }
-    } catch (Exception e) {
-      addln(name + ":" + value + ":" + e.toString());
-    }
-
-  }
-
-  private void setDynamicProperty(View view, String attr, String value)
-      throws IllegalArgumentException, IllegalAccessException, InvocationTargetException {
-    String name = "set" + PCase(attr);
-    try {
-      Method m = tryMethod(view, name, CharSequence.class);
-      if (m != null) {
-        m.invoke(view, value);
-      } else if ((m = tryMethod(view, name, Context.class, int.class)) != null) {
-        m.invoke(view, mContext, getInteger(view, value));
-      } else if ((m = tryMethod(view, name, int.class)) != null) {
-        m.invoke(view, getInteger(view, value));
-      } else if ((m = tryMethod(view, name, float.class)) != null) {
-        m.invoke(view, Float.parseFloat(value));
-      } else if ((m = tryMethod(view, name, boolean.class)) != null) {
-        m.invoke(view, Boolean.parseBoolean(value));
-      } else if ((m = tryMethod(view, name, Object.class)) != null) {
-        m.invoke(view, value);
-      } else {
-        mErrors.add(view.getClass().getSimpleName() + ":" + attr + " Property not found.");
-      }
-    } catch (Exception e) {
-      addln(name + ":" + value + ":" + e.toString());
-      mErrors.add(name + ":" + value + ":" + e.toString());
-    }
-  }
-
-  @SuppressLint("DefaultLocale")
-private String PCase(String s) {
-    if (s == null) {
-      return null;
-    }
-    if (s.length() > 0) {
-      return s.substring(0, 1).toUpperCase() + s.substring(1);
-    }
-    return "";
-  }
-
-  private Method tryMethod(Object o, String name, Class<?>... parameters) {
-    Method result;
-    try {
-      result = o.getClass().getMethod(name, parameters);
-    } catch (Exception e) {
-      result = null;
-    }
-    return result;
-  }
-
-  @SuppressLint("DefaultLocale")
-public String camelCase(String s) {
-    if (s == null) {
-      return "";
-    } else if (s.length() < 2) {
-      return s.toUpperCase();
-    } else {
-      return s.substring(0, 1).toUpperCase() + s.substring(1).toLowerCase();
-    }
-  }
-
-  @SuppressLint("DefaultLocale")
-private Integer getInteger(Class<?> clazz, String value) {
-    Integer result = null;
-    if (value.contains("|")) {
-      int work = 0;
-      for (String s : value.split("\\|")) {
-        work |= getInteger(clazz, s);
-      }
-      result = work;
-    } else {
-      if (value.startsWith("?")) {
-        result = parseTheme(value);
-      } else if (value.startsWith("@")) {
-        result = parseTheme(value);
-      } else if (value.startsWith("0x")) {
-        try {
-          result = (int) Long.parseLong(value.substring(2), 16);
-        } catch (NumberFormatException e) {
-          result = 0;
-        }
-      } else {
-        try {
-          result = Integer.parseInt(value);
-        } catch (NumberFormatException e) {
-          if (clazz == InputType.class) {
-            return getInputType(value);
-          }
-          try {
-            Field f = clazz.getField(value.toUpperCase());
-            result = f.getInt(null);
-          } catch (Exception ex) {
-            mErrors.add("Unknown value: " + value);
-            result = 0;
-          }
-        }
-      }
-    }
-    return result;
-  }
-
-  private Integer getInteger(View view, String value) {
-    return getInteger(view.getClass(), value);
-  }
-
-  private Integer parseTheme(String value) {
-    int result;
-    try {
-      String query = "";
-      int i;
-      value = value.substring(1); // skip past "?"
-      i = value.indexOf(":");
-      if (i >= 0) {
-        query = value.substring(0, i) + ".";
-        value = value.substring(i + 1);
-      }
-      query += "R";
-      i = value.indexOf("/");
-      if (i >= 0) {
-        query += "$" + value.substring(0, i);
-        value = value.substring(i + 1);
-      }
-      Class<?> clazz = Class.forName(query);
-      Field f = clazz.getField(value);
-      result = f.getInt(null);
-    } catch (Exception e) {
-      result = 0;
-    }
-    return result;
-  }
-
-  private View viewClass(Context context, String name) {
-    View result = null;
-    result = viewClassTry(context, "android.view." + name);
-    if (result == null) {
-      result = viewClassTry(context, "android.widget." + name);
-    }
-    if (result == null) {
-      result = viewClassTry(context, name);
-    }
-    return result;
-  }
-
-  private View viewClassTry(Context context, String name) {
-    View result = null;
-    try {
-      Class<? extends View> viewclass = Class.forName(name).asSubclass(View.class);
-      if (viewclass != null) {
-        Constructor<? extends View> ct = viewclass.getConstructor(Context.class);
-        result = ct.newInstance(context);
-      }
-    } catch (Exception e) {
-    }
-    return result;
-
-  }
-
-  public Map<String, Integer> getIdList() {
-    return mIdList;
-  }
-
-  public List<String> getErrors() {
-    return mErrors;
-  }
-
-  public String getIdName(int id) {
-    for (String key : mIdList.keySet()) {
-      if (mIdList.get(key) == id) {
-        return key;
-      }
-    }
-    return null;
-  }
-
-  public int getId(String name) {
-    return mIdList.get(name);
-  }
-
-  public Map<String, Map<String, String>> getViewAsMap(View v) {
-    Map<String, Map<String, String>> result = new HashMap<String, Map<String, String>>();
-    for (Entry<String, Integer> entry : mIdList.entrySet()) {
-      View tmp = v.findViewById(entry.getValue());
-      if (tmp != null) {
-        result.put(entry.getKey(), getViewInfo(tmp));
-      }
-    }
-    return result;
-  }
-
-  public Map<String, String> getViewInfo(View v) {
-    Map<String, String> result = new HashMap<String, String>();
-    if (v.getId() != 0) {
-      result.put("id", getIdName(v.getId()));
-    }
-    result.put("type", v.getClass().getSimpleName());
-    addProperty(v, "text", result);
-    addProperty(v, "visibility", result);
-    addProperty(v, "checked", result);
-    addProperty(v, "tag", result);
-    addProperty(v, "selectedItemPosition", result);
-    addProperty(v, "progress", result);
-    return result;
-  }
-
-  private void addProperty(View v, String attr, Map<String, String> dest) {
-    String result = getProperty(v, attr);
-    if (result != null) {
-      dest.put(attr, result);
-    }
-  }
-
-  private String getProperty(View v, String attr) {
-    String name = PCase(attr);
-    Method m = tryMethod(v, "get" + name);
-    if (m == null) {
-      m = tryMethod(v, "is" + name);
-    }
-    String result = null;
-    if (m != null) {
-      try {
-        Object o = m.invoke(v);
-        if (o != null) {
-          result = o.toString();
-        }
-      } catch (Exception e) {
-        result = null;
-      }
-    }
-    return result;
-  }
-
-  public static Map<String, Integer> getInputTypes() {
-    if (mInputTypes.size() == 0) {
-      mInputTypes.put("none", 0x00000000);
-      mInputTypes.put("text", 0x00000001);
-      mInputTypes.put("textCapCharacters", 0x00001001);
-      mInputTypes.put("textCapWords", 0x00002001);
-      mInputTypes.put("textCapSentences", 0x00004001);
-      mInputTypes.put("textAutoCorrect", 0x00008001);
-      mInputTypes.put("textAutoComplete", 0x00010001);
-      mInputTypes.put("textMultiLine", 0x00020001);
-      mInputTypes.put("textImeMultiLine", 0x00040001);
-      mInputTypes.put("textNoSuggestions", 0x00080001);
-      mInputTypes.put("textUri", 0x00000011);
-      mInputTypes.put("textEmailAddress", 0x00000021);
-      mInputTypes.put("textEmailSubject", 0x00000031);
-      mInputTypes.put("textShortMessage", 0x00000041);
-      mInputTypes.put("textLongMessage", 0x00000051);
-      mInputTypes.put("textPersonName", 0x00000061);
-      mInputTypes.put("textPostalAddress", 0x00000071);
-      mInputTypes.put("textPassword", 0x00000081);
-      mInputTypes.put("textVisiblePassword", 0x00000091);
-      mInputTypes.put("textWebEditText", 0x000000a1);
-      mInputTypes.put("textFilter", 0x000000b1);
-      mInputTypes.put("textPhonetic", 0x000000c1);
-      mInputTypes.put("textWebEmailAddress", 0x000000d1);
-      mInputTypes.put("textWebPassword", 0x000000e1);
-      mInputTypes.put("number", 0x00000002);
-      mInputTypes.put("numberSigned", 0x00001002);
-      mInputTypes.put("numberDecimal", 0x00002002);
-      mInputTypes.put("numberPassword", 0x00000012);
-      mInputTypes.put("phone", 0x00000003);
-      mInputTypes.put("datetime", 0x00000004);
-      mInputTypes.put("date", 0x00000014);
-      mInputTypes.put("time", 0x00000024);
-    }
-    return mInputTypes;
-  }
-
-  /** Query class (typically R.id) to extract id names */
-  public void setIdList(Class<?> idClass) {
-    mIdList.clear();
-    for (Field f : idClass.getDeclaredFields()) {
-      try {
-        String name = f.getName();
-        int value = f.getInt(null);
-        mIdList.put(name, value);
-      } catch (Exception e) {
-        // Ignore
-      }
-    }
-  }
-
-  public void setListAdapter(View view, JSONArray items) {
-    List<String> list = new ArrayList<String>();
-    try {
-      for (int i = 0; i < items.length(); i++) {
-        list.add(items.get(i).toString());
-      }
-      ArrayAdapter<String> adapter;
-      if (view instanceof Spinner) {
-        adapter =
-            new ArrayAdapter<String>(mContext, android.R.layout.simple_spinner_item,
-                android.R.id.text1, list);
-      } else {
-        adapter =
-            new ArrayAdapter<String>(mContext, android.R.layout.simple_list_item_1,
-                android.R.id.text1, list);
-      }
-      adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-      Method m = tryMethod(view, "setAdapter", SpinnerAdapter.class);
-      if (m == null) {
-        m = view.getClass().getMethod("setAdapter", ListAdapter.class);
-      }
-      m.invoke(view, adapter);
-    } catch (Exception e) {
-      mErrors.add("failed to load list " + e.getMessage());
-    }
-  }
-}
diff --git a/src/com/googlecode/android_scripting/future/FutureActivityTask.java b/src/com/googlecode/android_scripting/future/FutureActivityTask.java
deleted file mode 100644
index 46317097..00000000
--- a/src/com/googlecode/android_scripting/future/FutureActivityTask.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.future;
-
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.content.Intent;
-import android.util.Log;
-import android.view.ContextMenu;
-import android.view.ContextMenu.ContextMenuInfo;
-import android.view.KeyEvent;
-import android.view.Menu;
-import android.view.View;
-import android.view.Window;
-
-/**
- * Encapsulates an {@link Activity} and a {@link FutureObject}.
- * 
- * @author Damon Kohler (damonkohler@gmail.com)
- */
-public abstract class FutureActivityTask<T> {
-
-	final private String TAG = "FutureActivityTask";
-	private final FutureResult<T> mResult = new FutureResult<T>();
-	private Activity mActivity;
-
-	public void setActivity(Activity activity) {
-		mActivity = activity;
-	}
-
-	public Activity getActivity() {
-		return mActivity;
-	}
-
-	public void onCreate() {
-		Log.d(TAG, "onCreate");
-		mActivity.getWindow().requestFeature(Window.FEATURE_NO_TITLE);
-	}
-
-  public void onStart() {
-		Log.d(TAG, "onStart");
-
-  }
-
-  public void onResume() {
-		Log.d(TAG, "onResume");
-
-  }
-
-  public void onPause() {
-		Log.d(TAG, "onPause");
-
-  }
-
-  public void onStop() {
-		Log.d(TAG, "onStop");
-
-  }
-
-  public void onDestroy() {
-		Log.d(TAG, "onDestroy");
-
-  }
-
-  public void onNewIntent(Intent intent) {
-  }
-  public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
-  }
-
-  public boolean onPrepareOptionsMenu(Menu menu) {
-    return false;
-  }
-
-  public void onActivityResult(int requestCode, int resultCode, Intent data) {
-  }
-
-  protected void setResult(T result) {
-    mResult.set(result);
-  }
-
-  public T getResult() throws InterruptedException {
-    return mResult.get();
-  }
-
-  public void finish() {
-    mActivity.finish();
-  }
-
-  public void startActivity(Intent intent) {
-    mActivity.startActivity(intent);
-  }
-
-  public void startActivityForResult(Intent intent, int requestCode) {
-    mActivity.startActivityForResult(intent, requestCode);
-  }
-
-  public boolean onKeyDown(int keyCode, KeyEvent event) {
-    // Placeholder.
-    return false;
-  }
-}
diff --git a/src/com/googlecode/android_scripting/future/FutureResult.java b/src/com/googlecode/android_scripting/future/FutureResult.java
deleted file mode 100644
index 8806276f..00000000
--- a/src/com/googlecode/android_scripting/future/FutureResult.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.future;
-
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-
-/**
- * FutureResult represents an eventual execution result for asynchronous operations.
- * 
- * @author Damon Kohler (damonkohler@gmail.com)
- */
-public class FutureResult<T> implements Future<T> {
-
-  private final CountDownLatch mLatch = new CountDownLatch(1);
-  private volatile T mResult;
-
-  public void set(T result) {
-    mResult = result;
-    mLatch.countDown();
-  }
-
-  @Override
-  public boolean cancel(boolean mayInterruptIfRunning) {
-    return false;
-  }
-
-  @Override
-  public T get() throws InterruptedException {
-    mLatch.await();
-    return mResult;
-  }
-
-  @Override
-  public T get(long timeout, TimeUnit unit) throws InterruptedException {
-    mLatch.await(timeout, unit);
-    return mResult;
-  }
-
-  @Override
-  public boolean isCancelled() {
-    return false;
-  }
-
-  @Override
-  public boolean isDone() {
-    return mResult != null;
-  }
-
-}
diff --git a/src/com/googlecode/android_scripting/interpreter/ExternalClassLoader.java b/src/com/googlecode/android_scripting/interpreter/ExternalClassLoader.java
deleted file mode 100644
index 361c2194..00000000
--- a/src/com/googlecode/android_scripting/interpreter/ExternalClassLoader.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.googlecode.android_scripting.interpreter;
-
-import com.googlecode.android_scripting.StringUtils;
-
-import dalvik.system.DexClassLoader;
-
-import java.util.Collection;
-
-public class ExternalClassLoader {
-
-  public Object load(Collection<String> dexPaths, Collection<String> nativePaths, String className)
-      throws Exception {
-    String dexOutputDir = "/sdcard/dexoutput";
-    String joinedDexPaths = StringUtils.join(dexPaths, ":");
-    String joinedNativeLibPaths = nativePaths != null ? StringUtils.join(nativePaths, ":") : null;
-    DexClassLoader loader =
-        new DexClassLoader(joinedDexPaths, dexOutputDir, joinedNativeLibPaths, this.getClass()
-            .getClassLoader());
-    Class<?> classToLoad = Class.forName(className, true, loader);
-    return classToLoad.newInstance();
-  }
-}
\ No newline at end of file
diff --git a/src/com/googlecode/android_scripting/interpreter/InProcessInterpreter.java b/src/com/googlecode/android_scripting/interpreter/InProcessInterpreter.java
deleted file mode 100644
index ec4d400b..00000000
--- a/src/com/googlecode/android_scripting/interpreter/InProcessInterpreter.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.googlecode.android_scripting.interpreter;
-
-import java.io.FileDescriptor;
-
-public interface InProcessInterpreter {
-  public FileDescriptor getStdOut();
-
-  public FileDescriptor getStdIn();
-
-  public boolean runInteractive();
-
-  public void runScript(String filename);
-}
diff --git a/src/com/googlecode/android_scripting/interpreter/Interpreter.java b/src/com/googlecode/android_scripting/interpreter/Interpreter.java
deleted file mode 100644
index 99cd2007..00000000
--- a/src/com/googlecode/android_scripting/interpreter/Interpreter.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.interpreter;
-
-import com.googlecode.android_scripting.language.Language;
-import com.googlecode.android_scripting.language.SupportedLanguages;
-import com.googlecode.android_scripting.rpc.MethodDescriptor;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Combines all the execution-related specs of a particular interpreter installed in the system.
- * This class is instantiated through a map received from a concrete InterpreterProfider.
- * 
- * @author Damon Kohler (damonkohler@gmail.com)
- * @author Alexey Reznichenko (alexey.reznichenko@gmail.com)
- */
-public class Interpreter implements InterpreterPropertyNames {
-
-  private String mExtension;
-  private String mName;
-  private String mNiceName;
-  private String mInteractiveCommand;
-  private String mScriptExecutionCommand;
-  private File mBinary;
-  private boolean mHasInteractiveMode;
-  private final List<String> mArguments;
-  private final Map<String, String> mEnvironment;
-  private Language mLanguage;
-
-  public Interpreter() {
-    mArguments = new ArrayList<String>();
-    mEnvironment = new HashMap<String, String>();
-  }
-
-  public static Interpreter buildFromMaps(Map<String, String> data,
-      Map<String, String> environment_variables, Map<String, String> arguments) {
-    String extension = data.get(EXTENSION);
-    String name = data.get(NAME);
-    String niceName = data.get(NICE_NAME);
-    String binary = data.get(BINARY);
-    String interactiveCommand = data.get(INTERACTIVE_COMMAND);
-    String scriptCommand = data.get(SCRIPT_COMMAND);
-    Boolean hasInteractiveMode;
-    if (data.containsKey(HAS_INTERACTIVE_MODE)) {
-      hasInteractiveMode = Boolean.parseBoolean(data.get(HAS_INTERACTIVE_MODE));
-    } else {
-      // Default to true so that older interpreter APKs that don't have this value define still
-      // work.
-      hasInteractiveMode = true;
-    }
-    Interpreter interpreter = new Interpreter();
-    interpreter.setName(name);
-    interpreter.setNiceName(niceName);
-    interpreter.setExtension(extension);
-    interpreter.setBinary(new File(binary));
-    interpreter.setInteractiveCommand(interactiveCommand);
-    interpreter.setScriptCommand(scriptCommand);
-    interpreter.setHasInteractiveMode(hasInteractiveMode);
-    interpreter.setLanguage(SupportedLanguages.getLanguageByExtension(extension));
-    interpreter.putAllEnvironmentVariables(environment_variables);
-    interpreter.addAllArguments(arguments.values());
-    return interpreter;
-  }
-
-  // TODO(damonkohler): This should take a List<String> since order is important.
-  private void addAllArguments(Collection<String> arguments) {
-    mArguments.addAll(arguments);
-  }
-
-  List<String> getArguments() {
-    return mArguments;
-  }
-
-  private void putAllEnvironmentVariables(Map<String, String> environmentVariables) {
-    mEnvironment.putAll(environmentVariables);
-  }
-
-  public Map<String, String> getEnvironmentVariables() {
-    return mEnvironment;
-  }
-
-  protected void setScriptCommand(String executeParameters) {
-    mScriptExecutionCommand = executeParameters;
-  }
-
-  public String getScriptCommand() {
-    return mScriptExecutionCommand;
-  }
-
-  protected void setInteractiveCommand(String interactiveCommand) {
-    mInteractiveCommand = interactiveCommand;
-  }
-
-  public String getInteractiveCommand() {
-    return mInteractiveCommand;
-  }
-
-  protected void setBinary(File binary) {
-    if (!binary.exists()) {
-      throw new RuntimeException("Binary " + binary + " does not exist!");
-    }
-    mBinary = binary;
-  }
-
-  public File getBinary() {
-    return mBinary;
-  }
-
-  protected void setExtension(String extension) {
-    mExtension = extension;
-  }
-
-  protected void setHasInteractiveMode(boolean hasInteractiveMode) {
-    mHasInteractiveMode = hasInteractiveMode;
-  }
-
-  public boolean hasInteractiveMode() {
-    return mHasInteractiveMode;
-  }
-
-  public String getExtension() {
-    return mExtension;
-  }
-
-  protected void setName(String name) {
-    mName = name;
-  }
-
-  public String getName() {
-    return mName;
-  }
-
-  protected void setNiceName(String niceName) {
-    mNiceName = niceName;
-  }
-
-  public String getNiceName() {
-    return mNiceName;
-  }
-
-  public String getContentTemplate() {
-    return mLanguage.getContentTemplate();
-  }
-
-  protected void setLanguage(Language language) {
-    mLanguage = language;
-  }
-
-  public Language getLanguage() {
-    return mLanguage;
-  }
-
-  public String getRpcText(String content, MethodDescriptor rpc, String[] values) {
-    return mLanguage.getRpcText(content, rpc, values);
-  }
-
-  public boolean isInstalled() {
-    return mBinary.exists();
-  }
-
-  public boolean isUninstallable() {
-    return true;
-  }
-}
\ No newline at end of file
diff --git a/src/com/googlecode/android_scripting/interpreter/InterpreterConfiguration.java b/src/com/googlecode/android_scripting/interpreter/InterpreterConfiguration.java
deleted file mode 100644
index 791b543e..00000000
--- a/src/com/googlecode/android_scripting/interpreter/InterpreterConfiguration.java
+++ /dev/null
@@ -1,322 +0,0 @@
-/*
- * Copyright (C) 2009 Google Inc.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.interpreter;
-
-import android.content.BroadcastReceiver;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ProviderInfo;
-import android.content.pm.ResolveInfo;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.database.Cursor;
-import android.net.Uri;
-
-import com.googlecode.android_scripting.Log;
-import com.googlecode.android_scripting.SingleThreadExecutor;
-import com.googlecode.android_scripting.interpreter.html.HtmlInterpreter;
-import com.googlecode.android_scripting.interpreter.shell.ShellInterpreter;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.CopyOnWriteArraySet;
-import java.util.concurrent.ExecutorService;
-
-/**
- * Manages and provides access to the set of available interpreters.
- * 
- * @author Damon Kohler (damonkohler@gmail.com)
- */
-public class InterpreterConfiguration {
-
-  private final InterpreterListener mListener;
-  private final Set<Interpreter> mInterpreterSet;
-  private final Set<ConfigurationObserver> mObserverSet;
-  private final Context mContext;
-  private volatile boolean mIsDiscoveryComplete = false;
-
-  public interface ConfigurationObserver {
-    public void onConfigurationChanged();
-  }
-
-  private class InterpreterListener extends BroadcastReceiver {
-    private final PackageManager mmPackageManager;
-    private final ContentResolver mmResolver;
-    private final ExecutorService mmExecutor;
-    private final Map<String, Interpreter> mmDiscoveredInterpreters;
-
-    private InterpreterListener(Context context) {
-      mmPackageManager = context.getPackageManager();
-      mmResolver = context.getContentResolver();
-      mmExecutor = new SingleThreadExecutor();
-      mmDiscoveredInterpreters = new HashMap<String, Interpreter>();
-    }
-
-    private void discoverForType(final String mime) {
-      mmExecutor.execute(new Runnable() {
-        @Override
-        public void run() {
-          Intent intent = new Intent(InterpreterConstants.ACTION_DISCOVER_INTERPRETERS);
-          intent.addCategory(Intent.CATEGORY_LAUNCHER);
-          intent.setType(mime);
-          List<ResolveInfo> resolveInfos = mmPackageManager.queryIntentActivities(intent, 0);
-          for (ResolveInfo info : resolveInfos) {
-            addInterpreter(info.activityInfo.packageName);
-          }
-          mIsDiscoveryComplete = true;
-          notifyConfigurationObservers();
-        }
-      });
-    }
-
-    private void discoverAll() {
-      mmExecutor.execute(new Runnable() {
-        @Override
-        public void run() {
-          Intent intent = new Intent(InterpreterConstants.ACTION_DISCOVER_INTERPRETERS);
-          intent.addCategory(Intent.CATEGORY_LAUNCHER);
-          intent.setType(InterpreterConstants.MIME + "*");
-          List<ResolveInfo> resolveInfos = mmPackageManager.queryIntentActivities(intent, 0);
-          for (ResolveInfo info : resolveInfos) {
-            addInterpreter(info.activityInfo.packageName);
-          }
-          mIsDiscoveryComplete = true;
-          notifyConfigurationObservers();
-        }
-      });
-    }
-
-    private void notifyConfigurationObservers() {
-      for (ConfigurationObserver observer : mObserverSet) {
-        observer.onConfigurationChanged();
-      }
-    }
-
-    private void addInterpreter(final String packageName) {
-      if (mmDiscoveredInterpreters.containsKey(packageName)) {
-        return;
-      }
-      Interpreter discoveredInterpreter = buildInterpreter(packageName);
-      if (discoveredInterpreter == null) {
-        return;
-      }
-      mmDiscoveredInterpreters.put(packageName, discoveredInterpreter);
-      mInterpreterSet.add(discoveredInterpreter);
-      Log.v("Interpreter discovered: " + packageName + "\nBinary: "
-          + discoveredInterpreter.getBinary());
-    }
-
-    private void remove(final String packageName) {
-      if (!mmDiscoveredInterpreters.containsKey(packageName)) {
-        return;
-      }
-      mmExecutor.execute(new Runnable() {
-        @Override
-        public void run() {
-          Interpreter interpreter = mmDiscoveredInterpreters.get(packageName);
-          if (interpreter == null) {
-            Log.v("Interpreter for " + packageName + " not installed.");
-            return;
-          }
-          mInterpreterSet.remove(interpreter);
-          mmDiscoveredInterpreters.remove(packageName);
-          notifyConfigurationObservers();
-        }
-      });
-    }
-
-    // We require that there's only one interpreter provider per APK.
-    private Interpreter buildInterpreter(String packageName) {
-      PackageInfo packInfo;
-      try {
-        packInfo = mmPackageManager.getPackageInfo(packageName, PackageManager.GET_PROVIDERS);
-      } catch (NameNotFoundException e) {
-        throw new RuntimeException("Package '" + packageName + "' not found.");
-      }
-      ProviderInfo provider = packInfo.providers[0];
-
-      Map<String, String> interpreterMap =
-          getMap(provider, InterpreterConstants.PROVIDER_PROPERTIES);
-      if (interpreterMap == null) {
-        Log.e("Null interpreter map for: " + packageName);
-        return null;
-      }
-      Map<String, String> environmentMap =
-          getMap(provider, InterpreterConstants.PROVIDER_ENVIRONMENT_VARIABLES);
-      if (environmentMap == null) {
-        throw new RuntimeException("Null environment map for: " + packageName);
-      }
-      Map<String, String> argumentsMap = getMap(provider, InterpreterConstants.PROVIDER_ARGUMENTS);
-      if (argumentsMap == null) {
-        throw new RuntimeException("Null arguments map for: " + packageName);
-      }
-      return Interpreter.buildFromMaps(interpreterMap, environmentMap, argumentsMap);
-    }
-
-    private Map<String, String> getMap(ProviderInfo provider, String name) {
-      Uri uri = Uri.parse("content://" + provider.authority + "/" + name);
-      Cursor cursor = mmResolver.query(uri, null, null, null, null);
-      if (cursor == null) {
-        return null;
-      }
-      cursor.moveToFirst();
-      // Use LinkedHashMap so that order is maintained (important for position CLI arguments).
-      Map<String, String> map = new LinkedHashMap<String, String>();
-      for (int i = 0; i < cursor.getColumnCount(); i++) {
-        map.put(cursor.getColumnName(i), cursor.getString(i));
-      }
-      return map;
-    }
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-      final String action = intent.getAction();
-      final String packageName = intent.getData().getSchemeSpecificPart();
-      if (action.equals(InterpreterConstants.ACTION_INTERPRETER_ADDED)) {
-        mmExecutor.execute(new Runnable() {
-          @Override
-          public void run() {
-            addInterpreter(packageName);
-            notifyConfigurationObservers();
-          }
-        });
-      } else if (action.equals(InterpreterConstants.ACTION_INTERPRETER_REMOVED)
-          || action.equals(Intent.ACTION_PACKAGE_REMOVED)
-          || action.equals(Intent.ACTION_PACKAGE_REPLACED)
-          || action.equals(Intent.ACTION_PACKAGE_DATA_CLEARED)) {
-        remove(packageName);
-      }
-    }
-
-  }
-
-  public InterpreterConfiguration(Context context) {
-    mContext = context;
-    mInterpreterSet = new CopyOnWriteArraySet<Interpreter>();
-    mInterpreterSet.add(new ShellInterpreter());
-    try {
-      mInterpreterSet.add(new HtmlInterpreter(mContext));
-    } catch (IOException e) {
-      Log.e("Failed to instantiate HtmlInterpreter.", e);
-    }
-    mObserverSet = new CopyOnWriteArraySet<ConfigurationObserver>();
-    IntentFilter filter = new IntentFilter();
-    filter.addAction(InterpreterConstants.ACTION_INTERPRETER_ADDED);
-    filter.addAction(InterpreterConstants.ACTION_INTERPRETER_REMOVED);
-    filter.addAction(Intent.ACTION_PACKAGE_DATA_CLEARED);
-    filter.addAction(Intent.ACTION_PACKAGE_REMOVED);
-    filter.addAction(Intent.ACTION_PACKAGE_REPLACED);
-    filter.addDataScheme("package");
-    mListener = new InterpreterListener(mContext);
-    mContext.registerReceiver(mListener, filter);
-  }
-
-  public void startDiscovering() {
-    mListener.discoverAll();
-  }
-
-  public void startDiscovering(String mime) {
-    mListener.discoverForType(mime);
-  }
-
-  public boolean isDiscoveryComplete() {
-    return mIsDiscoveryComplete;
-  }
-
-  public void registerObserver(ConfigurationObserver observer) {
-    if (observer != null) {
-      mObserverSet.add(observer);
-    }
-  }
-
-  public void unregisterObserver(ConfigurationObserver observer) {
-    if (observer != null) {
-      mObserverSet.remove(observer);
-    }
-  }
-
-  /**
-   * Returns the list of all known interpreters.
-   */
-  public List<? extends Interpreter> getSupportedInterpreters() {
-    return new ArrayList<Interpreter>(mInterpreterSet);
-  }
-
-  /**
-   * Returns the list of all installed interpreters.
-   */
-  public List<Interpreter> getInstalledInterpreters() {
-    List<Interpreter> interpreters = new ArrayList<Interpreter>();
-    for (Interpreter i : mInterpreterSet) {
-      if (i.isInstalled()) {
-        interpreters.add(i);
-      }
-    }
-    return interpreters;
-  }
-
-  /**
-   * Returns the list of interpreters that support interactive mode execution.
-   */
-  public List<Interpreter> getInteractiveInterpreters() {
-    List<Interpreter> interpreters = new ArrayList<Interpreter>();
-    for (Interpreter i : mInterpreterSet) {
-      if (i.isInstalled() && i.hasInteractiveMode()) {
-        interpreters.add(i);
-      }
-    }
-    return interpreters;
-  }
-
-  /**
-   * Returns the interpreter matching the provided name or null if no interpreter was found.
-   */
-  public Interpreter getInterpreterByName(String interpreterName) {
-    for (Interpreter i : mInterpreterSet) {
-      if (i.getName().equals(interpreterName)) {
-        return i;
-      }
-    }
-    return null;
-  }
-
-  /**
-   * Returns the correct interpreter for the provided script name based on the script's extension or
-   * null if no interpreter was found.
-   */
-  public Interpreter getInterpreterForScript(String scriptName) {
-    int dotIndex = scriptName.lastIndexOf('.');
-    if (dotIndex == -1) {
-      return null;
-    }
-    String ext = scriptName.substring(dotIndex);
-    for (Interpreter i : mInterpreterSet) {
-      if (i.getExtension().equals(ext)) {
-        return i;
-      }
-    }
-    return null;
-  }
-}
diff --git a/src/com/googlecode/android_scripting/interpreter/InterpreterConstants.java b/src/com/googlecode/android_scripting/interpreter/InterpreterConstants.java
deleted file mode 100644
index 227dd6d6..00000000
--- a/src/com/googlecode/android_scripting/interpreter/InterpreterConstants.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.interpreter;
-
-import android.os.Environment;
-
-/**
- * A collection of constants required for installation/removal of an interpreter.
- * 
- * @author Damon Kohler (damonkohler@gmail.com)
- * @author Alexey Reznichenko (alexey.reznichenko@gmail.com)
- */
-public interface InterpreterConstants {
-
-  public static final String SDCARD_ROOT =
-      Environment.getExternalStorageDirectory().getAbsolutePath() + "/";
-
-  public static final String SDCARD_SL4A_ROOT = SDCARD_ROOT + "sl4a/";
-
-  public static final String SCRIPTS_ROOT = SDCARD_SL4A_ROOT + "scripts/";
-
-  public static final String SDCARD_SL4A_DOC = SDCARD_SL4A_ROOT + "doc/";
-
-  public static final String SL4A_DALVIK_CACHE_ROOT = "/dalvik-cache/";
-
-  public static final String INTERPRETER_EXTRAS_ROOT = "/extras/";
-
-  // Interpreters discovery mechanism.
-  public static final String ACTION_DISCOVER_INTERPRETERS =
-      "com.googlecode.android_scripting.DISCOVER_INTERPRETERS";
-
-  // Interpreters broadcasts.
-  public static final String ACTION_INTERPRETER_ADDED =
-      "com.googlecode.android_scripting.INTERPRETER_ADDED";
-  public static final String ACTION_INTERPRETER_REMOVED =
-      "com.googlecode.android_scripting.INTERPRETER_REMOVED";
-
-  // Interpreter content provider.
-  public static final String PROVIDER_PROPERTIES = "com.googlecode.android_scripting.base";
-  public static final String PROVIDER_ENVIRONMENT_VARIABLES =
-      "com.googlecode.android_scripting.env";
-  public static final String PROVIDER_ARGUMENTS = "com.googlecode.android_scripting.args";
-
-  public static final String INSTALLED_PREFERENCE_KEY = "SL4A.interpreter.installed";
-
-  public static final String MIME = "script/";
-}
diff --git a/src/com/googlecode/android_scripting/interpreter/InterpreterDescriptor.java b/src/com/googlecode/android_scripting/interpreter/InterpreterDescriptor.java
deleted file mode 100644
index 2aedc160..00000000
--- a/src/com/googlecode/android_scripting/interpreter/InterpreterDescriptor.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.interpreter;
-
-import android.content.Context;
-
-import java.io.File;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Provides interpreter-specific info for execution/installation/removal purposes.
- * 
- * @author Alexey Reznichenko (alexey.reznichenko@gmail.com)
- */
-public interface InterpreterDescriptor {
-
-  /**
-   * Returns unique name of the interpreter.
-   */
-  public String getName();
-
-  /**
-   * Returns display name of the interpreter.
-   */
-  public String getNiceName();
-
-  /**
-   * Returns supported script-file extension.
-   */
-  public String getExtension();
-
-  /**
-   * Returns interpreter version number.
-   */
-  public int getVersion();
-
-  /**
-   * Returns the binary as a File object. Context is the InterpreterProvider's {@link Context} and
-   * is provided to find the interpreter installation directory.
-   */
-  public File getBinary(Context context);
-
-  /**
-   * Returns execution parameters in case when script name is not provided (when interpreter is
-   * started in a shell mode);
-   */
-  public String getInteractiveCommand(Context context);
-
-  /**
-   * Returns command line arguments to execute a with a given script (format string with one
-   * argument).
-   */
-  public String getScriptCommand(Context context);
-
-  /**
-   * Returns an array of command line arguments required to execute the interpreter (it's essential
-   * that the order in the array is consistent with order of arguments in the command line).
-   */
-  public List<String> getArguments(Context context);
-
-  /**
-   * Should return a map of environment variables names and their values (or null if interpreter
-   * does not require any environment variables).
-   */
-  public Map<String, String> getEnvironmentVariables(Context context);
-
-  /**
-   * Returns true if interpreter has an archive.
-   */
-  public boolean hasInterpreterArchive();
-
-  /**
-   * Returns true if interpreter has an extras archive.
-   */
-  public boolean hasExtrasArchive();
-
-  /**
-   * Returns true if interpreter comes with a scripts archive.
-   */
-  public boolean hasScriptsArchive();
-
-  /**
-   * Returns file name of the interpreter archive.
-   */
-  public String getInterpreterArchiveName();
-
-  /**
-   * Returns file name of the extras archive.
-   */
-  public String getExtrasArchiveName();
-
-  /**
-   * Returns file name of the scripts archive.
-   */
-  public String getScriptsArchiveName();
-
-  /**
-   * Returns URL location of the interpreter archive.
-   */
-  public String getInterpreterArchiveUrl();
-
-  /**
-   * Returns URL location of the scripts archive.
-   */
-  public String getScriptsArchiveUrl();
-
-  /**
-   * Returns URL location of the extras archive.
-   */
-  public String getExtrasArchiveUrl();
-
-  /**
-   * Returns true if interpreter can be executed in interactive mode.
-   */
-  public boolean hasInteractiveMode();
-}
diff --git a/src/com/googlecode/android_scripting/interpreter/InterpreterProcess.java b/src/com/googlecode/android_scripting/interpreter/InterpreterProcess.java
deleted file mode 100644
index a2d9fb61..00000000
--- a/src/com/googlecode/android_scripting/interpreter/InterpreterProcess.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (C) 2009 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.interpreter;
-
-import com.googlecode.android_scripting.Analytics;
-import com.googlecode.android_scripting.AndroidProxy;
-import com.googlecode.android_scripting.Log;
-import com.googlecode.android_scripting.Process;
-import com.googlecode.android_scripting.SimpleServer;
-import com.googlecode.android_scripting.jsonrpc.RpcReceiverManagerFactory;
-
-import java.net.InetSocketAddress;
-import java.net.SocketException;
-import java.net.UnknownHostException;
-
-/**
- * This is a skeletal implementation of an interpreter process.
- * 
- * @author Damon Kohler (damonkohler@gmail.com)
- */
-public class InterpreterProcess extends Process {
-
-  private final AndroidProxy mProxy;
-  private final Interpreter mInterpreter;
-  private String mCommand;
-
-  /**
-   * Creates a new {@link InterpreterProcess}.
-   * 
-   * @param launchScript
-   *          the absolute path to a script that should be launched with the interpreter
-   * @param port
-   *          the port that the AndroidProxy is listening on
-   */
-  public InterpreterProcess(Interpreter interpreter, AndroidProxy proxy) {
-    mProxy = proxy;
-    mInterpreter = interpreter;
-
-    setBinary(interpreter.getBinary());
-    setName(interpreter.getNiceName());
-    setCommand(interpreter.getInteractiveCommand());
-    addAllArguments(interpreter.getArguments());
-    putAllEnvironmentVariables(System.getenv());
-    putEnvironmentVariable("AP_HOST", getHost());
-    putEnvironmentVariable("AP_PORT", Integer.toString(getPort()));
-    if (proxy.getSecret() != null) {
-      putEnvironmentVariable("AP_HANDSHAKE", getSecret());
-    }
-    putAllEnvironmentVariables(interpreter.getEnvironmentVariables());
-  }
-
-  protected void setCommand(String command) {
-    mCommand = command;
-  }
-
-  public Interpreter getInterpreter() {
-    return mInterpreter;
-  }
-
-  public String getHost() {
-    String result = mProxy.getAddress().getHostName();
-    if (result.equals("0.0.0.0")) { // Wildcard.
-      try {
-        return SimpleServer.getPublicInetAddress().getHostName();
-      } catch (UnknownHostException e) {
-        Log.i("public address", e);
-        e.printStackTrace();
-      } catch (SocketException e) {
-        Log.i("public address", e);
-      }
-    }
-    return result;
-  }
-
-  public int getPort() {
-    return mProxy.getAddress().getPort();
-  }
-
-  public InetSocketAddress getAddress() {
-    return mProxy.getAddress();
-  }
-
-  public String getSecret() {
-    return mProxy.getSecret();
-  }
-
-  public RpcReceiverManagerFactory getRpcReceiverManagerFactory() {
-    return mProxy.getRpcReceiverManagerFactory();
-  }
-
-  @Override
-  public void start(final Runnable shutdownHook) {
-    Analytics.track(mInterpreter.getName());
-    // NOTE(damonkohler): String.isEmpty() doesn't work on Cupcake.
-    if (!mCommand.equals("")) {
-      addArgument(mCommand);
-    }
-    super.start(shutdownHook);
-  }
-
-  @Override
-  public void kill() {
-    super.kill();
-    mProxy.shutdown();
-  }
-
-  @Override
-  public String getWorkingDirectory() {
-    return InterpreterConstants.SDCARD_SL4A_ROOT;
-  }
-}
diff --git a/src/com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.java b/src/com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.java
deleted file mode 100644
index c740d715..00000000
--- a/src/com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.interpreter;
-
-/**
- * A collection of {@link String} keys for querying an InterpreterProvider.
- * 
- * @author Alexey Reznichenko (alexey.reznichenko@gmail.com)
- */
-public interface InterpreterPropertyNames {
-
-  /**
-   * Unique name of the interpreter.
-   */
-  public static final String NAME = "name";
-
-  /**
-   * Display name of the interpreter.
-   */
-  public static final String NICE_NAME = "niceName";
-
-  /**
-   * Supported script file extension.
-   */
-  public static final String EXTENSION = "extension";
-
-  /**
-   * Absolute path of the interpreter executable.
-   */
-  public static final String BINARY = "binary";
-
-  /**
-   * Final argument to interpreter binary when running the interpreter interactively.
-   */
-  public static final String INTERACTIVE_COMMAND = "interactiveCommand";
-
-  /**
-   * Final argument to interpreter binary when running a script.
-   */
-  public static final String SCRIPT_COMMAND = "scriptCommand";
-
-  /**
-   * Interpreter interactive mode flag.
-   */
-  public static final String HAS_INTERACTIVE_MODE = "hasInteractiveMode";
-
-}
diff --git a/src/com/googlecode/android_scripting/interpreter/InterpreterUtils.java b/src/com/googlecode/android_scripting/interpreter/InterpreterUtils.java
deleted file mode 100644
index d77634b4..00000000
--- a/src/com/googlecode/android_scripting/interpreter/InterpreterUtils.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.interpreter;
-
-import android.content.Context;
-
-import java.io.File;
-
-public class InterpreterUtils {
-
-  private InterpreterUtils() {
-    // Utility class
-  }
-
-  public static File getInterpreterRoot(Context context) {
-    return context.getFilesDir();
-  }
-
-  public static File getInterpreterRoot(Context context, String interpreterName) {
-    return new File(getInterpreterRoot(context), interpreterName);
-  }
-}
diff --git a/src/com/googlecode/android_scripting/interpreter/MyInterpreter.java b/src/com/googlecode/android_scripting/interpreter/MyInterpreter.java
deleted file mode 100644
index 3fe909a4..00000000
--- a/src/com/googlecode/android_scripting/interpreter/MyInterpreter.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.interpreter;
-
-import java.util.List;
-
-/**
- * Wrapper for the Interpreter class.
- * 
- * Workaround for the default access modifier on the getArguments() method
- * in the Interpreter class
- */
-public class MyInterpreter {
-	private Interpreter interpreter;
-
-	public MyInterpreter(Interpreter interpreter){
-		this.interpreter = interpreter;
-	}
-
-	public Interpreter getInterpreter() {
-		return this.interpreter;
-	}
-
-	public List<String> getArguments() {
-		return interpreter.getArguments();
-	}
-}
\ No newline at end of file
diff --git a/src/com/googlecode/android_scripting/interpreter/html/HtmlActivityTask.java b/src/com/googlecode/android_scripting/interpreter/html/HtmlActivityTask.java
deleted file mode 100644
index 49be9e0d..00000000
--- a/src/com/googlecode/android_scripting/interpreter/html/HtmlActivityTask.java
+++ /dev/null
@@ -1,384 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.interpreter.html;
-
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.graphics.drawable.BitmapDrawable;
-import android.net.Uri;
-import android.view.ContextMenu;
-import android.view.ContextMenu.ContextMenuInfo;
-import android.view.Menu;
-import android.view.View;
-import android.view.Window;
-import android.webkit.JsPromptResult;
-import android.webkit.JsResult;
-import android.webkit.WebChromeClient;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
-
-import com.googlecode.android_scripting.FileUtils;
-import com.googlecode.android_scripting.Log;
-import com.googlecode.android_scripting.SingleThreadExecutor;
-import com.googlecode.android_scripting.event.Event;
-import com.googlecode.android_scripting.facade.EventFacade;
-import com.googlecode.android_scripting.facade.ui.UiFacade;
-import com.googlecode.android_scripting.future.FutureActivityTask;
-import com.googlecode.android_scripting.interpreter.InterpreterConstants;
-import com.googlecode.android_scripting.jsonrpc.JsonBuilder;
-import com.googlecode.android_scripting.jsonrpc.JsonRpcResult;
-import com.googlecode.android_scripting.jsonrpc.RpcReceiver;
-import com.googlecode.android_scripting.jsonrpc.RpcReceiverManager;
-import com.googlecode.android_scripting.rpc.MethodDescriptor;
-import com.googlecode.android_scripting.rpc.RpcError;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ExecutorService;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-/**
- * @author Alexey Reznichenko (alexey.reznichenko@gmail.com)
- */
-public class HtmlActivityTask extends FutureActivityTask<Void> {
-
-  private static final String HTTP = "http";
-  private static final String ANDROID_PROTOTYPE_JS =
-      "Android.prototype.%1$s = function(var_args) { "
-          + "return this._call(\"%1$s\", Array.prototype.slice.call(arguments)); };";
-
-  private static final String PREFIX = "file://";
-  private static final String BASE_URL = PREFIX + InterpreterConstants.SCRIPTS_ROOT;
-
-  private final RpcReceiverManager mReceiverManager;
-  private final String mJsonSource;
-  private final String mAndroidJsSource;
-  private final String mAPIWrapperSource;
-  private final String mUrl;
-  private final JavaScriptWrapper mWrapper;
-  private final HtmlEventObserver mObserver;
-  private final UiFacade mUiFacade;
-  private ChromeClient mChromeClient;
-  private WebView mView;
-  private MyWebViewClient mWebViewClient;
-  private static HtmlActivityTask reference;
-  private boolean mDestroyManager;
-
-  public HtmlActivityTask(RpcReceiverManager manager, String androidJsSource, String jsonSource,
-      String url, boolean destroyManager) {
-    reference = this;
-    mReceiverManager = manager;
-    mJsonSource = jsonSource;
-    mAndroidJsSource = androidJsSource;
-    mAPIWrapperSource = generateAPIWrapper();
-    mWrapper = new JavaScriptWrapper();
-    mObserver = new HtmlEventObserver();
-    mReceiverManager.getReceiver(EventFacade.class).addGlobalEventObserver(mObserver);
-    mUiFacade = mReceiverManager.getReceiver(UiFacade.class);
-    mUrl = url;
-    mDestroyManager = destroyManager;
-  }
-
-  public RpcReceiverManager getRpcReceiverManager() {
-    return mReceiverManager;
-  }
-
-  /*
-   * New WebviewClient
-   */
-  private class MyWebViewClient extends WebViewClient {
-    @Override
-    public boolean shouldOverrideUrlLoading(WebView view, String url) {
-      /*
-       * if (Uri.parse(url).getHost().equals("www.example.com")) { // This is my web site, so do not
-       * override; let my WebView load the page return false; } // Otherwise, the link is not for a
-       * page on my site, so launch another Activity that handles URLs Intent intent = new
-       * Intent(Intent.ACTION_VIEW, Uri.parse(url)); startActivity(intent);
-       */
-      if (!HTTP.equals(Uri.parse(url).getScheme())) {
-        String source = null;
-        try {
-          source = FileUtils.readToString(new File(Uri.parse(url).getPath()));
-        } catch (IOException e) {
-          throw new RuntimeException(e);
-        }
-        source =
-            "<script>" + mJsonSource + "</script>" + "<script>" + mAndroidJsSource + "</script>"
-                + "<script>" + mAPIWrapperSource + "</script>" + source;
-        mView.loadDataWithBaseURL(BASE_URL, source, "text/html", "utf-8", null);
-      } else {
-        mView.loadUrl(url);
-      }
-      return true;
-    }
-  }
-
-  @SuppressLint("SetJavaScriptEnabled")
-@Override
-  public void onCreate() {
-    mView = new WebView(getActivity());
-    mView.setId(1);
-    mView.getSettings().setJavaScriptEnabled(true);
-    mView.addJavascriptInterface(mWrapper, "_rpc_wrapper");
-    mView.addJavascriptInterface(new Object() {
-
-      @SuppressWarnings("unused")
-      public void register(String event, int id) {
-        mObserver.register(event, id);
-      }
-    }, "_callback_wrapper");
-
-    getActivity().setContentView(mView);
-    mView.setOnCreateContextMenuListener(getActivity());
-    mChromeClient = new ChromeClient(getActivity());
-    mWebViewClient = new MyWebViewClient();
-    mView.setWebChromeClient(mChromeClient);
-    mView.setWebViewClient(mWebViewClient);
-    mView.loadUrl("javascript:" + mJsonSource);
-    mView.loadUrl("javascript:" + mAndroidJsSource);
-    mView.loadUrl("javascript:" + mAPIWrapperSource);
-    load();
-  }
-
-  private void load() {
-    if (!HTTP.equals(Uri.parse(mUrl).getScheme())) {
-      String source = null;
-      try {
-        source = FileUtils.readToString(new File(Uri.parse(mUrl).getPath()));
-      } catch (IOException e) {
-        throw new RuntimeException(e);
-      }
-      mView.loadDataWithBaseURL(BASE_URL, source, "text/html", "utf-8", null);
-    } else {
-      mView.loadUrl(mUrl);
-    }
-  }
-
-  @Override
-  public void onDestroy() {
-    mReceiverManager.getReceiver(EventFacade.class).removeEventObserver(mObserver);
-    if (mDestroyManager) {
-      mReceiverManager.shutdown();
-    }
-    mView.destroy();
-    mView = null;
-    reference = null;
-    setResult(null);
-  }
-
-  public static void shutdown() {
-    if (HtmlActivityTask.reference != null) {
-      HtmlActivityTask.reference.finish();
-    }
-  }
-
-  @Override
-  public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
-    mUiFacade.onCreateContextMenu(menu, v, menuInfo);
-  }
-
-  @Override
-  public boolean onPrepareOptionsMenu(Menu menu) {
-    return mUiFacade.onPrepareOptionsMenu(menu);
-  }
-
-  private String generateAPIWrapper() {
-    StringBuilder wrapper = new StringBuilder();
-    for (Class<? extends RpcReceiver> clazz : mReceiverManager.getRpcReceiverClasses()) {
-      for (MethodDescriptor rpc : MethodDescriptor.collectFrom(clazz)) {
-        wrapper.append(String.format(ANDROID_PROTOTYPE_JS, rpc.getName()));
-      }
-    }
-    return wrapper.toString();
-  }
-
-  private class JavaScriptWrapper {
-    @SuppressWarnings("unused")
-    public String call(String data) throws JSONException {
-      Log.v("Received: " + data);
-      JSONObject request = new JSONObject(data);
-      int id = request.getInt("id");
-      String method = request.getString("method");
-      JSONArray params = request.getJSONArray("params");
-      MethodDescriptor rpc = mReceiverManager.getMethodDescriptor(method);
-      if (rpc == null) {
-        return JsonRpcResult.error(id, new RpcError("Unknown RPC.")).toString();
-      }
-      try {
-        return JsonRpcResult.result(id, rpc.invoke(mReceiverManager, params)).toString();
-      } catch (Throwable t) {
-        Log.e("Invocation error.", t);
-        return JsonRpcResult.error(id, t).toString();
-      }
-    }
-
-    @SuppressWarnings("unused")
-    public void dismiss() {
-      Activity parent = getActivity();
-      parent.finish();
-    }
-  }
-
-  private class HtmlEventObserver implements EventFacade.EventObserver {
-    private Map<String, Set<Integer>> mEventMap = new HashMap<String, Set<Integer>>();
-
-    public void register(String eventName, Integer id) {
-      if (mEventMap.containsKey(eventName)) {
-        mEventMap.get(eventName).add(id);
-      } else {
-        Set<Integer> idSet = new HashSet<Integer>();
-        idSet.add(id);
-        mEventMap.put(eventName, idSet);
-      }
-    }
-
-    @Override
-    public void onEventReceived(Event event) {
-      final JSONObject json = new JSONObject();
-      try {
-        json.put("data", JsonBuilder.build(event.getData()));
-      } catch (JSONException e) {
-        Log.e(e);
-      }
-      if (mEventMap.containsKey(event.getName())) {
-        for (final Integer id : mEventMap.get(event.getName())) {
-          getActivity().runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-              mView.loadUrl(String.format("javascript:droid._callback(%d, %s);", id, json));
-            }
-          });
-        }
-      }
-    }
-
-    @SuppressWarnings("unused")
-    public void dismiss() {
-      Activity parent = getActivity();
-      parent.finish();
-    }
-  }
-
-  private class ChromeClient extends WebChromeClient {
-    private final static String JS_TITLE = "JavaScript Dialog";
-
-    private final Activity mActivity;
-    private final Resources mResources;
-    private final ExecutorService mmExecutor;
-
-    public ChromeClient(Activity activity) {
-      mActivity = activity;
-      mResources = mActivity.getResources();
-      mmExecutor = new SingleThreadExecutor();
-    }
-
-    @Override
-    public void onReceivedTitle(WebView view, String title) {
-      mActivity.setTitle(title);
-    }
-
-    @SuppressWarnings("deprecation")
-	@Override
-    public void onReceivedIcon(WebView view, Bitmap icon) {
-      mActivity.getWindow().requestFeature(Window.FEATURE_RIGHT_ICON);
-      mActivity.getWindow().setFeatureDrawable(Window.FEATURE_RIGHT_ICON, new BitmapDrawable(icon));
-    }
-
-    @Override
-    public boolean onJsAlert(WebView view, String url, String message, final JsResult result) {
-      final UiFacade uiFacade = mReceiverManager.getReceiver(UiFacade.class);
-      uiFacade.dialogCreateAlert(JS_TITLE, message);
-      uiFacade.dialogSetPositiveButtonText(mResources.getString(android.R.string.ok));
-
-      mmExecutor.execute(new Runnable() {
-
-        @Override
-        public void run() {
-          try {
-            uiFacade.dialogShow();
-          } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-          }
-          uiFacade.dialogGetResponse();
-          result.confirm();
-        }
-      });
-      return true;
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public boolean onJsConfirm(WebView view, String url, String message, final JsResult result) {
-      final UiFacade uiFacade = mReceiverManager.getReceiver(UiFacade.class);
-      uiFacade.dialogCreateAlert(JS_TITLE, message);
-      uiFacade.dialogSetPositiveButtonText(mResources.getString(android.R.string.ok));
-      uiFacade.dialogSetNegativeButtonText(mResources.getString(android.R.string.cancel));
-
-      mmExecutor.execute(new Runnable() {
-
-        @Override
-        public void run() {
-          try {
-            uiFacade.dialogShow();
-          } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-          }
-          Map<String, Object> mResultMap = (Map<String, Object>) uiFacade.dialogGetResponse();
-          if ("positive".equals(mResultMap.get("which"))) {
-            result.confirm();
-          } else {
-            result.cancel();
-          }
-        }
-      });
-
-      return true;
-    }
-
-    @Override
-    public boolean onJsPrompt(WebView view, String url, final String message,
-        final String defaultValue, final JsPromptResult result) {
-      final UiFacade uiFacade = mReceiverManager.getReceiver(UiFacade.class);
-      mmExecutor.execute(new Runnable() {
-        @Override
-        public void run() {
-          String value = null;
-          try {
-            value = uiFacade.dialogGetInput(JS_TITLE, message, defaultValue);
-          } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-          }
-          if (value != null) {
-            result.confirm(value);
-          } else {
-            result.cancel();
-          }
-        }
-      });
-      return true;
-    }
-  }
-}
diff --git a/src/com/googlecode/android_scripting/interpreter/html/HtmlInterpreter.java b/src/com/googlecode/android_scripting/interpreter/html/HtmlInterpreter.java
deleted file mode 100644
index 04d40faf..00000000
--- a/src/com/googlecode/android_scripting/interpreter/html/HtmlInterpreter.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.interpreter.html;
-
-import android.content.Context;
-
-import com.googlecode.android_scripting.FileUtils;
-import com.googlecode.android_scripting.interpreter.Interpreter;
-import com.googlecode.android_scripting.language.HtmlLanguage;
-
-import java.io.IOException;
-
-public class HtmlInterpreter extends Interpreter {
-
-  public static final String HTML = "html";
-  public static final String HTML_EXTENSION = ".html";
-
-  public static final String JSON_FILE = "json2.js";
-  public static final String ANDROID_JS_FILE = "android.js";
-  public static final String HTML_NICE_NAME = "HTML and JavaScript";
-
-  private final String mJson;
-  private final String mAndroidJs;
-
-  public HtmlInterpreter(Context context) throws IOException {
-    setExtension(HTML_EXTENSION);
-    setName(HTML);
-    setNiceName(HTML_NICE_NAME);
-    setInteractiveCommand("");
-    setScriptCommand("%s");
-    setLanguage(new HtmlLanguage());
-    setHasInteractiveMode(false);
-    mJson = FileUtils.readFromAssetsFile(context, JSON_FILE);
-    mAndroidJs = FileUtils.readFromAssetsFile(context, ANDROID_JS_FILE);
-  }
-
-  public boolean hasInterpreterArchive() {
-    return false;
-  }
-
-  public boolean hasExtrasArchive() {
-    return false;
-  }
-
-  public boolean hasScriptsArchive() {
-    return false;
-  }
-
-  public int getVersion() {
-    return 0;
-  }
-
-  @Override
-  public boolean isUninstallable() {
-    return false;
-  }
-
-  @Override
-  public boolean isInstalled() {
-    return true;
-  }
-
-  public String getJsonSource() {
-    return mJson;
-  }
-
-  public String getAndroidJsSource() {
-    return mAndroidJs;
-  }
-}
diff --git a/src/com/googlecode/android_scripting/interpreter/shell/ShellInterpreter.java b/src/com/googlecode/android_scripting/interpreter/shell/ShellInterpreter.java
deleted file mode 100644
index 1f6a248c..00000000
--- a/src/com/googlecode/android_scripting/interpreter/shell/ShellInterpreter.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2009 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.interpreter.shell;
-
-import com.googlecode.android_scripting.interpreter.Interpreter;
-import com.googlecode.android_scripting.language.ShellLanguage;
-
-import java.io.File;
-
-/**
- * Represents the shell.
- * 
- * @author Damon Kohler (damonkohler@gmail.com)
- */
-public class ShellInterpreter extends Interpreter {
-  private final static String SHELL_BIN = "/system/bin/sh";
-
-  public ShellInterpreter() {
-    setExtension(".sh");
-    setName("sh");
-    setNiceName("Shell");
-    setBinary(new File(SHELL_BIN));
-    setInteractiveCommand("");
-    setScriptCommand("%s");
-    setLanguage(new ShellLanguage());
-    setHasInteractiveMode(true);
-  }
-
-  public boolean hasInterpreterArchive() {
-    return false;
-  }
-
-  public boolean hasExtrasArchive() {
-    return false;
-  }
-
-  public boolean hasScriptsArchive() {
-    return false;
-  }
-
-  public int getVersion() {
-    return 0;
-  }
-
-  @Override
-  public boolean isUninstallable() {
-    return false;
-  }
-
-  @Override
-  public boolean isInstalled() {
-    return true;
-  }
-}
diff --git a/src/com/googlecode/android_scripting/jsonrpc/JsonBuilder.java b/src/com/googlecode/android_scripting/jsonrpc/JsonBuilder.java
deleted file mode 100644
index dc52be44..00000000
--- a/src/com/googlecode/android_scripting/jsonrpc/JsonBuilder.java
+++ /dev/null
@@ -1,301 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.jsonrpc;
-
-import android.content.ComponentName;
-import android.content.Intent;
-import android.location.Address;
-import android.location.Location;
-import android.net.wifi.ScanResult;
-import android.net.wifi.WifiInfo;
-import android.os.Bundle;
-import android.telephony.CellLocation;
-import android.telephony.NeighboringCellInfo;
-import android.telephony.gsm.GsmCellLocation;
-
-import com.googlecode.android_scripting.event.Event;
-
-import java.net.InetSocketAddress;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
-import org.apache.commons.codec.binary.Base64Codec;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-public class JsonBuilder {
-
-  private JsonBuilder() {
-    // This is a utility class.
-  }
-
-  @SuppressWarnings("unchecked")
-  public static Object build(Object data) throws JSONException {
-    if (data == null) {
-      return JSONObject.NULL;
-    }
-    if (data instanceof Integer) {
-      return data;
-    }
-    if (data instanceof Float) {
-      return data;
-    }
-    if (data instanceof Double) {
-      return data;
-    }
-    if (data instanceof Long) {
-      return data;
-    }
-    if (data instanceof String) {
-      return data;
-    }
-    if (data instanceof Boolean) {
-      return data;
-    }
-    if (data instanceof JSONObject) {
-      return data;
-    }
-    if (data instanceof JSONArray) {
-      return data;
-    }
-    if (data instanceof Set<?>) {
-      List<Object> items = new ArrayList<Object>((Set<?>) data);
-      return buildJsonList(items);
-    }
-    if (data instanceof List<?>) {
-      return buildJsonList((List<?>) data);
-    }
-    if (data instanceof Address) {
-      return buildJsonAddress((Address) data);
-    }
-    if (data instanceof Location) {
-      return buildJsonLocation((Location) data);
-    }
-    if (data instanceof Bundle) {
-      return buildJsonBundle((Bundle) data);
-    }
-    if (data instanceof Intent) {
-      return buildJsonIntent((Intent) data);
-    }
-    if (data instanceof Event) {
-      return buildJsonEvent((Event) data);
-    }
-    if (data instanceof Map<?, ?>) {
-      // TODO(damonkohler): I would like to make this a checked cast if possible.
-      return buildJsonMap((Map<String, ?>) data);
-    }
-    if (data instanceof ScanResult) {
-      return buildJsonScanResult((ScanResult) data);
-    }
-    if (data instanceof CellLocation) {
-      return buildJsonCellLocation((CellLocation) data);
-    }
-    if (data instanceof WifiInfo) {
-      return buildJsonWifiInfo((WifiInfo) data);
-    }
-    if (data instanceof NeighboringCellInfo) {
-      return buildNeighboringCellInfo((NeighboringCellInfo) data);
-    }
-    if (data instanceof InetSocketAddress) {
-      return buildInetSocketAddress((InetSocketAddress) data);
-    }
-    if (data instanceof byte[]) {
-      return Base64Codec.encodeBase64((byte[]) data);
-    }
-    if (data instanceof Object[]) {
-      return buildJSONArray((Object[]) data);
-    }
-    return data.toString();
-    // throw new JSONException("Failed to build JSON result. " + data.getClass().getName());
-  }
-
-  private static JSONArray buildJSONArray(Object[] data) throws JSONException {
-    JSONArray result = new JSONArray();
-    for (Object o : data) {
-      result.put(build(o));
-    }
-    return result;
-  }
-
-  private static Object buildInetSocketAddress(InetSocketAddress data) {
-    JSONArray address = new JSONArray();
-    address.put(data.getHostName());
-    address.put(data.getPort());
-    return address;
-  }
-
-  private static <T> JSONArray buildJsonList(final List<T> list) throws JSONException {
-    JSONArray result = new JSONArray();
-    for (T item : list) {
-      result.put(build(item));
-    }
-    return result;
-  }
-
-  private static JSONObject buildJsonAddress(Address address) throws JSONException {
-    JSONObject result = new JSONObject();
-    result.put("admin_area", address.getAdminArea());
-    result.put("country_code", address.getCountryCode());
-    result.put("country_name", address.getCountryName());
-    result.put("feature_name", address.getFeatureName());
-    result.put("phone", address.getPhone());
-    result.put("locality", address.getLocality());
-    result.put("postal_code", address.getPostalCode());
-    result.put("sub_admin_area", address.getSubAdminArea());
-    result.put("thoroughfare", address.getThoroughfare());
-    result.put("url", address.getUrl());
-    return result;
-  }
-
-  private static JSONObject buildJsonLocation(Location location) throws JSONException {
-    JSONObject result = new JSONObject();
-    result.put("altitude", location.getAltitude());
-    result.put("latitude", location.getLatitude());
-    result.put("longitude", location.getLongitude());
-    result.put("time", location.getTime());
-    result.put("accuracy", location.getAccuracy());
-    result.put("speed", location.getSpeed());
-    result.put("provider", location.getProvider());
-    result.put("bearing", location.getBearing());
-    return result;
-  }
-
-  private static JSONObject buildJsonBundle(Bundle bundle) throws JSONException {
-    JSONObject result = new JSONObject();
-    for (String key : bundle.keySet()) {
-      result.put(key, build(bundle.get(key)));
-    }
-    return result;
-  }
-
-  private static JSONObject buildJsonIntent(Intent data) throws JSONException {
-    JSONObject result = new JSONObject();
-    result.put("data", data.getDataString());
-    result.put("type", data.getType());
-    result.put("extras", build(data.getExtras()));
-    result.put("categories", build(data.getCategories()));
-    result.put("action", data.getAction());
-    ComponentName component = data.getComponent();
-    if (component != null) {
-      result.put("packagename", component.getPackageName());
-      result.put("classname", component.getClassName());
-    }
-    result.put("flags", data.getFlags());
-    return result;
-  }
-
-  private static JSONObject buildJsonEvent(Event event) throws JSONException {
-    JSONObject result = new JSONObject();
-    result.put("name", event.getName());
-    result.put("data", build(event.getData()));
-    result.put("time", event.getCreationTime());
-    return result;
-  }
-
-  private static JSONObject buildJsonMap(Map<String, ?> map) throws JSONException {
-    JSONObject result = new JSONObject();
-    for (Entry<String, ?> entry : map.entrySet()) {
-      result.put(entry.getKey(), build(entry.getValue()));
-    }
-    return result;
-  }
-
-  private static JSONObject buildJsonScanResult(ScanResult scanResult) throws JSONException {
-    JSONObject result = new JSONObject();
-    result.put("bssid", scanResult.BSSID);
-    result.put("ssid", scanResult.SSID);
-    result.put("frequency", scanResult.frequency);
-    result.put("level", scanResult.level);
-    result.put("capabilities", scanResult.capabilities);
-    return result;
-  }
-
-  private static JSONObject buildJsonCellLocation(CellLocation cellLocation) throws JSONException {
-    JSONObject result = new JSONObject();
-    if (cellLocation instanceof GsmCellLocation) {
-      GsmCellLocation location = (GsmCellLocation) cellLocation;
-      result.put("lac", location.getLac());
-      result.put("cid", location.getCid());
-    }
-    // TODO(damonkohler): Add support for CdmaCellLocation. Not supported until API level 5.
-    return result;
-  }
-
-  private static JSONObject buildJsonWifiInfo(WifiInfo data) throws JSONException {
-    JSONObject result = new JSONObject();
-    result.put("hidden_ssid", data.getHiddenSSID());
-    result.put("ip_address", data.getIpAddress());
-    result.put("link_speed", data.getLinkSpeed());
-    result.put("network_id", data.getNetworkId());
-    result.put("rssi", data.getRssi());
-    result.put("bssid", data.getBSSID());
-    result.put("mac_address", data.getMacAddress());
-    result.put("ssid", data.getSSID());
-    String supplicantState = "";
-    switch (data.getSupplicantState()) {
-    case ASSOCIATED:
-      supplicantState = "associated";
-      break;
-    case ASSOCIATING:
-      supplicantState = "associating";
-      break;
-    case COMPLETED:
-      supplicantState = "completed";
-      break;
-    case DISCONNECTED:
-      supplicantState = "disconnected";
-      break;
-    case DORMANT:
-      supplicantState = "dormant";
-      break;
-    case FOUR_WAY_HANDSHAKE:
-      supplicantState = "four_way_handshake";
-      break;
-    case GROUP_HANDSHAKE:
-      supplicantState = "group_handshake";
-      break;
-    case INACTIVE:
-      supplicantState = "inactive";
-      break;
-    case INVALID:
-      supplicantState = "invalid";
-      break;
-    case SCANNING:
-      supplicantState = "scanning";
-      break;
-    case UNINITIALIZED:
-      supplicantState = "uninitialized";
-      break;
-    default:
-      supplicantState = null;
-    }
-    result.put("supplicant_state", build(supplicantState));
-    return result;
-  }
-
-  private static JSONObject buildNeighboringCellInfo(NeighboringCellInfo data) throws JSONException {
-    // TODO(damonkohler): Additional information available at API level 5.
-    JSONObject result = new JSONObject();
-    result.put("cid", data.getCid());
-    result.put("rssi", data.getRssi());
-    return result;
-  }
-}
diff --git a/src/com/googlecode/android_scripting/jsonrpc/JsonRpcResult.java b/src/com/googlecode/android_scripting/jsonrpc/JsonRpcResult.java
deleted file mode 100644
index d2dfe1cc..00000000
--- a/src/com/googlecode/android_scripting/jsonrpc/JsonRpcResult.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2009 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.jsonrpc;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-/**
- * Represents a JSON RPC result.
- * 
- * @see http://json-rpc.org/wiki/specification
- * 
- * @author Damon Kohler (damonkohler@gmail.com)
- */
-public class JsonRpcResult {
-
-  private JsonRpcResult() {
-    // Utility class.
-  }
-
-  public static JSONObject empty(int id) throws JSONException {
-    JSONObject json = new JSONObject();
-    json.put("id", id);
-    json.put("result", JSONObject.NULL);
-    json.put("error", JSONObject.NULL);
-    return json;
-  }
-
-  public static JSONObject result(int id, Object data) throws JSONException {
-    JSONObject json = new JSONObject();
-    json.put("id", id);
-    json.put("result", JsonBuilder.build(data));
-    json.put("error", JSONObject.NULL);
-    return json;
-  }
-
-  public static JSONObject error(int id, Throwable t) throws JSONException {
-    JSONObject json = new JSONObject();
-    json.put("id", id);
-    json.put("result", JSONObject.NULL);
-    json.put("error", t.toString());
-    return json;
-  }
-}
diff --git a/src/com/googlecode/android_scripting/jsonrpc/JsonRpcServer.java b/src/com/googlecode/android_scripting/jsonrpc/JsonRpcServer.java
deleted file mode 100644
index 94324d8d..00000000
--- a/src/com/googlecode/android_scripting/jsonrpc/JsonRpcServer.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (C) 2009 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.jsonrpc;
-
-import com.googlecode.android_scripting.Log;
-import com.googlecode.android_scripting.SimpleServer;
-import com.googlecode.android_scripting.rpc.MethodDescriptor;
-import com.googlecode.android_scripting.rpc.RpcError;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
-import java.net.Socket;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-/**
- * A JSON RPC server that forwards RPC calls to a specified receiver object.
- * 
- * @author Damon Kohler (damonkohler@gmail.com)
- */
-public class JsonRpcServer extends SimpleServer {
-
-  private final RpcReceiverManagerFactory mRpcReceiverManagerFactory;
-  private final String mHandshake;
-
-  /**
-   * Construct a {@link JsonRpcServer} connected to the provided {@link RpcReceiverManager}.
-   * 
-   * @param managerFactory
-   *          the {@link RpcReceiverManager} to register with the server
-   * @param handshake
-   *          the secret handshake required for authorization to use this server
-   */
-  public JsonRpcServer(RpcReceiverManagerFactory managerFactory, String handshake) {
-    mHandshake = handshake;
-    mRpcReceiverManagerFactory = managerFactory;
-  }
-
-  @Override
-  public void shutdown() {
-    super.shutdown();
-    // Notify all RPC receiving objects. They may have to clean up some of their state.
-    for (RpcReceiverManager manager : mRpcReceiverManagerFactory.getRpcReceiverManagers()) {
-      manager.shutdown();
-    }
-  }
-
-  @Override
-  protected void handleConnection(Socket socket) throws Exception {
-    RpcReceiverManager receiverManager = mRpcReceiverManagerFactory.create();
-    BufferedReader reader =
-        new BufferedReader(new InputStreamReader(socket.getInputStream()), 8192);
-    PrintWriter writer = new PrintWriter(socket.getOutputStream(), true);
-    boolean passedAuthentication = false;
-    String data;
-    while ((data = reader.readLine()) != null) {
-      Log.v("Received: " + data);
-      JSONObject request = new JSONObject(data);
-      int id = request.getInt("id");
-      String method = request.getString("method");
-      JSONArray params = request.getJSONArray("params");
-
-      // First RPC must be _authenticate if a handshake was specified.
-      if (!passedAuthentication && mHandshake != null) {
-        if (!checkHandshake(method, params)) {
-          SecurityException exception = new SecurityException("Authentication failed!");
-          send(writer, JsonRpcResult.error(id, exception));
-          shutdown();
-          throw exception;
-        }
-        passedAuthentication = true;
-        send(writer, JsonRpcResult.result(id, true));
-        continue;
-      }
-
-      MethodDescriptor rpc = receiverManager.getMethodDescriptor(method);
-      if (rpc == null) {
-        send(writer, JsonRpcResult.error(id, new RpcError("Unknown RPC.")));
-        continue;
-      }
-      try {
-        send(writer, JsonRpcResult.result(id, rpc.invoke(receiverManager, params)));
-      } catch (Throwable t) {
-        Log.e("Invocation error.", t);
-        send(writer, JsonRpcResult.error(id, t));
-      }
-    }
-  }
-
-  private boolean checkHandshake(String method, JSONArray params) throws JSONException {
-    if (!method.equals("_authenticate") || !mHandshake.equals(params.getString(0))) {
-      return false;
-    }
-    return true;
-  }
-
-  private void send(PrintWriter writer, JSONObject result) {
-    writer.write(result + "\n");
-    writer.flush();
-    Log.v("Sent: " + result);
-  }
-}
diff --git a/src/com/googlecode/android_scripting/jsonrpc/RpcReceiver.java b/src/com/googlecode/android_scripting/jsonrpc/RpcReceiver.java
deleted file mode 100644
index fa79d03f..00000000
--- a/src/com/googlecode/android_scripting/jsonrpc/RpcReceiver.java
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2010 Google Inc. All Rights Reserved.
-
-package com.googlecode.android_scripting.jsonrpc;
-
-public abstract class RpcReceiver {
-
-  protected final RpcReceiverManager mManager;
-
-  public RpcReceiver(RpcReceiverManager manager) {
-    // To make reflection easier, we ensures that all the subclasses agree on this common
-    // constructor.
-    mManager = manager;
-  }
-
-  /** Invoked when the receiver is shut down. */
-  public abstract void shutdown();
-}
diff --git a/src/com/googlecode/android_scripting/jsonrpc/RpcReceiverManager.java b/src/com/googlecode/android_scripting/jsonrpc/RpcReceiverManager.java
deleted file mode 100644
index d869afbd..00000000
--- a/src/com/googlecode/android_scripting/jsonrpc/RpcReceiverManager.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.jsonrpc;
-
-import com.googlecode.android_scripting.Log;
-import com.googlecode.android_scripting.rpc.MethodDescriptor;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-public abstract class RpcReceiverManager {
-
-  private final Map<Class<? extends RpcReceiver>, RpcReceiver> mReceivers;
-
-  /**
-   * A map of strings to known RPCs.
-   */
-  private final Map<String, MethodDescriptor> mKnownRpcs = new HashMap<String, MethodDescriptor>();
-
-  public RpcReceiverManager(Collection<Class<? extends RpcReceiver>> classList) {
-    mReceivers = new HashMap<Class<? extends RpcReceiver>, RpcReceiver>();
-    for (Class<? extends RpcReceiver> receiverClass : classList) {
-      mReceivers.put(receiverClass, null);
-      Collection<MethodDescriptor> methodList = MethodDescriptor.collectFrom(receiverClass);
-      for (MethodDescriptor m : methodList) {
-        if (mKnownRpcs.containsKey(m.getName())) {
-          // We already know an RPC of the same name. We don't catch this anywhere because this is a
-          // programming error.
-          throw new RuntimeException("An RPC with the name " + m.getName() + " is already known.");
-        }
-        mKnownRpcs.put(m.getName(), m);
-      }
-    }
-  }
-
-  public Collection<Class<? extends RpcReceiver>> getRpcReceiverClasses() {
-    return mReceivers.keySet();
-  }
-
-  private RpcReceiver get(Class<? extends RpcReceiver> clazz) {
-    RpcReceiver object = mReceivers.get(clazz);
-    if (object != null) {
-      return object;
-    }
-
-    Constructor<? extends RpcReceiver> constructor;
-    try {
-      constructor = clazz.getConstructor(getClass());
-      object = constructor.newInstance(this);
-      mReceivers.put(clazz, object);
-    } catch (Exception e) {
-      Log.e(e);
-    }
-
-    return object;
-  }
-
-  public <T extends RpcReceiver> T getReceiver(Class<T> clazz) {
-    RpcReceiver receiver = get(clazz);
-    return clazz.cast(receiver);
-  }
-
-  public MethodDescriptor getMethodDescriptor(String methodName) {
-    return mKnownRpcs.get(methodName);
-  }
-
-  public Object invoke(Class<? extends RpcReceiver> clazz, Method method, Object[] args)
-      throws Exception {
-    RpcReceiver object = get(clazz);
-    return method.invoke(object, args);
-  }
-
-  public void shutdown() {
-    for (RpcReceiver receiver : mReceivers.values()) {
-      if (receiver != null) {
-        receiver.shutdown();
-      }
-    }
-  }
-}
diff --git a/src/com/googlecode/android_scripting/jsonrpc/RpcReceiverManagerFactory.java b/src/com/googlecode/android_scripting/jsonrpc/RpcReceiverManagerFactory.java
deleted file mode 100644
index 8ac810c7..00000000
--- a/src/com/googlecode/android_scripting/jsonrpc/RpcReceiverManagerFactory.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.jsonrpc;
-
-import java.util.List;
-
-public interface RpcReceiverManagerFactory {
-  public RpcReceiverManager create();
-
-  public List<RpcReceiverManager> getRpcReceiverManagers();
-}
diff --git a/src/com/googlecode/android_scripting/language/BeanShellLanguage.java b/src/com/googlecode/android_scripting/language/BeanShellLanguage.java
deleted file mode 100644
index b6751e1c..00000000
--- a/src/com/googlecode/android_scripting/language/BeanShellLanguage.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.language;
-
-import com.googlecode.android_scripting.rpc.ParameterDescriptor;
-
-/**
- * Represents the BeanShell programming language.
- * 
- * @author igor.v.karp@gmail.com (Igor Karp)
- */
-public class BeanShellLanguage extends Language {
-
-  @Override
-  protected String getImportStatement() {
-    // FIXME(igor.v.karp): this is interpreter specific
-    return "source(\"/sdcard/com.googlecode.bshforandroid/extras/bsh/android.bsh\");\n";
-  }
-
-  @Override
-  protected String getRpcReceiverDeclaration(String rpcReceiver) {
-    return rpcReceiver + " = Android();\n";
-  }
-
-  @Override
-  protected String getMethodCallText(String receiver, String method,
-      ParameterDescriptor[] parameters) {
-    StringBuilder result =
-        new StringBuilder().append(getApplyReceiverText(receiver)).append(getApplyOperatorText())
-            .append(method);
-    if (parameters.length > 0) {
-      result.append(getLeftParametersText());
-    } else {
-      result.append(getQuote());
-    }
-    String separator = "";
-    for (ParameterDescriptor parameter : parameters) {
-      result.append(separator).append(getValueText(parameter));
-      separator = getParameterSeparator();
-    }
-    result.append(getRightParametersText());
-
-    return result.toString();
-  }
-
-  @Override
-  protected String getApplyOperatorText() {
-    return ".call(\"";
-  }
-
-  @Override
-  protected String getLeftParametersText() {
-    return "\", ";
-  }
-
-  @Override
-  protected String getRightParametersText() {
-    return ")";
-  }
-}
diff --git a/src/com/googlecode/android_scripting/language/HtmlLanguage.java b/src/com/googlecode/android_scripting/language/HtmlLanguage.java
deleted file mode 100644
index 73e7e6df..00000000
--- a/src/com/googlecode/android_scripting/language/HtmlLanguage.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.language;
-
-import com.googlecode.android_scripting.rpc.ParameterDescriptor;
-
-public class HtmlLanguage extends Language {
-
-  /** Returns the Android package import statement. */
-  @Override
-  protected String getImportStatement() {
-    return "<html>\n<head>\n<script>";
-  }
-
-  @Override
-  protected String getRpcReceiverDeclaration(String rpcReceiver) {
-    return String.format("var %s = new Android();\n</script>\n</head>\n<body>\n\n</body>\n</html>",
-        rpcReceiver);
-  }
-
-  @Override
-  protected String getMethodCallText(String receiver, String method,
-      ParameterDescriptor[] parameters) {
-    StringBuilder result =
-        new StringBuilder().append(getApplyReceiverText(receiver)).append(getApplyOperatorText())
-            .append(method);
-    if (parameters.length > 0) {
-      result.append(getLeftParametersText());
-    } else {
-      result.append(getQuote());
-    }
-    String separator = "";
-    for (ParameterDescriptor parameter : parameters) {
-      result.append(separator).append(getValueText(parameter));
-      separator = getParameterSeparator();
-    }
-    result.append(getRightParametersText());
-
-    return result.toString();
-  }
-
-  @Override
-  protected String getApplyOperatorText() {
-    return ".call('";
-  }
-
-  @Override
-  protected String getLeftParametersText() {
-    return "', ";
-  }
-
-  @Override
-  protected String getRightParametersText() {
-    return ")";
-  }
-
-  @Override
-  protected String getQuote() {
-    return "'";
-  }
-
-}
diff --git a/src/com/googlecode/android_scripting/language/JavaScriptLanguage.java b/src/com/googlecode/android_scripting/language/JavaScriptLanguage.java
deleted file mode 100644
index a56400e8..00000000
--- a/src/com/googlecode/android_scripting/language/JavaScriptLanguage.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.language;
-
-/**
- * Represents the JavaScript programming language.
- * 
- * @author igor.v.karp@gmail.com (Igor Karp)
- */
-public class JavaScriptLanguage extends Language {
-
-  @Override
-  protected String getImportStatement() {
-    // FIXME(igor.v.karp): this is interpreter specific
-    return "load(\"/sdcard/com.googlecode.rhinoforandroid/extras/rhino/android.js\");\n";
-  }
-
-  @Override
-  protected String getRpcReceiverDeclaration(String rpcReceiver) {
-    return "var " + rpcReceiver + " = Android();\n";
-  }
-
-}
diff --git a/src/com/googlecode/android_scripting/language/Language.java b/src/com/googlecode/android_scripting/language/Language.java
deleted file mode 100644
index cc5a3edb..00000000
--- a/src/com/googlecode/android_scripting/language/Language.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.language;
-
-import com.googlecode.android_scripting.rpc.MethodDescriptor;
-import com.googlecode.android_scripting.rpc.ParameterDescriptor;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Represents the programming language supported by the SL4A.
- * 
- * @author igor.v.karp@gmail.com (Igor Karp)
- */
-public class Language {
-
-  private final static Map<Character, String> AUTO_CLOSE_MAP = buildAutoCloseMap('[', "[]", '{',
-      "{}", '(', "()", '\'', "''", '"', "\"\"");
-
-  /** Returns the initial template for newly created script. */
-  public String getContentTemplate() {
-    StringBuilder content = new StringBuilder(getImportStatement());
-    if (content.length() != 0) {
-      content.append('\n');
-    }
-    content.append(getRpcReceiverDeclaration(getDefaultRpcReceiver()));
-    return content.toString();
-  }
-
-  /** Returns the Android package import statement. */
-  protected String getImportStatement() {
-    return "";
-  }
-
-  /** Returns the RPC receiver declaration. */
-  protected String getRpcReceiverDeclaration(String rpcReceiver) {
-    return "";
-  }
-
-  /** Returns the default RPC receiver name. */
-  protected String getDefaultRpcReceiver() {
-    return "droid";
-  }
-
-  /**
-   * Returns the string containing opening and closing tokens if the input is an opening token.
-   * Returns {@code null} otherwise.
-   */
-  public String autoClose(char token) {
-    return AUTO_CLOSE_MAP.get(token);
-  }
-
-  /** Returns the RPC call text with given parameter values. */
-  public final String getRpcText(String content, MethodDescriptor rpc, String[] values) {
-    return getMethodCallText(getRpcReceiverName(content), rpc.getName(),
-        rpc.getParameterValues(values));
-  }
-
-  /** Returns the RPC receiver found in the given script. */
-  protected String getRpcReceiverName(String content) {
-    return getDefaultRpcReceiver();
-  }
-
-  /** Returns the method call text in the language. */
-  protected String getMethodCallText(String receiver, String method,
-      ParameterDescriptor[] parameters) {
-    StringBuilder result =
-        new StringBuilder().append(getApplyReceiverText(receiver)).append(getApplyOperatorText())
-            .append(method).append(getLeftParametersText());
-    String separator = "";
-    for (ParameterDescriptor parameter : parameters) {
-      result.append(separator).append(getValueText(parameter));
-      separator = getParameterSeparator();
-    }
-    result.append(getRightParametersText());
-
-    return result.toString();
-  }
-
-  /** Returns the apply receiver text. */
-  protected String getApplyReceiverText(String receiver) {
-    return receiver;
-  }
-
-  /** Returns the apply operator text. */
-  protected String getApplyOperatorText() {
-    return ".";
-  }
-
-  /** Returns the text to the left of the parameters. */
-  protected String getLeftParametersText() {
-    return "(";
-  }
-
-  /** Returns the text to the right of the parameters. */
-  protected String getRightParametersText() {
-    return ")";
-  }
-
-  /** Returns the parameter separator text. */
-  protected String getParameterSeparator() {
-    return ", ";
-  }
-
-  /** Returns the text of the quotation. */
-  protected String getQuote() {
-    return "\"";
-  }
-
-  /** Returns the text of the {@code null} value. */
-  protected String getNull() {
-    return "null";
-  }
-
-  /** Returns the text of the {{@code true} value. */
-  protected String getTrue() {
-    return "true";
-  }
-
-  /** Returns the text of the false value. */
-  protected String getFalse() {
-    return "false";
-  }
-
-  /** Returns the parameter value suitable for code generation. */
-  protected String getValueText(ParameterDescriptor parameter) {
-    if (parameter.getValue() == null) {
-      return getNullValueText();
-    } else if (parameter.getType().equals(String.class)) {
-      return getStringValueText(parameter.getValue());
-    } else if (parameter.getType().equals(Boolean.class)) {
-      return getBooleanValueText(parameter.getValue());
-    } else {
-      return parameter.getValue();
-    }
-  }
-
-  /** Returns the null value suitable for code generation. */
-  private String getNullValueText() {
-    return getNull();
-  }
-
-  /** Returns the string parameter value suitable for code generation. */
-  protected String getStringValueText(String value) {
-    // TODO(igorkarp): do not quote expressions once they could be detected.
-    return getQuote() + value + getQuote();
-  }
-
-  /** Returns the boolean parameter value suitable for code generation. */
-  protected String getBooleanValueText(String value) {
-    if (value.equals(Boolean.TRUE.toString())) {
-      return getTrue();
-    } else if (value.equals(Boolean.FALSE.toString())) {
-      return getFalse();
-    } else {
-      // If it is neither true nor false it is must be an expression.
-      return value;
-    }
-  }
-
-  private static Map<Character, String> buildAutoCloseMap(char c1, String s1, char c2, String s2,
-      char c3, String s3, char c4, String s4, char c5, String s5) {
-    Map<Character, String> map = new HashMap<Character, String>(5);
-    map.put(c1, s1);
-    map.put(c2, s2);
-    map.put(c3, s3);
-    map.put(c4, s4);
-    map.put(c5, s5);
-    return map;
-  }
-}
diff --git a/src/com/googlecode/android_scripting/language/LuaLanguage.java b/src/com/googlecode/android_scripting/language/LuaLanguage.java
deleted file mode 100644
index 2d986fbe..00000000
--- a/src/com/googlecode/android_scripting/language/LuaLanguage.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.language;
-
-/**
- * Represents the Lua programming language.
- * 
- * @author igor.v.karp@gmail.com (Igor Karp)
- */
-public class LuaLanguage extends Language {
-
-  @Override
-  protected String getImportStatement() {
-    return "require \"android\"\n";
-  }
-
-  @Override
-  protected String getDefaultRpcReceiver() {
-    return "android";
-  }
-}
diff --git a/src/com/googlecode/android_scripting/language/PerlLanguage.java b/src/com/googlecode/android_scripting/language/PerlLanguage.java
deleted file mode 100644
index fae77720..00000000
--- a/src/com/googlecode/android_scripting/language/PerlLanguage.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.language;
-
-/**
- * Represents the Perl programming language.
- * 
- * @author igor.v.karp@gmail.com (Igor Karp)
- */
-public class PerlLanguage extends Language {
-
-  @Override
-  protected String getImportStatement() {
-    return "use Android;\n";
-  }
-
-  @Override
-  protected String getRpcReceiverDeclaration(String rpcReceiver) {
-    return "my " + rpcReceiver + " = Android->new();\n";
-  }
-
-  @Override
-  protected String getDefaultRpcReceiver() {
-    return "$droid";
-  }
-
-  @Override
-  protected String getApplyOperatorText() {
-    return "->";
-  }
-}
diff --git a/src/com/googlecode/android_scripting/language/PhpLanguage.java b/src/com/googlecode/android_scripting/language/PhpLanguage.java
deleted file mode 100644
index 01246481..00000000
--- a/src/com/googlecode/android_scripting/language/PhpLanguage.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2010 Irontec SL
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.language;
-
-/**
- * Represents the PHP programming language.
- * 
- * @author ivan@irontec.com (Ivan Mosquera Paulo)
- */
-public class PhpLanguage extends Language {
-
-  @Override
-  protected String getImportStatement() {
-    return "<?php\n\nrequire_once(\"Android.php\");";
-
-  }
-
-  @Override
-  protected String getRpcReceiverDeclaration(String rpcReceiver) {
-    return rpcReceiver + " = new Android();\n";
-  }
-
-  @Override
-  protected String getDefaultRpcReceiver() {
-    return "$droid";
-  }
-
-  @Override
-  protected String getApplyOperatorText() {
-    return "->";
-  }
-
-  @Override
-  protected String getQuote() {
-    return "'";
-  }
-
-}
\ No newline at end of file
diff --git a/src/com/googlecode/android_scripting/language/PythonLanguage.java b/src/com/googlecode/android_scripting/language/PythonLanguage.java
deleted file mode 100644
index 2e89485e..00000000
--- a/src/com/googlecode/android_scripting/language/PythonLanguage.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.language;
-
-/**
- * Represents the Python programming language.
- * 
- * @author igor.v.karp@gmail.com (Igor Karp)
- */
-public class PythonLanguage extends Language {
-
-  @Override
-  protected String getImportStatement() {
-    return "import android\n";
-  }
-
-  @Override
-  protected String getRpcReceiverDeclaration(String rpcReceiver) {
-    return rpcReceiver + " = android.Android()\n";
-  }
-
-  @Override
-  protected String getQuote() {
-    return "'";
-  }
-
-  @Override
-  protected String getNull() {
-    return "None";
-  }
-
-  @Override
-  protected String getTrue() {
-    return "True";
-  }
-
-  @Override
-  protected String getFalse() {
-    return "False";
-  }
-}
diff --git a/src/com/googlecode/android_scripting/language/RubyLanguage.java b/src/com/googlecode/android_scripting/language/RubyLanguage.java
deleted file mode 100644
index 0fe55247..00000000
--- a/src/com/googlecode/android_scripting/language/RubyLanguage.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.language;
-
-/**
- * Represents the Ruby programming language.
- * 
- * @author igor.v.karp@gmail.com (Igor Karp)
- */
-public class RubyLanguage extends Language {
-
-  @Override
-  protected String getImportStatement() {
-    return "require \"android\";\n";
-  }
-
-  @Override
-  protected String getRpcReceiverDeclaration(String rpcReceiver) {
-    return rpcReceiver + " = Droid.new\n";
-  }
-}
diff --git a/src/com/googlecode/android_scripting/language/ShellLanguage.java b/src/com/googlecode/android_scripting/language/ShellLanguage.java
deleted file mode 100644
index 1fc1d59b..00000000
--- a/src/com/googlecode/android_scripting/language/ShellLanguage.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.language;
-
-/**
- * Represents the Shell programming language.
- * 
- * @author igor.v.karp@gmail.com (Igor Karp)
- */
-public class ShellLanguage extends Language {
-}
diff --git a/src/com/googlecode/android_scripting/language/SleepLanguage.java b/src/com/googlecode/android_scripting/language/SleepLanguage.java
deleted file mode 100644
index e1a42474..00000000
--- a/src/com/googlecode/android_scripting/language/SleepLanguage.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.language;
-
-/**
- * Represents the Sleep programming language.
- * 
- * @author tomcatalbino@gmail.com
- */
-public class SleepLanguage extends Language {
-
-  @Override
-  protected String getImportStatement() {
-    return "import com.googlecode.rpc.*;\n";
-  }
-
-  @Override
-  protected String getRpcReceiverDeclaration(String rpcReceiver) {
-    return rpcReceiver + " = [new Android];\n";
-  }
-
-  @Override
-  protected String getDefaultRpcReceiver() {
-    return "$droid";
-  }
-
-}
diff --git a/src/com/googlecode/android_scripting/language/SquirrelLanguage.java b/src/com/googlecode/android_scripting/language/SquirrelLanguage.java
deleted file mode 100644
index d2e78dbb..00000000
--- a/src/com/googlecode/android_scripting/language/SquirrelLanguage.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.language;
-
-/**
- * Represents the Squirrel programming language, by Alberto Demichelis
- * this file adapted by Andy Tai, atai@atai.org
- * based on the Python version by
- * @author igor.v.karp@gmail.com (Igor Karp)
- */
-public class SquirrelLanguage extends Language {
-
-  @Override
-  protected String getImportStatement() {
-    /* initialization code */
-    return "";
-  }
-
-  @Override
-  protected String getRpcReceiverDeclaration(String rpcReceiver) {
-    return rpcReceiver + " <- Android();\n";
-  }
-
-  @Override
-  protected String getQuote() {
-    return "\"";
-  }
-
-  @Override
-  protected String getNull() {
-    return "null";
-  }
-
-  @Override
-  protected String getTrue() {
-    return "true";
-  }
-
-  @Override
-  protected String getFalse() {
-    return "false";
-  }
-}
-
diff --git a/src/com/googlecode/android_scripting/language/SupportedLanguages.java b/src/com/googlecode/android_scripting/language/SupportedLanguages.java
deleted file mode 100644
index 8ce9b0fb..00000000
--- a/src/com/googlecode/android_scripting/language/SupportedLanguages.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.googlecode.android_scripting.language;
-
-import com.googlecode.android_scripting.Log;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class SupportedLanguages {
-
-  private static enum KnownLanguage {
-    // SHELL(".sh", ShellLanguage.class), // We don't really support Shell language
-    HTML(".html", HtmlLanguage.class), BEANSHELL(".bsh", BeanShellLanguage.class), JAVASCRIPT(
-        ".js", JavaScriptLanguage.class), LUA(".lua", LuaLanguage.class), PERL(".pl",
-        PerlLanguage.class), PYTHON(".py", PythonLanguage.class), RUBY(".rb", RubyLanguage.class),
-    TCL(".tcl", TclLanguage.class), PHP(".php", PhpLanguage.class), SLEEP(".sl",
-        SleepLanguage.class), SQUIRREL(".nut", SquirrelLanguage.class);
-
-    private final String mmExtension;
-    private final Class<? extends Language> mmClass;
-
-    private KnownLanguage(String ext, Class<? extends Language> clazz) {
-      mmExtension = ext;
-      mmClass = clazz;
-    }
-
-    private String getExtension() {
-      return mmExtension;
-    }
-
-    private Class<? extends Language> getLanguageClass() {
-      return mmClass;
-    }
-  }
-
-  private static Map<String, Class<? extends Language>> sSupportedLanguages;
-
-  static {
-    sSupportedLanguages = new HashMap<String, Class<? extends Language>>();
-    for (KnownLanguage language : KnownLanguage.values()) {
-      sSupportedLanguages.put(language.getExtension(), language.getLanguageClass());
-    }
-  }
-
-  public static Language getLanguageByExtension(String extension) {
-    extension = extension.toLowerCase();
-    if (!extension.startsWith(".")) {
-      throw new RuntimeException("Extension does not start with a dot: " + extension);
-    }
-    Language lang = null;
-
-    Class<? extends Language> clazz = sSupportedLanguages.get(extension);
-    if (clazz == null) {
-      clazz = Language.class; // revert to default language.
-    }
-    if (clazz != null) {
-      try {
-        lang = clazz.newInstance();
-      } catch (IllegalAccessException e) {
-        Log.e(e);
-      } catch (InstantiationException e) {
-        Log.e(e);
-      }
-    }
-    return lang;
-  }
-
-  public static boolean checkLanguageSupported(String name) {
-    String extension = name.toLowerCase();
-    int index = extension.lastIndexOf('.');
-    if (index < 0) {
-      extension = "." + extension;
-    } else if (index > 0) {
-      extension = extension.substring(index);
-    }
-    return sSupportedLanguages.containsKey(extension);
-  }
-}
diff --git a/src/com/googlecode/android_scripting/language/TclLanguage.java b/src/com/googlecode/android_scripting/language/TclLanguage.java
deleted file mode 100644
index ec1682c9..00000000
--- a/src/com/googlecode/android_scripting/language/TclLanguage.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.language;
-
-/**
- * Represents the Tcl programming language.
- * 
- * @author igor.v.karp@gmail.com (Igor Karp)
- */
-public class TclLanguage extends Language {
-
-  @Override
-  protected String getImportStatement() {
-    return "package require android\n";
-  }
-
-  @Override
-  protected String getRpcReceiverDeclaration(String rpcReceiver) {
-    return "set " + rpcReceiver + " [android new]\n";
-  }
-
-  @Override
-  protected String getApplyReceiverText(String receiver) {
-    return "$" + receiver;
-  }
-
-  @Override
-  protected String getApplyOperatorText() {
-    return " ";
-  }
-
-  @Override
-  protected String getLeftParametersText() {
-    return " ";
-  }
-
-  @Override
-  protected String getRightParametersText() {
-    return "";
-  }
-
-  @Override
-  protected String getParameterSeparator() {
-    return " ";
-  }
-}
diff --git a/src/com/googlecode/android_scripting/rpc/Converter.java b/src/com/googlecode/android_scripting/rpc/Converter.java
deleted file mode 100644
index 5b9ea681..00000000
--- a/src/com/googlecode/android_scripting/rpc/Converter.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.rpc;
-
-/**
- * A converter can take a String and turn it into an instance of type T (the type parameter to the
- * converter).
- * 
- * @author igor.v.karp@gmail.com (Igor Karp)
- */
-public interface Converter<T> {
-
-  /** Convert a string into type T. */
-  T convert(String value);
-}
diff --git a/src/com/googlecode/android_scripting/rpc/MethodDescriptor.java b/src/com/googlecode/android_scripting/rpc/MethodDescriptor.java
deleted file mode 100644
index e63b4c60..00000000
--- a/src/com/googlecode/android_scripting/rpc/MethodDescriptor.java
+++ /dev/null
@@ -1,510 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.rpc;
-
-import android.content.Intent;
-import android.net.Uri;
-
-import com.googlecode.android_scripting.Analytics;
-import com.googlecode.android_scripting.facade.AndroidFacade;
-import com.googlecode.android_scripting.jsonrpc.RpcReceiver;
-import com.googlecode.android_scripting.jsonrpc.RpcReceiverManager;
-import com.googlecode.android_scripting.util.VisibleForTesting;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-/**
- * An adapter that wraps {@code Method}.
- * 
- * @author igor.v.karp@gmail.com (Igor Karp)
- */
-public final class MethodDescriptor {
-  private static final Map<Class<?>, Converter<?>> sConverters = populateConverters();
-
-  private final Method mMethod;
-  private final Class<? extends RpcReceiver> mClass;
-
-  public MethodDescriptor(Class<? extends RpcReceiver> clazz, Method method) {
-    mClass = clazz;
-    mMethod = method;
-  }
-
-  @Override
-  public String toString() {
-    return mMethod.getDeclaringClass().getCanonicalName() + "." + mMethod.getName();
-  }
-
-  /** Collects all methods with {@code RPC} annotation from given class. */
-  public static Collection<MethodDescriptor> collectFrom(Class<? extends RpcReceiver> clazz) {
-    List<MethodDescriptor> descriptors = new ArrayList<MethodDescriptor>();
-    for (Method method : clazz.getMethods()) {
-      if (method.isAnnotationPresent(Rpc.class)) {
-        descriptors.add(new MethodDescriptor(clazz, method));
-      }
-    }
-    return descriptors;
-  }
-
-  /**
-   * Invokes the call that belongs to this object with the given parameters. Wraps the response
-   * (possibly an exception) in a JSONObject.
-   * 
-   * @param parameters
-   *          {@code JSONArray} containing the parameters
-   * @return result
-   * @throws Throwable
-   */
-  public Object invoke(RpcReceiverManager manager, final JSONArray parameters) throws Throwable {
-    // Issue track call first in case of failure.
-    Analytics.track("api", getName());
-
-    final Type[] parameterTypes = getGenericParameterTypes();
-    final Object[] args = new Object[parameterTypes.length];
-    final Annotation annotations[][] = getParameterAnnotations();
-
-    if (parameters.length() > args.length) {
-      throw new RpcError("Too many parameters specified.");
-    }
-
-    for (int i = 0; i < args.length; i++) {
-      final Type parameterType = parameterTypes[i];
-      if (i < parameters.length()) {
-        args[i] = convertParameter(parameters, i, parameterType);
-      } else if (MethodDescriptor.hasDefaultValue(annotations[i])) {
-        args[i] = MethodDescriptor.getDefaultValue(parameterType, annotations[i]);
-      } else {
-        throw new RpcError("Argument " + (i + 1) + " is not present");
-      }
-    }
-
-    Object result = null;
-    try {
-      result = manager.invoke(mClass, mMethod, args);
-    } catch (Throwable t) {
-      throw t.getCause();
-    }
-    return result;
-  }
-
-  /**
-   * Converts a parameter from JSON into a Java Object.
-   * 
-   * @return TODO
-   */
-  // TODO(damonkohler): This signature is a bit weird (auto-refactored). The obvious alternative
-  // would be to work on one supplied parameter and return the converted parameter. However, that's
-  // problematic because you lose the ability to call the getXXX methods on the JSON array.
-  @VisibleForTesting
-  static Object convertParameter(final JSONArray parameters, int index, Type type)
-      throws JSONException, RpcError {
-    try {
-      // We must handle null and numbers explicitly because we cannot magically cast them. We
-      // also need to convert implicitly from numbers to bools.
-      if (parameters.isNull(index)) {
-        return null;
-      } else if (type == Boolean.class) {
-        try {
-          return parameters.getBoolean(index);
-        } catch (JSONException e) {
-          return new Boolean(parameters.getInt(index) != 0);
-        }
-      } else if (type == Long.class) {
-        return parameters.getLong(index);
-      } else if (type == Double.class) {
-        return parameters.getDouble(index);
-      } else if (type == Integer.class) {
-        return parameters.getInt(index);
-      } else if (type == Intent.class) {
-        return buildIntent(parameters.getJSONObject(index));
-      } else {
-        // Magically cast the parameter to the right Java type.
-        return ((Class<?>) type).cast(parameters.get(index));
-      }
-    } catch (ClassCastException e) {
-      throw new RpcError("Argument " + (index + 1) + " should be of type "
-          + ((Class<?>) type).getSimpleName() + ".");
-    }
-  }
-
-  public static Object buildIntent(JSONObject jsonObject) throws JSONException {
-    Intent intent = new Intent();
-    if (jsonObject.has("action")) {
-      intent.setAction(jsonObject.getString("action"));
-    }
-    if (jsonObject.has("data") && jsonObject.has("type")) {
-      intent.setDataAndType(Uri.parse(jsonObject.optString("data", null)),
-          jsonObject.optString("type", null));
-    } else if (jsonObject.has("data")) {
-      intent.setData(Uri.parse(jsonObject.optString("data", null)));
-    } else if (jsonObject.has("type")) {
-      intent.setType(jsonObject.optString("type", null));
-    }
-    if (jsonObject.has("packagename") && jsonObject.has("classname")) {
-      intent.setClassName(jsonObject.getString("packagename"), jsonObject.getString("classname"));
-    }
-    if (jsonObject.has("flags")) {
-      intent.setFlags(jsonObject.getInt("flags"));
-    }
-    if (!jsonObject.isNull("extras")) {
-      AndroidFacade.putExtrasFromJsonObject(jsonObject.getJSONObject("extras"), intent);
-    }
-    if (!jsonObject.isNull("categories")) {
-      JSONArray categories = jsonObject.getJSONArray("categories");
-      for (int i = 0; i < categories.length(); i++) {
-        intent.addCategory(categories.getString(i));
-      }
-    }
-    return intent;
-  }
-
-  public Method getMethod() {
-    return mMethod;
-  }
-
-  public Class<? extends RpcReceiver> getDeclaringClass() {
-    return mClass;
-  }
-
-  public String getName() {
-    if (mMethod.isAnnotationPresent(RpcName.class)) {
-      return mMethod.getAnnotation(RpcName.class).name();
-    }
-    return mMethod.getName();
-  }
-
-  public Type[] getGenericParameterTypes() {
-    return mMethod.getGenericParameterTypes();
-  }
-
-  public Annotation[][] getParameterAnnotations() {
-    return mMethod.getParameterAnnotations();
-  }
-
-  /**
-   * Returns a human-readable help text for this RPC, based on annotations in the source code.
-   * 
-   * @return derived help string
-   */
-  public String getHelp() {
-    StringBuilder helpBuilder = new StringBuilder();
-    Rpc rpcAnnotation = mMethod.getAnnotation(Rpc.class);
-
-    helpBuilder.append(mMethod.getName());
-    helpBuilder.append("(");
-    final Class<?>[] parameterTypes = mMethod.getParameterTypes();
-    final Type[] genericParameterTypes = mMethod.getGenericParameterTypes();
-    final Annotation[][] annotations = mMethod.getParameterAnnotations();
-    for (int i = 0; i < parameterTypes.length; i++) {
-      if (i == 0) {
-        helpBuilder.append("\n  ");
-      } else {
-        helpBuilder.append(",\n  ");
-      }
-
-      helpBuilder.append(getHelpForParameter(genericParameterTypes[i], annotations[i]));
-    }
-    helpBuilder.append(")\n\n");
-    helpBuilder.append(rpcAnnotation.description());
-    if (!rpcAnnotation.returns().equals("")) {
-      helpBuilder.append("\n");
-      helpBuilder.append("\nReturns:\n  ");
-      helpBuilder.append(rpcAnnotation.returns());
-    }
-
-    if (mMethod.isAnnotationPresent(RpcStartEvent.class)) {
-      String eventName = mMethod.getAnnotation(RpcStartEvent.class).value();
-      helpBuilder.append(String.format("\n\nGenerates \"%s\" events.", eventName));
-    }
-
-    if (mMethod.isAnnotationPresent(RpcDeprecated.class)) {
-      String replacedBy = mMethod.getAnnotation(RpcDeprecated.class).value();
-      String release = mMethod.getAnnotation(RpcDeprecated.class).release();
-      helpBuilder.append(String.format("\n\nDeprecated in %s! Please use %s instead.", release,
-          replacedBy));
-    }
-
-    return helpBuilder.toString();
-  }
-
-  /**
-   * Returns the help string for one particular parameter. This respects optional parameters.
-   * 
-   * @param parameterType
-   *          (generic) type of the parameter
-   * @param annotations
-   *          annotations of the parameter, may be null
-   * @return string describing the parameter based on source code annotations
-   */
-  private static String getHelpForParameter(Type parameterType, Annotation[] annotations) {
-    StringBuilder result = new StringBuilder();
-
-    appendTypeName(result, parameterType);
-    result.append(" ");
-    result.append(getName(annotations));
-    if (hasDefaultValue(annotations)) {
-      result.append("[optional");
-      if (hasExplicitDefaultValue(annotations)) {
-        result.append(", default " + getDefaultValue(parameterType, annotations));
-      }
-      result.append("]");
-    }
-
-    String description = getDescription(annotations);
-    if (description.length() > 0) {
-      result.append(": ");
-      result.append(description);
-    }
-
-    return result.toString();
-  }
-
-  /**
-   * Appends the name of the given type to the {@link StringBuilder}.
-   * 
-   * @param builder
-   *          string builder to append to
-   * @param type
-   *          type whose name to append
-   */
-  private static void appendTypeName(final StringBuilder builder, final Type type) {
-    if (type instanceof Class<?>) {
-      builder.append(((Class<?>) type).getSimpleName());
-    } else {
-      ParameterizedType parametrizedType = (ParameterizedType) type;
-      builder.append(((Class<?>) parametrizedType.getRawType()).getSimpleName());
-      builder.append("<");
-
-      Type[] arguments = parametrizedType.getActualTypeArguments();
-      for (int i = 0; i < arguments.length; i++) {
-        if (i > 0) {
-          builder.append(", ");
-        }
-        appendTypeName(builder, arguments[i]);
-      }
-      builder.append(">");
-    }
-  }
-
-  /**
-   * Returns parameter descriptors suitable for the RPC call text representation.
-   * 
-   * <p>
-   * Uses parameter value, default value or name, whatever is available first.
-   * 
-   * @return an array of parameter descriptors
-   */
-  public ParameterDescriptor[] getParameterValues(String[] values) {
-    Type[] parameterTypes = mMethod.getGenericParameterTypes();
-    Annotation[][] parametersAnnotations = mMethod.getParameterAnnotations();
-    ParameterDescriptor[] parameters = new ParameterDescriptor[parametersAnnotations.length];
-    for (int index = 0; index < parameters.length; index++) {
-      String value;
-      if (index < values.length) {
-        value = values[index];
-      } else if (hasDefaultValue(parametersAnnotations[index])) {
-        Object defaultValue = getDefaultValue(parameterTypes[index], parametersAnnotations[index]);
-        if (defaultValue == null) {
-          value = null;
-        } else {
-          value = String.valueOf(defaultValue);
-        }
-      } else {
-        value = getName(parametersAnnotations[index]);
-      }
-      parameters[index] = new ParameterDescriptor(value, parameterTypes[index]);
-    }
-    return parameters;
-  }
-
-  /**
-   * Returns parameter hints.
-   * 
-   * @return an array of parameter hints
-   */
-  public String[] getParameterHints() {
-    Annotation[][] parametersAnnotations = mMethod.getParameterAnnotations();
-    String[] hints = new String[parametersAnnotations.length];
-    for (int index = 0; index < hints.length; index++) {
-      String name = getName(parametersAnnotations[index]);
-      String description = getDescription(parametersAnnotations[index]);
-      String hint = "No paramenter description.";
-      if (!name.equals("") && !description.equals("")) {
-        hint = name + ": " + description;
-      } else if (!name.equals("")) {
-        hint = name;
-      } else if (!description.equals("")) {
-        hint = description;
-      }
-      hints[index] = hint;
-    }
-    return hints;
-  }
-
-  /**
-   * Extracts the formal parameter name from an annotation.
-   * 
-   * @param annotations
-   *          the annotations of the parameter
-   * @return the formal name of the parameter
-   */
-  private static String getName(Annotation[] annotations) {
-    for (Annotation a : annotations) {
-      if (a instanceof RpcParameter) {
-        return ((RpcParameter) a).name();
-      }
-    }
-    throw new IllegalStateException("No parameter name");
-  }
-
-  /**
-   * Extracts the parameter description from its annotations.
-   * 
-   * @param annotations
-   *          the annotations of the parameter
-   * @return the description of the parameter
-   */
-  private static String getDescription(Annotation[] annotations) {
-    for (Annotation a : annotations) {
-      if (a instanceof RpcParameter) {
-        return ((RpcParameter) a).description();
-      }
-    }
-    throw new IllegalStateException("No parameter description");
-  }
-
-  /**
-   * Returns the default value for a specific parameter.
-   * 
-   * @param parameterType
-   *          parameterType
-   * @param annotations
-   *          annotations of the parameter
-   */
-  public static Object getDefaultValue(Type parameterType, Annotation[] annotations) {
-    for (Annotation a : annotations) {
-      if (a instanceof RpcDefault) {
-        RpcDefault defaultAnnotation = (RpcDefault) a;
-        Converter<?> converter = converterFor(parameterType, defaultAnnotation.converter());
-        return converter.convert(defaultAnnotation.value());
-      } else if (a instanceof RpcOptional) {
-        return null;
-      }
-    }
-    throw new IllegalStateException("No default value for " + parameterType);
-  }
-
-  @SuppressWarnings("rawtypes")
-  private static Converter<?> converterFor(Type parameterType,
-      Class<? extends Converter> converterClass) {
-    if (converterClass == Converter.class) {
-      Converter<?> converter = sConverters.get(parameterType);
-      if (converter == null) {
-        throw new IllegalArgumentException("No predefined converter found for " + parameterType);
-      }
-      return converter;
-    }
-    try {
-      Constructor<?> constructor = converterClass.getConstructor(new Class<?>[0]);
-      return (Converter<?>) constructor.newInstance(new Object[0]);
-    } catch (Exception e) {
-      throw new IllegalArgumentException("Cannot create converter from "
-          + converterClass.getCanonicalName());
-    }
-  }
-
-  /**
-   * Determines whether or not this parameter has default value.
-   * 
-   * @param annotations
-   *          annotations of the parameter
-   */
-  public static boolean hasDefaultValue(Annotation[] annotations) {
-    for (Annotation a : annotations) {
-      if (a instanceof RpcDefault || a instanceof RpcOptional) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  /**
-   * Returns whether the default value is specified for a specific parameter.
-   * 
-   * @param annotations
-   *          annotations of the parameter
-   */
-  @VisibleForTesting
-  static boolean hasExplicitDefaultValue(Annotation[] annotations) {
-    for (Annotation a : annotations) {
-      if (a instanceof RpcDefault) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  /** Returns the converters for {@code String}, {@code Integer} and {@code Boolean}. */
-  private static Map<Class<?>, Converter<?>> populateConverters() {
-    Map<Class<?>, Converter<?>> converters = new HashMap<Class<?>, Converter<?>>();
-    converters.put(String.class, new Converter<String>() {
-      @Override
-      public String convert(String value) {
-        return value;
-      }
-    });
-    converters.put(Integer.class, new Converter<Integer>() {
-      @Override
-      public Integer convert(String input) {
-        try {
-          return Integer.decode(input);
-        } catch (NumberFormatException e) {
-          throw new IllegalArgumentException("'" + input + "' is not an integer");
-        }
-      }
-    });
-    converters.put(Boolean.class, new Converter<Boolean>() {
-      @Override
-      public Boolean convert(String input) {
-        if (input == null) {
-          return null;
-        }
-        input = input.toLowerCase();
-        if (input.equals("true")) {
-          return Boolean.TRUE;
-        }
-        if (input.equals("false")) {
-          return Boolean.FALSE;
-        }
-        throw new IllegalArgumentException("'" + input + "' is not a boolean");
-      }
-    });
-    return converters;
-  }
-}
diff --git a/src/com/googlecode/android_scripting/rpc/ParameterDescriptor.java b/src/com/googlecode/android_scripting/rpc/ParameterDescriptor.java
deleted file mode 100644
index 166d69a4..00000000
--- a/src/com/googlecode/android_scripting/rpc/ParameterDescriptor.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.rpc;
-
-import java.lang.reflect.Type;
-
-/**
- * RPC parameter description.
- * 
- * @author igor.v.karp@gmail.com (Igor Karp)
- */
-public final class ParameterDescriptor {
-  private final String value;
-  private final Type type;
-
-  public ParameterDescriptor(String value, Type type) {
-    this.value = value;
-    this.type = type;
-  }
-
-  public String getValue() {
-    return value;
-  }
-
-  public Type getType() {
-    return type;
-  }
-}
diff --git a/src/com/googlecode/android_scripting/rpc/Rpc.java b/src/com/googlecode/android_scripting/rpc/Rpc.java
deleted file mode 100644
index 29881304..00000000
--- a/src/com/googlecode/android_scripting/rpc/Rpc.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2009 Google Inc.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.rpc;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * The {@link Rpc} annotation is used to annotate server-side implementations of RPCs. It describes
- * meta-information (currently a brief documentation of the function), and marks a function as the
- * implementation of an RPC.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-@Documented
-public @interface Rpc {
-  /**
-   * Returns brief description of the function. Should be limited to one or two sentences.
-   */
-  String description();
-
-  /**
-   * Gives a brief description of the functions return value (and the underlying data structure).
-   */
-  String returns() default "";
-}
diff --git a/src/com/googlecode/android_scripting/rpc/RpcDefault.java b/src/com/googlecode/android_scripting/rpc/RpcDefault.java
deleted file mode 100644
index 42b23b16..00000000
--- a/src/com/googlecode/android_scripting/rpc/RpcDefault.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.rpc;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Use this annotation to mark an RPC parameter that have a default value.
- * 
- * @author igor.v.karp@gmail.com (Igor Karp)
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.PARAMETER)
-@Documented
-public @interface RpcDefault {
-  /** The default value of the RPC parameter. */
-  public String value();
-
-  @SuppressWarnings("rawtypes")
-  public Class<? extends Converter> converter() default Converter.class;
-}
diff --git a/src/com/googlecode/android_scripting/rpc/RpcDeprecated.java b/src/com/googlecode/android_scripting/rpc/RpcDeprecated.java
deleted file mode 100644
index 3ad3f148..00000000
--- a/src/com/googlecode/android_scripting/rpc/RpcDeprecated.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.rpc;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Use this annotation to mark RPC method as deprecated.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-@Documented
-public @interface RpcDeprecated {
-  /** The method that replaced this one. */
-  public String value();
-
-  /** Release of SL4A when deprecation occurred. */
-  public String release() default "r4";
-}
diff --git a/src/com/googlecode/android_scripting/rpc/RpcError.java b/src/com/googlecode/android_scripting/rpc/RpcError.java
deleted file mode 100644
index 9a79108e..00000000
--- a/src/com/googlecode/android_scripting/rpc/RpcError.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.rpc;
-
-@SuppressWarnings("serial")
-public class RpcError extends Exception {
-
-  public RpcError(String message) {
-    super(message);
-  }
-
-}
diff --git a/src/com/googlecode/android_scripting/rpc/RpcMinSdk.java b/src/com/googlecode/android_scripting/rpc/RpcMinSdk.java
deleted file mode 100644
index 9548ec61..00000000
--- a/src/com/googlecode/android_scripting/rpc/RpcMinSdk.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.rpc;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * Use this annotation to specify minimum SDK level (if higher than 3).
- * 
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-public @interface RpcMinSdk {
-  /** Minimum SDK Level. */
-  public int value();
-}
diff --git a/src/com/googlecode/android_scripting/rpc/RpcName.java b/src/com/googlecode/android_scripting/rpc/RpcName.java
deleted file mode 100644
index 243fc76c..00000000
--- a/src/com/googlecode/android_scripting/rpc/RpcName.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.rpc;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Use this annotation to mark an RPC parameter that have a default value.
- * 
- * @author igor.v.karp@gmail.com (Igor Karp)
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-@Documented
-public @interface RpcName {
-  /** The default value of the RPC parameter. */
-  public String name();
-}
diff --git a/src/com/googlecode/android_scripting/rpc/RpcOptional.java b/src/com/googlecode/android_scripting/rpc/RpcOptional.java
deleted file mode 100644
index fed5647d..00000000
--- a/src/com/googlecode/android_scripting/rpc/RpcOptional.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.rpc;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Use this annotation to mark RPC parameter as optional.
- * 
- * <p>
- * The parameter marked as optional has no explicit default value. {@code null} is used as default
- * value.
- * 
- * @author igor.v.karp@gmail.com (Igor Karp)
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.PARAMETER)
-@Documented
-public @interface RpcOptional {
-}
diff --git a/src/com/googlecode/android_scripting/rpc/RpcParameter.java b/src/com/googlecode/android_scripting/rpc/RpcParameter.java
deleted file mode 100644
index 7d0f830f..00000000
--- a/src/com/googlecode/android_scripting/rpc/RpcParameter.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2009 Google Inc.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.rpc;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * An annotation that is used to document the parameters of an RPC.
- * 
- * @author Felix Arends (felix.arends@gmail.com)
- * 
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.PARAMETER)
-@Documented
-public @interface RpcParameter {
-  /**
-   * The name of the formal parameter. This should be in agreement with the java code.
-   */
-  public String name();
-
-  /**
-   * Description of the RPC. This should be a short descriptive statement without a full stop, such
-   * as 'disables the WiFi mode'.
-   */
-  public String description() default "";
-}
diff --git a/src/com/googlecode/android_scripting/rpc/RpcStartEvent.java b/src/com/googlecode/android_scripting/rpc/RpcStartEvent.java
deleted file mode 100644
index 78938601..00000000
--- a/src/com/googlecode/android_scripting/rpc/RpcStartEvent.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.rpc;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Use this annotation to mark an RPC as one that starts generating events.
- * 
- * @author damonkohler@gmail.com (Damon Kohler)
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-@Documented
-public @interface RpcStartEvent {
-  /** The name of the event that is generated. */
-  public String value();
-}
diff --git a/src/com/googlecode/android_scripting/rpc/RpcStopEvent.java b/src/com/googlecode/android_scripting/rpc/RpcStopEvent.java
deleted file mode 100644
index 7753865b..00000000
--- a/src/com/googlecode/android_scripting/rpc/RpcStopEvent.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.rpc;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Use this annotation to mark an RPC as one that stops generating events.
- * 
- * @author damonkohler@gmail.com (Damon Kohler)
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-@Documented
-public @interface RpcStopEvent {
-  /** The name of the event that stops being generated. */
-  public String value();
-}
diff --git a/src/com/googlecode/android_scripting/trigger/EventGenerationControllingObserver.java b/src/com/googlecode/android_scripting/trigger/EventGenerationControllingObserver.java
deleted file mode 100644
index 1a5fc8c5..00000000
--- a/src/com/googlecode/android_scripting/trigger/EventGenerationControllingObserver.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.googlecode.android_scripting.trigger;
-
-import com.google.common.collect.Maps;
-import com.googlecode.android_scripting.facade.FacadeConfiguration;
-import com.googlecode.android_scripting.facade.FacadeManager;
-import com.googlecode.android_scripting.rpc.MethodDescriptor;
-import com.googlecode.android_scripting.trigger.TriggerRepository.TriggerRepositoryObserver;
-
-import java.util.Map;
-
-import org.json.JSONArray;
-
-/**
- * A {@link TriggerRepositoryObserver} that starts and stops the monitoring of events depending on
- * whether or not triggers for the event exist.
- * 
- * @author Felix Arends (felix.arends@gmail.com)
- */
-public class EventGenerationControllingObserver implements TriggerRepositoryObserver {
-  private final FacadeManager mFacadeManager;
-  private final Map<String, MethodDescriptor> mStartEventGeneratingMethodDescriptors;
-  private final Map<String, MethodDescriptor> mStopEventGeneratingMethodDescriptors;
-  private final Map<String, Integer> mEventTriggerRefCounts = Maps.newHashMap();
-
-  /**
-   * Creates a new StartEventMonitoringObserver for the given trigger repository.
-   * 
-   * @param facadeManager
-   * @param triggerRepository
-   */
-  public EventGenerationControllingObserver(FacadeManager facadeManager) {
-    mFacadeManager = facadeManager;
-    mStartEventGeneratingMethodDescriptors =
-        FacadeConfiguration.collectStartEventMethodDescriptors();
-    mStopEventGeneratingMethodDescriptors = FacadeConfiguration.collectStopEventMethodDescriptors();
-  }
-
-  private synchronized int incrementAndGetRefCount(String eventName) {
-    int refCount =
-        (mEventTriggerRefCounts.containsKey(eventName)) ? mEventTriggerRefCounts.get(eventName) : 0;
-    refCount++;
-    mEventTriggerRefCounts.put(eventName, refCount);
-    return refCount;
-  }
-
-  private synchronized int decrementAndGetRefCount(String eventName) {
-    int refCount =
-        (mEventTriggerRefCounts.containsKey(eventName)) ? mEventTriggerRefCounts.get(eventName) : 0;
-    refCount--;
-    mEventTriggerRefCounts.put(eventName, refCount);
-    return refCount;
-  }
-
-  @Override
-  public synchronized void onPut(Trigger trigger) {
-    // If we're not already monitoring the events corresponding to this trigger, do so.
-    if (incrementAndGetRefCount(trigger.getEventName()) == 1) {
-      startMonitoring(trigger.getEventName());
-    }
-  }
-
-  @Override
-  public synchronized void onRemove(Trigger trigger) {
-    // If there are no more triggers listening to this event, then we need to stop monitoring.
-    if (decrementAndGetRefCount(trigger.getEventName()) == 1) {
-      stopMonitoring(trigger.getEventName());
-    }
-  }
-
-  private void startMonitoring(String eventName) {
-    MethodDescriptor startEventGeneratingMethod =
-        mStartEventGeneratingMethodDescriptors.get(eventName);
-    try {
-      startEventGeneratingMethod.invoke(mFacadeManager, new JSONArray());
-    } catch (Throwable t) {
-      throw new RuntimeException(t);
-    }
-  }
-
-  private void stopMonitoring(String eventName) {
-    MethodDescriptor stopEventGeneratingMethod =
-        mStopEventGeneratingMethodDescriptors.get(eventName);
-    try {
-      stopEventGeneratingMethod.invoke(mFacadeManager, new JSONArray());
-    } catch (Throwable t) {
-      throw new RuntimeException(t);
-    }
-  }
-}
diff --git a/src/com/googlecode/android_scripting/trigger/ScriptTrigger.java b/src/com/googlecode/android_scripting/trigger/ScriptTrigger.java
deleted file mode 100644
index 4a10ca1e..00000000
--- a/src/com/googlecode/android_scripting/trigger/ScriptTrigger.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.googlecode.android_scripting.trigger;
-
-import android.content.Context;
-import android.content.Intent;
-
-import com.googlecode.android_scripting.IntentBuilders;
-import com.googlecode.android_scripting.event.Event;
-
-import java.io.File;
-
-/**
- * A trigger implementation that launches a given script when the event occurs.
- * 
- * @author Felix Arends (felix.arends@gmail.com)
- */
-public class ScriptTrigger implements Trigger {
-  private static final long serialVersionUID = 1804599219214041409L;
-  private final File mScript;
-  private final String mEventName;
-
-  public ScriptTrigger(String eventName, File script) {
-    mEventName = eventName;
-    mScript = script;
-  }
-
-  @Override
-  public void handleEvent(Event event, Context context) {
-    Intent intent = IntentBuilders.buildStartInBackgroundIntent(mScript);
-    // This is required since the script is being started from the TriggerService.
-    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-    context.startActivity(intent);
-  }
-
-  @Override
-  public String getEventName() {
-    return mEventName;
-  }
-
-  public File getScript() {
-    return mScript;
-  }
-}
diff --git a/src/com/googlecode/android_scripting/trigger/Trigger.java b/src/com/googlecode/android_scripting/trigger/Trigger.java
deleted file mode 100644
index dceb63b1..00000000
--- a/src/com/googlecode/android_scripting/trigger/Trigger.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.trigger;
-
-import android.content.Context;
-
-import com.googlecode.android_scripting.event.Event;
-
-import java.io.Serializable;
-
-/**
- * Interface implemented by objects listening to events on the event queue inside of the
- * {@link SerivceManager}.
- * 
- * @author Felix Arends (felix.arends@gmail.com)
- */
-public interface Trigger extends Serializable {
-  /**
-   * Handles an event from the event queue.
-   * 
-   * @param event
-   *          Event to handle
-   * @param context
-   *          TODO
-   */
-  void handleEvent(Event event, Context context);
-
-  /**
-   * Returns the event name that this {@link Trigger} is interested in.
-   */
-  // TODO(damonkohler): This could be removed by maintaining a reverse mapping from Trigger to event
-  // name in the TriggerRespository.
-  String getEventName();
-}
diff --git a/src/com/googlecode/android_scripting/trigger/TriggerRepository.java b/src/com/googlecode/android_scripting/trigger/TriggerRepository.java
deleted file mode 100644
index c8611799..00000000
--- a/src/com/googlecode/android_scripting/trigger/TriggerRepository.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.trigger;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
-
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.Multimap;
-import com.google.common.collect.Multimaps;
-import com.googlecode.android_scripting.IntentBuilders;
-import com.googlecode.android_scripting.Log;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.util.Map.Entry;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import org.apache.commons.codec.binary.Base64Codec;
-
-/**
- * A repository maintaining all currently scheduled triggers. This includes, for example, alarms or
- * observers of arriving text messages etc. This class is responsible for serializing the list of
- * triggers to the shared preferences store, and retrieving it from there.
- * 
- * @author Felix Arends (felix.arends@gmail.com)
- * @author Damon Kohler (damonkohler@gmail.com)
- */
-public class TriggerRepository {
-  /**
-   * The list of triggers is serialized to the shared preferences entry with this name.
-   */
-  private static final String TRIGGERS_PREF_KEY = "TRIGGERS";
-
-  private final SharedPreferences mPreferences;
-  private final Context mContext;
-
-  /**
-   * An interface for objects that are notified when a trigger is added to the repository.
-   */
-  public interface TriggerRepositoryObserver {
-    /**
-     * Invoked just before the trigger is added to the repository.
-     * 
-     * @param trigger
-     *          The trigger about to be added to the repository.
-     */
-    void onPut(Trigger trigger);
-
-    /**
-     * Invoked just after the trigger has been removed from the repository.
-     * 
-     * @param trigger
-     *          The trigger that has just been removed from the repository.
-     */
-    void onRemove(Trigger trigger);
-  }
-
-  private final Multimap<String, Trigger> mTriggers;
-  private final CopyOnWriteArrayList<TriggerRepositoryObserver> mTriggerObservers =
-      new CopyOnWriteArrayList<TriggerRepositoryObserver>();
-
-  public TriggerRepository(Context context) {
-    mContext = context;
-    mPreferences = PreferenceManager.getDefaultSharedPreferences(context);
-    String triggers = mPreferences.getString(TRIGGERS_PREF_KEY, null);
-    mTriggers = deserializeTriggersFromString(triggers);
-  }
-
-  /** Returns a list of all triggers. The list is unmodifiable. */
-  public synchronized Multimap<String, Trigger> getAllTriggers() {
-    return Multimaps.unmodifiableMultimap(mTriggers);
-  }
-
-  /**
-   * Adds a new trigger to the repository.
-   * 
-   * @param trigger
-   *          the {@link Trigger} to add
-   */
-  public synchronized void put(Trigger trigger) {
-    notifyOnAdd(trigger);
-    mTriggers.put(trigger.getEventName(), trigger);
-    storeTriggers();
-    ensureTriggerServiceRunning();
-  }
-
-  /** Removes a specific {@link Trigger}. */
-  public synchronized void remove(final Trigger trigger) {
-    mTriggers.get(trigger.getEventName()).remove(trigger);
-    storeTriggers();
-    notifyOnRemove(trigger);
-  }
-
-  /** Ensures that the {@link TriggerService} is running */
-  private void ensureTriggerServiceRunning() {
-    Intent startTriggerServiceIntent = IntentBuilders.buildTriggerServiceIntent();
-    mContext.startService(startTriggerServiceIntent);
-  }
-
-  /** Notify all {@link TriggerRepositoryObserver}s that a {@link Trigger} was added. */
-  private void notifyOnAdd(Trigger trigger) {
-    for (TriggerRepositoryObserver observer : mTriggerObservers) {
-      observer.onPut(trigger);
-    }
-  }
-
-  /** Notify all {@link TriggerRepositoryObserver}s that a {@link Trigger} was removed. */
-  private void notifyOnRemove(Trigger trigger) {
-    for (TriggerRepositoryObserver observer : mTriggerObservers) {
-      observer.onRemove(trigger);
-    }
-  }
-
-  /** Writes the list of triggers to the shared preferences. */
-  private synchronized void storeTriggers() {
-    SharedPreferences.Editor editor = mPreferences.edit();
-    final String triggerValue = serializeTriggersToString(mTriggers);
-    if (triggerValue != null) {
-      editor.putString(TRIGGERS_PREF_KEY, triggerValue);
-    }
-    editor.commit();
-  }
-
-  /** Deserializes the {@link Multimap} of {@link Trigger}s from a base 64 encoded string. */
-  @SuppressWarnings("unchecked")
-  private Multimap<String, Trigger> deserializeTriggersFromString(String triggers) {
-    if (triggers == null) {
-      return ArrayListMultimap.<String, Trigger> create();
-    }
-    try {
-      final ByteArrayInputStream inputStream =
-          new ByteArrayInputStream(Base64Codec.decodeBase64(triggers.getBytes()));
-      final ObjectInputStream objectInputStream = new ObjectInputStream(inputStream);
-      return (Multimap<String, Trigger>) objectInputStream.readObject();
-    } catch (Exception e) {
-      Log.e(e);
-    }
-    return ArrayListMultimap.<String, Trigger> create();
-  }
-
-  /** Serializes the list of triggers to a Base64 encoded string. */
-  private String serializeTriggersToString(Multimap<String, Trigger> triggers) {
-    try {
-      final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-      final ObjectOutputStream objectOutputStream = new ObjectOutputStream(outputStream);
-      objectOutputStream.writeObject(triggers);
-      return new String(Base64Codec.encodeBase64(outputStream.toByteArray()));
-    } catch (IOException e) {
-      Log.e(e);
-      return null;
-    }
-  }
-
-  /** Returns {@code true} iff the list of triggers is empty. */
-  public synchronized boolean isEmpty() {
-    return mTriggers.isEmpty();
-  }
-
-  /** Adds a {@link TriggerRepositoryObserver}. */
-  public void addObserver(TriggerRepositoryObserver observer) {
-    mTriggerObservers.add(observer);
-  }
-
-  /**
-   * Adds the given {@link TriggerRepositoryObserver} and invokes
-   * {@link TriggerRepositoryObserver#onPut} for all existing triggers.
-   * 
-   * @param observer
-   *          The observer to add.
-   */
-  public synchronized void bootstrapObserver(TriggerRepositoryObserver observer) {
-    addObserver(observer);
-    for (Entry<String, Trigger> trigger : mTriggers.entries()) {
-      observer.onPut(trigger.getValue());
-    }
-  }
-
-  /**
-   * Removes a {@link TriggerRepositoryObserver}.
-   */
-  public void removeObserver(TriggerRepositoryObserver observer) {
-    mTriggerObservers.remove(observer);
-  }
-}
\ No newline at end of file
diff --git a/src/com/googlecode/android_scripting/util/VisibleForTesting.java b/src/com/googlecode/android_scripting/util/VisibleForTesting.java
deleted file mode 100644
index 5b531c1f..00000000
--- a/src/com/googlecode/android_scripting/util/VisibleForTesting.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.googlecode.android_scripting.util;
-
-/**
- * An annotation that indicates that the visibility of a type or member has been relaxed from
- * private to package to make the code testable.
- * 
- * @author igor.v.karp@gmail.com (Igor Karp)
- */
-// TODO(igor.v.karp): Consider replacing this annotation by one from Guava or GCL
-public @interface VisibleForTesting {
-}
diff --git a/src/com/hipipal/sl4alib/CONF.java b/src/com/hipipal/sl4alib/CONF.java
deleted file mode 100644
index 87d5f5fb..00000000
--- a/src/com/hipipal/sl4alib/CONF.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.hipipal.sl4alib;
-
-public class CONF extends com.zuowuxuxi.config.CONF {
-    public final static String BASE_PATH = "com.hipipal.qpyplus";
-    public final static String DFROM_QPY = "scripts";
-
-    public final static String SCRIPT_SITE = "http://qpython.org/";
-    public final static String QR_APP = "http://qpython.com/";
-    public final static String QR_WH = "250";
-    
-    //public final static String UPDATE_URL = "http://"+BA_SITE+"/qpy_user.php";
-    //public final static String SOFT_CODE = "qpy";
-    public final static String GOOGLE_TRACKER_ID = "UA-34788925-1";
-    public final static int PY_NOTI_FLAG = 123400;
-    public final static String API_SCRIPT = ".last_api.py";
-
-}
\ No newline at end of file
diff --git a/src/com/hipipal/sl4alib/MNApp.java b/src/com/hipipal/sl4alib/MNApp.java
deleted file mode 100644
index 27373468..00000000
--- a/src/com/hipipal/sl4alib/MNApp.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package com.hipipal.sl4alib;
-
-import java.util.Map;
-import java.util.concurrent.CountDownLatch;
-import com.google.android.apps.analytics.GoogleAnalyticsTracker;
-
-import com.googlecode.android_scripting.FutureActivityTaskExecutor;
-
-import com.googlecode.android_scripting.Log;
-import com.googlecode.android_scripting.interpreter.InterpreterConfiguration;
-import com.googlecode.android_scripting.interpreter.InterpreterConstants;
-import com.googlecode.android_scripting.interpreter.InterpreterConfiguration.ConfigurationObserver;
-import com.googlecode.android_scripting.trigger.TriggerRepository;
-import com.zuowuxuxi.common.CrashHandler;
-import com.zuowuxuxi.util.NAction;
-import com.zuowuxuxi.util.NUtil;
-
-import android.content.Context;
-import android.content.Intent;
-import greendroid.app.GDApplication;
-
-
-public class MNApp extends GDApplication implements ConfigurationObserver {
-
-	Map<String, Integer> movieDirs = null;
-	GoogleAnalyticsTracker tracker;
-	@Override  
-    public void onCreate() {  
-        super.onCreate();  
-        
-        mConfiguration = new InterpreterConfiguration(this);
-        mConfiguration.registerObserver(this);
-        mConfiguration.startDiscovering(InterpreterConstants.MIME + SL4AScript.getFileExtension(this));
-
-        CrashHandler crashHandler = CrashHandler.getInstance();  
-        //注册crashHandler类  
-        crashHandler.init(getApplicationContext()); 
-    	tracker = GoogleAnalyticsTracker.getInstance();
-    	String x = NAction.getExtP(getApplicationContext(), "ga_gap");
-    	int xq = 30;
-    	if (!x.equals("")) {
-    		xq = Integer.valueOf(x);
-    	}
-    	String gtid = CONF.GOOGLE_TRACKER_ID;
-    	String gtid2 = NAction.getExtP(getApplicationContext(), "ga_gtid");
-    	if (!gtid2.equals("")) {
-    		gtid = gtid2;
-    	}
-        tracker.startNewSession(gtid, xq, getApplicationContext());
-    }  
-	
-    public void trackPageView(String page) {
-    	if (tracker!=null) {
-    		tracker.trackPageView("/"+NUtil.getVersinoCode(getApplicationContext())+"-"+page);
-    	}
-    }
-    
-    public void stopTraker() {
-    	if (tracker!=null) {
-    		tracker.stopSession();
-    	}
-    }
-	
-    /*@Override
-    public Class<?> getHomeActivityClass() {
-    }*/
-    
-    @Override
-    public Intent getMainApplicationIntent() {
-    	return null;
-
-        //return new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.app_url)));
-    }
-    
-    public void logout(Context context) {
-    }
-
-
-
-    private volatile boolean receivedConfigUpdate = false;
-    private final CountDownLatch mLatch = new CountDownLatch(1);
-
-    private final FutureActivityTaskExecutor mTaskExecutor = new FutureActivityTaskExecutor(this);
-    private TriggerRepository mTriggerRepository;
-
-    protected InterpreterConfiguration mConfiguration;
-
-    public FutureActivityTaskExecutor getTaskExecutor() {
-      return mTaskExecutor;
-    }
-
-
-    public InterpreterConfiguration getInterpreterConfiguration() {
-      return mConfiguration;
-    }
-
-    public TriggerRepository getTriggerRepository() {
-      return mTriggerRepository;
-    }
-    
-
-    @Override
-    public void onConfigurationChanged() {
-        receivedConfigUpdate = true;
-        mLatch.countDown();
-    }
-
-    public boolean readyToStart() {
-      try {
-        mLatch.await();
-      } catch (InterruptedException e) {
-        Log.e(e);
-      }
-      return receivedConfigUpdate;
-    }
-
-
-}
diff --git a/src/com/hipipal/sl4alib/PyScriptService.java b/src/com/hipipal/sl4alib/PyScriptService.java
deleted file mode 100644
index 7722c2eb..00000000
--- a/src/com/hipipal/sl4alib/PyScriptService.java
+++ /dev/null
@@ -1,233 +0,0 @@
-package com.hipipal.sl4alib;
-
-import android.annotation.SuppressLint;
-import android.app.Service;
-import android.content.Context;
-import android.content.Intent;
-import android.os.AsyncTask;
-import android.os.Binder;
-import android.os.Environment;
-import android.os.Handler;
-import android.os.IBinder;
-import android.os.Message;
-import android.util.Log;
-
-import com.android.python27.config.GlobalConstants;
-import com.android.python27.process.MyScriptProcess;
-import com.googlecode.android_scripting.AndroidProxy;
-import com.googlecode.android_scripting.jsonrpc.RpcReceiverManager;
-import com.googlecode.android_scripting.interpreter.InterpreterConfiguration;
-import com.zuowuxuxi.util.NStorage;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.CountDownLatch;
-
-//public class PyScriptService extends ForegroundService {
-
-public class PyScriptService extends Service {
-	private static final String TAG = "PyScriptService";
-
-	//private final static int NOTIFICATION_ID = NotificationIdFactory.create();
-	private final CountDownLatch mLatch = new CountDownLatch(1);
-	private final IBinder mBinder;
-	@SuppressWarnings("unused")
-	private MyScriptProcess myScriptProcess;
-	
-	@SuppressWarnings("unused")
-	private static PyScriptService instance;
-	@SuppressWarnings("unused")
-	private boolean killMe;
-	public static String scriptName;
-	  
-	private InterpreterConfiguration mInterpreterConfiguration = null;
-	private RpcReceiverManager mFacadeManager;
-    private AndroidProxy mProxy;
-    
-    private static Context context = null;
-    @SuppressWarnings("unused")
-	private int mStartId;
-    static {
-      instance = null;
-    }
-    
-    // ------------------------------------------------------------------------------------------------------
-
-	public class LocalBinder extends Binder {
-		public PyScriptService getService() {
-			return PyScriptService.this;
-		}
-	}
-
-    // ------------------------------------------------------------------------------------------------------
-
-	@Override
-	public void onDestroy() {
-		Log.d(TAG, "onDestroy");
-
-		if (mProxy!=null) {
-			mProxy.shutdown();
-		}
-		
-		super.onDestroy();
-	}
-
-    // ------------------------------------------------------------------------------------------------------
-
-	public PyScriptService() {
-//		super(NOTIFICATION_ID);
-		super();
-
-		mBinder = new LocalBinder();
-	}
-
-    // ------------------------------------------------------------------------------------------------------
-
-	@Override
-	public IBinder onBind(Intent intent) {
-		return mBinder;
-	}
-
-    // ------------------------------------------------------------------------------------------------------
-
-    public static Context getAppContext() {
-        return PyScriptService.context;
-    }
-    
-    // ------------------------------------------------------------------------------------------------------
-
-	@Override
-	public void onCreate() {
-		Log.d(TAG, "onCreate");
-		super.onCreate();
-		PyScriptService.context = getApplicationContext();
-		
-		// clear before run
-        /*File logFile = new File( Environment.getExternalStorageDirectory()+"/"+CONF.BASE_PATH+"/"+scriptName.substring(scriptName.lastIndexOf("/")+1)+".log" );
-        if (logFile.exists()) {
-        	logFile.delete();
-        }
-		killProcess();	*/	
-		// River Modify
-		instance = this;
-	    this.killMe = false;
-
-		new startMyAsyncTask().execute(101);
-	}
-
-    // ------------------------------------------------------------------------------------------------------
-
-	@SuppressWarnings("deprecation")
-	@Override
-	public void onStart(Intent intent, final int startId) {
-		super.onStart(intent, startId);
-	}
-
-    // ------------------------------------------------------------------------------------------------------
-
-	public class startMyAsyncTask extends AsyncTask<Integer, Integer, Boolean> {
-		@Override
-		protected void onPreExecute() {
-		}
-	
-		@Override
-		protected Boolean doInBackground(Integer... params) {	    
-			startMyMain(params[0]);
-			return true;
-		}
-	
-		@Override
-		protected void onProgressUpdate(Integer... values) {
-		}
-	
-		@Override
-		protected void onPostExecute(Boolean installStatus) {
-			Log.d(TAG, "startMyAsyncTask:onPostExecute");
-		}
-	}
-
-	// ------------------------------------------------------------------------------------------------------
-
-	private void startMyMain(final int startId) {
-		mStartId = startId;
-		if (scriptName == null) {
-			scriptName = this.getFilesDir().getAbsolutePath() + "/" + GlobalConstants.PYTHON_MAIN_SCRIPT_NAME;
-		}
-		
-		File script = new File(scriptName);
-		
-		// arguments
-		ArrayList<String> args = new ArrayList<String>();
-		args.add(scriptName);
-		args.add("--foreground");
-
-		// env var
-		Map<String, String> environmentVariables = null;
-		environmentVariables = new HashMap<String, String>();
-	    //environmentVariables.put("PYTHONPATH", this.getFilesDir().getAbsolutePath() + "/python/lib/python2.7/lib-dynload" + ":" + this.getFilesDir().getAbsolutePath() + "/python/lib/python2.7"+ ":" + this.getFilesDir().getAbsolutePath() + "/python/lib/python27.zip"+ ":" +Environment.getExternalStorageDirectory().getAbsolutePath()+ "/"  + this.getPackageName() + "/extras/site-packages" );
-	    //environmentVariables.put("TEMP", Environment.getExternalStorageDirectory().getAbsolutePath() + "/" + this.getPackageName() + "/extras/tmp");
-	    //environmentVariables.put("PYTHONHOME", this.getFilesDir().getAbsolutePath() + "/python");
-	    //environmentVariables.put("LD_LIBRARY_PATH", this.getFilesDir().getAbsolutePath() + "/python/lib" + ":" + this.getFilesDir().getAbsolutePath() + "/python/lib/python2.7/lib-dynload");			
-		
-		//File pythonBinary = new File(this.getFilesDir().getAbsolutePath() + "/python/bin/python");
-		//File pythonBinary = new File("/system/bin/id");
-		// launch script
-		try {
-			mProxy = new AndroidProxy(this, null, true);
-
-			mProxy.startLocal();
-			NStorage.setSP(getAppContext(), "sl4a.hostname", mProxy.getAddress().getHostName());
-			NStorage.setSP(getAppContext(), "sl4a.port", ""+mProxy.getAddress().getPort());
-			NStorage.setSP(getAppContext(), "sl4a.secue", mProxy.getSecret());
-			
-			Log.d(TAG, "startMyMain:"+mProxy.getAddress().getHostName()+":"+mProxy.getAddress().getPort()+":"+mProxy.getSecret());
-			mLatch.countDown();
-			
-			//Intent intent1 = new Intent(".PythonActivity");
-			//sendBroadcast(intent1);
-		      
-			myScriptProcess = MyScriptProcess.launchScript(this, script, mInterpreterConfiguration, mProxy, new Runnable() {
-				@Override
-				public void run() {
-					Log.d(TAG, "myScriptProcess");
-					mProxy.shutdown();
-					stopSelf(startId);						
-					// hard force restart
-	//				if (!ScriptService.this.killMe) {
-	//					startMyMain();				        	
-	//				}
-				}
-			}, script.getParent(),  Environment.getExternalStorageDirectory().getAbsolutePath() + "/" + this.getPackageName(), args, environmentVariables, null);
-		} catch (Exception e) {
-			
-		}
-	}
-	
-    // ------------------------------------------------------------------------------------------------------
-
-	RpcReceiverManager getRpcReceiverManager() throws InterruptedException {
-		mLatch.await();
-		
-		if (mFacadeManager==null) { // Facade manage may not be available on startup.
-			mFacadeManager = mProxy.getRpcReceiverManagerFactory()
-				.getRpcReceiverManagers().get(0);
-		}
-		return mFacadeManager;
-	}
-	
-	public void updateNotify(Message msg) {
-		updatePositionHandler.sendMessage(msg);
-	}
-	
-	@SuppressLint("HandlerLeak")
-	private Handler updatePositionHandler = new Handler() {
-		@Override
-		public void handleMessage(Message msg) {
-			@SuppressWarnings("unused")
-			String file = (String)msg.obj;
-			//updateNotification(msg.what, file);
-		}
-	};	
-}
\ No newline at end of file
diff --git a/src/com/hipipal/sl4alib/PyScriptService2.java b/src/com/hipipal/sl4alib/PyScriptService2.java
deleted file mode 100644
index faa0575a..00000000
--- a/src/com/hipipal/sl4alib/PyScriptService2.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.hipipal.sl4alib;
-
-public class PyScriptService2 extends PyScriptService {
-	
-}
\ No newline at end of file
diff --git a/src/com/hipipal/sl4alib/SL4ADialogActivity.java b/src/com/hipipal/sl4alib/SL4ADialogActivity.java
deleted file mode 100644
index ef5c730d..00000000
--- a/src/com/hipipal/sl4alib/SL4ADialogActivity.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.hipipal.sl4alib;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.ComponentName;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.content.pm.ResolveInfo;
-import android.net.Uri;
-import android.os.Bundle;
-
-import com.googlecode.android_scripting.Constants;
-import com.googlecode.android_scripting.FeaturedInterpreters;
-import com.googlecode.android_scripting.Log;
-import com.googlecode.android_scripting.interpreter.InterpreterConstants;
-
-import java.net.URL;
-import java.util.List;
-
-public class SL4ADialogActivity extends Activity {
-  @Override
-  protected void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-
-    String scriptName = getIntent().getStringExtra(Constants.EXTRA_SCRIPT_PATH);
-    String interpreter = FeaturedInterpreters.getInterpreterNameForScript(scriptName);
-
-    if (interpreter == null) {
-      Log.e("Cannot find interpreter for script " + scriptName);
-      finish();
-    }
-
-    final Intent activityIntent = new Intent();
-
-    Intent resolveIntent = new Intent(InterpreterConstants.ACTION_DISCOVER_INTERPRETERS);
-    resolveIntent.addCategory(Intent.CATEGORY_LAUNCHER);
-    resolveIntent.setType(InterpreterConstants.MIME + SL4AScript.getFileExtension(this));
-    List<ResolveInfo> resolveInfos = getPackageManager().queryIntentActivities(resolveIntent, 0);
-
-    if (resolveInfos != null && resolveInfos.size() == 1) {
-      ActivityInfo info = resolveInfos.get(0).activityInfo;
-      activityIntent.setComponent(new ComponentName(info.packageName, info.name));
-      activityIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-    } else {
-      final URL url = FeaturedInterpreters.getUrlForName(interpreter);
-      activityIntent.setAction(Intent.ACTION_VIEW);
-      activityIntent.setData(Uri.parse(url.toString()));
-    }
-
-    AlertDialog.Builder dialog = new AlertDialog.Builder(this);
-    dialog.setTitle(String.format("%s is not installed.", interpreter));
-    dialog.setMessage(String
-        .format("Do you want to download and install APK for %s ?", interpreter));
-
-    DialogInterface.OnClickListener buttonListener = new DialogInterface.OnClickListener() {
-      @Override
-      public void onClick(DialogInterface dialog, int which) {
-        if (which == DialogInterface.BUTTON_POSITIVE) {
-          startActivity(activityIntent);
-        }
-        dialog.dismiss();
-        finish();
-      }
-    };
-    dialog.setNegativeButton("No", buttonListener);
-    dialog.setPositiveButton("Yes", buttonListener);
-    dialog.show();
-  }
-
-}
diff --git a/src/com/hipipal/sl4alib/SL4AScript.java b/src/com/hipipal/sl4alib/SL4AScript.java
deleted file mode 100644
index b5de9c45..00000000
--- a/src/com/hipipal/sl4alib/SL4AScript.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.hipipal.sl4alib;
-
-import com.hipipal.sl4alib.R;
-
-import android.content.Context;
-import android.content.res.Resources;
-
-public class SL4AScript {
-
-  public final static int ID = R.raw.pymain;
-
-  public static String sFileName;
-
-  public static String getFileName(Context context) {
-    if (sFileName == null) {
-      Resources resources = context.getResources();
-      String name = resources.getText(ID).toString();
-      sFileName = name.substring(name.lastIndexOf('/') + 1, name.length());
-    }
-    return sFileName;
-  }
-
-  public static String getFileExtension(Context context) {
-    if (sFileName == null) {
-      getFileName(context);
-    }
-    int dotIndex = sFileName.lastIndexOf('.');
-    if (dotIndex == -1) {
-      return null;
-    }
-    return sFileName.substring(dotIndex);
-  }
-
-}
diff --git a/src/com/hipipal/sl4alib/SL4AScriptActivity.java b/src/com/hipipal/sl4alib/SL4AScriptActivity.java
deleted file mode 100644
index 531885a5..00000000
--- a/src/com/hipipal/sl4alib/SL4AScriptActivity.java
+++ /dev/null
@@ -1,66 +0,0 @@
-
-package com.hipipal.sl4alib;
-
-import android.app.Activity;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.os.Bundle;
-import android.os.IBinder;
-import android.util.Log;
-
-import com.googlecode.android_scripting.Constants;
-import com.googlecode.android_scripting.facade.ActivityResultFacade;
-import com.googlecode.android_scripting.jsonrpc.RpcReceiverManager;
-import com.hipipal.sl4alib.R;
-
-/**
- * @author Alexey Reznichenko (alexey.reznichenko@gmail.com)
- */
-public class SL4AScriptActivity extends Activity {
-
-  @Override
-  protected void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-    if (Constants.ACTION_LAUNCH_SCRIPT_FOR_RESULT.equals(getIntent().getAction())) {
-      setTheme(android.R.style.Theme_Dialog);
-      setContentView(R.layout.dialog);
-      ServiceConnection connection = new ServiceConnection() {
-        @Override
-        public void onServiceConnected(ComponentName name, IBinder service) {
-        	Log.d("SL4AScriptApp", "onServiceConnected");
-          SL4AScriptService scriptService = ((SL4AScriptService.LocalBinder) service).getService();
-          try {
-            RpcReceiverManager manager = scriptService.getRpcReceiverManager();
-            ActivityResultFacade resultFacade = manager.getReceiver(ActivityResultFacade.class);
-            resultFacade.setActivity(SL4AScriptActivity.this);
-          } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-          }
-        }
-
-        @Override
-        public void onServiceDisconnected(ComponentName name) {
-          // Ignore.
-        }
-      };
-  	//Log.d("SL4AScriptApp", "bindService 1");
-
-      bindService(new Intent(this, SL4AScriptService.class), connection, Context.BIND_AUTO_CREATE);
-    	//Log.d("SL4AScriptApp", "bindService 2");
-
-      startService(new Intent(this, SL4AScriptService.class));
-    } else {
-    	//Log.d("SL4AScriptApp", "bindService 3");
-
-    	MNApp application = (MNApp) getApplication();
-      if (application.readyToStart()) {
-        startService(new Intent(this, SL4AScriptService.class));
-      }
-  	//Log.d("SL4AScriptApp", "bindService 4");
-
-      finish();
-    }
-  }
-}
diff --git a/src/com/hipipal/sl4alib/SL4AScriptService.java b/src/com/hipipal/sl4alib/SL4AScriptService.java
deleted file mode 100644
index f825afe1..00000000
--- a/src/com/hipipal/sl4alib/SL4AScriptService.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.hipipal.sl4alib;
-
-import android.app.Notification;
-
-import android.app.PendingIntent;
-import android.content.Intent;
-import android.content.res.Resources;
-import android.os.Binder;
-import android.os.IBinder;
-
-import com.googlecode.android_scripting.AndroidProxy;
-import com.googlecode.android_scripting.Constants;
-import com.googlecode.android_scripting.FeaturedInterpreters;
-import com.googlecode.android_scripting.FileUtils;
-import com.googlecode.android_scripting.ForegroundService;
-import com.googlecode.android_scripting.Log;
-import com.googlecode.android_scripting.NotificationIdFactory;
-import com.googlecode.android_scripting.ScriptLauncher;
-import com.googlecode.android_scripting.interpreter.Interpreter;
-import com.googlecode.android_scripting.interpreter.InterpreterConfiguration;
-import com.googlecode.android_scripting.interpreter.InterpreterUtils;
-import com.googlecode.android_scripting.interpreter.html.HtmlActivityTask;
-import com.googlecode.android_scripting.interpreter.html.HtmlInterpreter;
-import com.googlecode.android_scripting.jsonrpc.RpcReceiverManager;
-import com.hipipal.sl4alib.R;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.util.concurrent.CountDownLatch;
-
-/**
- * A service that allows scripts and the RPC server to run in the background.
- * 
- * @author Alexey Reznichenko (alexey.reznichenko@gmail.com)
- * @author Manuel Naranjo (manuel@aircable.net)
- */
-public class SL4AScriptService extends ForegroundService {
-	protected final static int NOTIFICATION_ID = NotificationIdFactory.create();
-	protected final CountDownLatch mLatch = new CountDownLatch(1);
-	protected final IBinder mBinder;
-
-	protected InterpreterConfiguration mInterpreterConfiguration;
-	protected RpcReceiverManager mFacadeManager;
-	protected AndroidProxy mProxy;
-    
-	public class LocalBinder extends Binder {
-		public SL4AScriptService getService() {
-			return SL4AScriptService.this;
-		}
-	}
-	
-	public SL4AScriptService() {
-		super(NOTIFICATION_ID);
-		mBinder = new LocalBinder();
-	}
-
-	@Override
-	public IBinder onBind(Intent intent) {
-		return mBinder;
-	}
-
-	@Override
-	public void onCreate() {
-		super.onCreate();
-		mInterpreterConfiguration = ((MNApp) getApplication()).getInterpreterConfiguration();
-	}
-
-	@SuppressWarnings("deprecation")
-	@Override
-	public void onStart(Intent intent, final int startId) {
-		super.onStart(intent, startId);
-		String fileName = SL4AScript.getFileName(this);
-		Interpreter interpreter = mInterpreterConfiguration
-				.getInterpreterForScript(fileName);
-		if (interpreter == null || !interpreter.isInstalled()) {
-			mLatch.countDown();
-			if (FeaturedInterpreters.isSupported(fileName)) {
-				Intent i = new Intent(this, SL4ADialogActivity.class);
-				i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-				i.putExtra(Constants.EXTRA_SCRIPT_PATH, fileName);
-				startActivity(i);
-			} else {
-				Log.e(this, "Cannot find an interpreter for script "
-								+ fileName);
-			}
-			stopSelf(startId);
-			return;
-		}
-
-		// Copies script to internal memory.
-		fileName = InterpreterUtils.getInterpreterRoot(this).getAbsolutePath()
-				+ "/" + fileName;
-		File script = new File(fileName);
-		// TODO(raaar): Check size here!
-		if (!script.exists()) {
-			script = FileUtils.copyFromStream(fileName, getResources()
-					.openRawResource(SL4AScript.ID));
-		}
-		copyResourcesToLocal(); // Copy all resources
-
-		if (SL4AScript.getFileExtension(this)
-				.equals(HtmlInterpreter.HTML_EXTENSION)) {
-			HtmlActivityTask htmlTask = ScriptLauncher.launchHtmlScript(script,
-					this, intent, mInterpreterConfiguration);
-			mFacadeManager = htmlTask.getRpcReceiverManager();
-			mLatch.countDown();
-			stopSelf(startId);
-		} else {
-			mProxy = new AndroidProxy(this, null, true);
-			mProxy.startLocal();
-			mLatch.countDown();
-			ScriptLauncher.launchScript(script, mInterpreterConfiguration,
-					mProxy, new Runnable() {
-						@Override
-						public void run() {
-							mProxy.shutdown();
-							stopSelf(startId);
-						}
-					});
-		}
-	}
-
-	RpcReceiverManager getRpcReceiverManager() throws InterruptedException {
-		mLatch.await();
-		if (mFacadeManager==null) { // Facade manage may not be available on startup.
-		mFacadeManager = mProxy.getRpcReceiverManagerFactory()
-		.getRpcReceiverManagers().get(0);
-		}
-		return mFacadeManager;
-	}
-	
-    @SuppressWarnings("deprecation")
-	@Override
-	protected Notification createNotification() {
-		Notification notification =
-	        new Notification(R.drawable.icon_notify, this.getString(R.string.loading), System.currentTimeMillis());
-	    // This contentIntent is a noop.
-	    PendingIntent contentIntent = PendingIntent.getService(this, 0, new Intent(), 0);
-	    notification.contentIntent = contentIntent;
-	    notification.setLatestEventInfo(this, this.getString(R.string.app_name), this.getString(R.string.loading), contentIntent);
-	    notification.flags = Notification.FLAG_AUTO_CANCEL;
-		return notification;
-	}
-
-    protected boolean needsToBeUpdated(String filename, InputStream content) {
-		File script = new File(filename);
-		FileInputStream fin;
-		Log.d("Checking if " + filename + " exists");
-
-		if (!script.exists()) {
-			Log.d("not found");
-			return true;
-		}
-
-		Log.d("Comparing file with content");
-		try {
-			fin = new FileInputStream(filename);
-			int c;
-			while ((c = fin.read()) != -1) {
-				if (c != content.read()) {
-					Log.d("Something changed replacing");
-					return true;
-				}
-			}
-		} catch (Exception e) {
-			Log.d("Something failed during comparing");
-			Log.e(e);
-			return true;
-		}
-		Log.d("No need to update " + filename);
-		return false;
-	}
-
-    protected void copyResourcesToLocal() {
-		String name, sFileName;
-		InputStream content;
-		R.raw a = new R.raw();
-		java.lang.reflect.Field[] t = R.raw.class.getFields();
-		Resources resources = getResources();
-		for (int i = 0; i < t.length; i++) {
-			try {
-				name = resources.getText(t[i].getInt(a)).toString();
-				sFileName = name.substring(name.lastIndexOf('/') + 1, name
-						.length());
-				content = getResources().openRawResource(t[i].getInt(a));
-
-				// Copies script to internal memory only if changes were made
-				sFileName = InterpreterUtils.getInterpreterRoot(this)
-						.getAbsolutePath()
-						+ "/" + sFileName;
-				if (needsToBeUpdated(sFileName, content)) {
-					Log.d("Copying from stream " + sFileName);
-					content.reset();
-					FileUtils.copyFromStream(sFileName, content);
-				}
-				FileUtils.chmod(new File(sFileName), 0755);
-			} catch (Exception e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-	}
-}
diff --git a/termemulator/build.gradle b/termemulator/build.gradle
new file mode 100644
index 00000000..e93699a1
--- /dev/null
+++ b/termemulator/build.gradle
@@ -0,0 +1,23 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion rootProject.ext.compileSdkVersion
+    buildToolsVersion rootProject.ext.buildToolsVersion
+    defaultConfig {
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
+        versionCode 1
+        versionName "1.0"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+        }
+    }
+
+    lintOptions {
+        abortOnError false
+    }
+}
diff --git a/termemulator/src/main/AndroidManifest.xml b/termemulator/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..00341e29
--- /dev/null
+++ b/termemulator/src/main/AndroidManifest.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="jackpal.androidterm.emulatorview"></manifest>
diff --git a/termemulator/src/main/java/jackpal/androidterm/emulatorview/BaseTextRenderer.java b/termemulator/src/main/java/jackpal/androidterm/emulatorview/BaseTextRenderer.java
new file mode 100644
index 00000000..1ac579ac
--- /dev/null
+++ b/termemulator/src/main/java/jackpal/androidterm/emulatorview/BaseTextRenderer.java
@@ -0,0 +1,448 @@
+/*
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package jackpal.androidterm.emulatorview;
+
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.ColorMatrix;
+import android.graphics.ColorMatrixColorFilter;
+import android.graphics.Matrix;
+import android.graphics.Paint;
+import android.graphics.Path;
+import android.graphics.RectF;
+
+abstract class BaseTextRenderer implements TextRenderer {
+    protected boolean mReverseVideo;
+
+    protected int[] mPalette;
+
+    protected static final int[] sXterm256Paint = {
+            // 16 original colors
+            // First 8 are dim
+            0xff000000,  // black
+            0xffcd0000,  // dim red
+            0xff00cd00,  // dim green
+            0xffcdcd00,  // dim yellow
+            0xff0000ee,  // dim blue
+            0xffcd00cd,  // dim magenta
+            0xff00cdcd,  // dim cyan
+            0xffe5e5e5,  // dim white
+            // second 8 are bright
+            0xff7f7f7f,  // medium grey
+            0xffff0000,  // bright red
+            0xff00ff00,  // bright green
+            0xffffff00,  // bright yellow
+            0xff5c5cff,  // light blue
+            0xffff00ff,  // bright magenta
+            0xff00ffff,  // bright cyan
+            0xffffffff,  // bright white
+
+            // 216 color cube, six shades of each color
+            0xff000000,
+            0xff00005f,
+            0xff000087,
+            0xff0000af,
+            0xff0000d7,
+            0xff0000ff,
+            0xff005f00,
+            0xff005f5f,
+            0xff005f87,
+            0xff005faf,
+            0xff005fd7,
+            0xff005fff,
+            0xff008700,
+            0xff00875f,
+            0xff008787,
+            0xff0087af,
+            0xff0087d7,
+            0xff0087ff,
+            0xff00af00,
+            0xff00af5f,
+            0xff00af87,
+            0xff00afaf,
+            0xff00afd7,
+            0xff00afff,
+            0xff00d700,
+            0xff00d75f,
+            0xff00d787,
+            0xff00d7af,
+            0xff00d7d7,
+            0xff00d7ff,
+            0xff00ff00,
+            0xff00ff5f,
+            0xff00ff87,
+            0xff00ffaf,
+            0xff00ffd7,
+            0xff00ffff,
+            0xff5f0000,
+            0xff5f005f,
+            0xff5f0087,
+            0xff5f00af,
+            0xff5f00d7,
+            0xff5f00ff,
+            0xff5f5f00,
+            0xff5f5f5f,
+            0xff5f5f87,
+            0xff5f5faf,
+            0xff5f5fd7,
+            0xff5f5fff,
+            0xff5f8700,
+            0xff5f875f,
+            0xff5f8787,
+            0xff5f87af,
+            0xff5f87d7,
+            0xff5f87ff,
+            0xff5faf00,
+            0xff5faf5f,
+            0xff5faf87,
+            0xff5fafaf,
+            0xff5fafd7,
+            0xff5fafff,
+            0xff5fd700,
+            0xff5fd75f,
+            0xff5fd787,
+            0xff5fd7af,
+            0xff5fd7d7,
+            0xff5fd7ff,
+            0xff5fff00,
+            0xff5fff5f,
+            0xff5fff87,
+            0xff5fffaf,
+            0xff5fffd7,
+            0xff5fffff,
+            0xff870000,
+            0xff87005f,
+            0xff870087,
+            0xff8700af,
+            0xff8700d7,
+            0xff8700ff,
+            0xff875f00,
+            0xff875f5f,
+            0xff875f87,
+            0xff875faf,
+            0xff875fd7,
+            0xff875fff,
+            0xff878700,
+            0xff87875f,
+            0xff878787,
+            0xff8787af,
+            0xff8787d7,
+            0xff8787ff,
+            0xff87af00,
+            0xff87af5f,
+            0xff87af87,
+            0xff87afaf,
+            0xff87afd7,
+            0xff87afff,
+            0xff87d700,
+            0xff87d75f,
+            0xff87d787,
+            0xff87d7af,
+            0xff87d7d7,
+            0xff87d7ff,
+            0xff87ff00,
+            0xff87ff5f,
+            0xff87ff87,
+            0xff87ffaf,
+            0xff87ffd7,
+            0xff87ffff,
+            0xffaf0000,
+            0xffaf005f,
+            0xffaf0087,
+            0xffaf00af,
+            0xffaf00d7,
+            0xffaf00ff,
+            0xffaf5f00,
+            0xffaf5f5f,
+            0xffaf5f87,
+            0xffaf5faf,
+            0xffaf5fd7,
+            0xffaf5fff,
+            0xffaf8700,
+            0xffaf875f,
+            0xffaf8787,
+            0xffaf87af,
+            0xffaf87d7,
+            0xffaf87ff,
+            0xffafaf00,
+            0xffafaf5f,
+            0xffafaf87,
+            0xffafafaf,
+            0xffafafd7,
+            0xffafafff,
+            0xffafd700,
+            0xffafd75f,
+            0xffafd787,
+            0xffafd7af,
+            0xffafd7d7,
+            0xffafd7ff,
+            0xffafff00,
+            0xffafff5f,
+            0xffafff87,
+            0xffafffaf,
+            0xffafffd7,
+            0xffafffff,
+            0xffd70000,
+            0xffd7005f,
+            0xffd70087,
+            0xffd700af,
+            0xffd700d7,
+            0xffd700ff,
+            0xffd75f00,
+            0xffd75f5f,
+            0xffd75f87,
+            0xffd75faf,
+            0xffd75fd7,
+            0xffd75fff,
+            0xffd78700,
+            0xffd7875f,
+            0xffd78787,
+            0xffd787af,
+            0xffd787d7,
+            0xffd787ff,
+            0xffd7af00,
+            0xffd7af5f,
+            0xffd7af87,
+            0xffd7afaf,
+            0xffd7afd7,
+            0xffd7afff,
+            0xffd7d700,
+            0xffd7d75f,
+            0xffd7d787,
+            0xffd7d7af,
+            0xffd7d7d7,
+            0xffd7d7ff,
+            0xffd7ff00,
+            0xffd7ff5f,
+            0xffd7ff87,
+            0xffd7ffaf,
+            0xffd7ffd7,
+            0xffd7ffff,
+            0xffff0000,
+            0xffff005f,
+            0xffff0087,
+            0xffff00af,
+            0xffff00d7,
+            0xffff00ff,
+            0xffff5f00,
+            0xffff5f5f,
+            0xffff5f87,
+            0xffff5faf,
+            0xffff5fd7,
+            0xffff5fff,
+            0xffff8700,
+            0xffff875f,
+            0xffff8787,
+            0xffff87af,
+            0xffff87d7,
+            0xffff87ff,
+            0xffffaf00,
+            0xffffaf5f,
+            0xffffaf87,
+            0xffffafaf,
+            0xffffafd7,
+            0xffffafff,
+            0xffffd700,
+            0xffffd75f,
+            0xffffd787,
+            0xffffd7af,
+            0xffffd7d7,
+            0xffffd7ff,
+            0xffffff00,
+            0xffffff5f,
+            0xffffff87,
+            0xffffffaf,
+            0xffffffd7,
+            0xffffffff,
+
+            // 24 grey scale ramp
+            0xff080808,
+            0xff121212,
+            0xff1c1c1c,
+            0xff262626,
+            0xff303030,
+            0xff3a3a3a,
+            0xff444444,
+            0xff4e4e4e,
+            0xff585858,
+            0xff626262,
+            0xff6c6c6c,
+            0xff767676,
+            0xff808080,
+            0xff8a8a8a,
+            0xff949494,
+            0xff9e9e9e,
+            0xffa8a8a8,
+            0xffb2b2b2,
+            0xffbcbcbc,
+            0xffc6c6c6,
+            0xffd0d0d0,
+            0xffdadada,
+            0xffe4e4e4,
+            0xffeeeeee
+    };
+
+    static final ColorScheme defaultColorScheme =
+            new ColorScheme(0xffcccccc, 0xff000000);
+
+    private final Paint mCursorScreenPaint;
+    private final Paint mCopyRedToAlphaPaint;
+    private final Paint mCursorPaint;
+    private final Paint mCursorStrokePaint;
+    private final Path mShiftCursor;
+    private final Path mAltCursor;
+    private final Path mCtrlCursor;
+    private final Path mFnCursor;
+    private RectF mTempSrc;
+    private RectF mTempDst;
+    private Matrix mScaleMatrix;
+    private float mLastCharWidth;
+    private float mLastCharHeight;
+    private static final Matrix.ScaleToFit mScaleType = Matrix.ScaleToFit.FILL;
+
+    private Bitmap mCursorBitmap;
+    private Bitmap mWorkBitmap;
+    private int mCursorBitmapCursorMode = -1;
+
+    public BaseTextRenderer(ColorScheme scheme) {
+        if (scheme == null) {
+            scheme = defaultColorScheme;
+        }
+        setDefaultColors(scheme);
+
+        mCursorScreenPaint = new Paint();
+        mCursorScreenPaint.setColor(scheme.getCursorBackColor());
+
+        // Cursor paint and cursor stroke paint are used to draw a grayscale mask that's converted
+        // to an alpha8 texture. Only the red channel's value matters.
+        mCursorPaint = new Paint();
+        mCursorPaint.setColor(0xff909090); // Opaque lightgray
+        mCursorPaint.setAntiAlias(true);
+
+        mCursorStrokePaint = new Paint(mCursorPaint);
+        mCursorStrokePaint.setStrokeWidth(0.1f);
+        mCursorStrokePaint.setStyle(Paint.Style.STROKE);
+
+        mCopyRedToAlphaPaint = new Paint();
+        ColorMatrix cm = new ColorMatrix();
+        cm.set(new float[]{
+                0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0,
+                1, 0, 0, 0, 0});
+        mCopyRedToAlphaPaint.setColorFilter(new ColorMatrixColorFilter(cm));
+
+        mShiftCursor = new Path();
+        mShiftCursor.lineTo(0.5f, 0.33f);
+        mShiftCursor.lineTo(1.0f, 0.0f);
+
+        mAltCursor = new Path();
+        mAltCursor.moveTo(0.0f, 1.0f);
+        mAltCursor.lineTo(0.5f, 0.66f);
+        mAltCursor.lineTo(1.0f, 1.0f);
+
+        mCtrlCursor = new Path();
+        mCtrlCursor.moveTo(0.0f, 0.25f);
+        mCtrlCursor.lineTo(1.0f, 0.5f);
+        mCtrlCursor.lineTo(0.0f, 0.75f);
+
+        mFnCursor = new Path();
+        mFnCursor.moveTo(1.0f, 0.25f);
+        mFnCursor.lineTo(0.0f, 0.5f);
+        mFnCursor.lineTo(1.0f, 0.75f);
+
+        // For creating the transform when the terminal resizes
+        mTempSrc = new RectF();
+        mTempSrc.set(0.0f, 0.0f, 1.0f, 1.0f);
+        mTempDst = new RectF();
+        mScaleMatrix = new Matrix();
+    }
+
+    public void setReverseVideo(boolean reverseVideo) {
+        mReverseVideo = reverseVideo;
+    }
+
+    private void setDefaultColors(ColorScheme scheme) {
+        mPalette = cloneDefaultColors();
+        mPalette[TextStyle.ciForeground] = scheme.getForeColor();
+        mPalette[TextStyle.ciBackground] = scheme.getBackColor();
+        mPalette[TextStyle.ciCursorForeground] = scheme.getCursorForeColor();
+        mPalette[TextStyle.ciCursorBackground] = scheme.getCursorBackColor();
+    }
+
+    private static int[] cloneDefaultColors() {
+        int length = sXterm256Paint.length;
+        int[] clone = new int[TextStyle.ciColorLength];
+        System.arraycopy(sXterm256Paint, 0, clone, 0, length);
+        return clone;
+    }
+
+    protected void drawCursorImp(Canvas canvas, float x, float y, float charWidth, float charHeight,
+                                 int cursorMode) {
+        if (cursorMode == 0) {
+            canvas.drawRect(x, y - charHeight, x + charWidth, y, mCursorScreenPaint);
+            return;
+        }
+
+        // Fancy cursor. Draw an offscreen cursor shape, then blit it on screen.
+
+        // Has the character size changed?
+
+        if (charWidth != mLastCharWidth || charHeight != mLastCharHeight) {
+            mLastCharWidth = charWidth;
+            mLastCharHeight = charHeight;
+            mTempDst.set(0.0f, 0.0f, charWidth, charHeight);
+            mScaleMatrix.setRectToRect(mTempSrc, mTempDst, mScaleType);
+            mCursorBitmap = Bitmap.createBitmap((int) charWidth, (int) charHeight,
+                    Bitmap.Config.ALPHA_8);
+            mWorkBitmap = Bitmap.createBitmap((int) charWidth, (int) charHeight,
+                    Bitmap.Config.ARGB_8888);
+            mCursorBitmapCursorMode = -1;
+        }
+
+        // Has the cursor mode changed ?
+
+        if (cursorMode != mCursorBitmapCursorMode) {
+            mCursorBitmapCursorMode = cursorMode;
+            mWorkBitmap.eraseColor(0xffffffff);
+            Canvas workCanvas = new Canvas(mWorkBitmap);
+            workCanvas.concat(mScaleMatrix);
+            drawCursorHelper(workCanvas, mShiftCursor, cursorMode, MODE_SHIFT_SHIFT);
+            drawCursorHelper(workCanvas, mAltCursor, cursorMode, MODE_ALT_SHIFT);
+            drawCursorHelper(workCanvas, mCtrlCursor, cursorMode, MODE_CTRL_SHIFT);
+            drawCursorHelper(workCanvas, mFnCursor, cursorMode, MODE_FN_SHIFT);
+
+            mCursorBitmap.eraseColor(0);
+            Canvas bitmapCanvas = new Canvas(mCursorBitmap);
+            bitmapCanvas.drawBitmap(mWorkBitmap, 0, 0, mCopyRedToAlphaPaint);
+        }
+
+        canvas.drawBitmap(mCursorBitmap, x, y - charHeight, mCursorScreenPaint);
+    }
+
+    private void drawCursorHelper(Canvas canvas, Path path, int mode, int shift) {
+        switch ((mode >> shift) & MODE_MASK) {
+            case MODE_ON:
+                canvas.drawPath(path, mCursorStrokePaint);
+                break;
+            case MODE_LOCKED:
+                canvas.drawPath(path, mCursorPaint);
+                break;
+        }
+    }
+}
+
diff --git a/termemulator/src/main/java/jackpal/androidterm/emulatorview/Bitmap4x8FontRenderer.java b/termemulator/src/main/java/jackpal/androidterm/emulatorview/Bitmap4x8FontRenderer.java
new file mode 100644
index 00000000..8cf691c0
--- /dev/null
+++ b/termemulator/src/main/java/jackpal/androidterm/emulatorview/Bitmap4x8FontRenderer.java
@@ -0,0 +1,158 @@
+/*
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package jackpal.androidterm.emulatorview;
+
+import jackpal.androidterm.emulatorview.compat.AndroidCompat;
+
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.ColorMatrixColorFilter;
+import android.graphics.Paint;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffXfermode;
+import android.graphics.Rect;
+
+
+class Bitmap4x8FontRenderer extends BaseTextRenderer {
+    private final static int kCharacterWidth = 4;
+    private final static int kCharacterHeight = 8;
+    private Bitmap mFont;
+    private int mCurrentForeColor;
+    private int mCurrentBackColor;
+    private float[] mColorMatrix;
+    private Paint mPaint;
+    private static final float BYTE_SCALE = 1.0f / 255.0f;
+
+    public Bitmap4x8FontRenderer(Resources resources, ColorScheme scheme) {
+        super(scheme);
+        int fontResource = AndroidCompat.SDK <= 3 ? R.drawable.atari_small
+                : R.drawable.atari_small_nodpi;
+        mFont = BitmapFactory.decodeResource(resources, fontResource);
+        mPaint = new Paint();
+        mPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_IN));
+    }
+
+    public float getCharacterWidth() {
+        return kCharacterWidth;
+    }
+
+    public int getCharacterHeight() {
+        return kCharacterHeight;
+    }
+
+    public int getTopMargin() {
+        return 0;
+    }
+
+    public void drawTextRun(Canvas canvas, float x, float y,
+                            int lineOffset, int runWidth, char[] text, int index, int count,
+                            boolean selectionStyle, int textStyle,
+                            int cursorOffset, int cursorIndex, int cursorIncr, int cursorWidth, int cursorMode) {
+        int foreColor = TextStyle.decodeForeColor(textStyle);
+        int backColor = TextStyle.decodeBackColor(textStyle);
+        int effect = TextStyle.decodeEffect(textStyle);
+
+        boolean inverse = mReverseVideo ^
+                ((effect & (TextStyle.fxInverse | TextStyle.fxItalic)) != 0);
+        if (inverse) {
+            int temp = foreColor;
+            foreColor = backColor;
+            backColor = temp;
+        }
+
+        boolean bold = ((effect & TextStyle.fxBold) != 0);
+        if (bold && foreColor < 8) {
+            // In 16-color mode, bold also implies bright foreground colors
+            foreColor += 8;
+        }
+        boolean blink = ((effect & TextStyle.fxBlink) != 0);
+        if (blink && backColor < 8) {
+            // In 16-color mode, blink also implies bright background colors
+            backColor += 8;
+        }
+
+        if (selectionStyle) {
+            backColor = TextStyle.ciCursorBackground;
+        }
+
+        boolean invisible = (effect & TextStyle.fxInvisible) != 0;
+
+        if (invisible) {
+            foreColor = backColor;
+        }
+
+        drawTextRunHelper(canvas, x, y, lineOffset, text, index, count, foreColor, backColor);
+
+        // The cursor is too small to show the cursor mode.
+        if (lineOffset <= cursorOffset && cursorOffset < (lineOffset + count)) {
+            drawTextRunHelper(canvas, x, y, cursorOffset, text, cursorOffset - lineOffset, 1,
+                    TextStyle.ciCursorForeground, TextStyle.ciCursorBackground);
+        }
+    }
+
+    private void drawTextRunHelper(Canvas canvas, float x, float y, int lineOffset, char[] text,
+                                   int index, int count, int foreColor, int backColor) {
+        setColorMatrix(mPalette[foreColor], mPalette[backColor]);
+        int destX = (int) x + kCharacterWidth * lineOffset;
+        int destY = (int) y;
+        Rect srcRect = new Rect();
+        Rect destRect = new Rect();
+        destRect.top = (destY - kCharacterHeight);
+        destRect.bottom = destY;
+        boolean drawSpaces = mPalette[backColor] != mPalette[TextStyle.ciBackground];
+        for (int i = 0; i < count; i++) {
+            // XXX No Unicode support in bitmap font
+            char c = text[i + index];
+            if ((c < 128) && ((c != 32) || drawSpaces)) {
+                int cellX = c & 31;
+                int cellY = (c >> 5) & 3;
+                int srcX = cellX * kCharacterWidth;
+                int srcY = cellY * kCharacterHeight;
+                srcRect.set(srcX, srcY,
+                        srcX + kCharacterWidth, srcY + kCharacterHeight);
+                destRect.left = destX;
+                destRect.right = destX + kCharacterWidth;
+                canvas.drawBitmap(mFont, srcRect, destRect, mPaint);
+            }
+            destX += kCharacterWidth;
+        }
+    }
+
+    private void setColorMatrix(int foreColor, int backColor) {
+        if ((foreColor != mCurrentForeColor)
+                || (backColor != mCurrentBackColor)
+                || (mColorMatrix == null)) {
+            mCurrentForeColor = foreColor;
+            mCurrentBackColor = backColor;
+            if (mColorMatrix == null) {
+                mColorMatrix = new float[20];
+                mColorMatrix[18] = 1.0f; // Just copy Alpha
+            }
+            for (int component = 0; component < 3; component++) {
+                int rightShift = (2 - component) << 3;
+                int fore = 0xff & (foreColor >> rightShift);
+                int back = 0xff & (backColor >> rightShift);
+                int delta = back - fore;
+                mColorMatrix[component * 6] = delta * BYTE_SCALE;
+                mColorMatrix[component * 5 + 4] = fore;
+            }
+            mPaint.setColorFilter(new ColorMatrixColorFilter(mColorMatrix));
+        }
+    }
+}
diff --git a/termemulator/src/main/java/jackpal/androidterm/emulatorview/ByteQueue.java b/termemulator/src/main/java/jackpal/androidterm/emulatorview/ByteQueue.java
new file mode 100644
index 00000000..8f6a1fde
--- /dev/null
+++ b/termemulator/src/main/java/jackpal/androidterm/emulatorview/ByteQueue.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package jackpal.androidterm.emulatorview;
+
+/**
+ * A multi-thread-safe produce-consumer byte array.
+ * Only allows one producer and one consumer.
+ */
+
+class ByteQueue {
+    ByteQueue(int size) {
+        mBuffer = new byte[size];
+    }
+
+    int getBytesAvailable() {
+        synchronized (this) {
+            return mStoredBytes;
+        }
+    }
+
+    public int read(byte[] buffer, int offset, int length)
+            throws InterruptedException {
+        if (length + offset > buffer.length) {
+            throw
+                    new IllegalArgumentException("length + offset > buffer.length");
+        }
+        if (length < 0) {
+            throw
+                    new IllegalArgumentException("length < 0");
+
+        }
+        if (length == 0) {
+            return 0;
+        }
+        synchronized (this) {
+            while (mStoredBytes == 0) {
+                wait();
+            }
+            int totalRead = 0;
+            int bufferLength = mBuffer.length;
+            boolean wasFull = bufferLength == mStoredBytes;
+            while (length > 0 && mStoredBytes > 0) {
+                int oneRun = Math.min(bufferLength - mHead, mStoredBytes);
+                int bytesToCopy = Math.min(length, oneRun);
+                System.arraycopy(mBuffer, mHead, buffer, offset, bytesToCopy);
+                mHead += bytesToCopy;
+                if (mHead >= bufferLength) {
+                    mHead = 0;
+                }
+                mStoredBytes -= bytesToCopy;
+                length -= bytesToCopy;
+                offset += bytesToCopy;
+                totalRead += bytesToCopy;
+            }
+            if (wasFull) {
+                notify();
+            }
+            return totalRead;
+        }
+    }
+
+    /**
+     * Attempt to write the specified portion of the provided buffer to
+     * the queue.  Returns the number of bytes actually written to the queue;
+     * it is the caller's responsibility to check whether all of the data
+     * was written and repeat the call to write() if necessary.
+     */
+    public int write(byte[] buffer, int offset, int length)
+            throws InterruptedException {
+        if (length + offset > buffer.length) {
+            throw
+                    new IllegalArgumentException("length + offset > buffer.length");
+        }
+        if (length < 0) {
+            throw
+                    new IllegalArgumentException("length < 0");
+
+        }
+        if (length == 0) {
+            return 0;
+        }
+        synchronized (this) {
+            int bufferLength = mBuffer.length;
+            boolean wasEmpty = mStoredBytes == 0;
+            while (bufferLength == mStoredBytes) {
+                wait();
+            }
+            int tail = mHead + mStoredBytes;
+            int oneRun;
+            if (tail >= bufferLength) {
+                tail = tail - bufferLength;
+                oneRun = mHead - tail;
+            } else {
+                oneRun = bufferLength - tail;
+            }
+            int bytesToCopy = Math.min(oneRun, length);
+            System.arraycopy(buffer, offset, mBuffer, tail, bytesToCopy);
+            offset += bytesToCopy;
+            mStoredBytes += bytesToCopy;
+            if (wasEmpty) {
+                notify();
+            }
+            return bytesToCopy;
+        }
+    }
+
+    private byte[] mBuffer;
+    private int mHead;
+    private int mStoredBytes;
+}
diff --git a/termemulator/src/main/java/jackpal/androidterm/emulatorview/ColorScheme.java b/termemulator/src/main/java/jackpal/androidterm/emulatorview/ColorScheme.java
new file mode 100644
index 00000000..b7a8f6f7
--- /dev/null
+++ b/termemulator/src/main/java/jackpal/androidterm/emulatorview/ColorScheme.java
@@ -0,0 +1,145 @@
+/*
+ * Copyright (C) 2012 Steven Luo
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package jackpal.androidterm.emulatorview;
+
+/**
+ * A class describing a color scheme for an {@link EmulatorView}.
+ * <p>
+ * <code>EmulatorView</code> supports changing its default foreground,
+ * background, and cursor colors.  Passing a <code>ColorScheme</code> to
+ * {@link EmulatorView#setColorScheme setColorScheme} will cause the
+ * <code>EmulatorView</code> to use the specified colors as its defaults.
+ * <p>
+ * Cursor colors can be omitted when specifying a color scheme; if no cursor
+ * colors are specified, <code>ColorScheme</code> will automatically select
+ * suitable cursor colors for you.
+ *
+ * @see EmulatorView#setColorScheme
+ */
+
+public class ColorScheme {
+    private int foreColor;
+    private int backColor;
+    private int cursorForeColor;
+    private int cursorBackColor;
+    final private static int sDefaultCursorBackColor = 0xff808080;
+
+    private void setDefaultCursorColors() {
+        cursorBackColor = sDefaultCursorBackColor;
+        // Use the foreColor unless the foreColor is too similar to the cursorBackColor
+        int foreDistance = distance(foreColor, cursorBackColor);
+        int backDistance = distance(backColor, cursorBackColor);
+        if (foreDistance * 2 >= backDistance) {
+            cursorForeColor = foreColor;
+        } else {
+            cursorForeColor = backColor;
+        }
+    }
+
+    private static int distance(int a, int b) {
+        return channelDistance(a, b, 0) * 3 + channelDistance(a, b, 1) * 5
+                + channelDistance(a, b, 2);
+    }
+
+    private static int channelDistance(int a, int b, int channel) {
+        return Math.abs(getChannel(a, channel) - getChannel(b, channel));
+    }
+
+    private static int getChannel(int color, int channel) {
+        return 0xff & (color >> ((2 - channel) * 8));
+    }
+
+    /**
+     * Creates a <code>ColorScheme</code> object.
+     *
+     * @param foreColor The foreground color as an ARGB hex value.
+     * @param backColor The background color as an ARGB hex value.
+     */
+    public ColorScheme(int foreColor, int backColor) {
+        this.foreColor = foreColor;
+        this.backColor = backColor;
+        setDefaultCursorColors();
+    }
+
+    /**
+     * Creates a <code>ColorScheme</code> object.
+     *
+     * @param foreColor       The foreground color as an ARGB hex value.
+     * @param backColor       The background color as an ARGB hex value.
+     * @param cursorForeColor The cursor foreground color as an ARGB hex value.
+     * @param cursorBackColor The cursor foreground color as an ARGB hex value.
+     */
+    public ColorScheme(int foreColor, int backColor, int cursorForeColor, int cursorBackColor) {
+        this.foreColor = foreColor;
+        this.backColor = backColor;
+        this.cursorForeColor = cursorForeColor;
+        this.cursorBackColor = cursorBackColor;
+    }
+
+    /**
+     * Creates a <code>ColorScheme</code> object from an array.
+     *
+     * @param scheme An integer array <code>{ foreColor, backColor,
+     *               optionalCursorForeColor, optionalCursorBackColor }</code>.
+     */
+    public ColorScheme(int[] scheme) {
+        int schemeLength = scheme.length;
+        if (schemeLength != 2 && schemeLength != 4) {
+            throw new IllegalArgumentException();
+        }
+        this.foreColor = scheme[0];
+        this.backColor = scheme[1];
+        if (schemeLength == 2) {
+            setDefaultCursorColors();
+        } else {
+            this.cursorForeColor = scheme[2];
+            this.cursorBackColor = scheme[3];
+        }
+    }
+
+    /**
+     * @return This <code>ColorScheme</code>'s foreground color as an ARGB
+     * hex value.
+     */
+    public int getForeColor() {
+        return foreColor;
+    }
+
+    /**
+     * @return This <code>ColorScheme</code>'s background color as an ARGB
+     * hex value.
+     */
+    public int getBackColor() {
+        return backColor;
+    }
+
+    /**
+     * @return This <code>ColorScheme</code>'s cursor foreground color as an ARGB
+     * hex value.
+     */
+    public int getCursorForeColor() {
+        return cursorForeColor;
+    }
+
+    /**
+     * @return This <code>ColorScheme</code>'s cursor background color as an ARGB
+     * hex value.
+     */
+    public int getCursorBackColor() {
+        return cursorBackColor;
+    }
+}
diff --git a/termemulator/src/main/java/jackpal/androidterm/emulatorview/EmulatorDebug.java b/termemulator/src/main/java/jackpal/androidterm/emulatorview/EmulatorDebug.java
new file mode 100644
index 00000000..1bd2fa9a
--- /dev/null
+++ b/termemulator/src/main/java/jackpal/androidterm/emulatorview/EmulatorDebug.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package jackpal.androidterm.emulatorview;
+
+/**
+ * Debug settings.
+ */
+
+class EmulatorDebug {
+    /**
+     * Set to true to add debugging code and logging.
+     */
+    public static final boolean DEBUG = true;
+
+    /**
+     * Set to true to log IME calls.
+     */
+    public static final boolean LOG_IME = DEBUG & false;
+
+    /**
+     * Set to true to log each character received from the remote process to the
+     * android log, which makes it easier to debug some kinds of problems with
+     * emulating escape sequences and control codes.
+     */
+    public static final boolean LOG_CHARACTERS_FLAG = DEBUG;
+
+    /**
+     * Set to true to log unknown escape sequences.
+     */
+    public static final boolean LOG_UNKNOWN_ESCAPE_SEQUENCES = DEBUG & false;
+
+    /**
+     * The tag we use when logging, so that our messages can be distinguished
+     * from other messages in the log. Public because it's used by several
+     * classes.
+     */
+    public static final String LOG_TAG = "EmulatorView";
+
+    public static String bytesToString(byte[] data, int base, int length) {
+        StringBuilder buf = new StringBuilder();
+        for (int i = 0; i < length; i++) {
+            byte b = data[base + i];
+            if (b < 32 || b > 126) {
+                buf.append(String.format("\\x%02x", b));
+            } else {
+                buf.append((char) b);
+            }
+        }
+        return buf.toString();
+    }
+}
diff --git a/termemulator/src/main/java/jackpal/androidterm/emulatorview/EmulatorView.java b/termemulator/src/main/java/jackpal/androidterm/emulatorview/EmulatorView.java
new file mode 100644
index 00000000..6b2fb8bf
--- /dev/null
+++ b/termemulator/src/main/java/jackpal/androidterm/emulatorview/EmulatorView.java
@@ -0,0 +1,1790 @@
+/*
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package jackpal.androidterm.emulatorview;
+
+import jackpal.androidterm.emulatorview.compat.ClipboardManagerCompat;
+import jackpal.androidterm.emulatorview.compat.ClipboardManagerCompatFactory;
+import jackpal.androidterm.emulatorview.compat.KeycodeConstants;
+import jackpal.androidterm.emulatorview.compat.Patterns;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Hashtable;
+import java.util.LinkedList;
+import java.util.List;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Handler;
+import android.text.Editable;
+import android.text.SpannableStringBuilder;
+import android.text.TextUtils;
+import android.text.style.URLSpan;
+import android.text.util.Linkify;
+import android.text.util.Linkify.MatchFilter;
+import android.util.AttributeSet;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.view.GestureDetector;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.inputmethod.BaseInputConnection;
+import android.view.inputmethod.CompletionInfo;
+import android.view.inputmethod.CorrectionInfo;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.ExtractedText;
+import android.view.inputmethod.ExtractedTextRequest;
+import android.view.inputmethod.InputConnection;
+import android.widget.Scroller;
+
+import static android.view.inputmethod.EditorInfo.IME_ACTION_DONE;
+import static android.view.inputmethod.EditorInfo.IME_ACTION_NEXT;
+import static android.view.inputmethod.EditorInfo.IME_ACTION_NONE;
+import static android.view.inputmethod.EditorInfo.IME_ACTION_UNSPECIFIED;
+import static android.view.inputmethod.EditorInfo.IME_MASK_ACTION;
+
+/**
+ * A view on a {@link TermSession}.  Displays the terminal emulator's screen,
+ * provides access to its scrollback buffer, and passes input through to the
+ * terminal emulator.
+ * <p>
+ * If this view is inflated from an XML layout, you need to call {@link
+ * #attachSession attachSession} and {@link #setDensity setDensity} before using
+ * the view.  If creating this view from code, use the {@link
+ * #EmulatorView(Context, TermSession, DisplayMetrics)} constructor, which will
+ * take care of this for you.
+ */
+public class EmulatorView extends View implements GestureDetector.OnGestureListener {
+    private final static String TAG = "EmulatorView";
+    private final static boolean LOG_KEY_EVENTS = false;
+    private final static boolean LOG_IME = false;
+
+    /**
+     * We defer some initialization until we have been layed out in the view
+     * hierarchy. The boolean tracks when we know what our size is.
+     */
+    private boolean mKnownSize;
+
+    // Set if initialization was deferred because a TermSession wasn't attached
+    private boolean mDeferInit = false;
+
+    private int mVisibleWidth;
+    private int mVisibleHeight;
+
+    private TermSession mTermSession;
+
+    /**
+     * Total width of each character, in pixels
+     */
+    private float mCharacterWidth;
+
+    /**
+     * Total height of each character, in pixels
+     */
+    private int mCharacterHeight;
+
+    /**
+     * Top-of-screen margin
+     */
+    private int mTopOfScreenMargin;
+
+    /**
+     * Used to render text
+     */
+    private TextRenderer mTextRenderer;
+
+    /**
+     * Text size. Zero means 4 x 8 font.
+     */
+    private int mTextSize = 10;
+
+    private int mCursorBlink;
+
+    /**
+     * Color scheme (default foreground/background colors).
+     */
+    private ColorScheme mColorScheme = BaseTextRenderer.defaultColorScheme;
+
+    private Paint mForegroundPaint;
+
+    private Paint mBackgroundPaint;
+
+    private boolean mUseCookedIme;
+
+    /**
+     * Our terminal emulator.
+     */
+    private TerminalEmulator mEmulator;
+    private HistoryCmdUtils mHistory;
+    private StringBuffer mStringBuffer = new StringBuffer();
+
+    public TerminalEmulator getEmulator() {
+        return mEmulator;
+    }
+
+    /**
+     * The number of rows of text to display.
+     */
+    private int mRows;
+
+    /**
+     * The number of columns of text to display.
+     */
+    private int mColumns;
+
+    /**
+     * The number of columns that are visible on the display.
+     */
+
+    private int mVisibleColumns;
+
+    /*
+     * The number of rows that are visible on the view
+     */
+    private int mVisibleRows;
+
+    /**
+     * The top row of text to display. Ranges from -activeTranscriptRows to 0
+     */
+    private int mTopRow;
+
+    private int mLeftColumn;
+
+    private static final int CURSOR_BLINK_PERIOD = 1000;
+
+    private boolean mCursorVisible = true;
+
+    private boolean mIsSelectingText = false;
+
+    private boolean mBackKeySendsCharacter = false;
+    private int mControlKeyCode;
+    private int mFnKeyCode;
+    private boolean mIsControlKeySent = false;
+    private boolean mIsFnKeySent = false;
+    private boolean mIsTabKeySent = false;
+
+    private boolean mMouseTracking;
+
+    private float mDensity;
+
+    private float mScaledDensity;
+    private static final int SELECT_TEXT_OFFSET_Y = -40;
+    private int mSelXAnchor = -1;
+    private int mSelYAnchor = -1;
+    private int mSelX1 = -1;
+    private int mSelY1 = -1;
+    private int mSelX2 = -1;
+    private int mSelY2 = -1;
+
+    /**
+     * Routing alt and meta keyCodes away from the IME allows Alt key processing to work on
+     * the Asus Transformer TF101.
+     * It doesn't seem to harm anything else, but it also doesn't seem to be
+     * required on other platforms.
+     * <p>
+     * This test should be refined as we learn more.
+     */
+    private final static boolean sTrapAltAndMeta = Build.MODEL.contains("Transformer TF101");
+
+    private Runnable mBlinkCursor = new Runnable() {
+        public void run() {
+            if (mCursorBlink != 0) {
+                mCursorVisible = !mCursorVisible;
+                mHandler.postDelayed(this, CURSOR_BLINK_PERIOD);
+            } else {
+                mCursorVisible = true;
+            }
+            // Perhaps just invalidate the character with the cursor.
+            invalidate();
+        }
+    };
+
+    private GestureDetector mGestureDetector;
+    private GestureDetector.OnGestureListener mExtGestureListener;
+    private Scroller mScroller;
+    private Runnable mFlingRunner = new Runnable() {
+        public void run() {
+            if (mScroller.isFinished()) {
+                return;
+            }
+            // Check whether mouse tracking was turned on during fling.
+            if (isMouseTrackingActive()) {
+                return;
+            }
+
+            boolean more = mScroller.computeScrollOffset();
+            int newTopRow = mScroller.getCurrY();
+            if (newTopRow != mTopRow) {
+                mTopRow = newTopRow;
+                invalidate();
+            }
+
+            if (more) {
+                post(this);
+            }
+
+        }
+    };
+
+    /**
+     * A hash table of underlying URLs to implement clickable links.
+     */
+    private Hashtable<Integer, URLSpan[]> mLinkLayer = new Hashtable<Integer, URLSpan[]>();
+
+    /**
+     * Accept links that start with http[s]:
+     */
+    private static class HttpMatchFilter implements MatchFilter {
+        public boolean acceptMatch(CharSequence s, int start, int end) {
+            return startsWith(s, start, end, "http:") ||
+                    startsWith(s, start, end, "https:");
+        }
+
+        private boolean startsWith(CharSequence s, int start, int end,
+                                   String prefix) {
+            int prefixLen = prefix.length();
+            int fragmentLen = end - start;
+            if (prefixLen > fragmentLen) {
+                return false;
+            }
+            for (int i = 0; i < prefixLen; i++) {
+                if (s.charAt(start + i) != prefix.charAt(i)) {
+                    return false;
+                }
+            }
+            return true;
+        }
+    }
+
+    private static MatchFilter sHttpMatchFilter = new HttpMatchFilter();
+
+    /**
+     * Convert any URLs in the current row into a URLSpan,
+     * and store that result in a hash table of URLSpan entries.
+     *
+     * @param row The number of the row to check for links
+     * @return The number of lines in a multi-line-wrap set of links
+     */
+    private int createLinks(int row) {
+        TranscriptScreen transcriptScreen = mEmulator.getScreen();
+        char[] line = transcriptScreen.getScriptLine(row);
+        int lineCount = 1;
+
+        //Nothing to do if there's no text.
+        if (line == null)
+            return lineCount;
+
+        /* If this is not a basic line, the array returned from getScriptLine()
+         * could have arbitrary garbage at the end -- find the point at which
+         * the line ends and only include that in the text to linkify.
+         *
+         * XXX: The fact that the array returned from getScriptLine() on a
+         * basic line contains no garbage is an implementation detail -- the
+         * documented behavior explicitly allows garbage at the end! */
+        int lineLen;
+        boolean textIsBasic = transcriptScreen.isBasicLine(row);
+        if (textIsBasic) {
+            lineLen = line.length;
+        } else {
+            // The end of the valid data is marked by a NUL character
+            for (lineLen = 0; line[lineLen] != 0; ++lineLen) ;
+        }
+
+        SpannableStringBuilder textToLinkify = new SpannableStringBuilder(new String(line, 0, lineLen));
+
+        boolean lineWrap = transcriptScreen.getScriptLineWrap(row);
+
+        //While the current line has a wrap
+        while (lineWrap) {
+            //Get next line
+            int nextRow = row + lineCount;
+            line = transcriptScreen.getScriptLine(nextRow);
+
+            //If next line is blank, don't try and append
+            if (line == null)
+                break;
+
+            boolean lineIsBasic = transcriptScreen.isBasicLine(nextRow);
+            if (textIsBasic && !lineIsBasic) {
+                textIsBasic = lineIsBasic;
+            }
+            if (lineIsBasic) {
+                lineLen = line.length;
+            } else {
+                // The end of the valid data is marked by a NUL character
+                for (lineLen = 0; line[lineLen] != 0; ++lineLen) ;
+            }
+
+            textToLinkify.append(new String(line, 0, lineLen));
+
+            //Check if line after next is wrapped
+            lineWrap = transcriptScreen.getScriptLineWrap(nextRow);
+            ++lineCount;
+        }
+
+        Linkify.addLinks(textToLinkify, Patterns.WEB_URL,
+                null, sHttpMatchFilter, null);
+        URLSpan[] urls = textToLinkify.getSpans(0, textToLinkify.length(), URLSpan.class);
+        if (urls.length > 0) {
+            int columns = mColumns;
+
+            //re-index row to 0 if it is negative
+            int screenRow = row - mTopRow;
+
+            //Create and initialize set of links
+            URLSpan[][] linkRows = new URLSpan[lineCount][];
+            for (int i = 0; i < lineCount; ++i) {
+                linkRows[i] = new URLSpan[columns];
+                Arrays.fill(linkRows[i], null);
+            }
+
+            //For each URL:
+            for (int urlNum = 0; urlNum < urls.length; ++urlNum) {
+                URLSpan url = urls[urlNum];
+                int spanStart = textToLinkify.getSpanStart(url);
+                int spanEnd = textToLinkify.getSpanEnd(url);
+
+                // Build accurate indices for links
+                int startRow;
+                int startCol;
+                int endRow;
+                int endCol;
+                if (textIsBasic) {
+                    /* endRow/endCol must be the last character of the link,
+                     * not one after -- otherwise endRow might be too large */
+                    int spanLastPos = spanEnd - 1;
+                    // Basic line -- can assume one char per column
+                    startRow = spanStart / mColumns;
+                    startCol = spanStart % mColumns;
+                    endRow = spanLastPos / mColumns;
+                    endCol = spanLastPos % mColumns;
+                } else {
+                    /* Iterate over the line to get starting and ending columns
+                     * for this span */
+                    startRow = 0;
+                    startCol = 0;
+                    for (int i = 0; i < spanStart; ++i) {
+                        char c = textToLinkify.charAt(i);
+                        if (Character.isHighSurrogate(c)) {
+                            ++i;
+                            startCol += UnicodeTranscript.charWidth(c, textToLinkify.charAt(i));
+                        } else {
+                            startCol += UnicodeTranscript.charWidth(c);
+                        }
+                        if (startCol >= columns) {
+                            ++startRow;
+                            startCol %= columns;
+                        }
+                    }
+
+                    endRow = startRow;
+                    endCol = startCol;
+                    for (int i = spanStart; i < spanEnd; ++i) {
+                        char c = textToLinkify.charAt(i);
+                        if (Character.isHighSurrogate(c)) {
+                            ++i;
+                            endCol += UnicodeTranscript.charWidth(c, textToLinkify.charAt(i));
+                        } else {
+                            endCol += UnicodeTranscript.charWidth(c);
+                        }
+                        if (endCol >= columns) {
+                            ++endRow;
+                            endCol %= columns;
+                        }
+                    }
+                }
+
+                //Fill linkRows with the URL where appropriate
+                for (int i = startRow; i <= endRow; ++i) {
+                    int runStart = (i == startRow) ? startCol : 0;
+                    int runEnd = (i == endRow) ? endCol : mColumns - 1;
+
+                    Arrays.fill(linkRows[i], runStart, runEnd + 1, url);
+                }
+            }
+
+            //Add links into the link layer for later retrieval
+            for (int i = 0; i < lineCount; ++i)
+                mLinkLayer.put(screenRow + i, linkRows[i]);
+        }
+        return lineCount;
+    }
+
+    /**
+     * Sends mouse wheel codes to terminal in response to fling.
+     */
+    private class MouseTrackingFlingRunner implements Runnable {
+        private Scroller mScroller;
+        private int mLastY;
+        private MotionEvent mMotionEvent;
+
+        public void fling(MotionEvent e, float velocityX, float velocityY) {
+            float SCALE = 0.15f;
+            mScroller.fling(0, 0,
+                    -(int) (velocityX * SCALE), -(int) (velocityY * SCALE),
+                    0, 0, -100, 100);
+            mLastY = 0;
+            mMotionEvent = e;
+            post(this);
+        }
+
+        public void run() {
+            if (mScroller.isFinished()) {
+                return;
+            }
+            // Check whether mouse tracking was turned off during fling.
+            if (!isMouseTrackingActive()) {
+                return;
+            }
+
+            boolean more = mScroller.computeScrollOffset();
+            int newY = mScroller.getCurrY();
+            for (; mLastY < newY; mLastY++) {
+                sendMouseEventCode(mMotionEvent, 65);
+            }
+            for (; mLastY > newY; mLastY--) {
+                sendMouseEventCode(mMotionEvent, 64);
+            }
+
+            if (more) {
+                post(this);
+            }
+        }
+    }
+
+    ;
+    private MouseTrackingFlingRunner mMouseTrackingFlingRunner = new MouseTrackingFlingRunner();
+
+    private float mScrollRemainder;
+    private TermKeyListener mKeyListener;
+
+    private String mImeBuffer = "";
+
+    /**
+     * Our message handler class. Implements a periodic callback.
+     */
+    private final Handler mHandler = new Handler();
+
+    /**
+     * Called by the TermSession when the contents of the view need updating
+     */
+    private UpdateCallback mUpdateNotify = new UpdateCallback() {
+        public void onUpdate() {
+            if (mIsSelectingText) {
+                int rowShift = mEmulator.getScrollCounter();
+                mSelY1 -= rowShift;
+                mSelY2 -= rowShift;
+                mSelYAnchor -= rowShift;
+            }
+            mEmulator.clearScrollCounter();
+            ensureCursorVisible();
+            invalidate();
+        }
+    };
+
+    /**
+     * Create an <code>EmulatorView</code> for a {@link TermSession}.
+     *
+     * @param context The {@link Context} for the view.
+     * @param session The {@link TermSession} this view will be displaying.
+     * @param metrics The {@link DisplayMetrics} of the screen on which the view
+     *                will be displayed.
+     */
+    public EmulatorView(Context context, TermSession session, DisplayMetrics metrics) {
+        super(context);
+        attachSession(session);
+        setDensity(metrics);
+        commonConstructor(context);
+        mHistory = HistoryCmdUtils.getInstance(context);
+    }
+
+    /**
+     * Constructor called when inflating this view from XML.
+     * <p>
+     * You should call {@link #attachSession attachSession} and {@link
+     * #setDensity setDensity} before using an <code>EmulatorView</code> created
+     * using this constructor.
+     */
+    public EmulatorView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        commonConstructor(context);
+    }
+
+    /**
+     * Constructor called when inflating this view from XML with a
+     * default style set.
+     * <p>
+     * You should call {@link #attachSession attachSession} and {@link
+     * #setDensity setDensity} before using an <code>EmulatorView</code> created
+     * using this constructor.
+     */
+    public EmulatorView(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        commonConstructor(context);
+    }
+
+    private void commonConstructor(Context context) {
+        // TODO: See if we want to use the API level 11 constructor to get new flywheel feature.
+        mScroller = new Scroller(context);
+        mMouseTrackingFlingRunner.mScroller = new Scroller(context);
+    }
+
+    /**
+     * Attach a {@link TermSession} to this view.
+     *
+     * @param session The {@link TermSession} this view will be displaying.
+     */
+    public void attachSession(TermSession session) {
+        mTextRenderer = null;
+        mForegroundPaint = new Paint();
+        mBackgroundPaint = new Paint();
+        mTopRow = 0;
+        mLeftColumn = 0;
+        mGestureDetector = new GestureDetector(this);
+        // mGestureDetector.setIsLongpressEnabled(false);
+        setVerticalScrollBarEnabled(true);
+        setFocusable(true);
+        setFocusableInTouchMode(true);
+
+        mTermSession = session;
+
+        mKeyListener = new TermKeyListener(session);
+        session.setKeyListener(mKeyListener);
+
+        // Do init now if it was deferred until a TermSession was attached
+        if (mDeferInit) {
+            mDeferInit = false;
+            mKnownSize = true;
+            initialize();
+        }
+    }
+
+    /**
+     * Update the screen density for the screen on which the view is displayed.
+     *
+     * @param metrics The {@link DisplayMetrics} of the screen.
+     */
+    public void setDensity(DisplayMetrics metrics) {
+        if (mDensity == 0) {
+            // First time we've known the screen density, so update font size
+            mTextSize = (int) (mTextSize * metrics.density);
+        }
+        mDensity = metrics.density;
+        mScaledDensity = metrics.scaledDensity;
+    }
+
+    /**
+     * Inform the view that it is now visible on screen.
+     */
+    public void onResume() {
+        updateSize(false);
+        if (mCursorBlink != 0) {
+            mHandler.postDelayed(mBlinkCursor, CURSOR_BLINK_PERIOD);
+        }
+        if (mKeyListener != null) {
+            mKeyListener.onResume();
+        }
+    }
+
+    /**
+     * Inform the view that it is no longer visible on the screen.
+     */
+    public void onPause() {
+        if (mCursorBlink != 0) {
+            mHandler.removeCallbacks(mBlinkCursor);
+        }
+        if (mKeyListener != null) {
+            mKeyListener.onPause();
+        }
+    }
+
+    /**
+     * Set this <code>EmulatorView</code>'s color scheme.
+     *
+     * @param scheme The {@link ColorScheme} to use (use null for the default
+     *               scheme).
+     * @see TermSession#setColorScheme
+     * @see ColorScheme
+     */
+    public void setColorScheme(ColorScheme scheme) {
+        if (scheme == null) {
+            mColorScheme = BaseTextRenderer.defaultColorScheme;
+        } else {
+            mColorScheme = scheme;
+        }
+        updateText();
+    }
+
+    @Override
+    public boolean onCheckIsTextEditor() {
+        return true;
+    }
+
+    @Override
+    public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
+        outAttrs.inputType =
+                //EditorInfo.TYPE_CLASS_TEXT | EditorInfo.TYPE_TEXT_FLAG_NO_SUGGESTIONS;
+                mUseCookedIme ?
+                EditorInfo.TYPE_CLASS_TEXT :
+                EditorInfo.TYPE_NULL;
+       // outAttrs.imeOptions = IME_ACTION_DONE;
+        return new BaseInputConnection(this, true) {
+            /**
+             * Used to handle composing text requests
+             */
+            private int mCursor;
+            private int mComposingTextStart;
+            private int mComposingTextEnd;
+            private int mSelectedTextStart;
+            private int mSelectedTextEnd;
+
+            private void sendText(CharSequence text) {
+                Log.d(TAG, "sendText:"+text);
+                int n = text.length();
+                char c;
+                try {
+                    for (int i = 0; i < n; i++) {
+                        c = text.charAt(i);
+                        if (Character.isHighSurrogate(c)) {
+                            int codePoint;
+                            if (++i < n) {
+                                codePoint = Character.toCodePoint(c, text.charAt(i));
+                            } else {
+                                // Unicode Replacement Glyph, aka white question mark in black diamond.
+                                codePoint = '\ufffd';
+                            }
+                            mapAndSend(codePoint);
+                        } else {
+                            mapAndSend(c);
+                        }
+                    }
+                } catch (IOException e) {
+                    Log.e(TAG, "error writing ", e);
+                }
+            }
+
+            private void mapAndSend(int c) throws IOException {
+                int result = mKeyListener.mapControlChar(c);
+                if (result < TermKeyListener.KEYCODE_OFFSET) {
+                    mTermSession.write(result);
+                } else {
+                    mKeyListener.handleKeyCode(result - TermKeyListener.KEYCODE_OFFSET, null, getKeypadApplicationMode());
+                }
+                clearSpecialKeyStatus();
+            }
+
+            @Override
+            public boolean beginBatchEdit() {
+                if (LOG_IME) {
+                    Log.w(TAG, "beginBatchEdit");
+                }
+                setImeBuffer("");
+                mCursor = 0;
+                mComposingTextStart = 0;
+                mComposingTextEnd = 0;
+                return true;
+            }
+
+            @Override
+            public boolean clearMetaKeyStates(int arg0) {
+                if (LOG_IME) {
+                    Log.w(TAG, "clearMetaKeyStates " + arg0);
+                }
+                return false;
+            }
+
+            @Override
+            public boolean commitCompletion(CompletionInfo arg0) {
+                if (LOG_IME) {
+                    Log.w(TAG, "commitCompletion " + arg0);
+                }
+                return false;
+            }
+
+            @Override
+            public boolean endBatchEdit() {
+                if (LOG_IME) {
+                    Log.w(TAG, "endBatchEdit");
+                }
+                return true;
+            }
+
+            @Override
+            public boolean finishComposingText() {
+                if (LOG_IME) {
+                    Log.w(TAG, "finishComposingText");
+                }
+                sendText(mImeBuffer);
+                setImeBuffer("");
+                mComposingTextStart = 0;
+                mComposingTextEnd = 0;
+                mCursor = 0;
+                return true;
+            }
+
+            @Override
+            public int getCursorCapsMode(int reqModes) {
+                if (LOG_IME) {
+                    Log.w(TAG, "getCursorCapsMode(" + reqModes + ")");
+                }
+                int mode = 0;
+                if ((reqModes & TextUtils.CAP_MODE_CHARACTERS) != 0) {
+                    mode |= TextUtils.CAP_MODE_CHARACTERS;
+                }
+                return mode;
+            }
+
+            @Override
+            public ExtractedText getExtractedText(ExtractedTextRequest arg0,
+                                                  int arg1) {
+                if (LOG_IME) {
+                    Log.w(TAG, "getExtractedText" + arg0 + "," + arg1);
+                }
+                return null;
+            }
+
+            @Override
+            public Editable getEditable() {
+                return super.getEditable();
+            }
+
+            @Override
+            public CharSequence getTextAfterCursor(int n, int flags) {
+                if (LOG_IME) {
+                    Log.w(TAG, "getTextAfterCursor(" + n + "," + flags + ")");
+                }
+                int len = Math.min(n, mImeBuffer.length() - mCursor);
+                if (len <= 0 || mCursor < 0 || mCursor >= mImeBuffer.length()) {
+                    return "";
+                }
+                return mImeBuffer.substring(mCursor, mCursor + len);
+            }
+
+            @Override
+            public CharSequence getTextBeforeCursor(int n, int flags) {
+                if (LOG_IME) {
+                    Log.w(TAG, "getTextBeforeCursor(" + n + "," + flags + ")");
+                }
+                int len = Math.min(n, mCursor);
+                if (len <= 0 || mCursor < 0 || mCursor >= mImeBuffer.length()) {
+                    return "";
+                }
+                return mImeBuffer.substring(mCursor - len, mCursor);
+            }
+
+            @Override
+            public boolean performContextMenuAction(int arg0) {
+                if (LOG_IME) {
+                    Log.w(TAG, "performContextMenuAction" + arg0);
+                }
+                return true;
+            }
+
+            @Override
+            public boolean performPrivateCommand(String arg0, Bundle arg1) {
+                if (LOG_IME) {
+                    Log.w(TAG, "performPrivateCommand" + arg0 + "," + arg1);
+                }
+                return true;
+            }
+
+            @Override
+            public boolean reportFullscreenMode(boolean arg0) {
+                if (LOG_IME) {
+                    Log.w(TAG, "reportFullscreenMode" + arg0);
+                }
+                return true;
+            }
+
+            @Override
+            public boolean commitCorrection(CorrectionInfo correctionInfo) {
+                if (LOG_IME) {
+                    Log.w(TAG, "commitCorrection");
+                }
+                return true;
+            }
+
+            @Override
+            public boolean commitText(CharSequence text, int newCursorPosition) {
+                if (LOG_IME) {
+                    Log.w(TAG, "commitText(\"" + text + "\", " + newCursorPosition + ")");
+                }
+                clearComposingText();
+                sendText(text);
+                mStringBuffer.append(text);
+                setImeBuffer("");
+                mCursor = 0;
+                return true;
+            }
+
+            private void clearComposingText() {
+                int len = mImeBuffer.length();
+                if (mComposingTextStart > len || mComposingTextEnd > len) {
+                    mComposingTextEnd = mComposingTextStart = 0;
+                    return;
+                }
+                setImeBuffer(mImeBuffer.substring(0, mComposingTextStart) +
+                        mImeBuffer.substring(mComposingTextEnd));
+                if (mCursor < mComposingTextStart) {
+                    // do nothing
+                } else if (mCursor < mComposingTextEnd) {
+                    mCursor = mComposingTextStart;
+                } else {
+                    mCursor -= mComposingTextEnd - mComposingTextStart;
+                }
+                mComposingTextEnd = mComposingTextStart = 0;
+            }
+
+            @Override
+            public boolean deleteSurroundingText(int leftLength, int rightLength) {
+                if (LOG_IME) {
+                    Log.w(TAG, "deleteSurroundingText(" + leftLength +
+                            "," + rightLength + ")");
+                }
+                if (leftLength > 0) {
+                    for (int i = 0; i < leftLength; i++) {
+                        sendKeyEvent(
+                                new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DEL));
+                    }
+                } else if ((leftLength == 0) && (rightLength == 0)) {
+                    // Delete key held down / repeating
+                    sendKeyEvent(
+                            new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DEL));
+                }
+                // TODO: handle forward deletes.
+                return true;
+            }
+
+            @Override
+            public boolean performEditorAction(int actionCode) {
+                if (LOG_IME) {
+                    Log.w(TAG, "performEditorAction(" + actionCode + ")");
+                }
+                if (actionCode == IME_ACTION_UNSPECIFIED) {
+                    // The "return" key has been pressed on the IME.
+                    sendText("\r");
+                }
+                if (LOG_IME) {
+                    Log.w(TAG, "stringbuff(" + mStringBuffer.toString() + ")");
+                }
+                mHistory.addCmd(mStringBuffer.toString());
+                mStringBuffer.delete(0, mStringBuffer.length());
+                return true;
+            }
+
+            @Override
+            public boolean sendKeyEvent(KeyEvent event) {
+//                if (LOG_IME) {
+//                    Log.w(TAG, "sendKeyEvent(" + event + ")");
+//                }
+                // Some keys are sent here rather than to commitText.
+                // In particular, del and the digit keys are sent here.
+                // (And I have reports that the HTC Magic also sends Return here.)
+                // As a bit of defensive programming, handle every key.
+                dispatchKeyEvent(event);
+                return true;
+            }
+
+            @Override
+            public boolean setComposingText(CharSequence text, int newCursorPosition) {
+                if (LOG_IME) {
+                    Log.w(TAG, "setComposingText(\"" + text + "\", " + newCursorPosition + ")");
+                }
+                int len = mImeBuffer.length();
+                if (mComposingTextStart > len || mComposingTextEnd > len) {
+                    return false;
+                }
+                setImeBuffer(mImeBuffer.substring(0, mComposingTextStart) +
+                        text + mImeBuffer.substring(mComposingTextEnd));
+                mComposingTextEnd = mComposingTextStart + text.length();
+                mCursor = newCursorPosition > 0 ? mComposingTextEnd + newCursorPosition - 1
+                        : mComposingTextStart - newCursorPosition;
+                return true;
+            }
+
+            @Override
+            public boolean setSelection(int start, int end) {
+                if (LOG_IME) {
+                    Log.w(TAG, "setSelection" + start + "," + end);
+                }
+                int length = mImeBuffer.length();
+                if (start == end && start > 0 && start < length) {
+                    mSelectedTextStart = mSelectedTextEnd = 0;
+                    mCursor = start;
+                } else if (start < end && start > 0 && end < length) {
+                    mSelectedTextStart = start;
+                    mSelectedTextEnd = end;
+                    mCursor = start;
+                }
+                return true;
+            }
+
+            @Override
+            public boolean setComposingRegion(int start, int end) {
+                if (LOG_IME) {
+                    Log.w(TAG, "setComposingRegion " + start + "," + end);
+                }
+                if (start < end && start > 0 && end < mImeBuffer.length()) {
+                    clearComposingText();
+                    mComposingTextStart = start;
+                    mComposingTextEnd = end;
+                }
+                return true;
+            }
+
+            @Override
+            public CharSequence getSelectedText(int flags) {
+                if (LOG_IME) {
+                    Log.w(TAG, "getSelectedText " + flags);
+                }
+                int len = mImeBuffer.length();
+                if (mSelectedTextEnd >= len || mSelectedTextStart > mSelectedTextEnd) {
+                    return "";
+                }
+                return mImeBuffer.substring(mSelectedTextStart, mSelectedTextEnd + 1);
+            }
+
+        };
+    }
+
+    private void setImeBuffer(String buffer) {
+        if (!buffer.equals(mImeBuffer)) {
+            invalidate();
+        }
+        mImeBuffer = buffer;
+    }
+
+    public LinkedList<String> getHistoryCmd() {
+        return mHistory.getCmdList();
+    }
+
+    public void setTextBuff(String text) {
+        mStringBuffer.append(text);
+    }
+
+    /**
+     * Get the terminal emulator's keypad application mode.
+     */
+    public boolean getKeypadApplicationMode() {
+        return mEmulator.getKeypadApplicationMode();
+    }
+
+    /**
+     * Set a {@link android.view.GestureDetector.OnGestureListener
+     * GestureDetector.OnGestureListener} to receive gestures performed on this
+     * view.  Can be used to implement additional
+     * functionality via touch gestures or override built-in gestures.
+     *
+     * @param listener The {@link
+     *                 android.view.GestureDetector.OnGestureListener
+     *                 GestureDetector.OnGestureListener} which will receive
+     *                 gestures.
+     */
+    public void setExtGestureListener(GestureDetector.OnGestureListener listener) {
+        mExtGestureListener = listener;
+    }
+
+    /**
+     * Compute the vertical range that the vertical scrollbar represents.
+     */
+    @Override
+    protected int computeVerticalScrollRange() {
+        return mEmulator.getScreen().getActiveRows();
+    }
+
+    /**
+     * Compute the vertical extent of the horizontal scrollbar's thumb within
+     * the vertical range. This value is used to compute the length of the thumb
+     * within the scrollbar's track.
+     */
+    @Override
+    protected int computeVerticalScrollExtent() {
+        return mRows;
+    }
+
+    /**
+     * Compute the vertical offset of the vertical scrollbar's thumb within the
+     * horizontal range. This value is used to compute the position of the thumb
+     * within the scrollbar's track.
+     */
+    @Override
+    protected int computeVerticalScrollOffset() {
+        return mEmulator.getScreen().getActiveRows() + mTopRow - mRows;
+    }
+
+    /**
+     * Call this to initialize the view.
+     */
+    private void initialize() {
+        TermSession session = mTermSession;
+
+        updateText();
+
+        mEmulator = session.getEmulator();
+        session.setUpdateCallback(mUpdateNotify);
+
+        requestFocus();
+    }
+
+    /**
+     * Get the {@link TermSession} corresponding to this view.
+     *
+     * @return The {@link TermSession} object for this view.
+     */
+    public TermSession getTermSession() {
+        return mTermSession;
+    }
+
+    /**
+     * Get the width of the visible portion of this view.
+     *
+     * @return The width of the visible portion of this view, in pixels.
+     */
+    public int getVisibleWidth() {
+        return mVisibleWidth;
+    }
+
+    /**
+     * Get the height of the visible portion of this view.
+     *
+     * @return The height of the visible portion of this view, in pixels.
+     */
+    public int getVisibleHeight() {
+        return mVisibleHeight;
+    }
+
+    /**
+     * Gets the visible number of rows for the view, useful when updating Ptysize with the correct number of rows/columns
+     *
+     * @return The rows for the visible number of rows, this is calculate in updateSize(int w, int h), please call
+     * updateSize(true) if the view changed, to get the correct calculation before calling this.
+     */
+    public int getVisibleRows() {
+        return mVisibleRows;
+    }
+
+    /**
+     * Gets the visible number of columns for the view, again useful to get when updating PTYsize
+     *
+     * @return the columns for the visisble view, please call updateSize(true) to re-calculate this if the view has changed
+     */
+    public int getVisibleColumns() {
+        return mVisibleColumns;
+    }
+
+
+    /**
+     * Page the terminal view (scroll it up or down by <code>delta</code>
+     * screenfuls).
+     *
+     * @param delta The number of screens to scroll. Positive means scroll down,
+     *              negative means scroll up.
+     */
+    public void page(int delta) {
+        mTopRow =
+                Math.min(0, Math.max(-(mEmulator.getScreen()
+                        .getActiveTranscriptRows()), mTopRow + mRows * delta));
+        invalidate();
+    }
+
+    /**
+     * Page the terminal view horizontally.
+     *
+     * @param deltaColumns the number of columns to scroll. Positive scrolls to
+     *                     the right.
+     */
+    public void pageHorizontal(int deltaColumns) {
+        mLeftColumn =
+                Math.max(0, Math.min(mLeftColumn + deltaColumns, mColumns
+                        - mVisibleColumns));
+        invalidate();
+    }
+
+    /**
+     * Sets the text size, which in turn sets the number of rows and columns.
+     *
+     * @param fontSize the new font size, in density-independent pixels.
+     */
+    public void setTextSize(int fontSize) {
+        mTextSize = (int) (fontSize * mDensity);
+        updateText();
+    }
+
+    /**
+     * Sets the IME mode ("cooked" or "raw").
+     *
+     * @param useCookedIME Whether the IME should be used in cooked mode.
+     */
+    public void setUseCookedIME(boolean useCookedIME) {
+        mUseCookedIme = useCookedIME;
+    }
+
+    /**
+     * Returns true if mouse events are being sent as escape sequences to the terminal.
+     */
+    public boolean isMouseTrackingActive() {
+        return mEmulator.getMouseTrackingMode() != 0 && mMouseTracking;
+    }
+
+    /**
+     * Send a single mouse event code to the terminal.
+     */
+    private void sendMouseEventCode(MotionEvent e, int button_code) {
+        int x = (int) (e.getX() / mCharacterWidth) + 1;
+        int y = (int) ((e.getY() - mTopOfScreenMargin) / mCharacterHeight) + 1;
+        // Clip to screen, and clip to the limits of 8-bit data.
+        boolean out_of_bounds =
+                x < 1 || y < 1 ||
+                        x > mColumns || y > mRows ||
+                        x > 255 - 32 || y > 255 - 32;
+        //Log.d(TAG, "mouse button "+x+","+y+","+button_code+",oob="+out_of_bounds);
+        if (button_code < 0 || button_code > 255 - 32) {
+            Log.e(TAG, "mouse button_code out of range: " + button_code);
+            return;
+        }
+        if (!out_of_bounds) {
+            byte[] data = {
+                    '\033', '[', 'M',
+                    (byte) (32 + button_code),
+                    (byte) (32 + x),
+                    (byte) (32 + y)};
+            mTermSession.write(data, 0, data.length);
+        }
+    }
+
+    // Begin GestureDetector.OnGestureListener methods
+
+    @Override
+    public boolean onSingleTapUp(MotionEvent e) {
+        if (mExtGestureListener != null && mExtGestureListener.onSingleTapUp(e)) {
+            return true;
+        }
+
+        if (isMouseTrackingActive()) {
+            sendMouseEventCode(e, 0); // BTN1 press
+            sendMouseEventCode(e, 3); // release
+        }
+
+        requestFocus();
+        return true;
+    }
+
+    @Override
+    public void onLongPress(MotionEvent e) {
+        // XXX hook into external gesture listener
+        showContextMenu();
+    }
+
+    @Override
+    public boolean onScroll(MotionEvent e1, MotionEvent e2,
+                            float distanceX, float distanceY) {
+        if (mExtGestureListener != null && mExtGestureListener.onScroll(e1, e2, distanceX, distanceY)) {
+            return true;
+        }
+
+        distanceY += mScrollRemainder;
+        int deltaRows = (int) (distanceY / mCharacterHeight);
+        mScrollRemainder = distanceY - deltaRows * mCharacterHeight;
+
+        if (isMouseTrackingActive()) {
+            // Send mouse wheel events to terminal.
+            for (; deltaRows > 0; deltaRows--) {
+                sendMouseEventCode(e1, 65);
+            }
+            for (; deltaRows < 0; deltaRows++) {
+                sendMouseEventCode(e1, 64);
+            }
+            return true;
+        }
+
+        mTopRow =
+                Math.min(0, Math.max(-(mEmulator.getScreen()
+                        .getActiveTranscriptRows()), mTopRow + deltaRows));
+        invalidate();
+
+        return true;
+    }
+
+    public void onSingleTapConfirmed(MotionEvent e) {
+    }
+
+    public boolean onJumpTapDown(MotionEvent e1, MotionEvent e2) {
+        // Scroll to bottom
+        mTopRow = 0;
+        invalidate();
+        return true;
+    }
+
+    public boolean onJumpTapUp(MotionEvent e1, MotionEvent e2) {
+        // Scroll to top
+        mTopRow = -mEmulator.getScreen().getActiveTranscriptRows();
+        invalidate();
+        return true;
+    }
+
+    @Override
+    public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX,
+                           float velocityY) {
+        if (mExtGestureListener != null && mExtGestureListener.onFling(e1, e2, velocityX, velocityY)) {
+            return true;
+        }
+
+        mScrollRemainder = 0.0f;
+        if (isMouseTrackingActive()) {
+            mMouseTrackingFlingRunner.fling(e1, velocityX, velocityY);
+        } else {
+            float SCALE = 0.25f;
+            mScroller.fling(0, mTopRow,
+                    -(int) (velocityX * SCALE), -(int) (velocityY * SCALE),
+                    0, 0,
+                    -mEmulator.getScreen().getActiveTranscriptRows(), 0);
+            // onScroll(e1, e2, 0.1f * velocityX, -0.1f * velocityY);
+            post(mFlingRunner);
+        }
+        return true;
+    }
+
+    @Override
+    public void onShowPress(MotionEvent e) {
+        if (mExtGestureListener != null) {
+            mExtGestureListener.onShowPress(e);
+        }
+    }
+
+    @Override
+    public boolean onDown(MotionEvent e) {
+        if (mExtGestureListener != null && mExtGestureListener.onDown(e)) {
+            return true;
+        }
+        mScrollRemainder = 0.0f;
+        return true;
+    }
+
+    // End GestureDetector.OnGestureListener methods
+
+    @Override
+    public boolean onTouchEvent(MotionEvent ev) {
+        if (mIsSelectingText) {
+            return onTouchEventWhileSelectingText(ev);
+        } else {
+            return mGestureDetector.onTouchEvent(ev);
+        }
+    }
+
+    private boolean onTouchEventWhileSelectingText(MotionEvent ev) {
+        int action = ev.getAction();
+        int cx = (int) (ev.getX() / mCharacterWidth);
+        int cy = Math.max(0,
+                (int) ((ev.getY() + SELECT_TEXT_OFFSET_Y * mScaledDensity)
+                        / mCharacterHeight) + mTopRow);
+        switch (action) {
+            case MotionEvent.ACTION_DOWN:
+                mSelXAnchor = cx;
+                mSelYAnchor = cy;
+                mSelX1 = cx;
+                mSelY1 = cy;
+                mSelX2 = mSelX1;
+                mSelY2 = mSelY1;
+                break;
+            case MotionEvent.ACTION_MOVE:
+            case MotionEvent.ACTION_UP:
+                int minx = Math.min(mSelXAnchor, cx);
+                int maxx = Math.max(mSelXAnchor, cx);
+                int miny = Math.min(mSelYAnchor, cy);
+                int maxy = Math.max(mSelYAnchor, cy);
+                mSelX1 = minx;
+                mSelY1 = miny;
+                mSelX2 = maxx;
+                mSelY2 = maxy;
+                if (action == MotionEvent.ACTION_UP) {
+                    ClipboardManagerCompat clip = ClipboardManagerCompatFactory
+                            .getManager(getContext().getApplicationContext());
+                    clip.setText(getSelectedText().trim());
+                    toggleSelectingText();
+                }
+                invalidate();
+                break;
+            default:
+                toggleSelectingText();
+                invalidate();
+                break;
+        }
+        return true;
+    }
+
+    /**
+     * Called when a key is pressed in the view.
+     *
+     * @param keyCode The keycode of the key which was pressed.
+     * @param event   A {@link KeyEvent} describing the event.
+     * @return Whether the event was handled.
+     */
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        if (LOG_KEY_EVENTS) {
+            Log.w(TAG, "onKeyDown " + keyCode);
+        }
+        if (handleControlKey(keyCode, true)) {
+            return true;
+        } else if (handleFnKey(keyCode, true)) {
+            return true;
+        } else if (isSystemKey(keyCode, event)) {
+            if (!isInterceptedSystemKey(keyCode)) {
+                // Don't intercept the system keys
+                return super.onKeyDown(keyCode, event);
+            }
+        } else if (keyCode == KeyEvent.KEYCODE_DEL) {
+            mEmulator.deleteChar();
+            if (mStringBuffer.length() > 0)
+                mStringBuffer.delete(mStringBuffer.length() - 1, mStringBuffer.length());
+        }
+
+        // Translate the keyCode into an ASCII character.
+
+        try {
+            int oldCombiningAccent = mKeyListener.getCombiningAccent();
+            int oldCursorMode = mKeyListener.getCursorMode();
+            mKeyListener.keyDown(keyCode, event, getKeypadApplicationMode(),
+                    TermKeyListener.isEventFromToggleDevice(event));
+            if (mKeyListener.getCombiningAccent() != oldCombiningAccent
+                    || mKeyListener.getCursorMode() != oldCursorMode) {
+                invalidate();
+            }
+        } catch (IOException e) {
+            // Ignore I/O exceptions
+        }
+        return true;
+    }
+
+    /**
+     * Do we want to intercept this system key?
+     */
+    private boolean isInterceptedSystemKey(int keyCode) {
+        return keyCode == KeyEvent.KEYCODE_BACK && mBackKeySendsCharacter;
+    }
+
+    /**
+     * Called when a key is released in the view.
+     *
+     * @param keyCode The keycode of the key which was released.
+     * @param event   A {@link KeyEvent} describing the event.
+     * @return Whether the event was handled.
+     */
+    @Override
+    public boolean onKeyUp(int keyCode, KeyEvent event) {
+        if (LOG_KEY_EVENTS) {
+            Log.w(TAG, "onKeyUp " + keyCode);
+        }
+        if (handleControlKey(keyCode, false)) {
+            return true;
+        } else if (handleFnKey(keyCode, false)) {
+            return true;
+        } else if (isSystemKey(keyCode, event)) {
+            // Don't intercept the system keys
+            if (!isInterceptedSystemKey(keyCode)) {
+                return super.onKeyUp(keyCode, event);
+            }
+        }
+
+        mKeyListener.keyUp(keyCode, event);
+        clearSpecialKeyStatus();
+        return true;
+    }
+
+    @Override
+    public boolean onKeyPreIme(int keyCode, KeyEvent event) {
+        if (sTrapAltAndMeta) {
+            boolean altEsc = mKeyListener.getAltSendsEsc();
+            boolean altOn = (event.getMetaState() & KeyEvent.META_ALT_ON) != 0;
+            boolean metaOn = (event.getMetaState() & KeyEvent.META_META_ON) != 0;
+            boolean altPressed = (keyCode == KeyEvent.KEYCODE_ALT_LEFT)
+                    || (keyCode == KeyEvent.KEYCODE_ALT_RIGHT);
+            boolean altActive = mKeyListener.isAltActive();
+            if (altEsc && (altOn || altPressed || altActive || metaOn)) {
+                if (event.getAction() == KeyEvent.ACTION_DOWN) {
+                    return onKeyDown(keyCode, event);
+                } else {
+                    return onKeyUp(keyCode, event);
+                }
+            }
+        }
+
+        if (handleHardwareControlKey(keyCode, event)) {
+            return true;
+        }
+
+        if (mKeyListener.isCtrlActive()) {
+            if (event.getAction() == KeyEvent.ACTION_DOWN) {
+                return onKeyDown(keyCode, event);
+            } else {
+                return onKeyUp(keyCode, event);
+            }
+        }
+
+        return super.onKeyPreIme(keyCode, event);
+    }
+
+    ;
+
+    private boolean handleControlKey(int keyCode, boolean down) {
+        if (keyCode == mControlKeyCode) {
+            if (LOG_KEY_EVENTS) {
+                Log.w(TAG, "handleControlKey " + keyCode);
+            }
+            mKeyListener.handleControlKey(down);
+            invalidate();
+            return true;
+        }
+        return false;
+    }
+
+    private boolean handleHardwareControlKey(int keyCode, KeyEvent event) {
+        if (keyCode == KeycodeConstants.KEYCODE_CTRL_LEFT ||
+                keyCode == KeycodeConstants.KEYCODE_CTRL_RIGHT) {
+            if (LOG_KEY_EVENTS) {
+                Log.w(TAG, "handleHardwareControlKey " + keyCode);
+            }
+            boolean down = event.getAction() == KeyEvent.ACTION_DOWN;
+            mKeyListener.handleHardwareControlKey(down);
+            invalidate();
+            return true;
+        }
+        return false;
+    }
+
+    private boolean handleFnKey(int keyCode, boolean down) {
+        if (keyCode == mFnKeyCode) {
+            if (LOG_KEY_EVENTS) {
+                Log.w(TAG, "handleFnKey " + keyCode);
+            }
+            mKeyListener.handleFnKey(down);
+            invalidate();
+            return true;
+        }
+        return false;
+    }
+
+    private boolean isSystemKey(int keyCode, KeyEvent event) {
+        return event.isSystem();
+    }
+
+    private void clearSpecialKeyStatus() {
+        if (mIsControlKeySent) {
+            mIsControlKeySent = false;
+            mKeyListener.handleControlKey(false);
+            invalidate();
+        }
+        if (mIsFnKeySent) {
+            mIsFnKeySent = false;
+            mKeyListener.handleFnKey(false);
+            invalidate();
+        }
+    }
+
+    private void updateText() {
+        ColorScheme scheme = mColorScheme;
+        if (mTextSize > 0) {
+            mTextRenderer = new PaintRenderer(mTextSize, scheme);
+        } else {
+            mTextRenderer = new Bitmap4x8FontRenderer(getResources(), scheme);
+        }
+
+        mForegroundPaint.setColor(scheme.getForeColor());
+        mBackgroundPaint.setColor(scheme.getBackColor());
+        mCharacterWidth = mTextRenderer.getCharacterWidth();
+        mCharacterHeight = mTextRenderer.getCharacterHeight();
+
+        updateSize(true);
+    }
+
+    /**
+     * This is called during layout when the size of this view has changed. If
+     * you were just added to the view hierarchy, you're called with the old
+     * values of 0.
+     */
+    @Override
+    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
+        if (mTermSession == null) {
+            // Not ready, defer until TermSession is attached
+            mDeferInit = true;
+            return;
+        }
+
+        if (!mKnownSize) {
+            mKnownSize = true;
+            initialize();
+        } else {
+            updateSize(false);
+        }
+    }
+
+    private void updateSize(int w, int h) {
+        mColumns = Math.max(1, (int) (((float) w) / mCharacterWidth));
+        mVisibleColumns = Math.max(1, (int) (((float) mVisibleWidth) / mCharacterWidth));
+
+        mTopOfScreenMargin = mTextRenderer.getTopMargin();
+        mRows = Math.max(1, (h - mTopOfScreenMargin) / mCharacterHeight);
+        mVisibleRows = Math.max(1, (mVisibleHeight - mTopOfScreenMargin) / mCharacterHeight);
+        mTermSession.updateSize(mColumns, mRows);
+
+        // Reset our paging:
+        mTopRow = 0;
+        mLeftColumn = 0;
+
+        invalidate();
+    }
+
+    /**
+     * Update the view's idea of its size.
+     *
+     * @param force Whether a size adjustment should be performed even if the
+     *              view's size has not changed.
+     */
+    public void updateSize(boolean force) {
+        //Need to clear saved links on each display refresh
+        mLinkLayer.clear();
+        if (mKnownSize) {
+            int w = getWidth();
+            int h = getHeight();
+            // Log.w("Term", "(" + w + ", " + h + ")");
+            if (force || w != mVisibleWidth || h != mVisibleHeight) {
+                mVisibleWidth = w;
+                mVisibleHeight = h;
+                updateSize(mVisibleWidth, mVisibleHeight);
+            }
+        }
+    }
+
+    /**
+     * Draw the view to the provided {@link Canvas}.
+     *
+     * @param canvas The {@link Canvas} to draw the view to.
+     */
+    @Override
+    protected void onDraw(Canvas canvas) {
+        updateSize(false);
+
+        if (mEmulator == null) {
+            // Not ready yet
+            return;
+        }
+
+        int w = getWidth();
+        int h = getHeight();
+
+        boolean reverseVideo = mEmulator.getReverseVideo();
+        mTextRenderer.setReverseVideo(reverseVideo);
+
+        Paint backgroundPaint =
+                reverseVideo ? mForegroundPaint : mBackgroundPaint;
+        canvas.drawRect(0, 0, w, h, backgroundPaint);
+        float x = -mLeftColumn * mCharacterWidth;
+        float y = mCharacterHeight + mTopOfScreenMargin;
+        int endLine = mTopRow + mRows;
+        int cx = mEmulator.getCursorCol();
+        int cy = mEmulator.getCursorRow();
+        boolean cursorVisible = mCursorVisible && mEmulator.getShowCursor();
+        String effectiveImeBuffer = mImeBuffer;
+        int combiningAccent = mKeyListener.getCombiningAccent();
+        if (combiningAccent != 0) {
+            effectiveImeBuffer += String.valueOf((char) combiningAccent);
+        }
+        int cursorStyle = mKeyListener.getCursorMode();
+
+        int linkLinesToSkip = 0; //for multi-line links
+
+        for (int i = mTopRow; i < endLine; i++) {
+            int cursorX = -1;
+            if (i == cy && cursorVisible) {
+                cursorX = cx;
+            }
+            int selx1 = -1;
+            int selx2 = -1;
+            if (i >= mSelY1 && i <= mSelY2) {
+                if (i == mSelY1) {
+                    selx1 = mSelX1;
+                }
+                if (i == mSelY2) {
+                    selx2 = mSelX2;
+                } else {
+                    selx2 = mColumns;
+                }
+            }
+            mEmulator.getScreen().drawText(i, canvas, x, y, mTextRenderer, cursorX, selx1, selx2, effectiveImeBuffer, cursorStyle);
+            y += mCharacterHeight;
+            //if no lines to skip, create links for the line being drawn
+            if (linkLinesToSkip == 0)
+                linkLinesToSkip = createLinks(i);
+
+            //createLinks always returns at least 1
+            --linkLinesToSkip;
+        }
+    }
+
+    private void ensureCursorVisible() {
+        mTopRow = 0;
+        if (mVisibleColumns > 0) {
+            int cx = mEmulator.getCursorCol();
+            int visibleCursorX = mEmulator.getCursorCol() - mLeftColumn;
+            if (visibleCursorX < 0) {
+                mLeftColumn = cx;
+            } else if (visibleCursorX >= mVisibleColumns) {
+                mLeftColumn = (cx - mVisibleColumns) + 1;
+            }
+        }
+    }
+
+    /**
+     * Toggle text selection mode in the view.
+     */
+    public void toggleSelectingText() {
+        mIsSelectingText = !mIsSelectingText;
+        setVerticalScrollBarEnabled(!mIsSelectingText);
+        if (!mIsSelectingText) {
+            mSelX1 = -1;
+            mSelY1 = -1;
+            mSelX2 = -1;
+            mSelY2 = -1;
+        }
+    }
+
+    /**
+     * Whether the view is currently in text selection mode.
+     */
+    public boolean getSelectingText() {
+        return mIsSelectingText;
+    }
+
+    /**
+     * Get selected text.
+     *
+     * @return A {@link String} with the selected text.
+     */
+    public String getSelectedText() {
+        return mEmulator.getSelectedText(mSelX1, mSelY1, mSelX2, mSelY2);
+    }
+
+    /**
+     * Send a Ctrl key event to the terminal.
+     */
+    public void sendControlKey() {
+        mIsControlKeySent = true;
+        mKeyListener.handleControlKey(true);
+        invalidate();
+    }
+
+    /**
+     * Send an Fn key event to the terminal.  The Fn modifier key can be used to
+     * generate various special characters and escape codes.
+     */
+    public void sendFnKey() {
+        mIsFnKeySent = true;
+        mKeyListener.handleFnKey(true);
+        invalidate();
+    }
+
+    public void sendTabKey() {
+        mIsTabKeySent = true;
+        mKeyListener.handleTabKey(true);
+        invalidate();
+
+    }
+    /**
+     * Set the key code to be sent when the Back key is pressed.
+     */
+    public void setBackKeyCharacter(int keyCode) {
+        mKeyListener.setBackKeyCharacter(keyCode);
+        mBackKeySendsCharacter = (keyCode != 0);
+    }
+
+    /**
+     * Set whether to prepend the ESC keycode to the character when when pressing
+     * the ALT Key.
+     *
+     * @param flag
+     */
+    public void setAltSendsEsc(boolean flag) {
+        mKeyListener.setAltSendsEsc(flag);
+    }
+
+    /**
+     * Set the keycode corresponding to the Ctrl key.
+     */
+    public void setControlKeyCode(int keyCode) {
+        mControlKeyCode = keyCode;
+    }
+
+    /**
+     * Set the keycode corresponding to the Fn key.
+     */
+    public void setFnKeyCode(int keyCode) {
+        mFnKeyCode = keyCode;
+    }
+
+    public void setTermType(String termType) {
+        mKeyListener.setTermType(termType);
+    }
+
+    /**
+     * Set whether mouse events should be sent to the terminal as escape codes.
+     */
+    public void setMouseTracking(boolean flag) {
+        mMouseTracking = flag;
+    }
+
+
+    /**
+     * Get the URL for the link displayed at the specified screen coordinates.
+     *
+     * @param x The x coordinate being queried (from 0 to screen width)
+     * @param y The y coordinate being queried (from 0 to screen height)
+     * @return The URL for the link at the specified screen coordinates, or
+     * null if no link exists there.
+     */
+    public String getURLat(float x, float y) {
+        float w = getWidth();
+        float h = getHeight();
+
+        //Check for division by zero
+        //If width or height is zero, there are probably no links around, so return null.
+        if (w == 0 || h == 0)
+            return null;
+
+        //Get fraction of total screen
+        float x_pos = x / w;
+        float y_pos = y / h;
+
+        //Convert to integer row/column index
+        int row = (int) Math.floor(y_pos * mRows);
+        int col = (int) Math.floor(x_pos * mColumns);
+
+        //Grab row from link layer
+        URLSpan[] linkRow = mLinkLayer.get(row);
+        URLSpan link;
+
+        //If row exists, and link exists at column, return it
+        if (linkRow != null && (link = linkRow[col]) != null)
+            return link.getURL();
+        else
+            return null;
+    }
+
+}
diff --git a/termemulator/src/main/java/jackpal/androidterm/emulatorview/GrowableIntArray.java b/termemulator/src/main/java/jackpal/androidterm/emulatorview/GrowableIntArray.java
new file mode 100644
index 00000000..9576ae71
--- /dev/null
+++ b/termemulator/src/main/java/jackpal/androidterm/emulatorview/GrowableIntArray.java
@@ -0,0 +1,29 @@
+package jackpal.androidterm.emulatorview;
+
+class GrowableIntArray {
+    GrowableIntArray(int initalCapacity) {
+        mData = new int[initalCapacity];
+        mLength = 0;
+    }
+
+    void append(int i) {
+        if (mLength + 1 > mData.length) {
+            int newLength = Math.max((mData.length * 3) >> 1, 16);
+            int[] temp = new int[newLength];
+            System.arraycopy(mData, 0, temp, 0, mLength);
+            mData = temp;
+        }
+        mData[mLength++] = i;
+    }
+
+    int length() {
+        return mLength;
+    }
+
+    int at(int index) {
+        return mData[index];
+    }
+
+    int[] mData;
+    int mLength;
+}
diff --git a/termemulator/src/main/java/jackpal/androidterm/emulatorview/HistoryCmdUtils.java b/termemulator/src/main/java/jackpal/androidterm/emulatorview/HistoryCmdUtils.java
new file mode 100644
index 00000000..5c9edadf
--- /dev/null
+++ b/termemulator/src/main/java/jackpal/androidterm/emulatorview/HistoryCmdUtils.java
@@ -0,0 +1,79 @@
+package jackpal.androidterm.emulatorview;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.text.TextUtils;
+import android.util.Log;
+
+import java.util.LinkedList;
+
+/**
+ * 文 件 名: HIstoryCmdUtils
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/1/31 17:15
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class HistoryCmdUtils {
+    private static HistoryCmdUtils instance = null;
+    private SharedPreferences mSharedPreferences;
+    private LinkedList<String> cmdList;
+    private static final int COUNT_MAX = 10;
+    private static final String CACHE_NAME = "history";
+
+    private HistoryCmdUtils(Context context) {
+        mSharedPreferences = context.getSharedPreferences(CACHE_NAME, Context.MODE_PRIVATE);
+        cmdList = stringToList(mSharedPreferences.getString(CACHE_NAME,""));
+    }
+
+    public static HistoryCmdUtils getInstance(Context context) {
+        if (instance == null) {
+            instance = new HistoryCmdUtils(context);
+        }
+        return instance;
+    }
+
+    public void addCmd(String cmd) {
+        Log.d("HistoryCmdUtils", "addCmd:"+cmd);
+        int index = cmdList.indexOf(cmd);
+        if (TextUtils.isEmpty(cmd) || index==0){
+            return;
+        }
+        if (index>0){
+            cmdList.remove(index);
+        }else if (cmdList.size()==COUNT_MAX){
+            cmdList.pollLast();
+        }
+        cmdList.addFirst(cmd);
+
+        mSharedPreferences.edit().putString(CACHE_NAME,listToString(cmdList)).apply();
+    }
+
+    private LinkedList<String> stringToList(String text){
+        LinkedList<String> list = new LinkedList<>();
+        if (!TextUtils.isEmpty(text)){
+            String[] tempList = text.split("\n");
+            for (String str:tempList){
+                list.addLast(str);
+            }
+        }
+        return list;
+    }
+
+    private String listToString(LinkedList<String> list){
+        StringBuffer stringBuffer = new StringBuffer();
+        for (String str:list){
+            stringBuffer.append(str);
+            if (!str.equals(list.peekLast())){
+                stringBuffer.append("\n");
+            }
+        }
+        return stringBuffer.toString();
+    }
+
+    public LinkedList<String> getCmdList(){
+        return cmdList;
+    }
+
+}
diff --git a/termemulator/src/main/java/jackpal/androidterm/emulatorview/PaintRenderer.java b/termemulator/src/main/java/jackpal/androidterm/emulatorview/PaintRenderer.java
new file mode 100644
index 00000000..843bafa3
--- /dev/null
+++ b/termemulator/src/main/java/jackpal/androidterm/emulatorview/PaintRenderer.java
@@ -0,0 +1,145 @@
+/*
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package jackpal.androidterm.emulatorview;
+
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.Typeface;
+
+
+class PaintRenderer extends BaseTextRenderer {
+    public PaintRenderer(int fontSize, ColorScheme scheme) {
+        super(scheme);
+        mTextPaint = new Paint();
+        mTextPaint.setTypeface(Typeface.MONOSPACE);
+        mTextPaint.setAntiAlias(true);
+        mTextPaint.setTextSize(fontSize);
+
+        mCharHeight = (int) Math.ceil(mTextPaint.getFontSpacing());
+        mCharAscent = (int) Math.ceil(mTextPaint.ascent());
+        mCharDescent = mCharHeight + mCharAscent;
+        mCharWidth = mTextPaint.measureText(EXAMPLE_CHAR, 0, 1);
+    }
+
+    public void drawTextRun(Canvas canvas, float x, float y, int lineOffset,
+                            int runWidth, char[] text, int index, int count,
+                            boolean selectionStyle, int textStyle,
+                            int cursorOffset, int cursorIndex, int cursorIncr, int cursorWidth, int cursorMode) {
+        int foreColor = TextStyle.decodeForeColor(textStyle);
+        int backColor = TextStyle.decodeBackColor(textStyle);
+        int effect = TextStyle.decodeEffect(textStyle);
+
+        boolean inverse = mReverseVideo ^
+                (effect & (TextStyle.fxInverse | TextStyle.fxItalic)) != 0;
+        if (inverse) {
+            int temp = foreColor;
+            foreColor = backColor;
+            backColor = temp;
+        }
+
+        if (selectionStyle) {
+            backColor = TextStyle.ciCursorBackground;
+        }
+
+        boolean blink = (effect & TextStyle.fxBlink) != 0;
+        if (blink && backColor < 8) {
+            backColor += 8;
+        }
+        mTextPaint.setColor(mPalette[backColor]);
+
+        float left = x + lineOffset * mCharWidth;
+        canvas.drawRect(left, y + mCharAscent - mCharDescent,
+                left + runWidth * mCharWidth, y,
+                mTextPaint);
+
+        boolean cursorVisible = lineOffset <= cursorOffset && cursorOffset < (lineOffset + runWidth);
+        float cursorX = 0;
+        if (cursorVisible) {
+            cursorX = x + cursorOffset * mCharWidth;
+            drawCursorImp(canvas, (int) cursorX, y, cursorWidth * mCharWidth, mCharHeight, cursorMode);
+        }
+
+        boolean invisible = (effect & TextStyle.fxInvisible) != 0;
+        if (!invisible) {
+            boolean bold = (effect & TextStyle.fxBold) != 0;
+            boolean underline = (effect & TextStyle.fxUnderline) != 0;
+            if (bold) {
+                mTextPaint.setFakeBoldText(true);
+            }
+            if (underline) {
+                mTextPaint.setUnderlineText(true);
+            }
+            int textPaintColor;
+            if (foreColor < 8 && bold) {
+                // In 16-color mode, bold also implies bright foreground colors
+                textPaintColor = mPalette[foreColor + 8];
+            } else {
+                textPaintColor = mPalette[foreColor];
+            }
+            mTextPaint.setColor(textPaintColor);
+
+            float textOriginY = y - mCharDescent;
+
+            if (cursorVisible) {
+                // Text before cursor
+                int countBeforeCursor = cursorIndex - index;
+                int countAfterCursor = count - (countBeforeCursor + cursorIncr);
+                if (countBeforeCursor > 0) {
+                    canvas.drawText(text, index, countBeforeCursor, left, textOriginY, mTextPaint);
+                }
+                // Text at cursor
+                mTextPaint.setColor(mPalette[TextStyle.ciCursorForeground]);
+                canvas.drawText(text, cursorIndex, cursorIncr, cursorX,
+                        textOriginY, mTextPaint);
+                // Text after cursor
+                if (countAfterCursor > 0) {
+                    mTextPaint.setColor(textPaintColor);
+                    canvas.drawText(text, cursorIndex + cursorIncr, countAfterCursor,
+                            cursorX + cursorWidth * mCharWidth,
+                            textOriginY, mTextPaint);
+                }
+            } else {
+                canvas.drawText(text, index, count, left, textOriginY, mTextPaint);
+            }
+            if (bold) {
+                mTextPaint.setFakeBoldText(false);
+            }
+            if (underline) {
+                mTextPaint.setUnderlineText(false);
+            }
+        }
+    }
+
+    public int getCharacterHeight() {
+        return mCharHeight;
+    }
+
+    public float getCharacterWidth() {
+        return mCharWidth;
+    }
+
+    public int getTopMargin() {
+        return mCharDescent;
+    }
+
+    private Paint mTextPaint;
+    private float mCharWidth;
+    private int mCharHeight;
+    private int mCharAscent;
+    private int mCharDescent;
+    private static final char[] EXAMPLE_CHAR = {'X'};
+}
diff --git a/termemulator/src/main/java/jackpal/androidterm/emulatorview/Screen.java b/termemulator/src/main/java/jackpal/androidterm/emulatorview/Screen.java
new file mode 100644
index 00000000..89d55361
--- /dev/null
+++ b/termemulator/src/main/java/jackpal/androidterm/emulatorview/Screen.java
@@ -0,0 +1,159 @@
+/*
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package jackpal.androidterm.emulatorview;
+
+/**
+ * An abstract screen interface. A terminal screen stores lines of text. (The
+ * reason to abstract it is to allow different implementations, and to hide
+ * implementation details from clients.)
+ */
+interface Screen {
+
+    /**
+     * Set line wrap flag for a given row. Affects how lines are logically
+     * wrapped when changing screen size or converting to a transcript.
+     */
+    void setLineWrap(int row);
+
+    /**
+     * Store a Unicode code point into the screen at location (x, y)
+     *
+     * @param x         X coordinate (also known as column)
+     * @param y         Y coordinate (also known as row)
+     * @param codePoint Unicode code point to store
+     * @param style     the text style
+     */
+    void set(int x, int y, int codePoint, int style);
+
+    /**
+     * Store byte b into the screen at location (x, y)
+     *
+     * @param x     X coordinate (also known as column)
+     * @param y     Y coordinate (also known as row)
+     * @param b     ASCII character to store
+     * @param style the text style
+     */
+    void set(int x, int y, byte b, int style);
+
+    /**
+     * Scroll the screen down one line. To scroll the whole screen of a 24 line
+     * screen, the arguments would be (0, 24).
+     *
+     * @param topMargin    First line that is scrolled.
+     * @param bottomMargin One line after the last line that is scrolled.
+     * @param style        the style for the newly exposed line.
+     */
+    void scroll(int topMargin, int bottomMargin, int style);
+
+    /**
+     * Block copy characters from one position in the screen to another. The two
+     * positions can overlap. All characters of the source and destination must
+     * be within the bounds of the screen, or else an InvalidParemeterException
+     * will be thrown.
+     *
+     * @param sx source X coordinate
+     * @param sy source Y coordinate
+     * @param w  width
+     * @param h  height
+     * @param dx destination X coordinate
+     * @param dy destination Y coordinate
+     */
+    void blockCopy(int sx, int sy, int w, int h, int dx, int dy);
+
+    /**
+     * Block set characters. All characters must be within the bounds of the
+     * screen, or else and InvalidParemeterException will be thrown. Typically
+     * this is called with a "val" argument of 32 to clear a block of
+     * characters.
+     *
+     * @param sx    source X
+     * @param sy    source Y
+     * @param w     width
+     * @param h     height
+     * @param val   value to set.
+     * @param style the text style
+     */
+    void blockSet(int sx, int sy, int w, int h, int val, int style);
+
+    /**
+     * Get the contents of the transcript buffer as a text string.
+     *
+     * @return the contents of the transcript buffer.
+     */
+    String getTranscriptText();
+
+    /**
+     * Get the contents of the transcript buffer as a text string with color
+     * information.
+     *
+     * @param colors A GrowableIntArray which will hold the colors.
+     * @return the contents of the transcript buffer.
+     */
+    String getTranscriptText(GrowableIntArray colors);
+
+    /**
+     * Get the selected text inside transcript buffer as a text string.
+     *
+     * @param x1 Selection start
+     * @param y1 Selection start
+     * @param x2 Selection end
+     * @param y2 Selection end
+     * @return the contents of the transcript buffer.
+     */
+    String getSelectedText(int x1, int y1, int x2, int y2);
+
+    /**
+     * Get the selected text inside transcript buffer as a text string with
+     * color information.
+     *
+     * @param colors A StringBuilder which will hold the colors.
+     * @param x1     Selection start
+     * @param y1     Selection start
+     * @param x2     Selection end
+     * @param y2     Selection end
+     * @return the contents of the transcript buffer.
+     */
+    String getSelectedText(GrowableIntArray colors, int x1, int y1, int x2, int y2);
+
+    /**
+     * Get the number of "active" (in-use) screen rows, including any rows in a
+     * scrollback buffer.
+     */
+    int getActiveRows();
+
+    /**
+     * Try to resize the screen without losing its contents.
+     *
+     * @param columns
+     * @param rows
+     * @param cursor  An int[2] containing the current cursor position
+     *                { col, row }.  If the resize succeeds, the array will be
+     *                updated to reflect the new location.
+     * @return Whether the resize succeeded. If the operation fails, save the
+     * contents of the screen and then use the standard resize.
+     */
+    boolean fastResize(int columns, int rows, int[] cursor);
+
+    /**
+     * Resize the screen
+     *
+     * @param columns
+     * @param rows
+     * @param style
+     */
+    void resize(int columns, int rows, int style);
+}
diff --git a/termemulator/src/main/java/jackpal/androidterm/emulatorview/ShortcutBean.java b/termemulator/src/main/java/jackpal/androidterm/emulatorview/ShortcutBean.java
new file mode 100644
index 00000000..10307ae2
--- /dev/null
+++ b/termemulator/src/main/java/jackpal/androidterm/emulatorview/ShortcutBean.java
@@ -0,0 +1,44 @@
+package jackpal.androidterm.emulatorview;
+
+import android.view.View;
+
+import java.io.Serializable;
+
+/**
+ * Created by Hmei
+ * 11/15/17
+ */
+public class ShortcutBean implements Serializable{
+    private String name;
+    private boolean isUnDeletable;
+    private View.OnClickListener listener;
+
+    public ShortcutBean(String name, boolean isUnDeletable) {
+        this.name = name;
+        this.isUnDeletable = isUnDeletable;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public boolean isUnDeletable() {
+        return isUnDeletable;
+    }
+
+    public void setUnDeletable(boolean unDeletable) {
+        isUnDeletable = unDeletable;
+    }
+
+    public View.OnClickListener getListener() {
+        return listener;
+    }
+
+    public void setListener(View.OnClickListener listener) {
+        this.listener = listener;
+    }
+}
diff --git a/termemulator/src/main/java/jackpal/androidterm/emulatorview/StyleRow.java b/termemulator/src/main/java/jackpal/androidterm/emulatorview/StyleRow.java
new file mode 100644
index 00000000..9753f732
--- /dev/null
+++ b/termemulator/src/main/java/jackpal/androidterm/emulatorview/StyleRow.java
@@ -0,0 +1,99 @@
+package jackpal.androidterm.emulatorview;
+
+/**
+ * Utility class for dealing with text style lines.
+ * <p>
+ * We pack color and formatting information for a particular character into an
+ * int -- see the TextStyle class for details.  The simplest way of storing
+ * that information for a screen row would be to use an array of int -- but
+ * given that we only use the lower three bytes of the int to store information,
+ * that effectively wastes one byte per character -- nearly 8 KB per 100 lines
+ * with an 80-column transcript.
+ * <p>
+ * Instead, we use an array of bytes and store the bytes of each int
+ * consecutively in big-endian order.
+ */
+final class StyleRow {
+    private int mStyle;
+    private int mColumns;
+    /**
+     * Initially null, will be allocated when needed.
+     */
+    private byte[] mData;
+
+    StyleRow(int style, int columns) {
+        mStyle = style;
+        mColumns = columns;
+    }
+
+    void set(int column, int style) {
+        if (style == mStyle && mData == null) {
+            return;
+        }
+        ensureData();
+        setStyle(column, style);
+    }
+
+    int get(int column) {
+        if (mData == null) {
+            return mStyle;
+        }
+        return getStyle(column);
+    }
+
+    boolean isSolidStyle() {
+        return mData == null;
+    }
+
+    int getSolidStyle() {
+        if (mData != null) {
+            throw new IllegalArgumentException("Not a solid style");
+        }
+        return mStyle;
+    }
+
+    void copy(int start, StyleRow dst, int offset, int len) {
+        // fast case
+        if (mData == null && dst.mData == null && start == 0 && offset == 0
+                && len == mColumns) {
+            dst.mStyle = mStyle;
+            return;
+        }
+        // There are other potentially fast cases, but let's just treat them
+        // all the same for simplicity.
+        ensureData();
+        dst.ensureData();
+        System.arraycopy(mData, 3 * start, dst.mData, 3 * offset, 3 * len);
+
+    }
+
+    void ensureData() {
+        if (mData == null) {
+            allocate();
+        }
+    }
+
+    private void allocate() {
+        mData = new byte[3 * mColumns];
+        for (int i = 0; i < mColumns; i++) {
+            setStyle(i, mStyle);
+        }
+    }
+
+    private int getStyle(int column) {
+        int index = 3 * column;
+        byte[] line = mData;
+        return line[index] & 0xff | (line[index + 1] & 0xff) << 8
+                | (line[index + 2] & 0xff) << 16;
+    }
+
+    private void setStyle(int column, int value) {
+        int index = 3 * column;
+        byte[] line = mData;
+        line[index] = (byte) (value & 0xff);
+        line[index + 1] = (byte) ((value >> 8) & 0xff);
+        line[index + 2] = (byte) ((value >> 16) & 0xff);
+    }
+
+
+}
diff --git a/termemulator/src/main/java/jackpal/androidterm/emulatorview/TermKeyListener.java b/termemulator/src/main/java/jackpal/androidterm/emulatorview/TermKeyListener.java
new file mode 100644
index 00000000..cdda0660
--- /dev/null
+++ b/termemulator/src/main/java/jackpal/androidterm/emulatorview/TermKeyListener.java
@@ -0,0 +1,780 @@
+package jackpal.androidterm.emulatorview;
+
+import jackpal.androidterm.emulatorview.compat.AndroidCompat;
+import jackpal.androidterm.emulatorview.compat.KeyCharacterMapCompat;
+
+import java.io.IOException;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Stack;
+
+import android.util.Log;
+import android.view.KeyCharacterMap;
+import android.view.KeyEvent;
+
+import static jackpal.androidterm.emulatorview.compat.KeycodeConstants.*;
+
+/**
+ * An ASCII key listener. Supports control characters and escape. Keeps track of
+ * the current state of the alt, shift, fn, and control keys.
+ */
+class TermKeyListener {
+    private final static String  TAG                  = "TermKeyListener";
+    private static final boolean LOG_MISC             = false;
+    private static final boolean LOG_KEYS             = false;
+    private static final boolean LOG_COMBINING_ACCENT = false;
+
+    /**
+     * Disabled for now because it interferes with ALT processing on phones with physical keyboards.
+     */
+    private final static boolean SUPPORT_8_BIT_META = false;
+
+    private static final int KEYMOD_ALT   = 0x80000000;
+    private static final int KEYMOD_CTRL  = 0x40000000;
+    private static final int KEYMOD_SHIFT = 0x20000000;
+    /**
+     * Means this maps raw scancode
+     */
+    private static final int KEYMOD_SCAN  = 0x10000000;
+
+    private static Map<Integer, String> mKeyMap;
+
+    private String[] mKeyCodes    = new String[256];
+    private String[] mAppKeyCodes = new String[256];
+
+    private void initKeyCodes() {
+        mKeyMap = new HashMap<>();
+        mKeyMap.put(KEYMOD_SHIFT | KEYCODE_DPAD_LEFT, "\033[1;2D");
+        mKeyMap.put(KEYMOD_ALT | KEYCODE_DPAD_LEFT, "\033[1;3D");
+        mKeyMap.put(KEYMOD_ALT | KEYMOD_SHIFT | KEYCODE_DPAD_LEFT, "\033[1;4D");
+        mKeyMap.put(KEYMOD_CTRL | KEYCODE_DPAD_LEFT, "\033[1;5D");
+        mKeyMap.put(KEYMOD_CTRL | KEYMOD_SHIFT | KEYCODE_DPAD_LEFT, "\033[1;6D");
+        mKeyMap.put(KEYMOD_CTRL | KEYMOD_ALT | KEYCODE_DPAD_LEFT, "\033[1;7D");
+        mKeyMap.put(KEYMOD_CTRL | KEYMOD_ALT | KEYMOD_SHIFT | KEYCODE_DPAD_LEFT, "\033[1;8D");
+
+        mKeyMap.put(KEYMOD_SHIFT | KEYCODE_DPAD_RIGHT, "\033[1;2C");
+        mKeyMap.put(KEYMOD_ALT | KEYCODE_DPAD_RIGHT, "\033[1;3C");
+        mKeyMap.put(KEYMOD_ALT | KEYMOD_SHIFT | KEYCODE_DPAD_RIGHT, "\033[1;4C");
+        mKeyMap.put(KEYMOD_CTRL | KEYCODE_DPAD_RIGHT, "\033[1;5C");
+        mKeyMap.put(KEYMOD_CTRL | KEYMOD_SHIFT | KEYCODE_DPAD_RIGHT, "\033[1;6C");
+        mKeyMap.put(KEYMOD_CTRL | KEYMOD_ALT | KEYCODE_DPAD_RIGHT, "\033[1;7C");
+        mKeyMap.put(KEYMOD_CTRL | KEYMOD_ALT | KEYMOD_SHIFT | KEYCODE_DPAD_RIGHT, "\033[1;8C");
+
+        mKeyMap.put(KEYMOD_SHIFT | KEYCODE_DPAD_UP, "\033[1;2A");
+        mKeyMap.put(KEYMOD_ALT | KEYCODE_DPAD_UP, "\033[1;3A");
+        mKeyMap.put(KEYMOD_ALT | KEYMOD_SHIFT | KEYCODE_DPAD_UP, "\033[1;4A");
+        mKeyMap.put(KEYMOD_CTRL | KEYCODE_DPAD_UP, "\033[1;5A");
+        mKeyMap.put(KEYMOD_CTRL | KEYMOD_SHIFT | KEYCODE_DPAD_UP, "\033[1;6A");
+        mKeyMap.put(KEYMOD_CTRL | KEYMOD_ALT | KEYCODE_DPAD_UP, "\033[1;7A");
+        mKeyMap.put(KEYMOD_CTRL | KEYMOD_ALT | KEYMOD_SHIFT | KEYCODE_DPAD_UP, "\033[1;8A");
+
+        mKeyMap.put(KEYMOD_SHIFT | KEYCODE_DPAD_DOWN, "\033[1;2B");
+        mKeyMap.put(KEYMOD_ALT | KEYCODE_DPAD_DOWN, "\033[1;3B");
+        mKeyMap.put(KEYMOD_ALT | KEYMOD_SHIFT | KEYCODE_DPAD_DOWN, "\033[1;4B");
+        mKeyMap.put(KEYMOD_CTRL | KEYCODE_DPAD_DOWN, "\033[1;5B");
+        mKeyMap.put(KEYMOD_CTRL | KEYMOD_SHIFT | KEYCODE_DPAD_DOWN, "\033[1;6B");
+        mKeyMap.put(KEYMOD_CTRL | KEYMOD_ALT | KEYCODE_DPAD_DOWN, "\033[1;7B");
+        mKeyMap.put(KEYMOD_CTRL | KEYMOD_ALT | KEYMOD_SHIFT | KEYCODE_DPAD_DOWN, "\033[1;8B");
+
+        //^[[3~
+        mKeyMap.put(KEYMOD_SHIFT | KEYCODE_FORWARD_DEL, "\033[3;2~");
+        mKeyMap.put(KEYMOD_ALT | KEYCODE_FORWARD_DEL, "\033[3;3~");
+        mKeyMap.put(KEYMOD_CTRL | KEYCODE_FORWARD_DEL, "\033[3;5~");
+
+        //^[[2~
+        mKeyMap.put(KEYMOD_SHIFT | KEYCODE_INSERT, "\033[2;2~");
+        mKeyMap.put(KEYMOD_ALT | KEYCODE_INSERT, "\033[2;3~");
+        mKeyMap.put(KEYMOD_CTRL | KEYCODE_INSERT, "\033[2;5~");
+
+        mKeyMap.put(KEYMOD_CTRL | KEYCODE_MOVE_HOME, "\033[1;5H");
+        mKeyMap.put(KEYMOD_CTRL | KEYCODE_MOVE_END, "\033[1;5F");
+
+        mKeyMap.put(KEYMOD_ALT | KEYCODE_ENTER, "\033\r");
+        mKeyMap.put(KEYMOD_CTRL | KEYCODE_ENTER, "\n");
+        // Duh, so special...
+        mKeyMap.put(KEYMOD_CTRL | KEYCODE_SPACE, "\000");
+
+        mKeyMap.put(KEYMOD_SHIFT | KEYCODE_F1, "\033[1;2P");
+        mKeyMap.put(KEYMOD_SHIFT | KEYCODE_F2, "\033[1;2Q");
+        mKeyMap.put(KEYMOD_SHIFT | KEYCODE_F3, "\033[1;2R");
+        mKeyMap.put(KEYMOD_SHIFT | KEYCODE_F4, "\033[1;2S");
+        mKeyMap.put(KEYMOD_SHIFT | KEYCODE_F5, "\033[15;2~");
+        mKeyMap.put(KEYMOD_SHIFT | KEYCODE_F6, "\033[17;2~");
+        mKeyMap.put(KEYMOD_SHIFT | KEYCODE_F7, "\033[18;2~");
+        mKeyMap.put(KEYMOD_SHIFT | KEYCODE_F8, "\033[19;2~");
+        mKeyMap.put(KEYMOD_SHIFT | KEYCODE_F9, "\033[20;2~");
+        mKeyMap.put(KEYMOD_SHIFT | KEYCODE_F10, "\033[21;2~");
+
+        mKeyCodes[KEYCODE_DPAD_CENTER] = "\015";
+        mKeyCodes[KEYCODE_DPAD_UP] = "\033[A";
+        mKeyCodes[KEYCODE_DPAD_DOWN] = "\033[B";
+        mKeyCodes[KEYCODE_DPAD_RIGHT] = "\033[C";
+        mKeyCodes[KEYCODE_DPAD_LEFT] = "\033[D";
+        setFnKeys("vt100");
+        mKeyCodes[KEYCODE_SYSRQ] = "\033[32~"; // Sys Request / Print
+        // Is this Scroll lock? mKeyCodes[Cancel] = "\033[33~";
+        mKeyCodes[KEYCODE_BREAK] = "\033[34~"; // Pause/Break
+
+        mKeyCodes[KEYCODE_TAB] = "\011";
+        mKeyCodes[KEYCODE_ENTER] = "\015";
+        mKeyCodes[KEYCODE_ESCAPE] = "\033";
+
+        mKeyCodes[KEYCODE_INSERT] = "\033[2~";
+        mKeyCodes[KEYCODE_FORWARD_DEL] = "\033[3~";
+        // Home/End keys are set by setFnKeys()
+        mKeyCodes[KEYCODE_PAGE_UP] = "\033[5~";
+        mKeyCodes[KEYCODE_PAGE_DOWN] = "\033[6~";
+        mKeyCodes[KEYCODE_DEL] = "\177";
+        mKeyCodes[KEYCODE_NUM_LOCK] = "\033OP";
+        mKeyCodes[KEYCODE_NUMPAD_DIVIDE] = "/";
+        mKeyCodes[KEYCODE_NUMPAD_MULTIPLY] = "*";
+        mKeyCodes[KEYCODE_NUMPAD_SUBTRACT] = "-";
+        mKeyCodes[KEYCODE_NUMPAD_ADD] = "+";
+        mKeyCodes[KEYCODE_NUMPAD_ENTER] = "\015";
+        mKeyCodes[KEYCODE_NUMPAD_EQUALS] = "=";
+        mKeyCodes[KEYCODE_NUMPAD_COMMA] = ",";
+/*
+        mKeyCodes[KEYCODE_NUMPAD_DOT] = ".";
+        mKeyCodes[KEYCODE_NUMPAD_0] = "0";
+        mKeyCodes[KEYCODE_NUMPAD_1] = "1";
+        mKeyCodes[KEYCODE_NUMPAD_2] = "2";
+        mKeyCodes[KEYCODE_NUMPAD_3] = "3";
+        mKeyCodes[KEYCODE_NUMPAD_4] = "4";
+        mKeyCodes[KEYCODE_NUMPAD_5] = "5";
+        mKeyCodes[KEYCODE_NUMPAD_6] = "6";
+        mKeyCodes[KEYCODE_NUMPAD_7] = "7";
+        mKeyCodes[KEYCODE_NUMPAD_8] = "8";
+        mKeyCodes[KEYCODE_NUMPAD_9] = "9";
+*/
+        // Keypad is used for cursor/func keys
+        mKeyCodes[KEYCODE_NUMPAD_DOT] = mKeyCodes[KEYCODE_FORWARD_DEL];
+        mKeyCodes[KEYCODE_NUMPAD_0] = mKeyCodes[KEYCODE_INSERT];
+        mKeyCodes[KEYCODE_NUMPAD_1] = mKeyCodes[KEYCODE_MOVE_END];
+        mKeyCodes[KEYCODE_NUMPAD_2] = mKeyCodes[KEYCODE_DPAD_DOWN];
+        mKeyCodes[KEYCODE_NUMPAD_3] = mKeyCodes[KEYCODE_PAGE_DOWN];
+        mKeyCodes[KEYCODE_NUMPAD_4] = mKeyCodes[KEYCODE_DPAD_LEFT];
+        mKeyCodes[KEYCODE_NUMPAD_5] = "5";
+        mKeyCodes[KEYCODE_NUMPAD_6] = mKeyCodes[KEYCODE_DPAD_RIGHT];
+        mKeyCodes[KEYCODE_NUMPAD_7] = mKeyCodes[KEYCODE_MOVE_HOME];
+        mKeyCodes[KEYCODE_NUMPAD_8] = mKeyCodes[KEYCODE_DPAD_UP];
+        mKeyCodes[KEYCODE_NUMPAD_9] = mKeyCodes[KEYCODE_PAGE_UP];
+
+
+//        mAppKeyCodes[KEYCODE_DPAD_UP] = "\033OA";
+//        mAppKeyCodes[KEYCODE_DPAD_DOWN] = "\033OB";
+//        mAppKeyCodes[KEYCODE_DPAD_RIGHT] = "\033OC";
+//        mAppKeyCodes[KEYCODE_DPAD_LEFT] = "\033OD";
+        mAppKeyCodes[KEYCODE_NUMPAD_DIVIDE] = "\033Oo";
+        mAppKeyCodes[KEYCODE_NUMPAD_MULTIPLY] = "\033Oj";
+        mAppKeyCodes[KEYCODE_NUMPAD_SUBTRACT] = "\033Om";
+        mAppKeyCodes[KEYCODE_NUMPAD_ADD] = "\033Ok";
+        mAppKeyCodes[KEYCODE_NUMPAD_ENTER] = "\033OM";
+        mAppKeyCodes[KEYCODE_NUMPAD_EQUALS] = "\033OX";
+        mAppKeyCodes[KEYCODE_NUMPAD_DOT] = "\033On";
+        mAppKeyCodes[KEYCODE_NUMPAD_COMMA] = "\033Ol";
+        mAppKeyCodes[KEYCODE_NUMPAD_0] = "\033Op";
+        mAppKeyCodes[KEYCODE_NUMPAD_1] = "\033Oq";
+        mAppKeyCodes[KEYCODE_NUMPAD_2] = "\033Or";
+        mAppKeyCodes[KEYCODE_NUMPAD_3] = "\033Os";
+        mAppKeyCodes[KEYCODE_NUMPAD_4] = "\033Ot";
+        mAppKeyCodes[KEYCODE_NUMPAD_5] = "\033Ou";
+        mAppKeyCodes[KEYCODE_NUMPAD_6] = "\033Ov";
+        mAppKeyCodes[KEYCODE_NUMPAD_7] = "\033Ow";
+        mAppKeyCodes[KEYCODE_NUMPAD_8] = "\033Ox";
+        mAppKeyCodes[KEYCODE_NUMPAD_9] = "\033Oy";
+    }
+
+    void setCursorKeysApplicationMode(boolean val) {
+        if (LOG_MISC) {
+            Log.d(EmulatorDebug.LOG_TAG, "CursorKeysApplicationMode=" + val);
+        }
+        if (val) {
+            mKeyCodes[KEYCODE_NUMPAD_8] = mKeyCodes[KEYCODE_DPAD_UP] = "\033OA";
+            mKeyCodes[KEYCODE_NUMPAD_2] = mKeyCodes[KEYCODE_DPAD_DOWN] = "\033OB";
+            mKeyCodes[KEYCODE_NUMPAD_6] = mKeyCodes[KEYCODE_DPAD_RIGHT] = "\033OC";
+            mKeyCodes[KEYCODE_NUMPAD_4] = mKeyCodes[KEYCODE_DPAD_LEFT] = "\033OD";
+        } else {
+            mKeyCodes[KEYCODE_NUMPAD_8] = mKeyCodes[KEYCODE_DPAD_UP] = "\033[A";
+            mKeyCodes[KEYCODE_NUMPAD_2] = mKeyCodes[KEYCODE_DPAD_DOWN] = "\033[B";
+            mKeyCodes[KEYCODE_NUMPAD_6] = mKeyCodes[KEYCODE_DPAD_RIGHT] = "\033[C";
+            mKeyCodes[KEYCODE_NUMPAD_4] = mKeyCodes[KEYCODE_DPAD_LEFT] = "\033[D";
+        }
+    }
+
+    /**
+     * The state engine for a modifier key. Can be pressed, released, locked,
+     * and so on.
+     */
+    private class ModifierKey {
+
+        private int mState;
+
+        private static final int UNPRESSED = 0;
+
+        private static final int PRESSED = 1;
+
+        private static final int RELEASED = 2;
+
+        private static final int USED = 3;
+
+        private static final int LOCKED = 4;
+
+        /**
+         * Construct a modifier key. UNPRESSED by default.
+         */
+        ModifierKey() {
+            mState = UNPRESSED;
+        }
+
+        void onPress() {
+            switch (mState) {
+                case PRESSED:
+                    // This is a repeat before use
+                    break;
+                case RELEASED:
+                    mState = LOCKED;
+                    break;
+                case USED:
+                    // This is a repeat after use
+                    break;
+                case LOCKED:
+                    mState = UNPRESSED;
+                    break;
+                default:
+                    mState = PRESSED;
+                    break;
+            }
+        }
+
+        void onRelease() {
+            switch (mState) {
+                case USED:
+                    mState = UNPRESSED;
+                    break;
+                case PRESSED:
+                    mState = RELEASED;
+                    break;
+                default:
+                    // Leave state alone
+                    break;
+            }
+        }
+
+        void adjustAfterKeypress() {
+            switch (mState) {
+                case PRESSED:
+                    mState = USED;
+                    break;
+                case RELEASED:
+                    mState = UNPRESSED;
+                    break;
+                default:
+                    // Leave state alone
+                    break;
+            }
+        }
+
+        boolean isActive() {
+            Log.d(TAG, "isActive:"+mState);
+            return mState != UNPRESSED;
+        }
+
+        int getUIMode() {
+            switch (mState) {
+                default:
+                case UNPRESSED:
+                    return TextRenderer.MODE_OFF;
+                case PRESSED:
+                case RELEASED:
+                case USED:
+                    return TextRenderer.MODE_ON;
+                case LOCKED:
+                    return TextRenderer.MODE_LOCKED;
+            }
+        }
+    }
+
+    private ModifierKey mAltKey = new ModifierKey();
+
+    private ModifierKey mCapKey = new ModifierKey();
+
+    private ModifierKey mControlKey = new ModifierKey();
+
+    private ModifierKey mFnKey = new ModifierKey();
+
+    private ModifierKey mTabKey = new ModifierKey();
+
+    private int mCursorMode;
+
+    private boolean mHardwareControlKey;
+
+    private TermSession mTermSession;
+
+    private int     mBackKeyCode;
+    private boolean mAltSendsEsc;
+
+    private int mCombiningAccent;
+
+    // Map keycodes out of (above) the Unicode code point space.
+    static final int KEYCODE_OFFSET = 0xA00000;
+
+    /**
+     * Construct a term key listener.
+     */
+    TermKeyListener(TermSession termSession) {
+        mTermSession = termSession;
+        initKeyCodes();
+        updateCursorMode();
+    }
+
+    void setBackKeyCharacter(int code) {
+        mBackKeyCode = code;
+    }
+
+    void setAltSendsEsc(boolean flag) {
+        mAltSendsEsc = flag;
+    }
+
+    void handleHardwareControlKey(boolean down) {
+        mHardwareControlKey = down;
+    }
+
+    public void onPause() {
+        // Ensure we don't have any left-over modifier state when switching
+        // views.
+        mHardwareControlKey = false;
+    }
+
+    public void onResume() {
+        // Nothing special.
+    }
+
+    void handleTabKey(boolean down) {
+        Log.d(TAG,"handleTabKey:"+down);
+
+        if (down) {
+            mTabKey.onPress();
+        } else {
+            mTabKey.onRelease();
+        }
+        updateCursorMode();
+    }
+
+    void handleControlKey(boolean down) {
+        Log.d(TAG,"handleControlKey:"+down);
+
+        if (down) {
+            mControlKey.onPress();
+        } else {
+            mControlKey.onRelease();
+        }
+        updateCursorMode();
+    }
+
+    void handleFnKey(boolean down) {
+        Log.d(TAG,"handleFnKey:"+down);
+
+        if (down) {
+            mFnKey.onPress();
+        } else {
+            mFnKey.onRelease();
+        }
+        updateCursorMode();
+    }
+
+    void setTermType(String termType) {
+        setFnKeys(termType);
+    }
+
+    private void setFnKeys(String termType) {
+        // These key assignments taken from the debian squeeze terminfo database.
+        if (termType.equals("xterm")) {
+            mKeyCodes[KEYCODE_NUMPAD_7] = mKeyCodes[KEYCODE_MOVE_HOME] = "\033OH";
+            mKeyCodes[KEYCODE_NUMPAD_1] = mKeyCodes[KEYCODE_MOVE_END] = "\033OF";
+        } else {
+            mKeyCodes[KEYCODE_NUMPAD_7] = mKeyCodes[KEYCODE_MOVE_HOME] = "\033[1~";
+            mKeyCodes[KEYCODE_NUMPAD_1] = mKeyCodes[KEYCODE_MOVE_END] = "\033[4~";
+        }
+        if (termType.equals("vt100")) {
+            mKeyCodes[KEYCODE_F1] = "\033OP"; // VT100 PF1
+            mKeyCodes[KEYCODE_F2] = "\033OQ"; // VT100 PF2
+            mKeyCodes[KEYCODE_F3] = "\033OR"; // VT100 PF3
+            mKeyCodes[KEYCODE_F4] = "\033OS"; // VT100 PF4
+            // the following keys are in the database, but aren't on a real vt100.
+            mKeyCodes[KEYCODE_F5] = "\033Ot";
+            mKeyCodes[KEYCODE_F6] = "\033Ou";
+            mKeyCodes[KEYCODE_F7] = "\033Ov";
+            mKeyCodes[KEYCODE_F8] = "\033Ol";
+            mKeyCodes[KEYCODE_F9] = "\033Ow";
+            mKeyCodes[KEYCODE_F10] = "\033Ox";
+            // The following keys are not in database.
+            mKeyCodes[KEYCODE_F11] = "\033[23~";
+            mKeyCodes[KEYCODE_F12] = "\033[24~";
+        } else if (termType.startsWith("linux")) {
+            mKeyCodes[KEYCODE_F1] = "\033[[A";
+            mKeyCodes[KEYCODE_F2] = "\033[[B";
+            mKeyCodes[KEYCODE_F3] = "\033[[C";
+            mKeyCodes[KEYCODE_F4] = "\033[[D";
+            mKeyCodes[KEYCODE_F5] = "\033[[E";
+            mKeyCodes[KEYCODE_F6] = "\033[17~";
+            mKeyCodes[KEYCODE_F7] = "\033[18~";
+            mKeyCodes[KEYCODE_F8] = "\033[19~";
+            mKeyCodes[KEYCODE_F9] = "\033[20~";
+            mKeyCodes[KEYCODE_F10] = "\033[21~";
+            mKeyCodes[KEYCODE_F11] = "\033[23~";
+            mKeyCodes[KEYCODE_F12] = "\033[24~";
+        } else {
+            // default
+            // screen, screen-256colors, xterm, anything new
+            mKeyCodes[KEYCODE_F1] = "\033OP"; // VT100 PF1
+            mKeyCodes[KEYCODE_F2] = "\033OQ"; // VT100 PF2
+            mKeyCodes[KEYCODE_F3] = "\033OR"; // VT100 PF3
+            mKeyCodes[KEYCODE_F4] = "\033OS"; // VT100 PF4
+            mKeyCodes[KEYCODE_F5] = "\033[15~";
+            mKeyCodes[KEYCODE_F6] = "\033[17~";
+            mKeyCodes[KEYCODE_F7] = "\033[18~";
+            mKeyCodes[KEYCODE_F8] = "\033[19~";
+            mKeyCodes[KEYCODE_F9] = "\033[20~";
+            mKeyCodes[KEYCODE_F10] = "\033[21~";
+            mKeyCodes[KEYCODE_F11] = "\033[23~";
+            mKeyCodes[KEYCODE_F12] = "\033[24~";
+        }
+    }
+
+    int mapControlChar(int ch) {
+        return mapControlChar(mHardwareControlKey || mControlKey.isActive(), mFnKey.isActive(), ch);
+    }
+
+    private int mapControlChar(boolean control, boolean fn, int ch) {
+        Log.d(TAG, "mapControlChar:"+ch+"-:control:"+control+"-fn:"+fn);
+        int result = ch;
+        if (control) {
+            // Search is the control key.
+            if (result >= 'a' && result <= 'z') {
+                result = (char) (result - 'a' + '\001');
+            } else if (result >= 'A' && result <= 'Z') {
+                result = (char) (result - 'A' + '\001');
+            } else if (result == ' ' || result == '2') {
+                result = 0;
+            } else if (result == '[' || result == '3') {
+                result = 27; // ^[ (Esc)
+            } else if (result == '\\' || result == '4') {
+                result = 28;
+            } else if (result == ']' || result == '5') {
+                result = 29;
+            } else if (result == '^' || result == '6') {
+                result = 30; // control-^
+            } else if (result == '_' || result == '7') {
+                result = 31;
+            } else if (result == '8') {
+                result = 127; // DEL
+            } else if (result == '9') {
+                result = KEYCODE_OFFSET + KEYCODE_F11;
+            } else if (result == '0') {
+                result = KEYCODE_OFFSET + KEYCODE_F12;
+            }
+        } else if (fn) {
+            if (result == 'w' || result == 'W') {
+                result = KEYCODE_OFFSET + KeyEvent.KEYCODE_DPAD_UP;
+            } else if (result == 'a' || result == 'A') {
+                result = KEYCODE_OFFSET + KeyEvent.KEYCODE_DPAD_LEFT;
+            } else if (result == 's' || result == 'S') {
+                result = KEYCODE_OFFSET + KeyEvent.KEYCODE_DPAD_DOWN;
+            } else if (result == 'd' || result == 'D') {
+                result = KEYCODE_OFFSET + KeyEvent.KEYCODE_DPAD_RIGHT;
+            } else if (result == 'p' || result == 'P') {
+                result = KEYCODE_OFFSET + KEYCODE_PAGE_UP;
+            } else if (result == 'n' || result == 'N') {
+                result = KEYCODE_OFFSET + KEYCODE_PAGE_DOWN;
+            } else if (result == 't' || result == 'T') {
+                result = KEYCODE_OFFSET + KeyEvent.KEYCODE_TAB;
+            } else if (result == 'l' || result == 'L') {
+                result = '|';
+            } else if (result == 'u' || result == 'U') {
+                result = '_';
+            } else if (result == 'e' || result == 'E') {
+                result = 27; // ^[ (Esc)
+            } else if (result == '.') {
+                result = 28; // ^\
+            } else if (result > '0' && result <= '9') {
+                // F1-F9
+                result = (char) (result + KEYCODE_OFFSET + KEYCODE_F1 - 1);
+            } else if (result == '0') {
+                result = KEYCODE_OFFSET + KEYCODE_F10;
+            } else if (result == 'i' || result == 'I') {
+                result = KEYCODE_OFFSET + KEYCODE_INSERT;
+            } else if (result == 'x' || result == 'X') {
+                result = KEYCODE_OFFSET + KEYCODE_FORWARD_DEL;
+            } else if (result == 'h' || result == 'H') {
+                result = KEYCODE_OFFSET + KEYCODE_MOVE_HOME;
+            } else if (result == 'f' || result == 'F') {
+                result = KEYCODE_OFFSET + KEYCODE_MOVE_END;
+            }
+        }
+
+        if (result > -1) {
+            mAltKey.adjustAfterKeypress();
+            mCapKey.adjustAfterKeypress();
+            mControlKey.adjustAfterKeypress();
+            mFnKey.adjustAfterKeypress();
+            updateCursorMode();
+        }
+
+        return result;
+    }
+
+    /**
+     * Handle a keyDown event.
+     *
+     * @param keyCode the keycode of the keyDown event
+     */
+    void keyDown(int keyCode, KeyEvent event, boolean appMode,
+                 boolean allowToggle) throws IOException {
+        if (LOG_KEYS) {
+            Log.i(TAG, "keyDown(" + keyCode + "," + event + "," + appMode + "," + allowToggle + ")");
+        }
+        if (handleKeyCode(keyCode, event, appMode)) {
+            return;
+        }
+        int result = -1;
+        boolean chordedCtrl = false;
+        boolean setHighBit = false;
+        switch (keyCode) {
+            case KeyEvent.KEYCODE_ALT_RIGHT:
+            case KeyEvent.KEYCODE_ALT_LEFT:
+                if (allowToggle) {
+                    mAltKey.onPress();
+                    updateCursorMode();
+                }
+                break;
+
+            case KeyEvent.KEYCODE_SHIFT_LEFT:
+            case KeyEvent.KEYCODE_SHIFT_RIGHT:
+                if (allowToggle) {
+                    mCapKey.onPress();
+                    updateCursorMode();
+                }
+                break;
+
+            case KEYCODE_CTRL_LEFT:
+            case KEYCODE_CTRL_RIGHT:
+                // Ignore the control key.
+                return;
+
+            case KEYCODE_CAPS_LOCK:
+                // Ignore the capslock key.
+                return;
+
+            case KEYCODE_FUNCTION:
+                // Ignore the function key.
+                return;
+
+            case KeyEvent.KEYCODE_BACK:
+                result = mBackKeyCode;
+                break;
+//            case KeyEvent.KEYCODE_ENTER:
+//                history.push(stringBuffer.toString());
+//                break;
+
+            default: {
+                int metaState = event.getMetaState();
+                chordedCtrl = ((META_CTRL_ON & metaState) != 0);
+                boolean effectiveCaps = allowToggle &&
+                        (mCapKey.isActive());
+                boolean effectiveAlt = allowToggle && mAltKey.isActive();
+                int effectiveMetaState = metaState & (~META_CTRL_MASK);
+                if (effectiveCaps) {
+                    effectiveMetaState |= KeyEvent.META_SHIFT_ON;
+                }
+                if (!allowToggle && (effectiveMetaState & META_ALT_ON) != 0) {
+                    effectiveAlt = true;
+                }
+                if (effectiveAlt) {
+                    if (mAltSendsEsc) {
+                        mTermSession.write(new byte[]{0x1b}, 0, 1);
+                        effectiveMetaState &= ~KeyEvent.META_ALT_MASK;
+                    } else if (SUPPORT_8_BIT_META) {
+                        setHighBit = true;
+                        effectiveMetaState &= ~KeyEvent.META_ALT_MASK;
+                    } else {
+                        // Legacy behavior: Pass Alt through to allow composing characters.
+                        effectiveMetaState |= KeyEvent.META_ALT_ON;
+                    }
+                }
+
+                // Note: The Hacker keyboard IME key labeled Alt actually sends Meta.
+
+
+                if ((metaState & KeyEvent.META_META_ON) != 0) {
+                    if (mAltSendsEsc) {
+                        mTermSession.write(new byte[]{0x1b}, 0, 1);
+                        effectiveMetaState &= ~KeyEvent.META_META_MASK;
+                    } else {
+                        if (SUPPORT_8_BIT_META) {
+                            setHighBit = true;
+                            effectiveMetaState &= ~KeyEvent.META_META_MASK;
+                        }
+                    }
+                }
+                result = event.getUnicodeChar(effectiveMetaState);
+
+                if ((result & KeyCharacterMap.COMBINING_ACCENT) != 0) {
+                    if (LOG_COMBINING_ACCENT) {
+                        Log.i(TAG, "Got combining accent " + result);
+                    }
+                    mCombiningAccent = result & KeyCharacterMap.COMBINING_ACCENT_MASK;
+                    return;
+                }
+                if (mCombiningAccent != 0) {
+                    int unaccentedChar = result;
+                    result = KeyCharacterMap.getDeadChar(mCombiningAccent, unaccentedChar);
+                    if (LOG_COMBINING_ACCENT) {
+                        Log.i(TAG, "getDeadChar(" + mCombiningAccent + ", " + unaccentedChar + ") -> " + result);
+                    }
+                    mCombiningAccent = 0;
+                }
+
+                break;
+            }
+        }
+
+        boolean effectiveControl = chordedCtrl || mHardwareControlKey || (allowToggle && mControlKey.isActive());
+        boolean effectiveFn = allowToggle && mFnKey.isActive();
+
+        result = mapControlChar(effectiveControl, effectiveFn, result);
+
+        if (result >= KEYCODE_OFFSET) {
+            handleKeyCode(result - KEYCODE_OFFSET, null, appMode);
+        } else if (result >= 0) {
+            if (setHighBit) {
+                result |= 0x80;
+            }
+            mTermSession.write(result);
+//            stringBuffer.append(result);
+        }
+    }
+//
+//    private Stack<String> history      = new Stack<>();
+//    private StringBuffer  stringBuffer = new StringBuffer();
+
+    int getCombiningAccent() {
+        return mCombiningAccent;
+    }
+
+    int getCursorMode() {
+        return mCursorMode;
+    }
+
+    private void updateCursorMode() {
+        mCursorMode = getCursorModeHelper(mCapKey, TextRenderer.MODE_SHIFT_SHIFT)
+                | getCursorModeHelper(mAltKey, TextRenderer.MODE_ALT_SHIFT)
+                | getCursorModeHelper(mControlKey, TextRenderer.MODE_CTRL_SHIFT)
+                | getCursorModeHelper(mFnKey, TextRenderer.MODE_FN_SHIFT)
+                | getCursorModeHelper(mTabKey, TextRenderer.MODE_TAB_SHIFT);
+    }
+
+    private static int getCursorModeHelper(ModifierKey key, int shift) {
+        return key.getUIMode() << shift;
+    }
+
+    static boolean isEventFromToggleDevice(KeyEvent event) {
+        //if (AndroidCompat.SDK < 11) {
+            return true;
+        //}
+//        KeyCharacterMapCompat kcm = KeyCharacterMapCompat.wrap(
+//                KeyCharacterMap.load(event.getDeviceId()));
+//
+//        return kcm.getModifierBehaviour() ==
+//                KeyCharacterMapCompat.MODIFIER_BEHAVIOR_CHORDED_OR_TOGGLED;
+    }
+
+    boolean handleKeyCode(int keyCode, KeyEvent event, boolean appMode) throws IOException {
+        String code = null;
+        if (event != null) {
+            int keyMod = 0;
+            // META_CTRL_ON was added only in API 11, so don't use it,
+            // use our own tracking of Ctrl key instead.
+            // (event.getMetaState() & META_CTRL_ON) != 0
+            if (mHardwareControlKey || mControlKey.isActive()) {
+                keyMod |= KEYMOD_CTRL;
+            }
+            if ((event.getMetaState() & META_ALT_ON) != 0) {
+                keyMod |= KEYMOD_ALT;
+            }
+            if ((event.getMetaState() & META_SHIFT_ON) != 0) {
+                keyMod |= KEYMOD_SHIFT;
+            }
+            // First try to map scancode
+            code = mKeyMap.get(event.getScanCode() | KEYMOD_SCAN | keyMod);
+            if (code == null) {
+                code = mKeyMap.get(keyCode | keyMod);
+            }
+        }
+
+        if (code == null && keyCode >= 0 && keyCode < mKeyCodes.length) {
+            if (appMode) {
+                code = mAppKeyCodes[keyCode];
+            }
+            if (code == null) {
+                code = mKeyCodes[keyCode];
+            }
+        }
+
+        if (code != null) {
+            if (EmulatorDebug.LOG_CHARACTERS_FLAG) {
+                byte[] bytes = code.getBytes();
+                //Log.d(EmulatorDebug.LOG_TAG, "Out: '" + EmulatorDebug.bytesToString(bytes, 0, bytes.length) + "'");
+            }
+            //Log.d(TAG, "handleKeyCode:"+code);
+            mTermSession.write(code);
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Handle a keyUp event.
+     *
+     * @param keyCode the keyCode of the keyUp event
+     */
+    void keyUp(int keyCode, KeyEvent event) {
+        boolean allowToggle = isEventFromToggleDevice(event);
+        switch (keyCode) {
+            case KeyEvent.KEYCODE_ALT_LEFT:
+            case KeyEvent.KEYCODE_ALT_RIGHT:
+                if (allowToggle) {
+                    mAltKey.onRelease();
+                    updateCursorMode();
+                }
+                break;
+            case KeyEvent.KEYCODE_SHIFT_LEFT:
+            case KeyEvent.KEYCODE_SHIFT_RIGHT:
+                if (allowToggle) {
+                    mCapKey.onRelease();
+                    updateCursorMode();
+                }
+                break;
+
+            case KEYCODE_CTRL_LEFT:
+            case KEYCODE_CTRL_RIGHT:
+                // ignore control keys.
+                break;
+
+            default:
+                // Ignore other keyUps
+                break;
+        }
+    }
+
+    boolean getAltSendsEsc() {
+        return mAltSendsEsc;
+    }
+
+    boolean isAltActive() {
+        return mAltKey.isActive();
+    }
+
+    boolean isCtrlActive() {
+        return mControlKey.isActive();
+    }
+}
diff --git a/termemulator/src/main/java/jackpal/androidterm/emulatorview/TermSession.java b/termemulator/src/main/java/jackpal/androidterm/emulatorview/TermSession.java
new file mode 100644
index 00000000..e29c7c8c
--- /dev/null
+++ b/termemulator/src/main/java/jackpal/androidterm/emulatorview/TermSession.java
@@ -0,0 +1,673 @@
+/*
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package jackpal.androidterm.emulatorview;
+
+import android.annotation.SuppressLint;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.Message;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetEncoder;
+import java.nio.charset.CodingErrorAction;
+import java.util.Arrays;
+
+/**
+ * A terminal session, consisting of a VT100 terminal emulator and its
+ * input and output streams.
+ * <p>
+ * You need to supply an {@link InputStream} and {@link OutputStream} to
+ * provide input and output to the terminal.  For a locally running
+ * program, these would typically point to a tty; for a telnet program
+ * they might point to a network socket.  Reader and writer threads will be
+ * spawned to do I/O to these streams.  All other operations, including
+ * processing of input and output in {@link #processInput processInput} and
+ * {@link #write(byte[], int, int) write}, will be performed on the main thread.
+ * <p>
+ * Call {@link #setTermIn} and {@link #setTermOut} to connect the input and
+ * output streams to the emulator.  When all of your initialization is
+ * complete, your initial screen size is known, and you're ready to
+ * start VT100 emulation, call {@link #initializeEmulator} or {@link
+ * #updateSize} with the number of rows and columns the terminal should
+ * initially have.  (If you attach the session to an {@link EmulatorView},
+ * the view will take care of setting the screen size and initializing the
+ * emulator for you.)
+ * <p>
+ * When you're done with the session, you should call {@link #finish} on it.
+ * This frees emulator data from memory, stops the reader and writer threads,
+ * and closes the attached I/O streams.
+ */
+public class TermSession {
+    // Number of rows in the transcript
+    private static final int TRANSCRIPT_ROWS = 10000;
+    private static final int NEW_INPUT       = 1;
+    private static final int NEW_OUTPUT      = 2;
+    private static final int FINISH          = 3;
+    private static final int EOF             = 4;
+    private TermKeyListener mKeyListener;
+    private ColorScheme mColorScheme = BaseTextRenderer.defaultColorScheme;
+    private UpdateCallback   mNotify;
+    private OutputStream     mTermOut;
+    private InputStream      mTermIn;
+    private String           mTitle;
+    private TranscriptScreen mTranscriptScreen;
+    private TerminalEmulator mEmulator;
+    private boolean          mDefaultUTF8Mode;
+    private Thread           mReaderThread;
+    private ByteQueue        mByteQueue;
+    private byte[]           mReceiveBuffer;
+    private Thread           mWriterThread;
+    private ByteQueue        mWriteQueue;
+    private Handler          mWriterHandler;
+    private CharBuffer       mWriteCharBuffer;
+    private ByteBuffer       mWriteByteBuffer;
+    private CharsetEncoder   mUTF8Encoder;
+    private FinishCallback   mFinishCallback;
+    private boolean mIsRunning  = false;
+    private Handler mMsgHandler = new MyHandler();
+    private UpdateCallback mTitleChangedListener;
+
+    @SuppressLint("HandlerLeak")
+    private class MyHandler extends Handler {
+        @Override
+        public void handleMessage(Message msg) {
+            if (!mIsRunning) {
+                return;
+            }
+            if (msg.what == NEW_INPUT) {
+                readFromProcess();
+            } else if (msg.what == EOF) {
+                new Handler(Looper.getMainLooper()).post(new Runnable() {
+                    @Override
+                    public void run() {
+                        onProcessExit();
+                    }
+                });
+            }
+        }
+    }
+
+    public TermSession() {
+        this(false);
+    }
+
+    public TermSession(final boolean exitOnEOF) {
+        mWriteCharBuffer = CharBuffer.allocate(2);
+        mWriteByteBuffer = ByteBuffer.allocate(4);
+        mUTF8Encoder = Charset.forName("UTF-8").newEncoder();
+        mUTF8Encoder.onMalformedInput(CodingErrorAction.REPLACE);
+        mUTF8Encoder.onUnmappableCharacter(CodingErrorAction.REPLACE);
+
+        mReceiveBuffer = new byte[4 * 1024];
+        mByteQueue = new ByteQueue(4 * 1024);
+        mReaderThread = new Thread() {
+            private byte[] mBuffer = new byte[4096];
+
+            @Override
+            public void run() {
+                try {
+                    while (true) {
+                        int read = mTermIn.read(mBuffer);
+                        //System.out.println("READER + " + convert(mBuffer));
+                        if (read == -1) {
+                            // EOF -- process exited
+                            break;
+                        }
+                        int offset = 0;
+                        while (read > 0) {
+                            int written = mByteQueue.write(mBuffer,
+                                    offset, read);
+                            offset += written;
+                            read -= written;
+                            mMsgHandler.sendMessage(
+                                    mMsgHandler.obtainMessage(NEW_INPUT));
+                        }
+                    }
+                } catch (IOException e) {
+                } catch (InterruptedException e) {
+                }
+
+                if (exitOnEOF) mMsgHandler.sendMessage(mMsgHandler.obtainMessage(EOF));
+            }
+        };
+        mReaderThread.setName("% input reader");
+
+        mWriteQueue = new ByteQueue(4096);
+        mWriterThread = new Thread() {
+            private byte[] mBuffer = new byte[4096];
+
+            @Override
+            public void run() {
+                Looper.prepare();
+
+                mWriterHandler = new Handler() {
+                    @Override
+                    public void handleMessage(Message msg) {
+                        if (msg.what == NEW_OUTPUT) {
+                            writeToOutput();
+                        } else if (msg.what == FINISH) {
+                            Looper.myLooper().quit();
+                        }
+                    }
+                };
+
+                // Drain anything in the queue from before we started
+                writeToOutput();
+
+                Looper.loop();
+            }
+
+            private void writeToOutput() {
+                ByteQueue writeQueue = mWriteQueue;
+                byte[] buffer = mBuffer;
+                OutputStream termOut = mTermOut;
+                //System.out.println("OUTPUT+ " + convert(buffer));
+                int bytesAvailable = writeQueue.getBytesAvailable();
+                int bytesToWrite = Math.min(bytesAvailable, buffer.length);
+
+                if (bytesToWrite == 0) {
+                    return;
+                }
+
+                try {
+                    writeQueue.read(buffer, 0, bytesToWrite);
+                    termOut.write(buffer, 0, bytesToWrite);
+                    termOut.flush();
+                } catch (IOException e) {
+                    // Ignore exception
+                    // We don't really care if the receiver isn't listening.
+                    // We just make a best effort to answer the query.
+                    e.printStackTrace();
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+            }
+        };
+        mWriterThread.setName("TermSession output writer");
+    }
+
+    public void appendTextToEmulator(String text) {
+        byte[] input = text.getBytes();
+        int read = input.length;
+        int offset = 0;
+        while (read > 0) {
+            int written;
+            try {
+                written = mByteQueue.write(input,
+                        offset, read);
+                offset += written;
+                read -= written;
+                mMsgHandler.sendMessage(
+                        mMsgHandler.obtainMessage(NEW_INPUT));
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    private String convert(byte[] bytes) {
+        StringBuffer stringBuffer = new StringBuffer();
+        int index = 0;
+        while (index < bytes.length && bytes[index] != 0) {
+            stringBuffer.append(Character.toString((char) bytes[index]));
+            index++;
+        }
+        return stringBuffer.toString();
+    }
+
+    public void setKeyListener(TermKeyListener l) {
+        mKeyListener = l;
+    }
+
+    protected void onProcessExit() {
+        finish();
+    }
+
+    /**
+     * Set the terminal emulator's window size and start terminal emulation.
+     *
+     * @param columns The number of columns in the terminal window.
+     * @param rows    The number of rows in the terminal window.
+     */
+    public void initializeEmulator(int columns, int rows) {
+        mTranscriptScreen = new TranscriptScreen(columns, TRANSCRIPT_ROWS, rows, mColorScheme);
+        mEmulator = new TerminalEmulator(this, mTranscriptScreen, columns, rows, mColorScheme);
+        mEmulator.setDefaultUTF8Mode(mDefaultUTF8Mode);
+        mEmulator.setKeyListener(mKeyListener);
+
+        mIsRunning = true;
+        mReaderThread.start();
+        mWriterThread.start();
+    }
+
+    /**
+     * Write data to the terminal output.  The written data will be consumed by
+     * the emulation client as input.
+     * <p>
+     * <code>write</code> itself runs on the main thread.  The default
+     * implementation writes the data into a circular buffer and signals the
+     * writer thread to copy it from there to the {@link OutputStream}.
+     * <p>
+     * Subclasses may override this method to modify the output before writing
+     * it to the stream, but implementations in derived classes should call
+     * through to this method to do the actual writing.
+     *
+     * @param data   An array of bytes to write to the terminal.
+     * @param offset The offset into the array at which the data starts.
+     * @param count  The number of bytes to be written.
+     */
+    public void write(byte[] data, int offset, int count) {
+        try {
+            while (count > 0) {
+                int written = mWriteQueue.write(data, offset, count);
+                offset += written;
+                count -= written;
+                notifyNewOutput();
+            }
+        } catch (InterruptedException e) {
+        }
+    }
+
+    /**
+     * Write the UTF-8 representation of a String to the terminal output.  The
+     * written data will be consumed by the emulation client as input.
+     * <p>
+     * This implementation encodes the String and then calls
+     * {@link #write(byte[], int, int)} to do the actual writing.  It should
+     * therefore usually be unnecessary to override this method; override
+     * {@link #write(byte[], int, int)} instead.
+     *
+     * @param data The String to write to the terminal.
+     */
+    public void write(String data) {
+        try {
+            byte[] bytes = data.getBytes("UTF-8");
+            write(bytes, 0, bytes.length);
+        } catch (UnsupportedEncodingException e) {
+        }
+    }
+
+    /**
+     * Write the UTF-8 representation of a single Unicode code point to the
+     * terminal output.  The written data will be consumed by the emulation
+     * client as input.
+     * <p>
+     * This implementation encodes the code point and then calls
+     * {@link #write(byte[], int, int)} to do the actual writing.  It should
+     * therefore usually be unnecessary to override this method; override
+     * {@link #write(byte[], int, int)} instead.
+     *
+     * @param codePoint The Unicode code point to write to the terminal.
+     */
+    public void write(int codePoint) {
+        ByteBuffer byteBuf = mWriteByteBuffer;
+        if (codePoint < 128) {
+            // Fast path for ASCII characters
+            byte[] buf = byteBuf.array();
+            buf[0] = (byte) codePoint;
+            write(buf, 0, 1);
+            return;
+        }
+
+        CharBuffer charBuf = mWriteCharBuffer;
+        CharsetEncoder encoder = mUTF8Encoder;
+
+        charBuf.clear();
+        byteBuf.clear();
+        Character.toChars(codePoint, charBuf.array(), 0);
+        encoder.reset();
+        encoder.encode(charBuf, byteBuf, true);
+        encoder.flush(byteBuf);
+        write(byteBuf.array(), 0, byteBuf.position() - 1);
+    }
+
+    /* Notify the writer thread that there's new output waiting */
+    private void notifyNewOutput() {
+        Handler writerHandler = mWriterHandler;
+        if (writerHandler == null) {
+           /* Writer thread isn't started -- will pick up data once it does */
+            return;
+        }
+        writerHandler.sendEmptyMessage(NEW_OUTPUT);
+    }
+
+    /**
+     * Get the {@link OutputStream} associated with this session.
+     *
+     * @return This session's {@link OutputStream}.
+     */
+    public OutputStream getTermOut() {
+        return mTermOut;
+    }
+
+    /**
+     * Set the {@link OutputStream} associated with this session.
+     *
+     * @param termOut This session's {@link OutputStream}.
+     */
+    public void setTermOut(OutputStream termOut) {
+        mTermOut = termOut;
+    }
+
+    /**
+     * Get the {@link InputStream} associated with this session.
+     *
+     * @return This session's {@link InputStream}.
+     */
+    public InputStream getTermIn() {
+        return mTermIn;
+    }
+
+    /**
+     * Set the {@link InputStream} associated with this session.
+     *
+     * @param termIn This session's {@link InputStream}.
+     */
+    public void setTermIn(InputStream termIn) {
+        mTermIn = termIn;
+    }
+
+    /**
+     * @return Whether the terminal emulation is currently running.
+     */
+    public boolean isRunning() {
+        return mIsRunning;
+    }
+
+    TranscriptScreen getTranscriptScreen() {
+        return mTranscriptScreen;
+    }
+
+    TerminalEmulator getEmulator() {
+        return mEmulator;
+    }
+
+    /**
+     * Set an {@link UpdateCallback} to be invoked when the terminal emulator's
+     * screen is changed.
+     *
+     * @param notify The {@link UpdateCallback} to be invoked on changes.
+     */
+    public void setUpdateCallback(UpdateCallback notify) {
+        mNotify = notify;
+    }
+
+    /**
+     * Notify the {@link UpdateCallback} registered by {@link
+     * #setUpdateCallback setUpdateCallback} that the screen has changed.
+     */
+    public void notifyUpdate() {
+        if (mNotify != null) {
+            mNotify.onUpdate();
+        }
+    }
+
+    /**
+     * Get the terminal session's title (may be null).
+     */
+    public String getTitle() {
+        return mTitle;
+    }
+
+    /**
+     * Change the terminal session's title.
+     */
+    public void setTitle(String title) {
+        mTitle = title;
+        notifyTitleChanged();
+    }
+
+    /**
+     * Set an {@link UpdateCallback} to be invoked when the terminal emulator's
+     * title is changed.
+     *
+     * @param listener The {@link UpdateCallback} to be invoked on changes.
+     */
+    public void setTitleChangedListener(UpdateCallback listener) {
+        mTitleChangedListener = listener;
+    }
+
+    /**
+     * Notify the UpdateCallback registered for title changes, if any, that the
+     * terminal session's title has changed.
+     */
+    protected void notifyTitleChanged() {
+        UpdateCallback listener = mTitleChangedListener;
+        if (listener != null) {
+            listener.onUpdate();
+        }
+    }
+
+    /**
+     * Change the terminal's window size.  Will call {@link #initializeEmulator}
+     * if the emulator is not yet running.
+     * <p>
+     * You should override this method if your application needs to be notified
+     * when the screen size changes (for example, if you need to issue
+     * <code>TIOCSWINSZ</code> to a tty to adjust the window size).  <em>If you
+     * do override this method, you must call through to the superclass
+     * implementation.</em>
+     *
+     * @param columns The number of columns in the terminal window.
+     * @param rows    The number of rows in the terminal window.
+     */
+    public void updateSize(int columns, int rows) {
+        if (mEmulator == null) {
+            initializeEmulator(columns, rows);
+        } else {
+            mEmulator.updateSize(columns, rows);
+        }
+    }
+
+    /**
+     * Retrieve the terminal's screen and scrollback buffer.
+     *
+     * @return A {@link String} containing the contents of the screen and
+     * scrollback buffer.
+     */
+    public String getTranscriptText() {
+        return mTranscriptScreen.getTranscriptText();
+    }
+
+    /**
+     * Look for new input from the ptty, send it to the terminal emulator.
+     */
+    private void readFromProcess() {
+        int bytesAvailable = mByteQueue.getBytesAvailable();
+        int bytesToRead = Math.min(bytesAvailable, mReceiveBuffer.length);
+        int bytesRead = 0;
+        try {
+            bytesRead = mByteQueue.read(mReceiveBuffer, 0, bytesToRead);
+        } catch (InterruptedException e) {
+            return;
+        }
+
+        // Give subclasses a chance to process the read data
+        processInput(mReceiveBuffer, 0, bytesRead);
+        notifyUpdate();
+    }
+
+    /**
+     * Process input and send it to the terminal emulator.  This method is
+     * invoked on the main thread whenever new data is read from the
+     * InputStream.
+     * <p>
+     * The default implementation sends the data straight to the terminal
+     * emulator without modifying it in any way.  Subclasses can override it to
+     * modify the data before giving it to the terminal.
+     *
+     * @param data   A byte array containing the data read.
+     * @param offset The offset into the buffer where the read data begins.
+     * @param count  The number of bytes read.
+     */
+    public void processInput(byte[] data, int offset, int count) {
+        mEmulator.append(data, offset, count);
+    }
+
+    /**
+     * Write something directly to the terminal emulator input, bypassing the
+     * emulation client, the session's {@link InputStream}, and any processing
+     * being done by {@link #processInput processInput}.
+     *
+     * @param data   The data to be written to the terminal.
+     * @param offset The starting offset into the buffer of the data.
+     * @param count  The length of the data to be written.
+     */
+    protected final void appendToEmulator(byte[] data, int offset, int count) {
+        mEmulator.append(data, offset, count);
+    }
+
+    /**
+     * Set the terminal emulator's color scheme (default colors).
+     *
+     * @param scheme The {@link ColorScheme} to be used (use null for the
+     *               default scheme).
+     */
+    public void setColorScheme(ColorScheme scheme) {
+        if (scheme == null) {
+            scheme = BaseTextRenderer.defaultColorScheme;
+        }
+        mColorScheme = scheme;
+        if (mEmulator == null) {
+            return;
+        }
+        mEmulator.setColorScheme(scheme);
+    }
+
+    /**
+     * Set whether the terminal emulator should be in UTF-8 mode by default.
+     * <p>
+     * In UTF-8 mode, the terminal will handle UTF-8 sequences, allowing the
+     * display of text in most of the world's languages, but applications must
+     * encode C1 control characters and graphics drawing characters as the
+     * corresponding UTF-8 sequences.
+     *
+     * @param utf8ByDefault Whether the terminal emulator should be in UTF-8
+     *                      mode by default.
+     */
+    public void setDefaultUTF8Mode(boolean utf8ByDefault) {
+        mDefaultUTF8Mode = utf8ByDefault;
+        if (mEmulator == null) {
+            return;
+        }
+        mEmulator.setDefaultUTF8Mode(utf8ByDefault);
+    }
+
+    /**
+     * Get whether the terminal emulator is currently in UTF-8 mode.
+     *
+     * @return Whether the emulator is currently in UTF-8 mode.
+     */
+    public boolean getUTF8Mode() {
+        if (mEmulator == null) {
+            return mDefaultUTF8Mode;
+        } else {
+            return mEmulator.getUTF8Mode();
+        }
+    }
+
+    /**
+     * Set an {@link UpdateCallback} to be invoked when the terminal emulator
+     * goes into or out of UTF-8 mode.
+     *
+     * @param utf8ModeNotify The {@link UpdateCallback} to be invoked.
+     */
+    public void setUTF8ModeUpdateCallback(UpdateCallback utf8ModeNotify) {
+        if (mEmulator != null) {
+            mEmulator.setUTF8ModeUpdateCallback(utf8ModeNotify);
+        }
+    }
+
+    /**
+     * Reset the terminal emulator's state.
+     */
+    public void reset() {
+        mEmulator.reset();
+        notifyUpdate();
+    }
+
+    /**
+     * Set a {@link FinishCallback} to be invoked once this terminal session is
+     * finished.
+     *
+     * @param callback The {@link FinishCallback} to be invoked on finish.
+     */
+    public void setFinishCallback(FinishCallback callback) {
+        mFinishCallback = callback;
+    }
+
+    /**
+     * Finish this terminal session.  Frees resources used by the terminal
+     * emulator and closes the attached <code>InputStream</code> and
+     * <code>OutputStream</code>.
+     */
+    public void finish() {
+        mIsRunning = false;
+        if (mEmulator != null) {
+            mEmulator.finish();
+        }
+        if (mTranscriptScreen != null) {
+            mTranscriptScreen.finish();
+        }
+
+        // Stop the reader and writer threads, and close the I/O streams
+        if (mWriterHandler != null) {
+            mWriterHandler.sendEmptyMessage(FINISH);
+        }
+        try {
+            mTermIn.close();
+            mTermOut.close();
+        } catch (IOException e) {
+            // We don't care if this fails
+        } catch (NullPointerException e) {
+        }
+
+        if (mFinishCallback != null) {
+            mFinishCallback.onSessionFinish(this);
+        }
+    }
+
+    //ADDED BY RIVER
+    public void shellRun() {
+        //Exec.setPtyUTF8Mode(mTermFd, getUTF8Mode());
+        //setUTF8ModeUpdateCallback(mUTF8ModeNotify);
+        initializeEmulator(72, 24);
+        /*mWatcherThread.start();
+        sendInitialCommand(mInitialCommand);*/
+
+    }
+
+    /**
+     * Callback to be invoked when a {@link TermSession} finishes.
+     *
+     * @see TermSession#setUpdateCallback
+     */
+    public interface FinishCallback {
+        /**
+         * Callback function to be invoked when a {@link TermSession} finishes.
+         *
+         * @param session The <code>TermSession</code> which has finished.
+         */
+        void onSessionFinish(TermSession session);
+    }
+}
diff --git a/termemulator/src/main/java/jackpal/androidterm/emulatorview/TermShortcutLayout.java b/termemulator/src/main/java/jackpal/androidterm/emulatorview/TermShortcutLayout.java
new file mode 100644
index 00000000..b948ee0f
--- /dev/null
+++ b/termemulator/src/main/java/jackpal/androidterm/emulatorview/TermShortcutLayout.java
@@ -0,0 +1,212 @@
+package jackpal.androidterm.emulatorview;
+
+import android.app.Instrumentation;
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageButton;
+import android.widget.LinearLayout;
+
+import java.util.ArrayList;
+
+/**
+ * Created by Hmei
+ * 11/20/17
+ */
+public class TermShortcutLayout extends LinearLayout {
+    private EnterCallback callback;
+
+    public TermShortcutLayout(Context context) {
+        super(context);
+    }
+
+    public TermShortcutLayout(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public TermShortcutLayout(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public void setCallback(EnterCallback callback) {
+        this.callback = callback;
+    }
+
+    @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+        initShortcut();
+    }
+
+    private void initShortcut() {
+        LayoutInflater inflater = (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        String[] shortcuts1 = getResources().getStringArray(R.array.term_shortcut_head);
+        String[] shortcuts2 = getResources().getStringArray(R.array.term_shortcut);
+        ArrayList<String> shortcuts = new ArrayList<>();
+        for (int i=0;i<shortcuts1.length;i++) {
+            shortcuts.add(shortcuts1[i]);
+        }
+        for (int i=0;i<shortcuts2.length;i++) {
+            shortcuts.add(shortcuts2[i]);
+        }
+        for (String shortcut : shortcuts) {
+            final ShortcutBean shortcutBean = new ShortcutBean(shortcut, true);
+            switch (shortcutBean.getName()) {
+                case "tab":
+                    shortcutBean.setListener(new OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            callback.enter("[tab]");
+                        }
+                    });
+                    break;
+                case "del":
+                    shortcutBean.setListener(new OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            new Thread(new Runnable() {
+                                @Override
+                                public void run() {
+                                    Instrumentation inst = new Instrumentation();
+                                    inst.sendKeyDownUpSync(KeyEvent.KEYCODE_DEL);
+                                }
+                            }).start();
+                        }
+                    });
+                    break;
+                case "ltab":
+                    shortcutBean.setListener(new OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            new Thread(new Runnable() {
+                                @Override
+                                public void run() {
+                                    Instrumentation inst = new Instrumentation();
+                                    for (int i = 0; i < 4; i++) {
+                                        inst.sendKeyDownUpSync(KeyEvent.KEYCODE_DEL);
+                                    }
+                                }
+                            }).start();
+                        }
+                    });
+                    break;
+                case "rtab":
+                    shortcutBean.setListener(new OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            callback.enter("    ");
+                        }
+                    });
+                    break;
+                case "def":
+                    shortcutBean.setListener(new OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            callback.enter("def ");
+                        }
+                    });
+                    break;
+                case "if":
+                    shortcutBean.setListener(new OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            callback.enter("if ");
+                        }
+                    });
+                    break;
+                case "for":
+                    shortcutBean.setListener(new OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            callback.enter("for ");
+                        }
+                    });
+                    break;
+                case "imt":
+                    shortcutBean.setListener(new OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            callback.enter("import ");
+                        }
+                    });
+                    break;
+                case "frm":
+                    shortcutBean.setListener(new OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            callback.enter("from ");
+                        }
+                    });
+                    break;
+                case "clz":
+                    shortcutBean.setListener(new OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            callback.enter("class ");
+                        }
+                    });
+                    break;
+                case "ef":
+                    shortcutBean.setListener(new OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            callback.enter("elif ");
+                        }
+                    });
+                    break;
+                case "el":
+                    shortcutBean.setListener(new OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            callback.enter("else ");
+                        }
+                    });
+                    break;
+                case "ret":
+                    shortcutBean.setListener(new OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            callback.enter("return ");
+                        }
+                    });
+                    break;
+                default:
+                    shortcutBean.setListener(new OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            callback.enter(shortcutBean.getName());
+                        }
+                    });
+                    break;
+            }
+
+            switch (shortcutBean.getName()) {
+                case "ltab":
+                    ImageButton tab = (ImageButton) inflater.inflate(R.layout.widget_shortcut_imgbtn, null);
+                    tab.setImageResource(R.drawable.tab1);
+                    tab.setOnClickListener(shortcutBean.getListener());
+                    addView(tab);
+                    break;
+                case "rtab":
+                    ImageButton rtab = (ImageButton) inflater.inflate(R.layout.widget_shortcut_imgbtn, null);
+                    rtab.setImageResource(R.drawable.tab2);
+                    rtab.setOnClickListener(shortcutBean.getListener());
+                    addView(rtab);
+                    break;
+                default:
+                    Button button = (Button) inflater.inflate(R.layout.widget_shortcut_btn, null);
+                    button.setText(shortcutBean.getName());
+                    button.setOnClickListener(shortcutBean.getListener());
+                    addView(button);
+                    break;
+            }
+        }
+    }
+
+    public interface EnterCallback {
+        void enter(String text);
+    }
+}
diff --git a/termemulator/src/main/java/jackpal/androidterm/emulatorview/TerminalEmulator.java b/termemulator/src/main/java/jackpal/androidterm/emulatorview/TerminalEmulator.java
new file mode 100644
index 00000000..612f57c3
--- /dev/null
+++ b/termemulator/src/main/java/jackpal/androidterm/emulatorview/TerminalEmulator.java
@@ -0,0 +1,2066 @@
+/*
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package jackpal.androidterm.emulatorview;
+
+import java.io.UnsupportedEncodingException;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetDecoder;
+import java.nio.charset.CodingErrorAction;
+import java.util.LinkedList;
+import java.util.Locale;
+import java.util.Stack;
+
+import android.util.Log;
+
+/**
+ * Renders text into a screen. Contains all the terminal-specific knowledge and
+ * state. Emulates a subset of the X Window System xterm terminal, which in turn
+ * is an emulator for a subset of the Digital Equipment Corporation vt100
+ * terminal. Missing functionality: text attributes (bold, underline, reverse
+ * video, color) alternate screen cursor key and keypad escape sequences.
+ */
+public class TerminalEmulator {
+    public void setKeyListener(TermKeyListener l) {
+        mKeyListener = l;
+    }
+
+    private TermKeyListener mKeyListener;
+    /**
+     * The cursor row. Numbered 0..mRows-1.
+     */
+    private int             mCursorRow;
+
+    /**
+     * The cursor column. Numbered 0..mColumns-1.
+     */
+    private int mCursorCol;
+
+    /**
+     * The number of character rows in the terminal screen.
+     */
+    private int mRows;
+
+    /**
+     * The number of character columns in the terminal screen.
+     */
+    private int mColumns;
+
+    /**
+     * Stores the characters that appear on the screen of the emulated terminal.
+     */
+    private TranscriptScreen mMainBuffer;
+    private TranscriptScreen mAltBuffer;
+    private TranscriptScreen mScreen;
+
+    /**
+     * The terminal session this emulator is bound to.
+     */
+    private TermSession mSession;
+
+    /**
+     * Keeps track of the current argument of the current escape sequence.
+     * Ranges from 0 to MAX_ESCAPE_PARAMETERS-1. (Typically just 0 or 1.)
+     */
+    private int mArgIndex;
+
+    /**
+     * The number of parameter arguments. This name comes from the ANSI standard
+     * for terminal escape codes.
+     */
+    private static final int MAX_ESCAPE_PARAMETERS = 16;
+
+    /**
+     * Holds the arguments of the current escape sequence.
+     */
+    private int[] mArgs = new int[MAX_ESCAPE_PARAMETERS];
+
+    /**
+     * Holds OSC arguments, which can be strings.
+     */
+    private byte[] mOSCArg = new byte[MAX_OSC_STRING_LENGTH];
+
+    private int mOSCArgLength;
+
+    private int mOSCArgTokenizerIndex;
+
+    /**
+     * Don't know what the actual limit is, this seems OK for now.
+     */
+    private static final int MAX_OSC_STRING_LENGTH = 512;
+
+    // Escape processing states:
+
+    /**
+     * Escape processing state: Not currently in an escape sequence.
+     */
+    private static final int ESC_NONE = 0;
+
+    /**
+     * Escape processing state: Have seen an ESC character
+     */
+    private static final int ESC = 1;
+
+    /**
+     * Escape processing state: Have seen ESC POUND
+     */
+    private static final int ESC_POUND = 2;
+
+    /**
+     * Escape processing state: Have seen ESC and a character-set-select char
+     */
+    private static final int ESC_SELECT_LEFT_PAREN = 3;
+
+    /**
+     * Escape processing state: Have seen ESC and a character-set-select char
+     */
+    private static final int ESC_SELECT_RIGHT_PAREN = 4;
+
+    /**
+     * Escape processing state: ESC [
+     */
+    private static final int ESC_LEFT_SQUARE_BRACKET = 5;
+
+    /**
+     * Escape processing state: ESC [ ?
+     */
+    private static final int ESC_LEFT_SQUARE_BRACKET_QUESTION_MARK = 6;
+
+    /**
+     * Escape processing state: ESC %
+     */
+    private static final int ESC_PERCENT = 7;
+
+    /**
+     * Escape processing state: ESC ] (AKA OSC - Operating System Controls)
+     */
+    private static final int ESC_RIGHT_SQUARE_BRACKET = 8;
+
+    /**
+     * Escape processing state: ESC ] (AKA OSC - Operating System Controls)
+     */
+    private static final int ESC_RIGHT_SQUARE_BRACKET_ESC = 9;
+
+    /**
+     * True if the current escape sequence should continue, false if the current
+     * escape sequence should be terminated. Used when parsing a single
+     * character.
+     */
+    private boolean mContinueSequence;
+
+    /**
+     * The current state of the escape sequence state machine.
+     */
+    private int mEscapeState;
+
+    /**
+     * Saved state of the cursor row, Used to implement the save/restore cursor
+     * position escape sequences.
+     */
+    private int mSavedCursorRow;
+
+    /**
+     * Saved state of the cursor column, Used to implement the save/restore
+     * cursor position escape sequences.
+     */
+    private int mSavedCursorCol;
+
+    private int mSavedEffect;
+
+    private int mSavedDecFlags_DECSC_DECRC;
+
+
+    // DecSet booleans
+
+    /**
+     * This mask indicates 132-column mode is set. (As opposed to 80-column
+     * mode.)
+     */
+    private static final int K_132_COLUMN_MODE_MASK = 1 << 3;
+
+    /**
+     * DECSCNM - set means reverse video (light background.)
+     */
+    private static final int K_REVERSE_VIDEO_MASK = 1 << 5;
+
+    /**
+     * This mask indicates that origin mode is set. (Cursor addressing is
+     * relative to the absolute screen size, rather than the currently set top
+     * and bottom margins.)
+     */
+    private static final int K_ORIGIN_MODE_MASK = 1 << 6;
+
+    /**
+     * This mask indicates that wraparound mode is set. (As opposed to
+     * stop-at-right-column mode.)
+     */
+    private static final int K_WRAPAROUND_MODE_MASK = 1 << 7;
+
+    /**
+     * This mask indicates that the cursor should be shown. DECTCEM
+     */
+
+    private static final int K_SHOW_CURSOR_MASK = 1 << 25;
+
+    /**
+     * This mask is the subset of DecSet bits that are saved / restored by
+     * the DECSC / DECRC commands
+     */
+    private static final int K_DECSC_DECRC_MASK =
+            K_ORIGIN_MODE_MASK | K_WRAPAROUND_MODE_MASK;
+
+    /**
+     * Holds multiple DECSET flags. The data is stored this way, rather than in
+     * separate booleans, to make it easier to implement the save-and-restore
+     * semantics. The various k*ModeMask masks can be used to extract and modify
+     * the individual flags current states.
+     */
+    private int mDecFlags;
+
+    /**
+     * Saves away a snapshot of the DECSET flags. Used to implement save and
+     * restore escape sequences.
+     */
+    private int mSavedDecFlags;
+
+    /**
+     * The current DECSET mouse tracking mode, zero for no mouse tracking.
+     */
+    private int mMouseTrackingMode;
+
+    // Modes set with Set Mode / Reset Mode
+
+    /**
+     * True if insert mode (as opposed to replace mode) is active. In insert
+     * mode new characters are inserted, pushing existing text to the right.
+     */
+    private boolean mInsertMode;
+
+    /**
+     * An array of tab stops. mTabStop[i] is true if there is a tab stop set for
+     * column i.
+     */
+    private boolean[] mTabStop;
+
+    // The margins allow portions of the screen to be locked.
+
+    /**
+     * The top margin of the screen, for scrolling purposes. Ranges from 0 to
+     * mRows-2.
+     */
+    private int mTopMargin;
+
+    /**
+     * The bottom margin of the screen, for scrolling purposes. Ranges from
+     * mTopMargin + 2 to mRows. (Defines the first row after the scrolling
+     * region.
+     */
+    private int mBottomMargin;
+
+    /**
+     * True if the next character to be emitted will be automatically wrapped to
+     * the next line. Used to disambiguate the case where the cursor is
+     * positioned on column mColumns-1.
+     */
+    private boolean mAboutToAutoWrap;
+
+    /**
+     * The width of the last emitted spacing character.  Used to place
+     * combining characters into the correct column.
+     */
+    private int mLastEmittedCharWidth = 0;
+
+    /**
+     * True if we just auto-wrapped and no character has been emitted on this
+     * line yet.  Used to ensure combining characters following a character
+     * at the edge of the screen are stored in the proper place.
+     */
+    private boolean mJustWrapped = false;
+
+    /**
+     * Used for debugging, counts how many chars have been processed.
+     */
+    private int mProcessedCharCount;
+
+    /**
+     * Foreground color, 0..255
+     */
+    private int mForeColor;
+    private int mDefaultForeColor;
+
+    /**
+     * Background color, 0..255
+     */
+    private int mBackColor;
+    private int mDefaultBackColor;
+
+    /**
+     * Current TextStyle effect
+     */
+    private int mEffect;
+
+    private boolean mbKeypadApplicationMode;
+
+    /**
+     * false == G0, true == G1
+     */
+    private boolean mAlternateCharSet;
+
+    private final static int CHAR_SET_UK                  = 0;
+    private final static int CHAR_SET_ASCII               = 1;
+    private final static int CHAR_SET_SPECIAL_GRAPHICS    = 2;
+    private final static int CHAR_SET_ALT_STANDARD        = 3;
+    private final static int CHAR_SET_ALT_SPECIAL_GRAPICS = 4;
+
+    /**
+     * What is the current graphics character set. [0] == G0, [1] == G1
+     */
+    private int[] mCharSet = new int[2];
+
+    /**
+     * Derived from mAlternateCharSet and mCharSet.
+     * True if we're supposed to be drawing the special graphics.
+     */
+    private boolean mUseAlternateCharSet;
+
+    /**
+     * Special graphics character set
+     */
+    private static final char[] mSpecialGraphicsCharMap = new char[128];
+
+    static {
+        for (char i = 0; i < 128; ++i) {
+            mSpecialGraphicsCharMap[i] = i;
+        }
+        mSpecialGraphicsCharMap['_'] = ' ';    // Blank
+        mSpecialGraphicsCharMap['b'] = 0x2409;    // Tab
+        mSpecialGraphicsCharMap['c'] = 0x240C;    // Form feed
+        mSpecialGraphicsCharMap['d'] = 0x240D;    // Carriage return
+        mSpecialGraphicsCharMap['e'] = 0x240A;    // Line feed
+        mSpecialGraphicsCharMap['h'] = 0x2424;    // New line
+        mSpecialGraphicsCharMap['i'] = 0x240B;    // Vertical tab/"lantern"
+        mSpecialGraphicsCharMap['}'] = 0x00A3;    // Pound sterling symbol
+        mSpecialGraphicsCharMap['f'] = 0x00B0;    // Degree symbol
+        mSpecialGraphicsCharMap['`'] = 0x2B25;    // Diamond
+        mSpecialGraphicsCharMap['~'] = 0x2022;    // Bullet point
+        mSpecialGraphicsCharMap['y'] = 0x2264;    // Less-than-or-equals sign (<=)
+        mSpecialGraphicsCharMap['|'] = 0x2260;    // Not equals sign (!=)
+        mSpecialGraphicsCharMap['z'] = 0x2265;    // Greater-than-or-equals sign (>=)
+        mSpecialGraphicsCharMap['g'] = 0x00B1;    // Plus-or-minus sign (+/-)
+        mSpecialGraphicsCharMap['{'] = 0x03C0;    // Lowercase Greek letter pi
+        mSpecialGraphicsCharMap['.'] = 0x25BC;    // Down arrow
+        mSpecialGraphicsCharMap[','] = 0x25C0;    // Left arrow
+        mSpecialGraphicsCharMap['+'] = 0x25B6;    // Right arrow
+        mSpecialGraphicsCharMap['-'] = 0x25B2;    // Up arrow
+        mSpecialGraphicsCharMap['h'] = '#';    // Board of squares
+        mSpecialGraphicsCharMap['a'] = 0x2592;    // Checkerboard
+        mSpecialGraphicsCharMap['0'] = 0x2588;    // Solid block
+        mSpecialGraphicsCharMap['q'] = 0x2500;    // Horizontal line (box drawing)
+        mSpecialGraphicsCharMap['x'] = 0x2502;    // Vertical line (box drawing)
+        mSpecialGraphicsCharMap['m'] = 0x2514;    // Lower left hand corner (box drawing)
+        mSpecialGraphicsCharMap['j'] = 0x2518;    // Lower right hand corner (box drawing)
+        mSpecialGraphicsCharMap['l'] = 0x250C;    // Upper left hand corner (box drawing)
+        mSpecialGraphicsCharMap['k'] = 0x2510;    // Upper right hand corner (box drawing)
+        mSpecialGraphicsCharMap['w'] = 0x252C;    // T pointing downwards (box drawing)
+        mSpecialGraphicsCharMap['u'] = 0x2524;    // T pointing leftwards (box drawing)
+        mSpecialGraphicsCharMap['t'] = 0x251C;    // T pointing rightwards (box drawing)
+        mSpecialGraphicsCharMap['v'] = 0x2534;    // T pointing upwards (box drawing)
+        mSpecialGraphicsCharMap['n'] = 0x253C;    // Large plus/lines crossing (box drawing)
+        mSpecialGraphicsCharMap['o'] = 0x23BA;    // Horizontal scanline 1
+        mSpecialGraphicsCharMap['p'] = 0x23BB;    // Horizontal scanline 3
+        mSpecialGraphicsCharMap['r'] = 0x23BC;    // Horizontal scanline 7
+        mSpecialGraphicsCharMap['s'] = 0x23BD;    // Horizontal scanline 9
+    }
+
+    /**
+     * Used for moving selection up along with the scrolling text
+     */
+    private int mScrollCounter = 0;
+
+    /**
+     * UTF-8 support
+     */
+    private static final int     UNICODE_REPLACEMENT_CHAR = 0xfffd;
+    private              boolean mDefaultUTF8Mode         = false;
+    private              boolean mUTF8Mode                = false;
+    private              boolean mUTF8EscapeUsed          = false;
+    private              int     mUTF8ToFollow            = 0;
+    private ByteBuffer     mUTF8ByteBuffer;
+    private CharBuffer     mInputCharBuffer;
+    private CharsetDecoder mUTF8Decoder;
+    private UpdateCallback mUTF8ModeNotify;
+
+    /**
+     * This is not accurate, but it makes the terminal more useful on
+     * small screens.
+     */
+    private final static boolean DEFAULT_TO_AUTOWRAP_ENABLED = true;
+
+    /**
+     * Construct a terminal emulator that uses the supplied screen
+     *
+     * @param session the terminal session the emulator is attached to
+     * @param screen  the screen to render characters into.
+     * @param columns the number of columns to emulate
+     * @param rows    the number of rows to emulate
+     * @param scheme  the default color scheme of this emulator
+     */
+    public TerminalEmulator(TermSession session, TranscriptScreen screen, int columns, int rows, ColorScheme scheme) {
+        mSession = session;
+        mMainBuffer = screen;
+        mScreen = mMainBuffer;
+        mAltBuffer = new TranscriptScreen(columns, rows, rows, scheme);
+        mRows = rows;
+        mColumns = columns;
+        mTabStop = new boolean[mColumns];
+
+        setColorScheme(scheme);
+
+        mUTF8ByteBuffer = ByteBuffer.allocate(4);
+        mInputCharBuffer = CharBuffer.allocate(2);
+        mUTF8Decoder = Charset.forName("UTF-8").newDecoder();
+        mUTF8Decoder.onMalformedInput(CodingErrorAction.REPLACE);
+        mUTF8Decoder.onUnmappableCharacter(CodingErrorAction.REPLACE);
+
+        reset();
+    }
+
+    public TranscriptScreen getScreen() {
+        return mScreen;
+    }
+
+    public void updateSize(int columns, int rows) {
+        if (mRows == rows && mColumns == columns) {
+            return;
+        }
+        if (columns <= 0) {
+            throw new IllegalArgumentException("rows:" + columns);
+        }
+
+        if (rows <= 0) {
+            throw new IllegalArgumentException("rows:" + rows);
+        }
+
+        TranscriptScreen screen = mScreen;
+        TranscriptScreen altScreen;
+        if (screen != mMainBuffer) {
+            altScreen = mMainBuffer;
+        } else {
+            altScreen = mAltBuffer;
+        }
+
+        // Try to resize the screen without getting the transcript
+        int[] cursor = {mCursorCol, mCursorRow};
+        boolean fastResize = screen.fastResize(columns, rows, cursor);
+
+        GrowableIntArray cursorColor = null;
+        String charAtCursor = null;
+        GrowableIntArray colors = null;
+        String transcriptText = null;
+        if (!fastResize) {
+            /* Save the character at the cursor (if one exists) and store an
+             * ASCII ESC character at the cursor's location
+             * This is an epic hack that lets us restore the cursor later...
+             */
+            cursorColor = new GrowableIntArray(1);
+            charAtCursor = screen.getSelectedText(cursorColor, mCursorCol, mCursorRow, mCursorCol, mCursorRow);
+            screen.set(mCursorCol, mCursorRow, 27, 0);
+
+            colors = new GrowableIntArray(1024);
+            transcriptText = screen.getTranscriptText(colors);
+            screen.resize(columns, rows, getStyle());
+        }
+
+        boolean altFastResize = true;
+        GrowableIntArray altColors = null;
+        String altTranscriptText = null;
+        if (altScreen != null) {
+            altFastResize = altScreen.fastResize(columns, rows, null);
+
+            if (!altFastResize) {
+                altColors = new GrowableIntArray(1024);
+                altTranscriptText = altScreen.getTranscriptText(altColors);
+                altScreen.resize(columns, rows, getStyle());
+            }
+        }
+
+        if (mRows != rows) {
+            mRows = rows;
+            mTopMargin = 0;
+            mBottomMargin = mRows;
+        }
+        if (mColumns != columns) {
+            int oldColumns = mColumns;
+            mColumns = columns;
+            boolean[] oldTabStop = mTabStop;
+            mTabStop = new boolean[mColumns];
+            int toTransfer = Math.min(oldColumns, columns);
+            System.arraycopy(oldTabStop, 0, mTabStop, 0, toTransfer);
+        }
+
+        if (!altFastResize) {
+            boolean wasAboutToAutoWrap = mAboutToAutoWrap;
+
+            // Restore the contents of the inactive screen's buffer
+            mScreen = altScreen;
+            mCursorRow = 0;
+            mCursorCol = 0;
+            mAboutToAutoWrap = false;
+
+            int end = altTranscriptText.length() - 1;
+            /* Unlike for the main transcript below, don't trim off trailing
+             * newlines -- the alternate transcript lacks a cursor marking, so
+             * we might introduce an unwanted vertical shift in the screen
+             * contents this way */
+            char c, cLow;
+            int colorOffset = 0;
+            for (int i = 0; i <= end; i++) {
+                c = altTranscriptText.charAt(i);
+                int style = altColors.at(i - colorOffset);
+                if (Character.isHighSurrogate(c)) {
+                    cLow = altTranscriptText.charAt(++i);
+                    emit(Character.toCodePoint(c, cLow), style);
+                    ++colorOffset;
+                } else if (c == '\n') {
+                    setCursorCol(0);
+                    doLinefeed();
+                } else {
+                    emit(c, style);
+                }
+            }
+
+            mScreen = screen;
+            mAboutToAutoWrap = wasAboutToAutoWrap;
+        }
+
+        if (fastResize) {
+            // Only need to make sure the cursor is in the right spot
+            if (cursor[0] >= 0 && cursor[1] >= 0) {
+                mCursorCol = cursor[0];
+                mCursorRow = cursor[1];
+            } else {
+                // Cursor scrolled off screen, reset the cursor to top left
+                mCursorCol = 0;
+                mCursorRow = 0;
+            }
+
+            return;
+        }
+
+        mCursorRow = 0;
+        mCursorCol = 0;
+        mAboutToAutoWrap = false;
+
+        int newCursorRow = -1;
+        int newCursorCol = -1;
+        int newCursorTranscriptPos = -1;
+        int end = transcriptText.length() - 1;
+        while ((end >= 0) && transcriptText.charAt(end) == '\n') {
+            end--;
+        }
+        char c, cLow;
+        int colorOffset = 0;
+        for (int i = 0; i <= end; i++) {
+            c = transcriptText.charAt(i);
+            int style = colors.at(i - colorOffset);
+            if (Character.isHighSurrogate(c)) {
+                cLow = transcriptText.charAt(++i);
+                emit(Character.toCodePoint(c, cLow), style);
+                ++colorOffset;
+            } else if (c == '\n') {
+                setCursorCol(0);
+                doLinefeed();
+            } else if (c == 27) {
+                /* We marked the cursor location with ESC earlier, so this
+                   is the place to restore the cursor to */
+                newCursorRow = mCursorRow;
+                newCursorCol = mCursorCol;
+                newCursorTranscriptPos = screen.getActiveRows();
+                if (charAtCursor != null && charAtCursor.length() > 0) {
+                    // Emit the real character that was in this spot
+                    int encodedCursorColor = cursorColor.at(0);
+                    emit(charAtCursor.toCharArray(), 0, charAtCursor.length(), encodedCursorColor);
+                }
+            } else {
+                emit(c, style);
+            }
+        }
+
+        // If we marked a cursor location, move the cursor there now
+        if (newCursorRow != -1 && newCursorCol != -1) {
+            mCursorRow = newCursorRow;
+            mCursorCol = newCursorCol;
+
+            /* Adjust for any scrolling between the time we marked the cursor
+               location and now */
+            int scrollCount = screen.getActiveRows() - newCursorTranscriptPos;
+            if (scrollCount > 0 && scrollCount <= newCursorRow) {
+                mCursorRow -= scrollCount;
+            } else if (scrollCount > newCursorRow) {
+                // Cursor scrolled off screen -- reset to top left corner
+                mCursorRow = 0;
+                mCursorCol = 0;
+            }
+        }
+    }
+
+    /**
+     * Get the cursor's current row.
+     *
+     * @return the cursor's current row.
+     */
+    public final int getCursorRow() {
+        return mCursorRow;
+    }
+
+    /**
+     * Get the cursor's current column.
+     *
+     * @return the cursor's current column.
+     */
+    public final int getCursorCol() {
+        return mCursorCol;
+    }
+
+    public final boolean getReverseVideo() {
+        return (mDecFlags & K_REVERSE_VIDEO_MASK) != 0;
+    }
+
+    public final boolean getShowCursor() {
+        return (mDecFlags & K_SHOW_CURSOR_MASK) != 0;
+    }
+
+    public final boolean getKeypadApplicationMode() {
+        return mbKeypadApplicationMode;
+    }
+
+    /**
+     * Get the current DECSET mouse tracking mode, zero for no mouse tracking.
+     *
+     * @return the current DECSET mouse tracking mode.
+     */
+    public final int getMouseTrackingMode() {
+        return mMouseTrackingMode;
+    }
+
+    private void setDefaultTabStops() {
+        for (int i = 0; i < mColumns; i++) {
+            mTabStop[i] = (i & 7) == 0 && i != 0;
+        }
+    }
+
+    /**
+     * Accept bytes (typically from the pseudo-teletype) and process them.
+     *
+     * @param buffer a byte array containing the bytes to be processed
+     * @param base   the first index of the array to process
+     * @param length the number of bytes in the array to process
+     */
+    public void append(byte[] buffer, int base, int length) {
+
+        //Log.d(EmulatorDebug.LOG_TAG, "In: '" + EmulatorDebug.bytesToString(buffer, base, length) + "'");
+
+
+        if (EmulatorDebug.bytesToString(buffer, base, length).endsWith(">>> ")) {
+            sb = new StringBuffer();
+        } else if (sb != null) {
+            sb.append(EmulatorDebug.bytesToString(buffer, base, length)
+                    .replace("\\x0d", "")
+                    .replace("\\x0a", "")
+                    .replace("\\x08", ""));
+        }
+
+//        if (sb != null && EmulatorDebug.bytesToString(buffer, base, length).equals("\\x0d\\x0a")) {
+//            if (!history.contains(sb.toString().trim())){
+//
+//                if (history.size() >= HISTORY_MAX) {
+//                    history.remove(history.size()-1);
+//                }
+//                history.add(0,sb.toString().trim());
+//
+//                Log.d(EmulatorDebug.LOG_TAG, "History Added: " + sb.toString());
+//
+//            }
+//            Log.d(EmulatorDebug.LOG_TAG, "History: " + sb.toString());
+//            sb = null;
+//        }
+
+        for (int i = 0; i < length; i++) {
+            byte b = buffer[base + i];
+            try {
+                process(b);
+                mProcessedCharCount++;
+            } catch (Exception e) {
+                Log.e(EmulatorDebug.LOG_TAG, "Exception while processing character "
+                        + Integer.toString(mProcessedCharCount) + " code "
+                        + Integer.toString(b), e);
+            }
+        }
+    }
+
+    void deleteChar() {
+        if (sb != null) {
+            if (sb.length() <= 1) {
+                sb = sb.delete(0,1);
+            } else {
+                String temp = sb.substring(0, sb.length() - 1);
+                sb.setLength(0);
+                sb.append(temp);
+            }
+        }
+    }
+
+//    public LinkedList<String> getHistory() {
+//        return history;
+//    }
+
+    private static final int HISTORY_MAX = 10;
+
+    //private LinkedList<String> history = new LinkedList<>();
+    private StringBuffer       sb      = null;
+
+    private void process(byte b) {
+        process(b, true);
+    }
+
+    private void process(byte b, boolean doUTF8) {
+        // Let the UTF-8 decoder try to handle it if we're in UTF-8 mode
+        if (doUTF8 && mUTF8Mode && handleUTF8Sequence(b)) {
+            return;
+        }
+
+        // Handle C1 control characters
+        if ((b & 0x80) == 0x80 && (b & 0x7f) <= 0x1f) {
+            /* ESC ((code & 0x7f) + 0x40) is the two-byte escape sequence
+               corresponding to a particular C1 code */
+            process((byte) 27, false);
+            process((byte) ((b & 0x7f) + 0x40), false);
+            return;
+        }
+
+        switch (b) {
+            case 0: // NUL
+                // Do nothing
+                break;
+
+            case 7: // BEL
+            /* If in an OSC sequence, BEL may terminate a string; otherwise do
+             * nothing */
+                if (mEscapeState == ESC_RIGHT_SQUARE_BRACKET) {
+                    doEscRightSquareBracket(b);
+                }
+                break;
+
+            case 8: // BS
+                setCursorCol(Math.max(0, mCursorCol - 1));
+                break;
+
+            case 9: // HT
+                // Move to next tab stop, but not past edge of screen
+                setCursorCol(nextTabStop(mCursorCol));
+                break;
+
+            case 13:
+                setCursorCol(0);
+                break;
+
+            case 10: // CR
+            case 11: // VT
+            case 12: // LF
+                doLinefeed();
+                break;
+
+            case 14: // SO:
+                setAltCharSet(true);
+                break;
+
+            case 15: // SI:
+                setAltCharSet(false);
+                break;
+
+
+            case 24: // CAN
+            case 26: // SUB
+                if (mEscapeState != ESC_NONE) {
+                    mEscapeState = ESC_NONE;
+                    emit((byte) 127);
+                }
+                break;
+
+            case 27: // ESC
+                // Starts an escape sequence unless we're parsing a string
+                if (mEscapeState != ESC_RIGHT_SQUARE_BRACKET) {
+                    startEscapeSequence(ESC);
+                } else {
+                    doEscRightSquareBracket(b);
+                }
+                break;
+
+            default:
+                mContinueSequence = false;
+                switch (mEscapeState) {
+                    case ESC_NONE:
+                        if (b >= 32) {
+                            emit(b);
+                        }
+                        break;
+
+                    case ESC:
+                        doEsc(b);
+                        break;
+
+                    case ESC_POUND:
+                        doEscPound(b);
+                        break;
+
+                    case ESC_SELECT_LEFT_PAREN:
+                        doEscSelectLeftParen(b);
+                        break;
+
+                    case ESC_SELECT_RIGHT_PAREN:
+                        doEscSelectRightParen(b);
+                        break;
+
+                    case ESC_LEFT_SQUARE_BRACKET:
+                        doEscLeftSquareBracket(b); // CSI
+                        break;
+
+                    case ESC_LEFT_SQUARE_BRACKET_QUESTION_MARK:
+                        doEscLSBQuest(b); // CSI ?
+                        break;
+
+                    case ESC_PERCENT:
+                        doEscPercent(b);
+                        break;
+
+                    case ESC_RIGHT_SQUARE_BRACKET:
+                        doEscRightSquareBracket(b);
+                        break;
+
+                    case ESC_RIGHT_SQUARE_BRACKET_ESC:
+                        doEscRightSquareBracketEsc(b);
+                        break;
+
+                    default:
+                        unknownSequence(b);
+                        break;
+                }
+                if (!mContinueSequence) {
+                    mEscapeState = ESC_NONE;
+                }
+                break;
+        }
+    }
+
+    private boolean handleUTF8Sequence(byte b) {
+        if (mUTF8ToFollow == 0 && (b & 0x80) == 0) {
+            // ASCII character -- we don't need to handle this
+            return false;
+        }
+
+        if (mUTF8ToFollow > 0) {
+            if ((b & 0xc0) != 0x80) {
+                /* Not a UTF-8 continuation byte (doesn't begin with 0b10)
+                   Replace the entire sequence with the replacement char */
+                mUTF8ToFollow = 0;
+                mUTF8ByteBuffer.clear();
+                emit(UNICODE_REPLACEMENT_CHAR);
+
+                /* The Unicode standard (section 3.9, definition D93) requires
+                 * that we now attempt to process this byte as though it were
+                 * the beginning of another possibly-valid sequence */
+                return handleUTF8Sequence(b);
+            }
+
+            mUTF8ByteBuffer.put(b);
+            if (--mUTF8ToFollow == 0) {
+                // Sequence complete -- decode and emit it
+                ByteBuffer byteBuf = mUTF8ByteBuffer;
+                CharBuffer charBuf = mInputCharBuffer;
+                CharsetDecoder decoder = mUTF8Decoder;
+
+                byteBuf.rewind();
+                decoder.reset();
+                decoder.decode(byteBuf, charBuf, true);
+                decoder.flush(charBuf);
+
+                char[] chars = charBuf.array();
+                if (chars[0] >= 0x80 && chars[0] <= 0x9f) {
+                    /* Sequence decoded to a C1 control character which needs
+                       to be sent through process() again */
+                    process((byte) chars[0], false);
+                } else {
+                    emit(chars);
+                }
+
+                byteBuf.clear();
+                charBuf.clear();
+            }
+        } else {
+            if ((b & 0xe0) == 0xc0) { // 0b110 -- two-byte sequence
+                mUTF8ToFollow = 1;
+            } else if ((b & 0xf0) == 0xe0) { // 0b1110 -- three-byte sequence
+                mUTF8ToFollow = 2;
+            } else if ((b & 0xf8) == 0xf0) { // 0b11110 -- four-byte sequence
+                mUTF8ToFollow = 3;
+            } else {
+                // Not a valid UTF-8 sequence start -- replace this char
+                emit(UNICODE_REPLACEMENT_CHAR);
+                return true;
+            }
+
+            mUTF8ByteBuffer.put(b);
+        }
+
+        return true;
+    }
+
+    private void setAltCharSet(boolean alternateCharSet) {
+        mAlternateCharSet = alternateCharSet;
+        computeEffectiveCharSet();
+    }
+
+    private void computeEffectiveCharSet() {
+        int charSet = mCharSet[mAlternateCharSet ? 1 : 0];
+        mUseAlternateCharSet = charSet == CHAR_SET_SPECIAL_GRAPHICS;
+    }
+
+    private int nextTabStop(int cursorCol) {
+        for (int i = cursorCol + 1; i < mColumns; i++) {
+            if (mTabStop[i]) {
+                return i;
+            }
+        }
+        return mColumns - 1;
+    }
+
+    private int prevTabStop(int cursorCol) {
+        for (int i = cursorCol - 1; i >= 0; i--) {
+            if (mTabStop[i]) {
+                return i;
+            }
+        }
+        return 0;
+    }
+
+    private void doEscPercent(byte b) {
+        switch (b) {
+            case '@': // Esc % @ -- return to ISO 2022 mode
+                setUTF8Mode(false);
+                mUTF8EscapeUsed = true;
+                break;
+            case 'G': // Esc % G -- UTF-8 mode
+                setUTF8Mode(true);
+                mUTF8EscapeUsed = true;
+                break;
+            default: // unimplemented character set
+                break;
+        }
+    }
+
+    private void doEscLSBQuest(byte b) {
+        int arg = getArg0(0);
+        int mask = getDecFlagsMask(arg);
+        int oldFlags = mDecFlags;
+        switch (b) {
+            case 'h': // Esc [ ? Pn h - DECSET
+                mDecFlags |= mask;
+                switch (arg) {
+                    case 1:
+                        mKeyListener.setCursorKeysApplicationMode(true);
+                        break;
+                    case 47:
+                    case 1047:
+                    case 1049:
+                        if (mAltBuffer != null) {
+                            mScreen = mAltBuffer;
+                        }
+                        break;
+                }
+                if (arg >= 1000 && arg <= 1003) {
+                    mMouseTrackingMode = arg;
+                }
+                break;
+
+            case 'l': // Esc [ ? Pn l - DECRST
+                mDecFlags &= ~mask;
+                switch (arg) {
+                    case 1:
+                        mKeyListener.setCursorKeysApplicationMode(false);
+                        break;
+                    case 47:
+                    case 1047:
+                    case 1049:
+                        mScreen = mMainBuffer;
+                        break;
+                }
+                if (arg >= 1000 && arg <= 1003) {
+                    mMouseTrackingMode = 0;
+                }
+                break;
+
+            case 'r': // Esc [ ? Pn r - restore
+                mDecFlags = (mDecFlags & ~mask) | (mSavedDecFlags & mask);
+                break;
+
+            case 's': // Esc [ ? Pn s - save
+                mSavedDecFlags = (mSavedDecFlags & ~mask) | (mDecFlags & mask);
+                break;
+
+            default:
+                parseArg(b);
+                break;
+        }
+
+        int newlySetFlags = (~oldFlags) & mDecFlags;
+        int changedFlags = oldFlags ^ mDecFlags;
+
+        // 132 column mode
+        if ((changedFlags & K_132_COLUMN_MODE_MASK) != 0) {
+            // We don't actually set/reset 132 cols, but we do want the
+            // side effect of clearing the screen and homing the cursor.
+            blockClear(0, 0, mColumns, mRows);
+            setCursorRowCol(0, 0);
+        }
+
+        // origin mode
+        if ((newlySetFlags & K_ORIGIN_MODE_MASK) != 0) {
+            // Home the cursor.
+            setCursorPosition(0, 0);
+        }
+    }
+
+    private int getDecFlagsMask(int argument) {
+        if (argument >= 1 && argument <= 32) {
+            return (1 << argument);
+        }
+
+        return 0;
+    }
+
+    private void startEscapeSequence(int escapeState) {
+        mEscapeState = escapeState;
+        mArgIndex = 0;
+        for (int j = 0; j < MAX_ESCAPE_PARAMETERS; j++) {
+            mArgs[j] = -1;
+        }
+    }
+
+    private void doLinefeed() {
+        int newCursorRow = mCursorRow + 1;
+        if (newCursorRow >= mBottomMargin) {
+            scroll();
+            newCursorRow = mBottomMargin - 1;
+        }
+        setCursorRow(newCursorRow);
+    }
+
+    private void continueSequence() {
+        mContinueSequence = true;
+    }
+
+    private void continueSequence(int state) {
+        mEscapeState = state;
+        mContinueSequence = true;
+    }
+
+    private void doEscSelectLeftParen(byte b) {
+        doSelectCharSet(0, b);
+    }
+
+    private void doEscSelectRightParen(byte b) {
+        doSelectCharSet(1, b);
+    }
+
+    private void doSelectCharSet(int charSetIndex, byte b) {
+        int charSet;
+        switch (b) {
+            case 'A': // United Kingdom character set
+                charSet = CHAR_SET_UK;
+                break;
+            case 'B': // ASCII set
+                charSet = CHAR_SET_ASCII;
+                break;
+            case '0': // Special Graphics
+                charSet = CHAR_SET_SPECIAL_GRAPHICS;
+                break;
+            case '1': // Alternate character set
+                charSet = CHAR_SET_ALT_STANDARD;
+                break;
+            case '2':
+                charSet = CHAR_SET_ALT_SPECIAL_GRAPICS;
+                break;
+            default:
+                unknownSequence(b);
+                return;
+        }
+        mCharSet[charSetIndex] = charSet;
+        computeEffectiveCharSet();
+    }
+
+    private void doEscPound(byte b) {
+        switch (b) {
+            case '8': // Esc # 8 - DECALN alignment test
+                mScreen.blockSet(0, 0, mColumns, mRows, 'E',
+                        getStyle());
+                break;
+
+            default:
+                unknownSequence(b);
+                break;
+        }
+    }
+
+    private void doEsc(byte b) {
+        switch (b) {
+            case '#':
+                continueSequence(ESC_POUND);
+                break;
+
+            case '(':
+                continueSequence(ESC_SELECT_LEFT_PAREN);
+                break;
+
+            case ')':
+                continueSequence(ESC_SELECT_RIGHT_PAREN);
+                break;
+
+            case '7': // DECSC save cursor
+                mSavedCursorRow = mCursorRow;
+                mSavedCursorCol = mCursorCol;
+                mSavedEffect = mEffect;
+                mSavedDecFlags_DECSC_DECRC = mDecFlags & K_DECSC_DECRC_MASK;
+                break;
+
+            case '8': // DECRC restore cursor
+                setCursorRowCol(mSavedCursorRow, mSavedCursorCol);
+                mEffect = mSavedEffect;
+                mDecFlags = (mDecFlags & ~K_DECSC_DECRC_MASK)
+                        | mSavedDecFlags_DECSC_DECRC;
+                break;
+
+            case 'D': // INDEX
+                doLinefeed();
+                break;
+
+            case 'E': // NEL
+                setCursorCol(0);
+                doLinefeed();
+                break;
+
+            case 'F': // Cursor to lower-left corner of screen
+                setCursorRowCol(0, mBottomMargin - 1);
+                break;
+
+            case 'H': // Tab set
+                mTabStop[mCursorCol] = true;
+                break;
+
+            case 'M': // Reverse index
+                if (mCursorRow <= mTopMargin) {
+                    mScreen.blockCopy(0, mTopMargin, mColumns, mBottomMargin
+                            - (mTopMargin + 1), 0, mTopMargin + 1);
+                    blockClear(0, mTopMargin, mColumns);
+                } else {
+                    mCursorRow--;
+                }
+
+                break;
+
+            case 'N': // SS2
+                unimplementedSequence(b);
+                break;
+
+            case '0': // SS3
+                unimplementedSequence(b);
+                break;
+
+            case 'P': // Device control string
+                unimplementedSequence(b);
+                break;
+
+            case 'Z': // return terminal ID
+                sendDeviceAttributes();
+                break;
+
+            case '[':
+                continueSequence(ESC_LEFT_SQUARE_BRACKET);
+                break;
+
+            case '=': // DECKPAM
+                mbKeypadApplicationMode = true;
+                break;
+
+            case ']': // OSC
+                startCollectingOSCArgs();
+                continueSequence(ESC_RIGHT_SQUARE_BRACKET);
+                break;
+
+            case '>': // DECKPNM
+                mbKeypadApplicationMode = false;
+                break;
+
+            default:
+                unknownSequence(b);
+                break;
+        }
+    }
+
+    private void doEscLeftSquareBracket(byte b) {
+        // CSI
+        switch (b) {
+            case '@': // ESC [ Pn @ - ICH Insert Characters
+            {
+                int charsAfterCursor = mColumns - mCursorCol;
+                int charsToInsert = Math.min(getArg0(1), charsAfterCursor);
+                int charsToMove = charsAfterCursor - charsToInsert;
+                mScreen.blockCopy(mCursorCol, mCursorRow, charsToMove, 1,
+                        mCursorCol + charsToInsert, mCursorRow);
+                blockClear(mCursorCol, mCursorRow, charsToInsert);
+            }
+            break;
+
+            case 'A': // ESC [ Pn A - Cursor Up
+                setCursorRow(Math.max(mTopMargin, mCursorRow - getArg0(1)));
+                break;
+
+            case 'B': // ESC [ Pn B - Cursor Down
+                setCursorRow(Math.min(mBottomMargin - 1, mCursorRow + getArg0(1)));
+                break;
+
+            case 'C': // ESC [ Pn C - Cursor Right
+                setCursorCol(Math.min(mColumns - 1, mCursorCol + getArg0(1)));
+                break;
+
+            case 'D': // ESC [ Pn D - Cursor Left
+                setCursorCol(Math.max(0, mCursorCol - getArg0(1)));
+                break;
+
+            case 'G': // ESC [ Pn G - Cursor Horizontal Absolute
+                setCursorCol(Math.min(Math.max(1, getArg0(1)), mColumns) - 1);
+                break;
+
+            case 'H': // ESC [ Pn ; H - Cursor Position
+                setHorizontalVerticalPosition();
+                break;
+
+            case 'J': // ESC [ Pn J - ED - Erase in Display
+                // ED ignores the scrolling margins.
+                switch (getArg0(0)) {
+                    case 0: // Clear below
+                        blockClear(mCursorCol, mCursorRow, mColumns - mCursorCol);
+                        blockClear(0, mCursorRow + 1, mColumns,
+                                mRows - (mCursorRow + 1));
+                        break;
+
+                    case 1: // Erase from the start of the screen to the cursor.
+                        blockClear(0, 0, mColumns, mCursorRow);
+                        blockClear(0, mCursorRow, mCursorCol + 1);
+                        break;
+
+                    case 2: // Clear all
+                        blockClear(0, 0, mColumns, mRows);
+                        break;
+
+                    default:
+                        unknownSequence(b);
+                        break;
+                }
+                break;
+
+            case 'K': // ESC [ Pn K - Erase in Line
+                switch (getArg0(0)) {
+                    case 0: // Clear to right
+                        blockClear(mCursorCol, mCursorRow, mColumns - mCursorCol);
+                        break;
+
+                    case 1: // Erase start of line to cursor (including cursor)
+                        blockClear(0, mCursorRow, mCursorCol + 1);
+                        break;
+
+                    case 2: // Clear whole line
+                        blockClear(0, mCursorRow, mColumns);
+                        break;
+
+                    default:
+                        unknownSequence(b);
+                        break;
+                }
+                break;
+
+            case 'L': // Insert Lines
+            {
+                int linesAfterCursor = mBottomMargin - mCursorRow;
+                int linesToInsert = Math.min(getArg0(1), linesAfterCursor);
+                int linesToMove = linesAfterCursor - linesToInsert;
+                mScreen.blockCopy(0, mCursorRow, mColumns, linesToMove, 0,
+                        mCursorRow + linesToInsert);
+                blockClear(0, mCursorRow, mColumns, linesToInsert);
+            }
+            break;
+
+            case 'M': // Delete Lines
+            {
+                int linesAfterCursor = mBottomMargin - mCursorRow;
+                int linesToDelete = Math.min(getArg0(1), linesAfterCursor);
+                int linesToMove = linesAfterCursor - linesToDelete;
+                mScreen.blockCopy(0, mCursorRow + linesToDelete, mColumns,
+                        linesToMove, 0, mCursorRow);
+                blockClear(0, mCursorRow + linesToMove, mColumns, linesToDelete);
+            }
+            break;
+
+            case 'P': // Delete Characters
+            {
+                int charsAfterCursor = mColumns - mCursorCol;
+                int charsToDelete = Math.min(getArg0(1), charsAfterCursor);
+                int charsToMove = charsAfterCursor - charsToDelete;
+                mScreen.blockCopy(mCursorCol + charsToDelete, mCursorRow,
+                        charsToMove, 1, mCursorCol, mCursorRow);
+                blockClear(mCursorCol + charsToMove, mCursorRow, charsToDelete);
+            }
+            break;
+
+            case 'T': // Mouse tracking
+                unimplementedSequence(b);
+                break;
+
+            case 'X': // Erase characters
+                blockClear(mCursorCol, mCursorRow, getArg0(0));
+                break;
+
+            case 'Z': // Back tab
+                setCursorCol(prevTabStop(mCursorCol));
+                break;
+
+            case '?': // Esc [ ? -- start of a private mode set
+                continueSequence(ESC_LEFT_SQUARE_BRACKET_QUESTION_MARK);
+                break;
+
+            case 'c': // Send device attributes
+                sendDeviceAttributes();
+                break;
+
+            case 'd': // ESC [ Pn d - Vert Position Absolute
+                setCursorRow(Math.min(Math.max(1, getArg0(1)), mRows) - 1);
+                break;
+
+            case 'f': // Horizontal and Vertical Position
+                setHorizontalVerticalPosition();
+                break;
+
+            case 'g': // Clear tab stop
+                switch (getArg0(0)) {
+                    case 0:
+                        mTabStop[mCursorCol] = false;
+                        break;
+
+                    case 3:
+                        for (int i = 0; i < mColumns; i++) {
+                            mTabStop[i] = false;
+                        }
+                        break;
+
+                    default:
+                        // Specified to have no effect.
+                        break;
+                }
+                break;
+
+            case 'h': // Set Mode
+                doSetMode(true);
+                break;
+
+            case 'l': // Reset Mode
+                doSetMode(false);
+                break;
+
+            case 'm': // Esc [ Pn m - character attributes.
+                // (can have up to 16 numerical arguments)
+                selectGraphicRendition();
+                break;
+
+            case 'n': // Esc [ Pn n - ECMA-48 Status Report Commands
+                //sendDeviceAttributes()
+                switch (getArg0(0)) {
+                    case 5: // Device status report (DSR):
+                        // Answer is ESC [ 0 n (Terminal OK).
+                        byte[] dsr = {(byte) 27, (byte) '[', (byte) '0', (byte) 'n'};
+                        mSession.write(dsr, 0, dsr.length);
+                        break;
+
+                    case 6: // Cursor position report (CPR):
+                        // Answer is ESC [ y ; x R, where x,y is
+                        // the cursor location.
+                        byte[] cpr = String.format(Locale.US, "\033[%d;%dR",
+                                mCursorRow + 1, mCursorCol + 1).getBytes();
+                        mSession.write(cpr, 0, cpr.length);
+                        break;
+
+                    default:
+                        break;
+                }
+                break;
+
+            case 'r': // Esc [ Pn ; Pn r - set top and bottom margins
+            {
+                // The top margin defaults to 1, the bottom margin
+                // (unusually for arguments) defaults to mRows.
+                //
+                // The escape sequence numbers top 1..23, but we
+                // number top 0..22.
+                // The escape sequence numbers bottom 2..24, and
+                // so do we (because we use a zero based numbering
+                // scheme, but we store the first line below the
+                // bottom-most scrolling line.
+                // As a result, we adjust the top line by -1, but
+                // we leave the bottom line alone.
+                //
+                // Also require that top + 2 <= bottom
+
+                int top = Math.max(0, Math.min(getArg0(1) - 1, mRows - 2));
+                int bottom = Math.max(top + 2, Math.min(getArg1(mRows), mRows));
+                mTopMargin = top;
+                mBottomMargin = bottom;
+
+                // The cursor is placed in the home position
+                setCursorRowCol(mTopMargin, 0);
+            }
+            break;
+
+            default:
+                parseArg(b);
+                break;
+        }
+    }
+
+    private void selectGraphicRendition() {
+        // SGR
+        for (int i = 0; i <= mArgIndex; i++) {
+            int code = mArgs[i];
+            if (code < 0) {
+                if (mArgIndex > 0) {
+                    continue;
+                } else {
+                    code = 0;
+                }
+            }
+
+            // See http://en.wikipedia.org/wiki/ANSI_escape_code#graphics
+
+            if (code == 0) { // reset
+                mForeColor = mDefaultForeColor;
+                mBackColor = mDefaultBackColor;
+                mEffect = TextStyle.fxNormal;
+            } else if (code == 1) { // bold
+                mEffect |= TextStyle.fxBold;
+            } else if (code == 3) { // italics, but rarely used as such; "standout" (inverse colors) with TERM=screen
+                mEffect |= TextStyle.fxItalic;
+            } else if (code == 4) { // underscore
+                mEffect |= TextStyle.fxUnderline;
+            } else if (code == 5) { // blink
+                mEffect |= TextStyle.fxBlink;
+            } else if (code == 7) { // inverse
+                mEffect |= TextStyle.fxInverse;
+            } else if (code == 8) { // invisible
+                mEffect |= TextStyle.fxInvisible;
+            } else if (code == 10) { // exit alt charset (TERM=linux)
+                setAltCharSet(false);
+            } else if (code == 11) { // enter alt charset (TERM=linux)
+                setAltCharSet(true);
+            } else if (code == 22) { // Normal color or intensity, neither bright, bold nor faint
+                //mEffect &= ~(TextStyle.fxBold | TextStyle.fxFaint);
+                mEffect &= ~TextStyle.fxBold;
+            } else if (code == 23) { // not italic, but rarely used as such; clears standout with TERM=screen
+                mEffect &= ~TextStyle.fxItalic;
+            } else if (code == 24) { // underline: none
+                mEffect &= ~TextStyle.fxUnderline;
+            } else if (code == 25) { // blink: none
+                mEffect &= ~TextStyle.fxBlink;
+            } else if (code == 27) { // image: positive
+                mEffect &= ~TextStyle.fxInverse;
+            } else if (code == 28) { // invisible
+                mEffect &= ~TextStyle.fxInvisible;
+            } else if (code >= 30 && code <= 37) { // foreground color
+                mForeColor = code - 30;
+            } else if (code == 38 && i + 2 <= mArgIndex && mArgs[i + 1] == 5) { // foreground 256 color
+                int color = mArgs[i + 2];
+                if (checkColor(color)) {
+                    mForeColor = color;
+                }
+                i += 2;
+            } else if (code == 39) { // set default text color
+                mForeColor = mDefaultForeColor;
+            } else if (code >= 40 && code <= 47) { // background color
+                mBackColor = code - 40;
+            } else if (code == 48 && i + 2 <= mArgIndex && mArgs[i + 1] == 5) { // background 256 color
+                mBackColor = mArgs[i + 2];
+                int color = mArgs[i + 2];
+                if (checkColor(color)) {
+                    mBackColor = color;
+                }
+                i += 2;
+            } else if (code == 49) { // set default background color
+                mBackColor = mDefaultBackColor;
+            } else if (code >= 90 && code <= 97) { // bright foreground color
+                mForeColor = code - 90 + 8;
+            } else if (code >= 100 && code <= 107) { // bright background color
+                mBackColor = code - 100 + 8;
+            } else {
+                if (EmulatorDebug.LOG_UNKNOWN_ESCAPE_SEQUENCES) {
+                    Log.w(EmulatorDebug.LOG_TAG, String.format("SGR unknown code %d", code));
+                }
+            }
+        }
+    }
+
+    private boolean checkColor(int color) {
+        boolean result = isValidColor(color);
+        if (!result) {
+            if (EmulatorDebug.LOG_UNKNOWN_ESCAPE_SEQUENCES) {
+                Log.w(EmulatorDebug.LOG_TAG,
+                        String.format("Invalid color %d", color));
+            }
+        }
+        return result;
+    }
+
+    private boolean isValidColor(int color) {
+        return color >= 0 && color < TextStyle.ciColorLength;
+    }
+
+    private void doEscRightSquareBracket(byte b) {
+        switch (b) {
+            case 0x7:
+                doOSC();
+                break;
+            case 0x1b: // Esc, probably start of Esc \ sequence
+                continueSequence(ESC_RIGHT_SQUARE_BRACKET_ESC);
+                break;
+            default:
+                collectOSCArgs(b);
+                break;
+        }
+    }
+
+    private void doEscRightSquareBracketEsc(byte b) {
+        switch (b) {
+            case '\\':
+                doOSC();
+                break;
+
+            default:
+                // The ESC character was not followed by a \, so insert the ESC and
+                // the current character in arg buffer.
+                collectOSCArgs((byte) 0x1b);
+                collectOSCArgs(b);
+                continueSequence(ESC_RIGHT_SQUARE_BRACKET);
+                break;
+        }
+    }
+
+    private void doOSC() { // Operating System Controls
+        startTokenizingOSC();
+        int ps = nextOSCInt(';');
+        switch (ps) {
+            case 0: // Change icon name and window title to T
+            case 1: // Change icon name to T
+            case 2: // Change window title to T
+                changeTitle(ps, nextOSCString(-1));
+                break;
+            default:
+                unknownParameter(ps);
+                break;
+        }
+        finishSequence();
+    }
+
+    private void changeTitle(int parameter, String title) {
+        if (parameter == 0 || parameter == 2) {
+            mSession.setTitle(title);
+        }
+    }
+
+    private void blockClear(int sx, int sy, int w) {
+        blockClear(sx, sy, w, 1);
+    }
+
+    private void blockClear(int sx, int sy, int w, int h) {
+        mScreen.blockSet(sx, sy, w, h, ' ', getStyle());
+    }
+
+    private int getForeColor() {
+        return mForeColor;
+    }
+
+    private int getBackColor() {
+        return mBackColor;
+    }
+
+    private int getEffect() {
+        return mEffect;
+    }
+
+    private int getStyle() {
+        return TextStyle.encode(getForeColor(), getBackColor(), getEffect());
+    }
+
+    private void doSetMode(boolean newValue) {
+        int modeBit = getArg0(0);
+        switch (modeBit) {
+            case 4:
+                mInsertMode = newValue;
+                break;
+
+            default:
+                unknownParameter(modeBit);
+                break;
+        }
+    }
+
+    private void setHorizontalVerticalPosition() {
+
+        // Parameters are Row ; Column
+
+        setCursorPosition(getArg1(1) - 1, getArg0(1) - 1);
+    }
+
+    private void setCursorPosition(int x, int y) {
+        int effectiveTopMargin = 0;
+        int effectiveBottomMargin = mRows;
+        if ((mDecFlags & K_ORIGIN_MODE_MASK) != 0) {
+            effectiveTopMargin = mTopMargin;
+            effectiveBottomMargin = mBottomMargin;
+        }
+        int newRow =
+                Math.max(effectiveTopMargin, Math.min(effectiveTopMargin + y,
+                        effectiveBottomMargin - 1));
+        int newCol = Math.max(0, Math.min(x, mColumns - 1));
+        setCursorRowCol(newRow, newCol);
+    }
+
+    private void sendDeviceAttributes() {
+        // This identifies us as a DEC vt100 with advanced
+        // video options. This is what the xterm terminal
+        // emulator sends.
+        byte[] attributes =
+                {
+                /* VT100 */
+                        (byte) 27, (byte) '[', (byte) '?', (byte) '1',
+                        (byte) ';', (byte) '2', (byte) 'c'
+
+                /* VT220
+                (byte) 27, (byte) '[', (byte) '?', (byte) '6',
+                (byte) '0',  (byte) ';',
+                (byte) '1',  (byte) ';',
+                (byte) '2',  (byte) ';',
+                (byte) '6',  (byte) ';',
+                (byte) '8',  (byte) ';',
+                (byte) '9',  (byte) ';',
+                (byte) '1',  (byte) '5', (byte) ';',
+                (byte) 'c'
+                */
+                };
+
+        mSession.write(attributes, 0, attributes.length);
+    }
+
+    private void scroll() {
+        //System.out.println("Scroll(): mTopMargin " + mTopMargin + " mBottomMargin " + mBottomMargin);
+        mScrollCounter++;
+        mScreen.scroll(mTopMargin, mBottomMargin, getStyle());
+    }
+
+    /**
+     * Process the next ASCII character of a parameter.
+     *
+     * @param b The next ASCII character of the paramater sequence.
+     */
+    private void parseArg(byte b) {
+        if (b >= '0' && b <= '9') {
+            if (mArgIndex < mArgs.length) {
+                int oldValue = mArgs[mArgIndex];
+                int thisDigit = b - '0';
+                int value;
+                if (oldValue >= 0) {
+                    value = oldValue * 10 + thisDigit;
+                } else {
+                    value = thisDigit;
+                }
+                mArgs[mArgIndex] = value;
+            }
+            continueSequence();
+        } else if (b == ';') {
+            if (mArgIndex < mArgs.length) {
+                mArgIndex++;
+            }
+            continueSequence();
+        } else {
+            unknownSequence(b);
+        }
+    }
+
+    private int getArg0(int defaultValue) {
+        return getArg(0, defaultValue, true);
+    }
+
+    private int getArg1(int defaultValue) {
+        return getArg(1, defaultValue, true);
+    }
+
+    private int getArg(int index, int defaultValue,
+                       boolean treatZeroAsDefault) {
+        int result = mArgs[index];
+        if (result < 0 || (result == 0 && treatZeroAsDefault)) {
+            result = defaultValue;
+        }
+        return result;
+    }
+
+    private void startCollectingOSCArgs() {
+        mOSCArgLength = 0;
+    }
+
+    private void collectOSCArgs(byte b) {
+        if (mOSCArgLength < MAX_OSC_STRING_LENGTH) {
+            mOSCArg[mOSCArgLength++] = b;
+            continueSequence();
+        } else {
+            unknownSequence(b);
+        }
+    }
+
+    private void startTokenizingOSC() {
+        mOSCArgTokenizerIndex = 0;
+    }
+
+    private String nextOSCString(int delimiter) {
+        int start = mOSCArgTokenizerIndex;
+        int end = start;
+        while (mOSCArgTokenizerIndex < mOSCArgLength) {
+            byte b = mOSCArg[mOSCArgTokenizerIndex++];
+            if ((int) b == delimiter) {
+                break;
+            }
+            end++;
+        }
+        if (start == end) {
+            return "";
+        }
+        try {
+            return new String(mOSCArg, start, end - start, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            return new String(mOSCArg, start, end - start);
+        }
+    }
+
+    private int nextOSCInt(int delimiter) {
+        int value = -1;
+        while (mOSCArgTokenizerIndex < mOSCArgLength) {
+            byte b = mOSCArg[mOSCArgTokenizerIndex++];
+            if ((int) b == delimiter) {
+                break;
+            } else if (b >= '0' && b <= '9') {
+                if (value < 0) {
+                    value = 0;
+                }
+                value = value * 10 + b - '0';
+            } else {
+                unknownSequence(b);
+            }
+        }
+        return value;
+    }
+
+    private void unimplementedSequence(byte b) {
+        if (EmulatorDebug.LOG_UNKNOWN_ESCAPE_SEQUENCES) {
+            logError("unimplemented", b);
+        }
+        finishSequence();
+    }
+
+    private void unknownSequence(byte b) {
+        if (EmulatorDebug.LOG_UNKNOWN_ESCAPE_SEQUENCES) {
+            logError("unknown", b);
+        }
+        finishSequence();
+    }
+
+    private void unknownParameter(int parameter) {
+        if (EmulatorDebug.LOG_UNKNOWN_ESCAPE_SEQUENCES) {
+            StringBuilder buf = new StringBuilder();
+            buf.append("Unknown parameter");
+            buf.append(parameter);
+            logError(buf.toString());
+        }
+    }
+
+    private void logError(String errorType, byte b) {
+        if (EmulatorDebug.LOG_UNKNOWN_ESCAPE_SEQUENCES) {
+            StringBuilder buf = new StringBuilder();
+            buf.append(errorType);
+            buf.append(" sequence ");
+            buf.append(" EscapeState: ");
+            buf.append(mEscapeState);
+            buf.append(" char: '");
+            buf.append((char) b);
+            buf.append("' (");
+            buf.append(b);
+            buf.append(")");
+            boolean firstArg = true;
+            for (int i = 0; i <= mArgIndex; i++) {
+                int value = mArgs[i];
+                if (value >= 0) {
+                    if (firstArg) {
+                        firstArg = false;
+                        buf.append("args = ");
+                    }
+                    buf.append(String.format("%d; ", value));
+                }
+            }
+            logError(buf.toString());
+        }
+    }
+
+    private void logError(String error) {
+        if (EmulatorDebug.LOG_UNKNOWN_ESCAPE_SEQUENCES) {
+            Log.e(EmulatorDebug.LOG_TAG, error);
+        }
+        finishSequence();
+    }
+
+    private void finishSequence() {
+        mEscapeState = ESC_NONE;
+    }
+
+    private boolean autoWrapEnabled() {
+        return (mDecFlags & K_WRAPAROUND_MODE_MASK) != 0;
+    }
+
+    /**
+     * Send a Unicode code point to the screen.
+     *
+     * @param c The code point of the character to display
+     */
+    private void emit(int c, int style) {
+        boolean autoWrap = autoWrapEnabled();
+        int width = UnicodeTranscript.charWidth(c);
+
+        if (autoWrap) {
+            if (mCursorCol == mColumns - 1 && (mAboutToAutoWrap || width == 2)) {
+                mScreen.setLineWrap(mCursorRow);
+                mCursorCol = 0;
+                mJustWrapped = true;
+                if (mCursorRow + 1 < mBottomMargin) {
+                    mCursorRow++;
+                } else {
+                    scroll();
+                }
+            }
+        }
+
+        if (mInsertMode & width != 0) { // Move character to right one space
+            int destCol = mCursorCol + width;
+            if (destCol < mColumns) {
+                mScreen.blockCopy(mCursorCol, mCursorRow, mColumns - destCol,
+                        1, destCol, mCursorRow);
+            }
+        }
+
+        if (width == 0) {
+            // Combining character -- store along with character it modifies
+            if (mJustWrapped) {
+                mScreen.set(mColumns - mLastEmittedCharWidth, mCursorRow - 1, c, style);
+            } else {
+                mScreen.set(mCursorCol - mLastEmittedCharWidth, mCursorRow, c, style);
+            }
+        } else {
+            mScreen.set(mCursorCol, mCursorRow, c, style);
+            mJustWrapped = false;
+        }
+
+        if (autoWrap) {
+            mAboutToAutoWrap = (mCursorCol == mColumns - 1);
+
+            //Force line-wrap flag to trigger even for lines being typed
+            if (mAboutToAutoWrap)
+                mScreen.setLineWrap(mCursorRow);
+        }
+
+        mCursorCol = Math.min(mCursorCol + width, mColumns - 1);
+        if (width > 0) {
+            mLastEmittedCharWidth = width;
+        }
+    }
+
+    private void emit(int c) {
+        emit(c, getStyle());
+    }
+
+    private void emit(byte b) {
+        if (mUseAlternateCharSet && b < 128) {
+            emit((int) mSpecialGraphicsCharMap[b]);
+        } else {
+            emit((int) b);
+        }
+    }
+
+    /**
+     * Send a UTF-16 char or surrogate pair to the screen.
+     *
+     * @param c A char[2] containing either a single UTF-16 char or a surrogate pair to be sent to the screen.
+     */
+    private void emit(char[] c) {
+        if (Character.isHighSurrogate(c[0])) {
+            emit(Character.toCodePoint(c[0], c[1]));
+        } else {
+            emit((int) c[0]);
+        }
+    }
+
+    /**
+     * Send an array of UTF-16 chars to the screen.
+     *
+     * @param c A char[] array whose contents are to be sent to the screen.
+     */
+    private void emit(char[] c, int offset, int length, int style) {
+        for (int i = offset; i < length; ++i) {
+            if (c[i] == 0) {
+                break;
+            }
+            if (Character.isHighSurrogate(c[i])) {
+                emit(Character.toCodePoint(c[i], c[i + 1]), style);
+                ++i;
+            } else {
+                emit((int) c[i], style);
+            }
+        }
+    }
+
+    private void setCursorRow(int row) {
+        mCursorRow = row;
+        mAboutToAutoWrap = false;
+    }
+
+    private void setCursorCol(int col) {
+        mCursorCol = col;
+        mAboutToAutoWrap = false;
+    }
+
+    private void setCursorRowCol(int row, int col) {
+        mCursorRow = Math.min(row, mRows - 1);
+        mCursorCol = Math.min(col, mColumns - 1);
+        mAboutToAutoWrap = false;
+    }
+
+    public int getScrollCounter() {
+        return mScrollCounter;
+    }
+
+    public void clearScrollCounter() {
+        mScrollCounter = 0;
+    }
+
+    /**
+     * Reset the terminal emulator to its initial state.
+     */
+    public void reset() {
+        mCursorRow = 0;
+        mCursorCol = 0;
+        mArgIndex = 0;
+        mContinueSequence = false;
+        mEscapeState = ESC_NONE;
+        mSavedCursorRow = 0;
+        mSavedCursorCol = 0;
+        mSavedEffect = 0;
+        mSavedDecFlags_DECSC_DECRC = 0;
+        mDecFlags = 0;
+        if (DEFAULT_TO_AUTOWRAP_ENABLED) {
+            mDecFlags |= K_WRAPAROUND_MODE_MASK;
+        }
+        mDecFlags |= K_SHOW_CURSOR_MASK;
+        mSavedDecFlags = 0;
+        mInsertMode = false;
+        mTopMargin = 0;
+        mBottomMargin = mRows;
+        mAboutToAutoWrap = false;
+        mForeColor = mDefaultForeColor;
+        mBackColor = mDefaultBackColor;
+        mbKeypadApplicationMode = false;
+        mAlternateCharSet = false;
+        mCharSet[0] = CHAR_SET_ASCII;
+        mCharSet[1] = CHAR_SET_SPECIAL_GRAPHICS;
+        computeEffectiveCharSet();
+        // mProcessedCharCount is preserved unchanged.
+        setDefaultTabStops();
+        blockClear(0, 0, mColumns, mRows);
+
+        setUTF8Mode(mDefaultUTF8Mode);
+        mUTF8EscapeUsed = false;
+        mUTF8ToFollow = 0;
+        mUTF8ByteBuffer.clear();
+        mInputCharBuffer.clear();
+    }
+
+    public void setDefaultUTF8Mode(boolean defaultToUTF8Mode) {
+        mDefaultUTF8Mode = defaultToUTF8Mode;
+        if (!mUTF8EscapeUsed) {
+            setUTF8Mode(defaultToUTF8Mode);
+        }
+    }
+
+    public void setUTF8Mode(boolean utf8Mode) {
+        if (utf8Mode && !mUTF8Mode) {
+            mUTF8ToFollow = 0;
+            mUTF8ByteBuffer.clear();
+            mInputCharBuffer.clear();
+        }
+        mUTF8Mode = utf8Mode;
+        if (mUTF8ModeNotify != null) {
+            mUTF8ModeNotify.onUpdate();
+        }
+    }
+
+    public boolean getUTF8Mode() {
+        return mUTF8Mode;
+    }
+
+    public void setUTF8ModeUpdateCallback(UpdateCallback utf8ModeNotify) {
+        mUTF8ModeNotify = utf8ModeNotify;
+    }
+
+    public void setColorScheme(ColorScheme scheme) {
+        mDefaultForeColor = TextStyle.ciForeground;
+        mDefaultBackColor = TextStyle.ciBackground;
+        mMainBuffer.setColorScheme(scheme);
+        if (mAltBuffer != null) {
+            mAltBuffer.setColorScheme(scheme);
+        }
+    }
+
+    public String getSelectedText(int x1, int y1, int x2, int y2) {
+        return mScreen.getSelectedText(x1, y1, x2, y2);
+    }
+
+    public void finish() {
+        if (mAltBuffer != null) {
+            mAltBuffer.finish();
+            mAltBuffer = null;
+        }
+    }
+}
diff --git a/termemulator/src/main/java/jackpal/androidterm/emulatorview/TextRenderer.java b/termemulator/src/main/java/jackpal/androidterm/emulatorview/TextRenderer.java
new file mode 100644
index 00000000..4bfa61d1
--- /dev/null
+++ b/termemulator/src/main/java/jackpal/androidterm/emulatorview/TextRenderer.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package jackpal.androidterm.emulatorview;
+
+import android.graphics.Canvas;
+
+/**
+ * Text renderer interface
+ */
+
+interface TextRenderer {
+    public static final int MODE_OFF = 0;
+    public static final int MODE_ON = 1;
+    public static final int MODE_LOCKED = 2;
+    public static final int MODE_MASK = 3;
+
+    public static final int MODE_SHIFT_SHIFT = 0;
+    public static final int MODE_ALT_SHIFT = 2;
+    public static final int MODE_CTRL_SHIFT = 4;
+    public static final int MODE_FN_SHIFT = 6;
+    public static final int MODE_TAB_SHIFT = 8;
+
+    void setReverseVideo(boolean reverseVideo);
+
+    float getCharacterWidth();
+
+    int getCharacterHeight();
+
+    /**
+     * @return pixels above top row of text to avoid looking cramped.
+     */
+    int getTopMargin();
+
+    /**
+     * Draw a run of text
+     *
+     * @param canvas         The canvas to draw into.
+     * @param x              Canvas coordinate of the left edge of the whole line.
+     * @param y              Canvas coordinate of the bottom edge of the whole line.
+     * @param lineOffset     The screen character offset of this text run (0..length of line)
+     * @param runWidth
+     * @param text
+     * @param index
+     * @param count
+     * @param selectionStyle True to draw the text using the "selected" style (for clipboard copy)
+     * @param textStyle
+     * @param cursorOffset   The screen character offset of the cursor (or -1 if not on this line.)
+     * @param cursorIndex    The index of the cursor in text chars.
+     * @param cursorIncr     The width of the cursor in text chars. (1 or 2)
+     * @param cursorWidth    The width of the cursor in screen columns (1 or 2)
+     * @param cursorMode     The cursor mode (used to show state of shift/control/alt/fn locks.
+     */
+    void drawTextRun(Canvas canvas, float x, float y,
+                     int lineOffset, int runWidth, char[] text,
+                     int index, int count, boolean selectionStyle, int textStyle,
+                     int cursorOffset, int cursorIndex, int cursorIncr, int cursorWidth, int cursorMode);
+}
diff --git a/termemulator/src/main/java/jackpal/androidterm/emulatorview/TextStyle.java b/termemulator/src/main/java/jackpal/androidterm/emulatorview/TextStyle.java
new file mode 100644
index 00000000..bf16e435
--- /dev/null
+++ b/termemulator/src/main/java/jackpal/androidterm/emulatorview/TextStyle.java
@@ -0,0 +1,44 @@
+package jackpal.androidterm.emulatorview;
+
+final class TextStyle {
+    // Effect bitmasks:
+    final static int fxNormal = 0;
+    final static int fxBold = 1; // Originally Bright
+    //final static int fxFaint = 2;
+    final static int fxItalic = 1 << 1;
+    final static int fxUnderline = 1 << 2;
+    final static int fxBlink = 1 << 3;
+    final static int fxInverse = 1 << 4;
+    final static int fxInvisible = 1 << 5;
+
+    // Special color indices
+    final static int ciForeground = 256; // VT100 text foreground color
+    final static int ciBackground = 257; // VT100 text background color
+    final static int ciCursorForeground = 258;     // VT100 text cursor foreground color
+    final static int ciCursorBackground = 259;     // VT100 text cursor background color
+
+    final static int ciColorLength = ciCursorBackground + 1;
+
+    final static int kNormalTextStyle = encode(ciForeground, ciBackground, fxNormal);
+
+    static int encode(int foreColor, int backColor, int effect) {
+        return ((effect & 0x3f) << 18) | ((foreColor & 0x1ff) << 9) | (backColor & 0x1ff);
+    }
+
+    static int decodeForeColor(int encodedColor) {
+        return (encodedColor >> 9) & 0x1ff;
+    }
+
+    static int decodeBackColor(int encodedColor) {
+        return encodedColor & 0x1ff;
+    }
+
+    static int decodeEffect(int encodedColor) {
+        return (encodedColor >> 18) & 0x3f;
+    }
+
+    private TextStyle() {
+        // Prevent instantiation
+        throw new UnsupportedOperationException();
+    }
+}
diff --git a/termemulator/src/main/java/jackpal/androidterm/emulatorview/TranscriptScreen.java b/termemulator/src/main/java/jackpal/androidterm/emulatorview/TranscriptScreen.java
new file mode 100644
index 00000000..b3a83d07
--- /dev/null
+++ b/termemulator/src/main/java/jackpal/androidterm/emulatorview/TranscriptScreen.java
@@ -0,0 +1,493 @@
+/*
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package jackpal.androidterm.emulatorview;
+
+import java.util.Arrays;
+
+import android.graphics.Canvas;
+
+/**
+ * A TranscriptScreen is a screen that remembers data that's been scrolled. The
+ * old data is stored in a ring buffer to minimize the amount of copying that
+ * needs to be done. The transcript does its own drawing, to avoid having to
+ * expose its internal data structures.
+ */
+class TranscriptScreen implements Screen {
+    /**
+     * The width of the transcript, in characters. Fixed at initialization.
+     */
+    private int mColumns;
+
+    /**
+     * The total number of rows in the transcript and the screen. Fixed at
+     * initialization.
+     */
+    private int mTotalRows;
+
+    /**
+     * The number of rows in the screen.
+     */
+    private int mScreenRows;
+
+    private UnicodeTranscript mData;
+
+    /**
+     * Create a transcript screen.
+     *
+     * @param columns    the width of the screen in characters.
+     * @param totalRows  the height of the entire text area, in rows of text.
+     * @param screenRows the height of just the screen, not including the
+     *                   transcript that holds lines that have scrolled off the top of the
+     *                   screen.
+     */
+    public TranscriptScreen(int columns, int totalRows, int screenRows,
+                            ColorScheme scheme) {
+        init(columns, totalRows, screenRows, TextStyle.kNormalTextStyle);
+    }
+
+    private void init(int columns, int totalRows, int screenRows, int style) {
+        mColumns = columns;
+        mTotalRows = totalRows;
+        mScreenRows = screenRows;
+
+        mData = new UnicodeTranscript(columns, totalRows, screenRows, style);
+        mData.blockSet(0, 0, mColumns, mScreenRows, ' ', style);
+    }
+
+    public void setColorScheme(ColorScheme scheme) {
+        mData.setDefaultStyle(TextStyle.kNormalTextStyle);
+    }
+
+    public void finish() {
+        /*
+         * The Android InputMethodService will sometimes hold a reference to
+         * us for a while after the activity closes, which is expensive because
+         * it means holding on to the now-useless mData array.  Explicitly
+         * get rid of our references to this data to help keep the amount of
+         * memory being leaked down.
+         */
+        mData = null;
+    }
+
+    public void setLineWrap(int row) {
+        mData.setLineWrap(row);
+    }
+
+    /**
+     * Store a Unicode code point into the screen at location (x, y)
+     *
+     * @param x         X coordinate (also known as column)
+     * @param y         Y coordinate (also known as row)
+     * @param codePoint Unicode codepoint to store
+     * @param foreColor the foreground color
+     * @param backColor the background color
+     */
+    public void set(int x, int y, int codePoint, int style) {
+        mData.setChar(x, y, codePoint, style);
+    }
+
+    public void set(int x, int y, byte b, int style) {
+        mData.setChar(x, y, b, style);
+    }
+
+    /**
+     * Scroll the screen down one line. To scroll the whole screen of a 24 line
+     * screen, the arguments would be (0, 24).
+     *
+     * @param topMargin    First line that is scrolled.
+     * @param bottomMargin One line after the last line that is scrolled.
+     * @param style        the style for the newly exposed line.
+     */
+    public void scroll(int topMargin, int bottomMargin, int style) {
+        mData.scroll(topMargin, bottomMargin, style);
+    }
+
+    /**
+     * Block copy characters from one position in the screen to another. The two
+     * positions can overlap. All characters of the source and destination must
+     * be within the bounds of the screen, or else an InvalidParemeterException
+     * will be thrown.
+     *
+     * @param sx source X coordinate
+     * @param sy source Y coordinate
+     * @param w  width
+     * @param h  height
+     * @param dx destination X coordinate
+     * @param dy destination Y coordinate
+     */
+    public void blockCopy(int sx, int sy, int w, int h, int dx, int dy) {
+        mData.blockCopy(sx, sy, w, h, dx, dy);
+    }
+
+    /**
+     * Block set characters. All characters must be within the bounds of the
+     * screen, or else and InvalidParemeterException will be thrown. Typically
+     * this is called with a "val" argument of 32 to clear a block of
+     * characters.
+     *
+     * @param sx  source X
+     * @param sy  source Y
+     * @param w   width
+     * @param h   height
+     * @param val value to set.
+     */
+    public void blockSet(int sx, int sy, int w, int h, int val,
+                         int style) {
+        mData.blockSet(sx, sy, w, h, val, style);
+    }
+
+    /**
+     * Draw a row of text. Out-of-bounds rows are blank, not errors.
+     *
+     * @param row        The row of text to draw.
+     * @param canvas     The canvas to draw to.
+     * @param x          The x coordinate origin of the drawing
+     * @param y          The y coordinate origin of the drawing
+     * @param renderer   The renderer to use to draw the text
+     * @param cx         the cursor X coordinate, -1 means don't draw it
+     * @param selx1      the text selection start X coordinate
+     * @param selx2      the text selection end X coordinate, if equals to selx1 don't draw selection
+     * @param imeText    current IME text, to be rendered at cursor
+     * @param cursorMode the cursor mode. See TextRenderer.
+     */
+    public final void drawText(int row, Canvas canvas, float x, float y,
+                               TextRenderer renderer, int cx, int selx1, int selx2, String imeText, int cursorMode) {
+        char[] line;
+        StyleRow color;
+        int cursorWidth = 1;
+        try {
+            line = mData.getLine(row);
+            color = mData.getLineColor(row);
+        } catch (IllegalArgumentException e) {
+            // Out-of-bounds rows are blank.
+            return;
+        } catch (NullPointerException e) {
+            // Attempt to draw on a finished transcript
+            // XXX Figure out why this happens on Honeycomb
+            return;
+        }
+        int defaultStyle = mData.getDefaultStyle();
+
+        if (line == null) {
+            // Line is blank.
+            if (selx1 != selx2) {
+                // We need to draw a selection
+                char[] blank = new char[selx2 - selx1];
+                Arrays.fill(blank, ' ');
+                renderer.drawTextRun(canvas, x, y, selx1, selx2 - selx1,
+                        blank, 0, 1, true, defaultStyle,
+                        cx, 0, 1, 1, cursorMode);
+            }
+            if (cx != -1) {
+                char[] blank = new char[1];
+                Arrays.fill(blank, ' ');
+                // We need to draw the cursor
+                renderer.drawTextRun(canvas, x, y, cx, 1,
+                        blank, 0, 1, true, defaultStyle,
+                        cx, 0, 1, 1, cursorMode);
+            }
+
+            return;
+        }
+
+        int columns = mColumns;
+        int lineLen = line.length;
+        int lastStyle = 0;
+        boolean lastSelectionStyle = false;
+        int runWidth = 0;
+        int lastRunStart = -1;
+        int lastRunStartIndex = -1;
+        boolean forceFlushRun = false;
+        int column = 0;
+        int nextColumn = 0;
+        int displayCharWidth = 0;
+        int index = 0;
+        int cursorIndex = 0;
+        int cursorIncr = 0;
+        while (column < columns && index < lineLen && line[index] != '\0') {
+            int incr = 1;
+            int width;
+            if (Character.isHighSurrogate(line[index])) {
+                width = UnicodeTranscript.charWidth(line, index);
+                incr++;
+            } else {
+                width = UnicodeTranscript.charWidth(line[index]);
+            }
+            if (width > 0) {
+                // We've moved on to the next column
+                column = nextColumn;
+                displayCharWidth = width;
+            }
+            int style = color.get(column);
+            boolean selectionStyle = false;
+            if ((column >= selx1 || (displayCharWidth == 2 && column == selx1 - 1)) &&
+                    column <= selx2) {
+                // Draw selection:
+                selectionStyle = true;
+            }
+            if (style != lastStyle
+                    || selectionStyle != lastSelectionStyle
+                    || (width > 0 && forceFlushRun)) {
+                if (lastRunStart >= 0) {
+                    renderer.drawTextRun(canvas, x, y, lastRunStart, runWidth,
+                            line,
+                            lastRunStartIndex, index - lastRunStartIndex,
+                            lastSelectionStyle, lastStyle,
+                            cx, cursorIndex, cursorIncr, cursorWidth, cursorMode);
+                }
+                lastStyle = style;
+                lastSelectionStyle = selectionStyle;
+                runWidth = 0;
+                lastRunStart = column;
+                lastRunStartIndex = index;
+                forceFlushRun = false;
+            }
+            if (cx == column) {
+                if (width > 0) {
+                    cursorIndex = index;
+                    cursorIncr = incr;
+                    cursorWidth = width;
+                } else {
+                    // Combining char attaching to the char under the cursor
+                    cursorIncr += incr;
+                }
+            }
+            runWidth += width;
+            nextColumn += width;
+            index += incr;
+            if (width > 1) {
+                /* We cannot draw two or more East Asian wide characters in the
+                   same run, because we need to make each wide character take
+                   up two columns, which may not match the font's idea of the
+                   character width */
+                forceFlushRun = true;
+            }
+        }
+        if (lastRunStart >= 0) {
+            renderer.drawTextRun(canvas, x, y, lastRunStart, runWidth,
+                    line,
+                    lastRunStartIndex, index - lastRunStartIndex,
+                    lastSelectionStyle, lastStyle,
+                    cx, cursorIndex, cursorIncr, cursorWidth, cursorMode);
+        }
+
+        if (cx >= 0 && imeText.length() > 0) {
+            int imeLength = Math.min(columns, imeText.length());
+            int imeOffset = imeText.length() - imeLength;
+            int imePosition = Math.min(cx, columns - imeLength);
+            renderer.drawTextRun(canvas, x, y, imePosition, imeLength, imeText.toCharArray(),
+                    imeOffset, imeLength, true, TextStyle.encode(0x0f, 0x00, TextStyle.fxNormal),
+                    -1, 0, 0, 0, 0);
+        }
+    }
+
+    /**
+     * Get the count of active rows.
+     *
+     * @return the count of active rows.
+     */
+    public int getActiveRows() {
+        return mData.getActiveRows();
+    }
+
+    /**
+     * Get the count of active transcript rows.
+     *
+     * @return the count of active transcript rows.
+     */
+    public int getActiveTranscriptRows() {
+        return mData.getActiveTranscriptRows();
+    }
+
+    public String getTranscriptText() {
+        return internalGetTranscriptText(null, 0, -mData.getActiveTranscriptRows(), mColumns, mScreenRows);
+    }
+
+    public String getTranscriptText(GrowableIntArray colors) {
+        return internalGetTranscriptText(colors, 0, -mData.getActiveTranscriptRows(), mColumns, mScreenRows);
+    }
+
+    public String getSelectedText(int selX1, int selY1, int selX2, int selY2) {
+        return internalGetTranscriptText(null, selX1, selY1, selX2, selY2);
+    }
+
+    public String getSelectedText(GrowableIntArray colors, int selX1, int selY1, int selX2, int selY2) {
+        return internalGetTranscriptText(colors, selX1, selY1, selX2, selY2);
+    }
+
+    private String internalGetTranscriptText(GrowableIntArray colors, int selX1, int selY1, int selX2, int selY2) {
+        StringBuilder builder = new StringBuilder();
+        UnicodeTranscript data = mData;
+        int columns = mColumns;
+        char[] line;
+        StyleRow rowColorBuffer = null;
+        if (selY1 < -data.getActiveTranscriptRows()) {
+            selY1 = -data.getActiveTranscriptRows();
+        }
+        if (selY2 >= mScreenRows) {
+            selY2 = mScreenRows - 1;
+        }
+        for (int row = selY1; row <= selY2; row++) {
+            int x1 = 0;
+            int x2;
+            if (row == selY1) {
+                x1 = selX1;
+            }
+            if (row == selY2) {
+                x2 = selX2 + 1;
+                if (x2 > columns) {
+                    x2 = columns;
+                }
+            } else {
+                x2 = columns;
+            }
+            line = data.getLine(row, x1, x2);
+            if (colors != null) {
+                rowColorBuffer = data.getLineColor(row, x1, x2);
+            }
+            if (line == null) {
+                if (!data.getLineWrap(row) && row < selY2 && row < mScreenRows - 1) {
+                    builder.append('\n');
+                    if (colors != null) {
+                        colors.append(0);
+                    }
+                }
+                continue;
+            }
+            int defaultColor = mData.getDefaultStyle();
+            int lastPrintingChar = -1;
+            int lineLen = line.length;
+            int i;
+            int column = 0;
+            for (i = 0; i < lineLen; ++i) {
+                char c = line[i];
+                if (c == 0) {
+                    break;
+                }
+
+                int style = defaultColor;
+                try {
+                    if (rowColorBuffer != null) {
+                        style = rowColorBuffer.get(column);
+                    }
+                } catch (ArrayIndexOutOfBoundsException e) {
+                    // XXX This probably shouldn't happen ...
+                    style = defaultColor;
+                }
+
+                if (c != ' ' || style != defaultColor) {
+                    lastPrintingChar = i;
+                }
+                if (!Character.isLowSurrogate(c)) {
+                    column += UnicodeTranscript.charWidth(line, i);
+                }
+            }
+            if (data.getLineWrap(row) && lastPrintingChar > -1 && x2 == columns) {
+                // If the line was wrapped, we shouldn't lose trailing space
+                lastPrintingChar = i - 1;
+            }
+            builder.append(line, 0, lastPrintingChar + 1);
+            if (colors != null) {
+                if (rowColorBuffer != null) {
+                    column = 0;
+                    for (int j = 0; j <= lastPrintingChar; ++j) {
+                        colors.append(rowColorBuffer.get(column));
+                        column += UnicodeTranscript.charWidth(line, j);
+                        if (Character.isHighSurrogate(line[j])) {
+                            ++j;
+                        }
+                    }
+                } else {
+                    for (int j = 0; j <= lastPrintingChar; ++j) {
+                        colors.append(defaultColor);
+                        char c = line[j];
+                        if (Character.isHighSurrogate(c)) {
+                            ++j;
+                        }
+                    }
+                }
+            }
+            if (!data.getLineWrap(row) && row < selY2 && row < mScreenRows - 1) {
+                builder.append('\n');
+                if (colors != null) {
+                    colors.append((char) 0);
+                }
+            }
+        }
+        return builder.toString();
+    }
+
+    public boolean fastResize(int columns, int rows, int[] cursor) {
+        if (mData == null) {
+            // XXX Trying to resize a finished TranscriptScreen?
+            return true;
+        }
+        if (mData.resize(columns, rows, cursor)) {
+            mColumns = columns;
+            mScreenRows = rows;
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public void resize(int columns, int rows, int style) {
+        // Ensure backing store will be large enough to hold the whole screen 
+        if (rows > mTotalRows) {
+            mTotalRows = rows;
+        }
+        init(columns, mTotalRows, rows, style);
+    }
+
+    /**
+     * Return the UnicodeTranscript line at this row index.
+     *
+     * @param row The row index to be queried
+     * @return The line of text at this row index
+     */
+    char[] getScriptLine(int row) {
+        try {
+            return mData.getLine(row);
+        } catch (IllegalArgumentException e) {
+            return null;
+        } catch (NullPointerException e) {
+            return null;
+        }
+    }
+
+    /**
+     * Get the line wrap status of the row provided.
+     *
+     * @param row The row to check for line-wrap status
+     * @return The line wrap status of the row provided
+     */
+    boolean getScriptLineWrap(int row) {
+        return mData.getLineWrap(row);
+    }
+
+    /**
+     * Get whether the line at this index is "basic" (contains only BMP
+     * characters of width 1).
+     */
+    boolean isBasicLine(int row) {
+        if (mData != null) {
+            return mData.isBasicLine(row);
+        } else {
+            return true;
+        }
+    }
+}
diff --git a/termemulator/src/main/java/jackpal/androidterm/emulatorview/UnicodeTranscript.java b/termemulator/src/main/java/jackpal/androidterm/emulatorview/UnicodeTranscript.java
new file mode 100644
index 00000000..e92f98df
--- /dev/null
+++ b/termemulator/src/main/java/jackpal/androidterm/emulatorview/UnicodeTranscript.java
@@ -0,0 +1,1141 @@
+/*
+ * Copyright (C) 2011 Steven Luo
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package jackpal.androidterm.emulatorview;
+
+import android.util.Log;
+
+import jackpal.androidterm.emulatorview.compat.AndroidCharacterCompat;
+import jackpal.androidterm.emulatorview.compat.AndroidCompat;
+
+/**
+ * A backing store for a TranscriptScreen.
+ * <p>
+ * The text is stored as a circular buffer of rows.  There are two types of
+ * row:
+ * - "basic", which is a char[] array used to store lines which consist
+ * entirely of regular-width characters (no combining characters, zero-width
+ * characters, East Asian double-width characters, etc.) in the BMP; and
+ * - "full", which is a char[] array with extra trappings which can be used to
+ * store a line containing any valid Unicode sequence.  An array of short[]
+ * is used to store the "offset" at which each column starts; for example,
+ * if column 20 starts at index 23 in the array, then mOffset[20] = 3.
+ * <p>
+ * Style information is stored in a separate circular buffer of StyleRows.
+ * <p>
+ * Rows are allocated on demand, when a character is first stored into them.
+ * A "basic" row is allocated unless the store which triggers the allocation
+ * requires a "full" row.  "Basic" rows are converted to "full" rows when
+ * needed.  There is no conversion in the other direction -- a "full" row
+ * stays that way even if it contains only regular-width BMP characters.
+ */
+class UnicodeTranscript {
+    private static final String TAG = "UnicodeTranscript";
+
+    private Object[] mLines;
+    private StyleRow[] mColor;
+    private boolean[] mLineWrap;
+    private int mTotalRows;
+    private int mScreenRows;
+    private int mColumns;
+    private int mActiveTranscriptRows = 0;
+    private int mDefaultStyle = 0;
+
+    private int mScreenFirstRow = 0;
+
+    private char[] tmpLine;
+    private StyleRow tmpColor;
+
+    public UnicodeTranscript(int columns, int totalRows, int screenRows, int defaultStyle) {
+        mColumns = columns;
+        mTotalRows = totalRows;
+        mScreenRows = screenRows;
+        mLines = new Object[totalRows];
+        mColor = new StyleRow[totalRows];
+        mLineWrap = new boolean[totalRows];
+        tmpColor = new StyleRow(defaultStyle, mColumns);
+
+        mDefaultStyle = defaultStyle;
+    }
+
+    public void setDefaultStyle(int defaultStyle) {
+        mDefaultStyle = defaultStyle;
+    }
+
+    public int getDefaultStyle() {
+        return mDefaultStyle;
+    }
+
+    public int getActiveTranscriptRows() {
+        return mActiveTranscriptRows;
+    }
+
+    public int getActiveRows() {
+        return mActiveTranscriptRows + mScreenRows;
+    }
+
+    /**
+     * Convert a row value from the public external coordinate system to our
+     * internal private coordinate system.
+     * External coordinate system:
+     * -mActiveTranscriptRows to mScreenRows-1, with the screen being
+     * 0..mScreenRows-1
+     * Internal coordinate system: the mScreenRows lines starting at
+     * mScreenFirstRow comprise the screen, while the mActiveTranscriptRows
+     * lines ending at mScreenRows-1 form the transcript (as a circular
+     * buffer).
+     *
+     * @param extRow a row in the external coordinate system.
+     * @return The row corresponding to the input argument in the private
+     * coordinate system.
+     */
+    private int externalToInternalRow(int extRow) {
+        if (extRow < -mActiveTranscriptRows || extRow > mScreenRows) {
+            String errorMessage = "externalToInternalRow " + extRow +
+                    " " + mScreenRows + " " + mActiveTranscriptRows;
+            Log.e(TAG, errorMessage);
+            throw new IllegalArgumentException(errorMessage);
+        }
+
+        if (extRow >= 0) {
+            return (mScreenFirstRow + extRow) % mTotalRows;
+        } else {
+            if (-extRow > mScreenFirstRow) {
+                return mTotalRows + mScreenFirstRow + extRow;
+            } else {
+                return mScreenFirstRow + extRow;
+            }
+        }
+    }
+
+    public void setLineWrap(int row) {
+        mLineWrap[externalToInternalRow(row)] = true;
+    }
+
+    public boolean getLineWrap(int row) {
+        return mLineWrap[externalToInternalRow(row)];
+    }
+
+    /**
+     * Resize the screen which this transcript backs.  Currently, this
+     * only works if the number of columns does not change.
+     *
+     * @param newColumns The number of columns the screen should have.
+     * @param newRows    The number of rows the screen should have.
+     * @param cursor     An int[2] containing the current cursor location; if the
+     *                   resize succeeds, this will be updated with the new cursor
+     *                   location.  If null, don't do cursor-position-dependent tasks such
+     *                   as trimming blank lines during the resize.
+     * @return Whether or not the resize succeeded.  If the resize failed,
+     * the caller may "resize" the screen by copying out all the data
+     * and placing it into a new transcript of the correct size.
+     */
+    public boolean resize(int newColumns, int newRows, int[] cursor) {
+        if (newColumns != mColumns || newRows > mTotalRows) {
+            return false;
+        }
+
+        int screenRows = mScreenRows;
+        int activeTranscriptRows = mActiveTranscriptRows;
+        int shift = screenRows - newRows;
+        if (shift < -activeTranscriptRows) {
+            // We want to add blank lines at the bottom instead of at the top
+            Object[] lines = mLines;
+            Object[] color = mColor;
+            boolean[] lineWrap = mLineWrap;
+            int screenFirstRow = mScreenFirstRow;
+            int totalRows = mTotalRows;
+            for (int i = 0; i < activeTranscriptRows - shift; ++i) {
+                int index = (screenFirstRow + screenRows + i) % totalRows;
+                lines[index] = null;
+                color[index] = null;
+                lineWrap[index] = false;
+            }
+            shift = -activeTranscriptRows;
+        } else if (shift > 0 && cursor != null && cursor[1] != screenRows - 1) {
+            /* When shrinking the screen, we want to hide blank lines at the
+               bottom in preference to lines at the top of the screen */
+            Object[] lines = mLines;
+            for (int i = screenRows - 1; i > cursor[1]; --i) {
+                int index = externalToInternalRow(i);
+                if (lines[index] == null) {
+                    // Line is blank
+                    --shift;
+                    if (shift == 0) {
+                        break;
+                    } else {
+                        continue;
+                    }
+                }
+
+                char[] line;
+                if (lines[index] instanceof char[]) {
+                    line = (char[]) lines[index];
+                } else {
+                    line = ((FullUnicodeLine) lines[index]).getLine();
+                }
+
+                int len = line.length;
+                int j;
+                for (j = 0; j < len; ++j) {
+                    if (line[j] == 0) {
+                        // We've reached the end of the line
+                        j = len;
+                        break;
+                    } else if (line[j] != ' ') {
+                        // Line is not blank
+                        break;
+                    }
+                }
+
+                if (j == len) {
+                    // Line is blank
+                    --shift;
+                    if (shift == 0) {
+                        break;
+                    } else {
+                        continue;
+                    }
+                } else {
+                    // Line not blank -- we keep it and everything above
+                    break;
+                }
+            }
+        }
+
+        if (shift > 0 || (shift < 0 && mScreenFirstRow >= -shift)) {
+            // All we're doing is moving the top of the screen.
+            mScreenFirstRow = (mScreenFirstRow + shift) % mTotalRows;
+        } else if (shift < 0) {
+            // The new top of the screen wraps around the top of the array.
+            mScreenFirstRow = mTotalRows + mScreenFirstRow + shift;
+        }
+
+        if (mActiveTranscriptRows + shift < 0) {
+            mActiveTranscriptRows = 0;
+        } else {
+            mActiveTranscriptRows += shift;
+        }
+        if (cursor != null) {
+            cursor[1] -= shift;
+        }
+        mScreenRows = newRows;
+
+        return true;
+    }
+
+    /**
+     * Block copy lines and associated metadata from one location to another
+     * in the circular buffer, taking wraparound into account.
+     *
+     * @param src   The first line to be copied.
+     * @param len   The number of lines to be copied.
+     * @param shift The offset of the destination from the source.
+     */
+    private void blockCopyLines(int src, int len, int shift) {
+        int totalRows = mTotalRows;
+
+        int dst;
+        if (src + shift >= 0) {
+            dst = (src + shift) % totalRows;
+        } else {
+            dst = totalRows + src + shift;
+        }
+
+        if (src + len <= totalRows && dst + len <= totalRows) {
+            // Fast path -- no wraparound
+            System.arraycopy(mLines, src, mLines, dst, len);
+            System.arraycopy(mColor, src, mColor, dst, len);
+            System.arraycopy(mLineWrap, src, mLineWrap, dst, len);
+            return;
+        }
+
+        if (shift < 0) {
+            // Do the copy from top to bottom
+            for (int i = 0; i < len; ++i) {
+                mLines[(dst + i) % totalRows] = mLines[(src + i) % totalRows];
+                mColor[(dst + i) % totalRows] = mColor[(src + i) % totalRows];
+                mLineWrap[(dst + i) % totalRows] = mLineWrap[(src + i) % totalRows];
+            }
+        } else {
+            // Do the copy from bottom to top
+            for (int i = len - 1; i >= 0; --i) {
+                mLines[(dst + i) % totalRows] = mLines[(src + i) % totalRows];
+                mColor[(dst + i) % totalRows] = mColor[(src + i) % totalRows];
+                mLineWrap[(dst + i) % totalRows] = mLineWrap[(src + i) % totalRows];
+            }
+        }
+    }
+
+    /**
+     * Scroll the screen down one line. To scroll the whole screen of a 24 line
+     * screen, the arguments would be (0, 24).
+     *
+     * @param topMargin    First line that is scrolled.
+     * @param bottomMargin One line after the last line that is scrolled.
+     * @param style        the style for the newly exposed line.
+     */
+    public void scroll(int topMargin, int bottomMargin, int style) {
+        // Separate out reasons so that stack crawls help us
+        // figure out which condition was violated.
+        if (topMargin > bottomMargin - 1) {
+            throw new IllegalArgumentException();
+        }
+
+        if (topMargin < 0) {
+            throw new IllegalArgumentException();
+        }
+
+        if (bottomMargin > mScreenRows) {
+            throw new IllegalArgumentException();
+        }
+
+        int screenRows = mScreenRows;
+        int totalRows = mTotalRows;
+
+        if (topMargin == 0 && bottomMargin == screenRows) {
+            // Fast path -- scroll the entire screen
+            mScreenFirstRow = (mScreenFirstRow + 1) % totalRows;
+            if (mActiveTranscriptRows < totalRows - screenRows) {
+                ++mActiveTranscriptRows;
+            }
+
+            // Blank the bottom margin
+            int blankRow = externalToInternalRow(bottomMargin - 1);
+            mLines[blankRow] = null;
+            mColor[blankRow] = new StyleRow(style, mColumns);
+            mLineWrap[blankRow] = false;
+
+            return;
+        }
+
+        int screenFirstRow = mScreenFirstRow;
+        int topMarginInt = externalToInternalRow(topMargin);
+        int bottomMarginInt = externalToInternalRow(bottomMargin);
+
+        /* Save the scrolled line, move the lines above it on the screen down
+           one line, move the lines on screen below the bottom margin down
+           one line, then insert the scrolled line into the transcript */
+        Object[] lines = mLines;
+        StyleRow[] color = mColor;
+        boolean[] lineWrap = mLineWrap;
+        Object scrollLine = lines[topMarginInt];
+        StyleRow scrollColor = color[topMarginInt];
+        boolean scrollLineWrap = lineWrap[topMarginInt];
+        blockCopyLines(screenFirstRow, topMargin, 1);
+        blockCopyLines(bottomMarginInt, screenRows - bottomMargin, 1);
+        lines[screenFirstRow] = scrollLine;
+        color[screenFirstRow] = scrollColor;
+        lineWrap[screenFirstRow] = scrollLineWrap;
+
+        // Update the screen location
+        mScreenFirstRow = (screenFirstRow + 1) % totalRows;
+        if (mActiveTranscriptRows < totalRows - screenRows) {
+            ++mActiveTranscriptRows;
+        }
+
+        // Blank the bottom margin
+        int blankRow = externalToInternalRow(bottomMargin - 1);
+        lines[blankRow] = null;
+        color[blankRow] = new StyleRow(style, mColumns);
+        lineWrap[blankRow] = false;
+
+        return;
+    }
+
+    /**
+     * Block copy characters from one position in the screen to another. The two
+     * positions can overlap. All characters of the source and destination must
+     * be within the bounds of the screen, or else an InvalidParameterException
+     * will be thrown.
+     *
+     * @param sx source X coordinate
+     * @param sy source Y coordinate
+     * @param w  width
+     * @param h  height
+     * @param dx destination X coordinate
+     * @param dy destination Y coordinate
+     */
+    public void blockCopy(int sx, int sy, int w, int h, int dx, int dy) {
+        if (sx < 0 || sx + w > mColumns || sy < 0 || sy + h > mScreenRows
+                || dx < 0 || dx + w > mColumns || dy < 0
+                || dy + h > mScreenRows) {
+            throw new IllegalArgumentException();
+        }
+        Object[] lines = mLines;
+        StyleRow[] color = mColor;
+        if (sy > dy) {
+            // Move in increasing order
+            for (int y = 0; y < h; y++) {
+                int srcRow = externalToInternalRow(sy + y);
+                int dstRow = externalToInternalRow(dy + y);
+                if (lines[srcRow] instanceof char[] && lines[dstRow] instanceof char[]) {
+                    System.arraycopy(lines[srcRow], sx, lines[dstRow], dx, w);
+                } else {
+                    // XXX There has to be a faster way to do this ...
+                    int extDstRow = dy + y;
+                    char[] tmp = getLine(sy + y, sx, sx + w, true);
+                    if (tmp == null) {
+                        // Source line was blank
+                        blockSet(dx, extDstRow, w, 1, ' ', mDefaultStyle);
+                        continue;
+                    }
+                    char cHigh = 0;
+                    int x = 0;
+                    int columns = mColumns;
+                    for (int i = 0; i < tmp.length; ++i) {
+                        if (tmp[i] == 0 || dx + x >= columns) {
+                            break;
+                        }
+                        if (Character.isHighSurrogate(tmp[i])) {
+                            cHigh = tmp[i];
+                            continue;
+                        } else if (Character.isLowSurrogate(tmp[i])) {
+                            int codePoint = Character.toCodePoint(cHigh, tmp[i]);
+                            setChar(dx + x, extDstRow, codePoint);
+                            x += charWidth(codePoint);
+                        } else {
+                            setChar(dx + x, extDstRow, tmp[i]);
+                            x += charWidth(tmp[i]);
+                        }
+                    }
+                }
+                color[srcRow].copy(sx, color[dstRow], dx, w);
+            }
+        } else {
+            // Move in decreasing order
+            for (int y = 0; y < h; y++) {
+                int y2 = h - (y + 1);
+                int srcRow = externalToInternalRow(sy + y2);
+                int dstRow = externalToInternalRow(dy + y2);
+                if (lines[srcRow] instanceof char[] && lines[dstRow] instanceof char[]) {
+                    System.arraycopy(lines[srcRow], sx, lines[dstRow], dx, w);
+                } else {
+                    int extDstRow = dy + y2;
+                    char[] tmp = getLine(sy + y2, sx, sx + w, true);
+                    if (tmp == null) {
+                        // Source line was blank
+                        blockSet(dx, extDstRow, w, 1, ' ', mDefaultStyle);
+                        continue;
+                    }
+                    char cHigh = 0;
+                    int x = 0;
+                    int columns = mColumns;
+                    for (int i = 0; i < tmp.length; ++i) {
+                        if (tmp[i] == 0 || dx + x >= columns) {
+                            break;
+                        }
+                        if (Character.isHighSurrogate(tmp[i])) {
+                            cHigh = tmp[i];
+                            continue;
+                        } else if (Character.isLowSurrogate(tmp[i])) {
+                            int codePoint = Character.toCodePoint(cHigh, tmp[i]);
+                            setChar(dx + x, extDstRow, codePoint);
+                            x += charWidth(codePoint);
+                        } else {
+                            setChar(dx + x, extDstRow, tmp[i]);
+                            x += charWidth(tmp[i]);
+                        }
+                    }
+                }
+                color[srcRow].copy(sx, color[dstRow], dx, w);
+            }
+        }
+    }
+
+    /**
+     * Block set characters. All characters must be within the bounds of the
+     * screen, or else and InvalidParemeterException will be thrown. Typically
+     * this is called with a "val" argument of 32 to clear a block of
+     * characters.
+     *
+     * @param sx  source X
+     * @param sy  source Y
+     * @param w   width
+     * @param h   height
+     * @param val value to set.
+     */
+    public void blockSet(int sx, int sy, int w, int h, int val, int style) {
+        if (sx < 0 || sx + w > mColumns || sy < 0 || sy + h > mScreenRows) {
+            Log.e(TAG, "illegal arguments! " + sx + " " + sy + " " + w + " " + h + " " + val + " " + mColumns + " " + mScreenRows);
+            throw new IllegalArgumentException();
+        }
+
+        for (int y = 0; y < h; y++) {
+            for (int x = 0; x < w; x++) {
+                setChar(sx + x, sy + y, val, style);
+            }
+        }
+    }
+
+    /**
+     * Minimum API version for which we're willing to let Android try
+     * rendering conjoining Hangul jamo as composed syllable blocks.
+     * <p>
+     * This appears to work on Android 4.1.2, 4.3, and 4.4 (real devices only;
+     * the emulator's broken for some reason), but not on 4.0.4 -- hence the
+     * choice of API 16 as the minimum.
+     */
+    static final int HANGUL_CONJOINING_MIN_SDK = 16;
+
+    /**
+     * Gives the display width of the code point in a monospace font.
+     * <p>
+     * Nonspacing combining marks, format characters, and control characters
+     * have display width zero.  East Asian fullwidth and wide characters
+     * have display width two.  All other characters have display width one.
+     * <p>
+     * Known issues:
+     * - Proper support for East Asian wide characters requires API >= 8.
+     * - Assigning all East Asian "ambiguous" characters a width of 1 may not
+     * be correct if Android renders those characters as wide in East Asian
+     * context (as the Unicode standard permits).
+     * - Isolated Hangul conjoining medial vowels and final consonants are
+     * treated as combining characters (they should only be combining when
+     * part of a Korean syllable block).
+     *
+     * @param codePoint A Unicode code point.
+     * @return The display width of the Unicode code point.
+     */
+    public static int charWidth(int codePoint) {
+        // Early out for ASCII printable characters
+        if (codePoint > 31 && codePoint < 127) {
+            return 1;
+        }
+
+        /* HACK: We're using ASCII ESC to save the location of the cursor
+           across screen resizes, so we need to pretend that it has width 1 */
+        if (codePoint == 27) {
+            return 1;
+        }
+
+        switch (Character.getType(codePoint)) {
+            case Character.CONTROL:
+            case Character.FORMAT:
+            case Character.NON_SPACING_MARK:
+            case Character.ENCLOSING_MARK:
+                return 0;
+        }
+
+        if ((codePoint >= 0x1160 && codePoint <= 0x11FF) ||
+                (codePoint >= 0xD7B0 && codePoint <= 0xD7FF)) {
+            if (AndroidCompat.SDK >= HANGUL_CONJOINING_MIN_SDK) {
+                /* Treat Hangul jamo medial vowels and final consonants as
+                 * combining characters with width 0 to make jamo composition
+                 * work correctly.
+                 *
+                 * XXX: This is wrong for medials/finals outside a Korean
+                 * syllable block, but there's no easy solution to that
+                 * problem, and we may as well at least get the common case
+                 * right. */
+                return 0;
+            } else {
+                /* Older versions of Android didn't compose Hangul jamo, but
+                 * instead rendered them as individual East Asian wide
+                 * characters (despite Unicode defining medial vowels and final
+                 * consonants as East Asian neutral/narrow).  Treat them as
+                 * width 2 characters to match the rendering. */
+                return 2;
+            }
+        }
+        if (Character.charCount(codePoint) == 1) {
+            // Android's getEastAsianWidth() only works for BMP characters
+            switch (AndroidCharacterCompat.getEastAsianWidth((char) codePoint)) {
+                case AndroidCharacterCompat.EAST_ASIAN_WIDTH_FULL_WIDTH:
+                case AndroidCharacterCompat.EAST_ASIAN_WIDTH_WIDE:
+                    return 2;
+            }
+        } else {
+            // Outside the BMP, only the ideographic planes contain wide chars
+            switch ((codePoint >> 16) & 0xf) {
+                case 2: // Supplementary Ideographic Plane
+                case 3: // Tertiary Ideographic Plane
+                    return 2;
+            }
+        }
+
+        return 1;
+    }
+
+    public static int charWidth(char cHigh, char cLow) {
+        return charWidth(Character.toCodePoint(cHigh, cLow));
+    }
+
+    /**
+     * Gives the display width of a code point in a char array
+     * in a monospace font.
+     *
+     * @param chars The array containing the code point in question.
+     * @param index The index into the array at which the code point starts.
+     * @return The display width of the Unicode code point.
+     */
+    public static int charWidth(char[] chars, int index) {
+        char c = chars[index];
+        if (Character.isHighSurrogate(c)) {
+            return charWidth(c, chars[index + 1]);
+        } else {
+            return charWidth(c);
+        }
+    }
+
+    /**
+     * Get the contents of a line (or part of a line) of the transcript.
+     * <p>
+     * The char[] array returned may be part of the internal representation
+     * of the line -- make a copy first if you want to modify it.  The returned
+     * array may be longer than the requested portion of the transcript; in
+     * this case, the last character requested will be followed by a NUL, and
+     * the contents of the rest of the array could potentially be garbage.
+     *
+     * @param row The row number to get (-mActiveTranscriptRows..mScreenRows-1)
+     * @param x1  The first screen position that's wanted
+     * @param x2  One after the last screen position that's wanted
+     * @return A char[] array containing the requested contents
+     */
+    public char[] getLine(int row, int x1, int x2) {
+        return getLine(row, x1, x2, false);
+    }
+
+    /**
+     * Get the whole contents of a line of the transcript.
+     */
+    public char[] getLine(int row) {
+        return getLine(row, 0, mColumns, true);
+    }
+
+    private char[] getLine(int row, int x1, int x2, boolean strictBounds) {
+        if (row < -mActiveTranscriptRows || row > mScreenRows - 1) {
+            throw new IllegalArgumentException();
+        }
+
+        int columns = mColumns;
+        row = externalToInternalRow(row);
+        if (mLines[row] == null) {
+            // Line is blank
+            return null;
+        }
+        if (mLines[row] instanceof char[]) {
+            // Line contains only regular-width BMP characters
+            if (x1 == 0 && x2 == columns) {
+                // Want the whole row? Easy.
+                return (char[]) mLines[row];
+            } else {
+                if (tmpLine == null || tmpLine.length < columns + 1) {
+                    tmpLine = new char[columns + 1];
+                }
+                int length = x2 - x1;
+                System.arraycopy(mLines[row], x1, tmpLine, 0, length);
+                tmpLine[length] = 0;
+                return tmpLine;
+            }
+        }
+
+        // Figure out how long the array needs to be
+        FullUnicodeLine line = (FullUnicodeLine) mLines[row];
+        char[] rawLine = line.getLine();
+
+        if (x1 == 0 && x2 == columns) {
+            /* We can return the raw line after ensuring it's NUL-terminated at
+             * the appropriate place */
+            int spaceUsed = line.getSpaceUsed();
+            if (spaceUsed < rawLine.length) {
+                rawLine[spaceUsed] = 0;
+            }
+            return rawLine;
+        }
+
+        x1 = line.findStartOfColumn(x1);
+        if (x2 < columns) {
+            int endCol = x2;
+            x2 = line.findStartOfColumn(endCol);
+            if (!strictBounds && endCol > 0 && endCol < columns - 1) {
+                /* If the end column is the middle of an East Asian wide
+                 * character, include that character in the bounds */
+                if (x2 == line.findStartOfColumn(endCol - 1)) {
+                    x2 = line.findStartOfColumn(endCol + 1);
+                }
+            }
+        } else {
+            x2 = line.getSpaceUsed();
+        }
+        int length = x2 - x1;
+
+        if (tmpLine == null || tmpLine.length < length + 1) {
+            tmpLine = new char[length + 1];
+        }
+        System.arraycopy(rawLine, x1, tmpLine, 0, length);
+        tmpLine[length] = 0;
+        return tmpLine;
+    }
+
+    /**
+     * Get color/formatting information for a particular line.
+     * The returned object may be a pointer to a temporary buffer, only good
+     * until the next call to getLineColor.
+     */
+    public StyleRow getLineColor(int row, int x1, int x2) {
+        return getLineColor(row, x1, x2, false);
+    }
+
+    public StyleRow getLineColor(int row) {
+        return getLineColor(row, 0, mColumns, true);
+    }
+
+    private StyleRow getLineColor(int row, int x1, int x2, boolean strictBounds) {
+        if (row < -mActiveTranscriptRows || row > mScreenRows - 1) {
+            throw new IllegalArgumentException();
+        }
+
+        row = externalToInternalRow(row);
+        StyleRow color = mColor[row];
+        StyleRow tmp = tmpColor;
+        if (color != null) {
+            int columns = mColumns;
+            if (!strictBounds && mLines[row] != null &&
+                    mLines[row] instanceof FullUnicodeLine) {
+                FullUnicodeLine line = (FullUnicodeLine) mLines[row];
+                /* If either the start or the end column is in the middle of
+                 * an East Asian wide character, include the appropriate column
+                 * of style information */
+                if (x1 > 0 && line.findStartOfColumn(x1 - 1) == line.findStartOfColumn(x1)) {
+                    --x1;
+                }
+                if (x2 < columns - 1 && line.findStartOfColumn(x2 + 1) == line.findStartOfColumn(x2)) {
+                    ++x2;
+                }
+            }
+            if (x1 == 0 && x2 == columns) {
+                return color;
+            }
+            color.copy(x1, tmp, 0, x2 - x1);
+            return tmp;
+        } else {
+            return null;
+        }
+    }
+
+    boolean isBasicLine(int row) {
+        if (row < -mActiveTranscriptRows || row > mScreenRows - 1) {
+            throw new IllegalArgumentException();
+        }
+
+        return (mLines[externalToInternalRow(row)] instanceof char[]);
+    }
+
+    public boolean getChar(int row, int column) {
+        return getChar(row, column, 0);
+    }
+
+    public boolean getChar(int row, int column, int charIndex) {
+        return getChar(row, column, charIndex, new char[1], 0);
+    }
+
+    /**
+     * Get a character at a specific position in the transcript.
+     *
+     * @param row       The row of the character to get.
+     * @param column    The column of the character to get.
+     * @param charIndex The index of the character in the column to get
+     *                  (0 for the first character, 1 for the next, etc.)
+     * @param out       The char[] array into which the character will be placed.
+     * @param offset    The offset in the array at which the character will be placed.
+     * @return Whether or not there are characters following this one in the column.
+     */
+    public boolean getChar(int row, int column, int charIndex, char[] out, int offset) {
+        if (row < -mActiveTranscriptRows || row > mScreenRows - 1) {
+            throw new IllegalArgumentException();
+        }
+        row = externalToInternalRow(row);
+
+        if (mLines[row] instanceof char[]) {
+            // Fast path: all regular-width BMP chars in the row
+            char[] line = (char[]) mLines[row];
+            out[offset] = line[column];
+            return false;
+        }
+
+        FullUnicodeLine line = (FullUnicodeLine) mLines[row];
+        return line.getChar(column, charIndex, out, offset);
+    }
+
+    private boolean isBasicChar(int codePoint) {
+        return !(charWidth(codePoint) != 1 || Character.charCount(codePoint) != 1);
+    }
+
+    private char[] allocateBasicLine(int row, int columns) {
+        char[] line = new char[columns];
+
+        // Fill the line with blanks
+        for (int i = 0; i < columns; ++i) {
+            line[i] = ' ';
+        }
+
+        mLines[row] = line;
+        if (mColor[row] == null) {
+            mColor[row] = new StyleRow(0, columns);
+        }
+        return line;
+    }
+
+    private FullUnicodeLine allocateFullLine(int row, int columns) {
+        FullUnicodeLine line = new FullUnicodeLine(columns);
+
+        mLines[row] = line;
+        if (mColor[row] == null) {
+            mColor[row] = new StyleRow(0, columns);
+        }
+        return line;
+    }
+
+    public boolean setChar(int column, int row, int codePoint, int style) {
+        if (!setChar(column, row, codePoint)) {
+            return false;
+        }
+
+        row = externalToInternalRow(row);
+        mColor[row].set(column, style);
+
+        return true;
+    }
+
+    public boolean setChar(int column, int row, int codePoint) {
+        if (row >= mScreenRows || column >= mColumns) {
+            Log.e(TAG, "illegal arguments! " + row + " " + column + " " + mScreenRows + " " + mColumns);
+            throw new IllegalArgumentException();
+        }
+        row = externalToInternalRow(row);
+
+        /*
+         * Whether data contains non-BMP or characters with charWidth != 1
+         * 0 - false; 1 - true; -1 - undetermined
+         */
+        int basicMode = -1;
+
+        // Allocate a row on demand
+        if (mLines[row] == null) {
+            if (isBasicChar(codePoint)) {
+                allocateBasicLine(row, mColumns);
+                basicMode = 1;
+            } else {
+                allocateFullLine(row, mColumns);
+                basicMode = 0;
+            }
+        }
+
+        if (mLines[row] instanceof char[]) {
+            char[] line = (char[]) mLines[row];
+
+            if (basicMode == -1) {
+                if (isBasicChar(codePoint)) {
+                    basicMode = 1;
+                } else {
+                    basicMode = 0;
+                }
+            }
+
+            if (basicMode == 1) {
+                // Fast path -- just put the char in the array
+                line[column] = (char) codePoint;
+                return true;
+            }
+
+            // Need to switch to the full-featured mode
+            mLines[row] = new FullUnicodeLine(line);
+        }
+
+        FullUnicodeLine line = (FullUnicodeLine) mLines[row];
+        line.setChar(column, codePoint);
+        return true;
+    }
+}
+
+/*
+ * A representation of a line that's capable of handling non-BMP characters,
+ * East Asian wide characters, and combining characters.
+ *
+ * The text of the line is stored in an array of char[], allowing easy
+ * conversion to a String and/or reuse by other string-handling functions.
+ * An array of short[] is used to keep track of the difference between a column
+ * and the starting index corresponding to its contents in the char[] array (so
+ * if column 42 starts at index 45 in the char[] array, the offset stored is 3).
+ * Column 0 always starts at index 0 in the char[] array, so we use that
+ * element of the array to keep track of how much of the char[] array we're
+ * using at the moment.
+ */
+class FullUnicodeLine {
+    private static final float SPARE_CAPACITY_FACTOR = 1.5f;
+
+    private char[] mText;
+    private short[] mOffset;
+    private int mColumns;
+
+    public FullUnicodeLine(int columns) {
+        commonConstructor(columns);
+        char[] text = mText;
+        // Fill in the line with blanks
+        for (int i = 0; i < columns; ++i) {
+            text[i] = ' ';
+        }
+        // Store the space used
+        mOffset[0] = (short) columns;
+    }
+
+    public FullUnicodeLine(char[] basicLine) {
+        commonConstructor(basicLine.length);
+        System.arraycopy(basicLine, 0, mText, 0, mColumns);
+        // Store the space used
+        mOffset[0] = (short) basicLine.length;
+    }
+
+    private void commonConstructor(int columns) {
+        mColumns = columns;
+        mOffset = new short[columns];
+        mText = new char[(int) (SPARE_CAPACITY_FACTOR * columns)];
+    }
+
+    public int getSpaceUsed() {
+        return mOffset[0];
+    }
+
+    public char[] getLine() {
+        return mText;
+    }
+
+    public int findStartOfColumn(int column) {
+        if (column == 0) {
+            return 0;
+        } else {
+            return column + mOffset[column];
+        }
+    }
+
+    public boolean getChar(int column, int charIndex, char[] out, int offset) {
+        int pos = findStartOfColumn(column);
+        int length;
+        if (column + 1 < mColumns) {
+            length = findStartOfColumn(column + 1) - pos;
+        } else {
+            length = getSpaceUsed() - pos;
+        }
+        if (charIndex >= length) {
+            throw new IllegalArgumentException();
+        }
+        out[offset] = mText[pos + charIndex];
+        return (charIndex + 1 < length);
+    }
+
+    public void setChar(int column, int codePoint) {
+        int columns = mColumns;
+        if (column < 0 || column >= columns) {
+            throw new IllegalArgumentException();
+        }
+
+        char[] text = mText;
+        short[] offset = mOffset;
+        int spaceUsed = offset[0];
+
+        int pos = findStartOfColumn(column);
+
+        int charWidth = UnicodeTranscript.charWidth(codePoint);
+        int oldCharWidth = UnicodeTranscript.charWidth(text, pos);
+
+        if (charWidth == 2 && column == columns - 1) {
+            // A width 2 character doesn't fit in the last column.
+            codePoint = ' ';
+            charWidth = 1;
+        }
+
+        boolean wasExtraColForWideChar = false;
+        if (oldCharWidth == 2 && column > 0) {
+            /* If the previous screen column starts at the same offset in the
+             * array as this one, this column must be the second column used
+             * by an East Asian wide character */
+            wasExtraColForWideChar = (findStartOfColumn(column - 1) == pos);
+        }
+
+        // Get the number of elements in the mText array this column uses now
+        int oldLen;
+        if (wasExtraColForWideChar && column + 1 < columns) {
+            oldLen = findStartOfColumn(column + 1) - pos;
+        } else if (column + oldCharWidth < columns) {
+            oldLen = findStartOfColumn(column + oldCharWidth) - pos;
+        } else {
+            oldLen = spaceUsed - pos;
+        }
+
+        // Find how much space this column will need
+        int newLen = Character.charCount(codePoint);
+        if (charWidth == 0) {
+            /* Combining characters are added to the contents of the column
+               instead of overwriting them, so that they modify the existing
+               contents */
+            newLen += oldLen;
+        }
+        int shift = newLen - oldLen;
+
+        // Shift the rest of the line right to make room if necessary
+        if (shift > 0) {
+            if (spaceUsed + shift > text.length) {
+                // We need to grow the array
+                char[] newText = new char[text.length + columns];
+                System.arraycopy(text, 0, newText, 0, pos);
+                System.arraycopy(text, pos + oldLen, newText, pos + newLen, spaceUsed - pos - oldLen);
+                mText = text = newText;
+            } else {
+                System.arraycopy(text, pos + oldLen, text, pos + newLen, spaceUsed - pos - oldLen);
+            }
+        }
+
+        // Store the character
+        if (charWidth > 0) {
+            Character.toChars(codePoint, text, pos);
+        } else {
+            /* Store a combining character at the end of the existing contents,
+               so that it modifies them */
+            Character.toChars(codePoint, text, pos + oldLen);
+        }
+
+        // Shift the rest of the line left to eliminate gaps if necessary
+        if (shift < 0) {
+            System.arraycopy(text, pos + oldLen, text, pos + newLen, spaceUsed - pos - oldLen);
+        }
+
+        // Update space used
+        if (shift != 0) {
+            spaceUsed += shift;
+            offset[0] = (short) spaceUsed;
+        }
+
+        /*
+         * Handle cases where we need to pad with spaces to preserve column
+         * alignment
+         *
+         * width 2 -> width 1: pad with a space before or after the new
+         * character, depending on which of the two previously-occupied columns
+         * we wrote into
+         *
+         * inserting width 2 character into the second column of an existing
+         * width 2 character: pad with a space before the new character
+         */
+        if (oldCharWidth == 2 && charWidth == 1 || wasExtraColForWideChar && charWidth == 2) {
+            int nextPos = pos + newLen;
+            char[] newText = text;
+            if (spaceUsed + 1 > text.length) {
+                // Array needs growing
+                newText = new char[text.length + columns];
+                System.arraycopy(text, 0, newText, 0, wasExtraColForWideChar ? pos : nextPos);
+            }
+
+            if (wasExtraColForWideChar) {
+                // Padding goes before the new character
+                System.arraycopy(text, pos, newText, pos + 1, spaceUsed - pos);
+                newText[pos] = ' ';
+            } else {
+                // Padding goes after the new character
+                System.arraycopy(text, nextPos, newText, nextPos + 1, spaceUsed - nextPos);
+                newText[nextPos] = ' ';
+            }
+
+            if (newText != text) {
+                // Update mText to point to the newly grown array
+                mText = text = newText;
+            }
+
+            // Update space used
+            spaceUsed = ++offset[0];
+
+            // Correct the offset for the just-modified column to reflect
+            // width change
+            if (wasExtraColForWideChar) {
+                ++offset[column];
+                ++pos;
+            } else {
+                if (column == 0) {
+                    offset[1] = (short) (newLen - 1);
+                } else if (column + 1 < columns) {
+                    offset[column + 1] = (short) (offset[column] + newLen - 1);
+                }
+                ++column;
+            }
+
+            ++shift;
+        }
+        
+        /*
+         * Handle cases where we need to clobber the contents of the next
+         * column in order to preserve column alignment
+         *
+         * width 1 -> width 2: should clobber the contents of the next
+         * column (if next column contains wide char, need to pad with a space)
+         *
+         * inserting width 2 character into the second column of an existing
+         * width 2 character: same
+         */
+        if (oldCharWidth == 1 && charWidth == 2 || wasExtraColForWideChar && charWidth == 2) {
+            if (column == columns - 2) {
+                // Correct offset for the next column to reflect width change
+                offset[column + 1] = (short) (offset[column] - 1);
+
+                // Truncate the line after this character.
+                offset[0] = (short) (pos + newLen);
+                shift = 0;
+            } else {
+                // Overwrite the contents of the next column.
+                int nextPos = pos + newLen;
+                int nextWidth = UnicodeTranscript.charWidth(text, nextPos);
+                int nextLen;
+                if (column + nextWidth + 1 < columns) {
+                    nextLen = findStartOfColumn(column + nextWidth + 1) + shift - nextPos;
+                } else {
+                    nextLen = spaceUsed - nextPos;
+                }
+
+                if (nextWidth == 2) {
+                    text[nextPos] = ' ';
+                    // Shift the array to match
+                    if (nextLen > 1) {
+                        System.arraycopy(text, nextPos + nextLen, text, nextPos + 1, spaceUsed - nextPos - nextLen);
+                        shift -= nextLen - 1;
+                        offset[0] -= nextLen - 1;
+                    }
+                } else {
+                    // Shift the array leftwards
+                    System.arraycopy(text, nextPos + nextLen, text, nextPos, spaceUsed - nextPos - nextLen);
+                    shift -= nextLen;
+
+                    // Truncate the line
+                    offset[0] -= nextLen;
+                }
+
+                // Correct the offset for the next column to reflect width change
+                if (column == 0) {
+                    offset[1] = -1;
+                } else {
+                    offset[column + 1] = (short) (offset[column] - 1);
+                }
+                ++column;
+            }
+        }
+
+        // Update offset table
+        if (shift != 0) {
+            for (int i = column + 1; i < columns; ++i) {
+                offset[i] += shift;
+            }
+        }
+    }
+}
+
diff --git a/termemulator/src/main/java/jackpal/androidterm/emulatorview/UpdateCallback.java b/termemulator/src/main/java/jackpal/androidterm/emulatorview/UpdateCallback.java
new file mode 100644
index 00000000..b2dbe218
--- /dev/null
+++ b/termemulator/src/main/java/jackpal/androidterm/emulatorview/UpdateCallback.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package jackpal.androidterm.emulatorview;
+
+/**
+ * Generic callback to be invoked to notify of updates.
+ */
+public interface UpdateCallback {
+    /**
+     * Callback function to be invoked when an update happens.
+     */
+    void onUpdate();
+}
diff --git a/termemulator/src/main/java/jackpal/androidterm/emulatorview/compat/AndroidCharacterCompat.java b/termemulator/src/main/java/jackpal/androidterm/emulatorview/compat/AndroidCharacterCompat.java
new file mode 100644
index 00000000..91762a6a
--- /dev/null
+++ b/termemulator/src/main/java/jackpal/androidterm/emulatorview/compat/AndroidCharacterCompat.java
@@ -0,0 +1,29 @@
+package jackpal.androidterm.emulatorview.compat;
+
+import android.text.AndroidCharacter;
+
+/**
+ * Definitions related to android.text.AndroidCharacter
+ */
+public class AndroidCharacterCompat {
+    public static final int EAST_ASIAN_WIDTH_NEUTRAL = 0;
+    public static final int EAST_ASIAN_WIDTH_AMBIGUOUS = 1;
+    public static final int EAST_ASIAN_WIDTH_HALF_WIDTH = 2;
+    public static final int EAST_ASIAN_WIDTH_FULL_WIDTH = 3;
+    public static final int EAST_ASIAN_WIDTH_NARROW = 4;
+    public static final int EAST_ASIAN_WIDTH_WIDE = 5;
+
+    private static class Api8OrLater {
+        public static int getEastAsianWidth(char c) {
+            return AndroidCharacter.getEastAsianWidth(c);
+        }
+    }
+
+    public static int getEastAsianWidth(char c) {
+        if (AndroidCompat.SDK >= 8) {
+            return Api8OrLater.getEastAsianWidth(c);
+        } else {
+            return EAST_ASIAN_WIDTH_NARROW;
+        }
+    }
+}
diff --git a/termemulator/src/main/java/jackpal/androidterm/emulatorview/compat/AndroidCompat.java b/termemulator/src/main/java/jackpal/androidterm/emulatorview/compat/AndroidCompat.java
new file mode 100644
index 00000000..0590f731
--- /dev/null
+++ b/termemulator/src/main/java/jackpal/androidterm/emulatorview/compat/AndroidCompat.java
@@ -0,0 +1,40 @@
+package jackpal.androidterm.emulatorview.compat;
+
+/**
+ * The classes in this package take advantage of the fact that the VM does
+ * not attempt to load a class until it's accessed, and the verifier
+ * does not run until a class is loaded.  By keeping the methods which
+ * are unavailable on older platforms in subclasses which are only ever
+ * accessed on platforms where they are available, we can preserve
+ * compatibility with older platforms without resorting to reflection.
+ * <p>
+ * See http://developer.android.com/resources/articles/backward-compatibility.html
+ * and http://android-developers.blogspot.com/2010/07/how-to-have-your-cupcake-and-eat-it-too.html
+ * for further discussion of this technique.
+ */
+
+public class AndroidCompat {
+    public final static int SDK = getSDK();
+
+    private final static int getSDK() {
+        int result;
+        try {
+            result = AndroidLevel4PlusCompat.getSDKInt();
+        } catch (VerifyError e) {
+            // We must be at an SDK level less than 4.
+            try {
+                result = Integer.valueOf(android.os.Build.VERSION.SDK);
+            } catch (NumberFormatException e2) {
+                // Couldn't parse string, assume the worst.
+                result = 1;
+            }
+        }
+        return result;
+    }
+}
+
+class AndroidLevel4PlusCompat {
+    static int getSDKInt() {
+        return android.os.Build.VERSION.SDK_INT;
+    }
+}
diff --git a/termemulator/src/main/java/jackpal/androidterm/emulatorview/compat/ClipboardManagerCompat.java b/termemulator/src/main/java/jackpal/androidterm/emulatorview/compat/ClipboardManagerCompat.java
new file mode 100644
index 00000000..71e304ef
--- /dev/null
+++ b/termemulator/src/main/java/jackpal/androidterm/emulatorview/compat/ClipboardManagerCompat.java
@@ -0,0 +1,9 @@
+package jackpal.androidterm.emulatorview.compat;
+
+public interface ClipboardManagerCompat {
+    CharSequence getText();
+
+    boolean hasText();
+
+    void setText(CharSequence text);
+}
diff --git a/termemulator/src/main/java/jackpal/androidterm/emulatorview/compat/ClipboardManagerCompatFactory.java b/termemulator/src/main/java/jackpal/androidterm/emulatorview/compat/ClipboardManagerCompatFactory.java
new file mode 100644
index 00000000..5eaf2a21
--- /dev/null
+++ b/termemulator/src/main/java/jackpal/androidterm/emulatorview/compat/ClipboardManagerCompatFactory.java
@@ -0,0 +1,18 @@
+package jackpal.androidterm.emulatorview.compat;
+
+import android.content.Context;
+
+public class ClipboardManagerCompatFactory {
+
+    private ClipboardManagerCompatFactory() {
+        /* singleton */
+    }
+
+    public static ClipboardManagerCompat getManager(Context context) {
+        if (AndroidCompat.SDK < 11) {
+            return new ClipboardManagerCompatV1(context);
+        } else {
+            return new ClipboardManagerCompatV11(context);
+        }
+    }
+}
diff --git a/termemulator/src/main/java/jackpal/androidterm/emulatorview/compat/ClipboardManagerCompatV1.java b/termemulator/src/main/java/jackpal/androidterm/emulatorview/compat/ClipboardManagerCompatV1.java
new file mode 100644
index 00000000..672e5c2a
--- /dev/null
+++ b/termemulator/src/main/java/jackpal/androidterm/emulatorview/compat/ClipboardManagerCompatV1.java
@@ -0,0 +1,29 @@
+package jackpal.androidterm.emulatorview.compat;
+
+import android.content.Context;
+import android.text.ClipboardManager;
+
+@SuppressWarnings("deprecation")
+public class ClipboardManagerCompatV1 implements ClipboardManagerCompat {
+    private final ClipboardManager clip;
+
+    public ClipboardManagerCompatV1(Context context) {
+        clip = (ClipboardManager) context.getApplicationContext()
+                .getSystemService(Context.CLIPBOARD_SERVICE);
+    }
+
+    @Override
+    public CharSequence getText() {
+        return clip.getText();
+    }
+
+    @Override
+    public boolean hasText() {
+        return clip.hasText();
+    }
+
+    @Override
+    public void setText(CharSequence text) {
+        clip.setText(text);
+    }
+}
diff --git a/termemulator/src/main/java/jackpal/androidterm/emulatorview/compat/ClipboardManagerCompatV11.java b/termemulator/src/main/java/jackpal/androidterm/emulatorview/compat/ClipboardManagerCompatV11.java
new file mode 100644
index 00000000..dfdbd786
--- /dev/null
+++ b/termemulator/src/main/java/jackpal/androidterm/emulatorview/compat/ClipboardManagerCompatV11.java
@@ -0,0 +1,35 @@
+package jackpal.androidterm.emulatorview.compat;
+
+import android.annotation.SuppressLint;
+import android.content.ClipData;
+import android.content.ClipDescription;
+import android.content.Context;
+import android.content.ClipboardManager;
+
+@SuppressLint("NewApi")
+public class ClipboardManagerCompatV11 implements ClipboardManagerCompat {
+    private final ClipboardManager clip;
+
+    public ClipboardManagerCompatV11(Context context) {
+        clip = (ClipboardManager) context.getApplicationContext()
+                .getSystemService(Context.CLIPBOARD_SERVICE);
+    }
+
+    @Override
+    public CharSequence getText() {
+        ClipData.Item item = clip.getPrimaryClip().getItemAt(0);
+        return item.getText();
+    }
+
+    @Override
+    public boolean hasText() {
+        return (clip.hasPrimaryClip() && clip.getPrimaryClipDescription()
+                .hasMimeType(ClipDescription.MIMETYPE_TEXT_PLAIN));
+    }
+
+    @Override
+    public void setText(CharSequence text) {
+        ClipData clipData = ClipData.newPlainText("simple text", text);
+        clip.setPrimaryClip(clipData);
+    }
+}
diff --git a/termemulator/src/main/java/jackpal/androidterm/emulatorview/compat/KeyCharacterMapCompat.java b/termemulator/src/main/java/jackpal/androidterm/emulatorview/compat/KeyCharacterMapCompat.java
new file mode 100644
index 00000000..827f6de4
--- /dev/null
+++ b/termemulator/src/main/java/jackpal/androidterm/emulatorview/compat/KeyCharacterMapCompat.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2011 Jack Palevich
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package jackpal.androidterm.emulatorview.compat;
+
+import android.view.KeyCharacterMap;
+
+public abstract class KeyCharacterMapCompat {
+    public static final int MODIFIER_BEHAVIOR_CHORDED = 0;
+    public static final int MODIFIER_BEHAVIOR_CHORDED_OR_TOGGLED = 1;
+
+    public static KeyCharacterMapCompat wrap(Object map) {
+        if (map != null) {
+            if (AndroidCompat.SDK >= 11) {
+                return new KeyCharacterMapApi11OrLater(map);
+            }
+        }
+        return null;
+    }
+
+    private static class KeyCharacterMapApi11OrLater
+            extends KeyCharacterMapCompat {
+        private KeyCharacterMap mMap;
+
+        public KeyCharacterMapApi11OrLater(Object map) {
+            mMap = (KeyCharacterMap) map;
+        }
+
+        public int getModifierBehaviour() {
+            return mMap.getModifierBehavior();
+        }
+    }
+
+    public abstract int getModifierBehaviour();
+}
diff --git a/termemulator/src/main/java/jackpal/androidterm/emulatorview/compat/KeycodeConstants.java b/termemulator/src/main/java/jackpal/androidterm/emulatorview/compat/KeycodeConstants.java
new file mode 100644
index 00000000..6ff7d6ac
--- /dev/null
+++ b/termemulator/src/main/java/jackpal/androidterm/emulatorview/compat/KeycodeConstants.java
@@ -0,0 +1,864 @@
+package jackpal.androidterm.emulatorview.compat;
+
+/**
+ * Keycode constants and modifier masks for use with keyboard event listeners.
+ * <p>
+ * The Meta masks (ctrl, alt, shift, and meta) are used as follows:
+ * KeyEvent keyEvent = ...;
+ * boolean isCtrlPressed = (keyEvent.getMetaState() & META_CTRL_ON) != 0
+ * <p>
+ * Contains the complete set of Android key codes that were defined as of the 2.3 API.
+ * We could pull in the constants from the 2.3 API, but then we would need to raise the
+ * SDK minVersion in the manifest. We want to keep compatibility with Android 1.6,
+ * and raising this level could result in the accidental use of a newer API.
+ */
+public class KeycodeConstants {
+
+    /**
+     * Key code constant: Unknown key code.
+     */
+    public static final int KEYCODE_UNKNOWN = 0;
+    /**
+     * Key code constant: Soft Left key.
+     * Usually situated below the display on phones and used as a multi-function
+     * feature key for selecting a software defined function shown on the bottom left
+     * of the display.
+     */
+    public static final int KEYCODE_SOFT_LEFT = 1;
+    /**
+     * Key code constant: Soft Right key.
+     * Usually situated below the display on phones and used as a multi-function
+     * feature key for selecting a software defined function shown on the bottom right
+     * of the display.
+     */
+    public static final int KEYCODE_SOFT_RIGHT = 2;
+    /**
+     * Key code constant: Home key.
+     * This key is handled by the framework and is never delivered to applications.
+     */
+    public static final int KEYCODE_HOME = 3;
+    /**
+     * Key code constant: Back key.
+     */
+    public static final int KEYCODE_BACK = 4;
+    /**
+     * Key code constant: Call key.
+     */
+    public static final int KEYCODE_CALL = 5;
+    /**
+     * Key code constant: End Call key.
+     */
+    public static final int KEYCODE_ENDCALL = 6;
+    /**
+     * Key code constant: '0' key.
+     */
+    public static final int KEYCODE_0 = 7;
+    /**
+     * Key code constant: '1' key.
+     */
+    public static final int KEYCODE_1 = 8;
+    /**
+     * Key code constant: '2' key.
+     */
+    public static final int KEYCODE_2 = 9;
+    /**
+     * Key code constant: '3' key.
+     */
+    public static final int KEYCODE_3 = 10;
+    /**
+     * Key code constant: '4' key.
+     */
+    public static final int KEYCODE_4 = 11;
+    /**
+     * Key code constant: '5' key.
+     */
+    public static final int KEYCODE_5 = 12;
+    /**
+     * Key code constant: '6' key.
+     */
+    public static final int KEYCODE_6 = 13;
+    /**
+     * Key code constant: '7' key.
+     */
+    public static final int KEYCODE_7 = 14;
+    /**
+     * Key code constant: '8' key.
+     */
+    public static final int KEYCODE_8 = 15;
+    /**
+     * Key code constant: '9' key.
+     */
+    public static final int KEYCODE_9 = 16;
+    /**
+     * Key code constant: '*' key.
+     */
+    public static final int KEYCODE_STAR = 17;
+    /**
+     * Key code constant: '#' key.
+     */
+    public static final int KEYCODE_POUND = 18;
+    /**
+     * Key code constant: Directional Pad Up key.
+     * May also be synthesized from trackball motions.
+     */
+    public static final int KEYCODE_DPAD_UP = 19;
+    /**
+     * Key code constant: Directional Pad Down key.
+     * May also be synthesized from trackball motions.
+     */
+    public static final int KEYCODE_DPAD_DOWN = 20;
+    /**
+     * Key code constant: Directional Pad Left key.
+     * May also be synthesized from trackball motions.
+     */
+    public static final int KEYCODE_DPAD_LEFT = 21;
+    /**
+     * Key code constant: Directional Pad Right key.
+     * May also be synthesized from trackball motions.
+     */
+    public static final int KEYCODE_DPAD_RIGHT = 22;
+    /**
+     * Key code constant: Directional Pad Center key.
+     * May also be synthesized from trackball motions.
+     */
+    public static final int KEYCODE_DPAD_CENTER = 23;
+    /**
+     * Key code constant: Volume Up key.
+     * Adjusts the speaker volume up.
+     */
+    public static final int KEYCODE_VOLUME_UP = 24;
+    /**
+     * Key code constant: Volume Down key.
+     * Adjusts the speaker volume down.
+     */
+    public static final int KEYCODE_VOLUME_DOWN = 25;
+    /**
+     * Key code constant: Power key.
+     */
+    public static final int KEYCODE_POWER = 26;
+    /**
+     * Key code constant: Camera key.
+     * Used to launch a camera application or take pictures.
+     */
+    public static final int KEYCODE_CAMERA = 27;
+    /**
+     * Key code constant: Clear key.
+     */
+    public static final int KEYCODE_CLEAR = 28;
+    /**
+     * Key code constant: 'A' key.
+     */
+    public static final int KEYCODE_A = 29;
+    /**
+     * Key code constant: 'B' key.
+     */
+    public static final int KEYCODE_B = 30;
+    /**
+     * Key code constant: 'C' key.
+     */
+    public static final int KEYCODE_C = 31;
+    /**
+     * Key code constant: 'D' key.
+     */
+    public static final int KEYCODE_D = 32;
+    /**
+     * Key code constant: 'E' key.
+     */
+    public static final int KEYCODE_E = 33;
+    /**
+     * Key code constant: 'F' key.
+     */
+    public static final int KEYCODE_F = 34;
+    /**
+     * Key code constant: 'G' key.
+     */
+    public static final int KEYCODE_G = 35;
+    /**
+     * Key code constant: 'H' key.
+     */
+    public static final int KEYCODE_H = 36;
+    /**
+     * Key code constant: 'I' key.
+     */
+    public static final int KEYCODE_I = 37;
+    /**
+     * Key code constant: 'J' key.
+     */
+    public static final int KEYCODE_J = 38;
+    /**
+     * Key code constant: 'K' key.
+     */
+    public static final int KEYCODE_K = 39;
+    /**
+     * Key code constant: 'L' key.
+     */
+    public static final int KEYCODE_L = 40;
+    /**
+     * Key code constant: 'M' key.
+     */
+    public static final int KEYCODE_M = 41;
+    /**
+     * Key code constant: 'N' key.
+     */
+    public static final int KEYCODE_N = 42;
+    /**
+     * Key code constant: 'O' key.
+     */
+    public static final int KEYCODE_O = 43;
+    /**
+     * Key code constant: 'P' key.
+     */
+    public static final int KEYCODE_P = 44;
+    /**
+     * Key code constant: 'Q' key.
+     */
+    public static final int KEYCODE_Q = 45;
+    /**
+     * Key code constant: 'R' key.
+     */
+    public static final int KEYCODE_R = 46;
+    /**
+     * Key code constant: 'S' key.
+     */
+    public static final int KEYCODE_S = 47;
+    /**
+     * Key code constant: 'T' key.
+     */
+    public static final int KEYCODE_T = 48;
+    /**
+     * Key code constant: 'U' key.
+     */
+    public static final int KEYCODE_U = 49;
+    /**
+     * Key code constant: 'V' key.
+     */
+    public static final int KEYCODE_V = 50;
+    /**
+     * Key code constant: 'W' key.
+     */
+    public static final int KEYCODE_W = 51;
+    /**
+     * Key code constant: 'X' key.
+     */
+    public static final int KEYCODE_X = 52;
+    /**
+     * Key code constant: 'Y' key.
+     */
+    public static final int KEYCODE_Y = 53;
+    /**
+     * Key code constant: 'Z' key.
+     */
+    public static final int KEYCODE_Z = 54;
+    /**
+     * Key code constant: ',' key.
+     */
+    public static final int KEYCODE_COMMA = 55;
+    /**
+     * Key code constant: '.' key.
+     */
+    public static final int KEYCODE_PERIOD = 56;
+    /**
+     * Key code constant: Left Alt modifier key.
+     */
+    public static final int KEYCODE_ALT_LEFT = 57;
+    /**
+     * Key code constant: Right Alt modifier key.
+     */
+    public static final int KEYCODE_ALT_RIGHT = 58;
+    /**
+     * Key code constant: Left Shift modifier key.
+     */
+    public static final int KEYCODE_SHIFT_LEFT = 59;
+    /**
+     * Key code constant: Right Shift modifier key.
+     */
+    public static final int KEYCODE_SHIFT_RIGHT = 60;
+    /**
+     * Key code constant: Tab key.
+     */
+    public static final int KEYCODE_TAB = 61;
+    /**
+     * Key code constant: Space key.
+     */
+    public static final int KEYCODE_SPACE = 62;
+    /**
+     * Key code constant: Symbol modifier key.
+     * Used to enter alternate symbols.
+     */
+    public static final int KEYCODE_SYM = 63;
+    /**
+     * Key code constant: Explorer special function key.
+     * Used to launch a browser application.
+     */
+    public static final int KEYCODE_EXPLORER = 64;
+    /**
+     * Key code constant: Envelope special function key.
+     * Used to launch a mail application.
+     */
+    public static final int KEYCODE_ENVELOPE = 65;
+    /**
+     * Key code constant: Enter key.
+     */
+    public static final int KEYCODE_ENTER = 66;
+    /**
+     * Key code constant: Backspace key.
+     * Deletes characters before the insertion point, unlike {@link #KEYCODE_FORWARD_DEL}.
+     */
+    public static final int KEYCODE_DEL = 67;
+    /**
+     * Key code constant: '`' (backtick) key.
+     */
+    public static final int KEYCODE_GRAVE = 68;
+    /**
+     * Key code constant: '-'.
+     */
+    public static final int KEYCODE_MINUS = 69;
+    /**
+     * Key code constant: '=' key.
+     */
+    public static final int KEYCODE_EQUALS = 70;
+    /**
+     * Key code constant: '[' key.
+     */
+    public static final int KEYCODE_LEFT_BRACKET = 71;
+    /**
+     * Key code constant: ']' key.
+     */
+    public static final int KEYCODE_RIGHT_BRACKET = 72;
+    /**
+     * Key code constant: '\' key.
+     */
+    public static final int KEYCODE_BACKSLASH = 73;
+    /**
+     * Key code constant: ';' key.
+     */
+    public static final int KEYCODE_SEMICOLON = 74;
+    /**
+     * Key code constant: ''' (apostrophe) key.
+     */
+    public static final int KEYCODE_APOSTROPHE = 75;
+    /**
+     * Key code constant: '/' key.
+     */
+    public static final int KEYCODE_SLASH = 76;
+    /**
+     * Key code constant: '@' key.
+     */
+    public static final int KEYCODE_AT = 77;
+    /**
+     * Key code constant: Number modifier key.
+     * Used to enter numeric symbols.
+     * This key is not Num Lock; it is more like {@link #KEYCODE_ALT_LEFT} and is
+     * interpreted as an ALT key by {@link android.text.method.MetaKeyKeyListener}.
+     */
+    public static final int KEYCODE_NUM = 78;
+    /**
+     * Key code constant: Headset Hook key.
+     * Used to hang up calls and stop media.
+     */
+    public static final int KEYCODE_HEADSETHOOK = 79;
+    /**
+     * Key code constant: Camera Focus key.
+     * Used to focus the camera.
+     */
+    public static final int KEYCODE_FOCUS = 80;   // *Camera* focus
+    /**
+     * Key code constant: '+' key.
+     */
+    public static final int KEYCODE_PLUS = 81;
+    /**
+     * Key code constant: Menu key.
+     */
+    public static final int KEYCODE_MENU = 82;
+    /**
+     * Key code constant: Notification key.
+     */
+    public static final int KEYCODE_NOTIFICATION = 83;
+    /**
+     * Key code constant: Search key.
+     */
+    public static final int KEYCODE_SEARCH = 84;
+    /**
+     * Key code constant: Play/Pause media key.
+     */
+    public static final int KEYCODE_MEDIA_PLAY_PAUSE = 85;
+    /**
+     * Key code constant: Stop media key.
+     */
+    public static final int KEYCODE_MEDIA_STOP = 86;
+    /**
+     * Key code constant: Play Next media key.
+     */
+    public static final int KEYCODE_MEDIA_NEXT = 87;
+    /**
+     * Key code constant: Play Previous media key.
+     */
+    public static final int KEYCODE_MEDIA_PREVIOUS = 88;
+    /**
+     * Key code constant: Rewind media key.
+     */
+    public static final int KEYCODE_MEDIA_REWIND = 89;
+    /**
+     * Key code constant: Fast Forward media key.
+     */
+    public static final int KEYCODE_MEDIA_FAST_FORWARD = 90;
+    /**
+     * Key code constant: Mute key.
+     * Mutes the microphone, unlike {@link #KEYCODE_VOLUME_MUTE}.
+     */
+    public static final int KEYCODE_MUTE = 91;
+    /**
+     * Key code constant: Page Up key.
+     */
+    public static final int KEYCODE_PAGE_UP = 92;
+    /**
+     * Key code constant: Page Down key.
+     */
+    public static final int KEYCODE_PAGE_DOWN = 93;
+    /**
+     * Key code constant: Picture Symbols modifier key.
+     * Used to switch symbol sets (Emoji, Kao-moji).
+     */
+    public static final int KEYCODE_PICTSYMBOLS = 94;   // switch symbol-sets (Emoji,Kao-moji)
+    /**
+     * Key code constant: Switch Charset modifier key.
+     * Used to switch character sets (Kanji, Katakana).
+     */
+    public static final int KEYCODE_SWITCH_CHARSET = 95;   // switch char-sets (Kanji,Katakana)
+    /**
+     * Key code constant: A Button key.
+     * On a game controller, the A button should be either the button labeled A
+     * or the first button on the upper row of controller buttons.
+     */
+    public static final int KEYCODE_BUTTON_A = 96;
+    /**
+     * Key code constant: B Button key.
+     * On a game controller, the B button should be either the button labeled B
+     * or the second button on the upper row of controller buttons.
+     */
+    public static final int KEYCODE_BUTTON_B = 97;
+    /**
+     * Key code constant: C Button key.
+     * On a game controller, the C button should be either the button labeled C
+     * or the third button on the upper row of controller buttons.
+     */
+    public static final int KEYCODE_BUTTON_C = 98;
+    /**
+     * Key code constant: X Button key.
+     * On a game controller, the X button should be either the button labeled X
+     * or the first button on the lower row of controller buttons.
+     */
+    public static final int KEYCODE_BUTTON_X = 99;
+    /**
+     * Key code constant: Y Button key.
+     * On a game controller, the Y button should be either the button labeled Y
+     * or the second button on the lower row of controller buttons.
+     */
+    public static final int KEYCODE_BUTTON_Y = 100;
+    /**
+     * Key code constant: Z Button key.
+     * On a game controller, the Z button should be either the button labeled Z
+     * or the third button on the lower row of controller buttons.
+     */
+    public static final int KEYCODE_BUTTON_Z = 101;
+    /**
+     * Key code constant: L1 Button key.
+     * On a game controller, the L1 button should be either the button labeled L1 (or L)
+     * or the top left trigger button.
+     */
+    public static final int KEYCODE_BUTTON_L1 = 102;
+    /**
+     * Key code constant: R1 Button key.
+     * On a game controller, the R1 button should be either the button labeled R1 (or R)
+     * or the top right trigger button.
+     */
+    public static final int KEYCODE_BUTTON_R1 = 103;
+    /**
+     * Key code constant: L2 Button key.
+     * On a game controller, the L2 button should be either the button labeled L2
+     * or the bottom left trigger button.
+     */
+    public static final int KEYCODE_BUTTON_L2 = 104;
+    /**
+     * Key code constant: R2 Button key.
+     * On a game controller, the R2 button should be either the button labeled R2
+     * or the bottom right trigger button.
+     */
+    public static final int KEYCODE_BUTTON_R2 = 105;
+    /**
+     * Key code constant: Left Thumb Button key.
+     * On a game controller, the left thumb button indicates that the left (or only)
+     * joystick is pressed.
+     */
+    public static final int KEYCODE_BUTTON_THUMBL = 106;
+    /**
+     * Key code constant: Right Thumb Button key.
+     * On a game controller, the right thumb button indicates that the right
+     * joystick is pressed.
+     */
+    public static final int KEYCODE_BUTTON_THUMBR = 107;
+    /**
+     * Key code constant: Start Button key.
+     * On a game controller, the button labeled Start.
+     */
+    public static final int KEYCODE_BUTTON_START = 108;
+    /**
+     * Key code constant: Select Button key.
+     * On a game controller, the button labeled Select.
+     */
+    public static final int KEYCODE_BUTTON_SELECT = 109;
+    /**
+     * Key code constant: Mode Button key.
+     * On a game controller, the button labeled Mode.
+     */
+    public static final int KEYCODE_BUTTON_MODE = 110;
+    /**
+     * Key code constant: Escape key.
+     */
+    public static final int KEYCODE_ESCAPE = 111;
+    /**
+     * Key code constant: Forward Delete key.
+     * Deletes characters ahead of the insertion point, unlike {@link #KEYCODE_DEL}.
+     */
+    public static final int KEYCODE_FORWARD_DEL = 112;
+    /**
+     * Key code constant: Left Control modifier key.
+     */
+    public static final int KEYCODE_CTRL_LEFT = 113;
+    /**
+     * Key code constant: Right Control modifier key.
+     */
+    public static final int KEYCODE_CTRL_RIGHT = 114;
+    /**
+     * Key code constant: Caps Lock modifier key.
+     */
+    public static final int KEYCODE_CAPS_LOCK = 115;
+    /**
+     * Key code constant: Scroll Lock key.
+     */
+    public static final int KEYCODE_SCROLL_LOCK = 116;
+    /**
+     * Key code constant: Left Meta modifier key.
+     */
+    public static final int KEYCODE_META_LEFT = 117;
+    /**
+     * Key code constant: Right Meta modifier key.
+     */
+    public static final int KEYCODE_META_RIGHT = 118;
+    /**
+     * Key code constant: Function modifier key.
+     */
+    public static final int KEYCODE_FUNCTION = 119;
+    /**
+     * Key code constant: System Request / Print Screen key.
+     */
+    public static final int KEYCODE_SYSRQ = 120;
+    /**
+     * Key code constant: Break / Pause key.
+     */
+    public static final int KEYCODE_BREAK = 121;
+    /**
+     * Key code constant: Home Movement key.
+     * Used for scrolling or moving the cursor around to the start of a line
+     * or to the top of a list.
+     */
+    public static final int KEYCODE_MOVE_HOME = 122;
+    /**
+     * Key code constant: End Movement key.
+     * Used for scrolling or moving the cursor around to the end of a line
+     * or to the bottom of a list.
+     */
+    public static final int KEYCODE_MOVE_END = 123;
+    /**
+     * Key code constant: Insert key.
+     * Toggles insert / overwrite edit mode.
+     */
+    public static final int KEYCODE_INSERT = 124;
+    /**
+     * Key code constant: Forward key.
+     * Navigates forward in the history stack.  Complement of {@link #KEYCODE_BACK}.
+     */
+    public static final int KEYCODE_FORWARD = 125;
+    /**
+     * Key code constant: Play media key.
+     */
+    public static final int KEYCODE_MEDIA_PLAY = 126;
+    /**
+     * Key code constant: Pause media key.
+     */
+    public static final int KEYCODE_MEDIA_PAUSE = 127;
+    /**
+     * Key code constant: Close media key.
+     * May be used to close a CD tray, for example.
+     */
+    public static final int KEYCODE_MEDIA_CLOSE = 128;
+    /**
+     * Key code constant: Eject media key.
+     * May be used to eject a CD tray, for example.
+     */
+    public static final int KEYCODE_MEDIA_EJECT = 129;
+    /**
+     * Key code constant: Record media key.
+     */
+    public static final int KEYCODE_MEDIA_RECORD = 130;
+    /**
+     * Key code constant: F1 key.
+     */
+    public static final int KEYCODE_F1 = 131;
+    /**
+     * Key code constant: F2 key.
+     */
+    public static final int KEYCODE_F2 = 132;
+    /**
+     * Key code constant: F3 key.
+     */
+    public static final int KEYCODE_F3 = 133;
+    /**
+     * Key code constant: F4 key.
+     */
+    public static final int KEYCODE_F4 = 134;
+    /**
+     * Key code constant: F5 key.
+     */
+    public static final int KEYCODE_F5 = 135;
+    /**
+     * Key code constant: F6 key.
+     */
+    public static final int KEYCODE_F6 = 136;
+    /**
+     * Key code constant: F7 key.
+     */
+    public static final int KEYCODE_F7 = 137;
+    /**
+     * Key code constant: F8 key.
+     */
+    public static final int KEYCODE_F8 = 138;
+    /**
+     * Key code constant: F9 key.
+     */
+    public static final int KEYCODE_F9 = 139;
+    /**
+     * Key code constant: F10 key.
+     */
+    public static final int KEYCODE_F10 = 140;
+    /**
+     * Key code constant: F11 key.
+     */
+    public static final int KEYCODE_F11 = 141;
+    /**
+     * Key code constant: F12 key.
+     */
+    public static final int KEYCODE_F12 = 142;
+    /**
+     * Key code constant: Num Lock modifier key.
+     * This is the Num Lock key; it is different from {@link #KEYCODE_NUM}.
+     * This key generally modifies the behavior of other keys on the numeric keypad.
+     */
+    public static final int KEYCODE_NUM_LOCK = 143;
+    /**
+     * Key code constant: Numeric keypad '0' key.
+     */
+    public static final int KEYCODE_NUMPAD_0 = 144;
+    /**
+     * Key code constant: Numeric keypad '1' key.
+     */
+    public static final int KEYCODE_NUMPAD_1 = 145;
+    /**
+     * Key code constant: Numeric keypad '2' key.
+     */
+    public static final int KEYCODE_NUMPAD_2 = 146;
+    /**
+     * Key code constant: Numeric keypad '3' key.
+     */
+    public static final int KEYCODE_NUMPAD_3 = 147;
+    /**
+     * Key code constant: Numeric keypad '4' key.
+     */
+    public static final int KEYCODE_NUMPAD_4 = 148;
+    /**
+     * Key code constant: Numeric keypad '5' key.
+     */
+    public static final int KEYCODE_NUMPAD_5 = 149;
+    /**
+     * Key code constant: Numeric keypad '6' key.
+     */
+    public static final int KEYCODE_NUMPAD_6 = 150;
+    /**
+     * Key code constant: Numeric keypad '7' key.
+     */
+    public static final int KEYCODE_NUMPAD_7 = 151;
+    /**
+     * Key code constant: Numeric keypad '8' key.
+     */
+    public static final int KEYCODE_NUMPAD_8 = 152;
+    /**
+     * Key code constant: Numeric keypad '9' key.
+     */
+    public static final int KEYCODE_NUMPAD_9 = 153;
+    /**
+     * Key code constant: Numeric keypad '/' key (for division).
+     */
+    public static final int KEYCODE_NUMPAD_DIVIDE = 154;
+    /**
+     * Key code constant: Numeric keypad '*' key (for multiplication).
+     */
+    public static final int KEYCODE_NUMPAD_MULTIPLY = 155;
+    /**
+     * Key code constant: Numeric keypad '-' key (for subtraction).
+     */
+    public static final int KEYCODE_NUMPAD_SUBTRACT = 156;
+    /**
+     * Key code constant: Numeric keypad '+' key (for addition).
+     */
+    public static final int KEYCODE_NUMPAD_ADD = 157;
+    /**
+     * Key code constant: Numeric keypad '.' key (for decimals or digit grouping).
+     */
+    public static final int KEYCODE_NUMPAD_DOT = 158;
+    /**
+     * Key code constant: Numeric keypad ',' key (for decimals or digit grouping).
+     */
+    public static final int KEYCODE_NUMPAD_COMMA = 159;
+    /**
+     * Key code constant: Numeric keypad Enter key.
+     */
+    public static final int KEYCODE_NUMPAD_ENTER = 160;
+    /**
+     * Key code constant: Numeric keypad '=' key.
+     */
+    public static final int KEYCODE_NUMPAD_EQUALS = 161;
+    /**
+     * Key code constant: Numeric keypad '(' key.
+     */
+    public static final int KEYCODE_NUMPAD_LEFT_PAREN = 162;
+    /**
+     * Key code constant: Numeric keypad ')' key.
+     */
+    public static final int KEYCODE_NUMPAD_RIGHT_PAREN = 163;
+    /**
+     * Key code constant: Volume Mute key.
+     * Mutes the speaker, unlike {@link #KEYCODE_MUTE}.
+     * This key should normally be implemented as a toggle such that the first press
+     * mutes the speaker and the second press restores the original volume.
+     */
+    public static final int KEYCODE_VOLUME_MUTE = 164;
+    /**
+     * Key code constant: Info key.
+     * Common on TV remotes to show additional information related to what is
+     * currently being viewed.
+     */
+    public static final int KEYCODE_INFO = 165;
+    /**
+     * Key code constant: Channel up key.
+     * On TV remotes, increments the television channel.
+     */
+    public static final int KEYCODE_CHANNEL_UP = 166;
+    /**
+     * Key code constant: Channel down key.
+     * On TV remotes, decrements the television channel.
+     */
+    public static final int KEYCODE_CHANNEL_DOWN = 167;
+    /**
+     * Key code constant: Zoom in key.
+     */
+    public static final int KEYCODE_ZOOM_IN = 168;
+    /**
+     * Key code constant: Zoom out key.
+     */
+    public static final int KEYCODE_ZOOM_OUT = 169;
+    /**
+     * Key code constant: TV key.
+     * On TV remotes, switches to viewing live TV.
+     */
+    public static final int KEYCODE_TV = 170;
+    /**
+     * Key code constant: Window key.
+     * On TV remotes, toggles picture-in-picture mode or other windowing functions.
+     */
+    public static final int KEYCODE_WINDOW = 171;
+    /**
+     * Key code constant: Guide key.
+     * On TV remotes, shows a programming guide.
+     */
+    public static final int KEYCODE_GUIDE = 172;
+    /**
+     * Key code constant: DVR key.
+     * On some TV remotes, switches to a DVR mode for recorded shows.
+     */
+    public static final int KEYCODE_DVR = 173;
+    /**
+     * Key code constant: Bookmark key.
+     * On some TV remotes, bookmarks content or web pages.
+     */
+    public static final int KEYCODE_BOOKMARK = 174;
+    /**
+     * Key code constant: Toggle captions key.
+     * Switches the mode for closed-captioning text, for example during television shows.
+     */
+    public static final int KEYCODE_CAPTIONS = 175;
+    /**
+     * Key code constant: Settings key.
+     * Starts the system settings activity.
+     */
+    public static final int KEYCODE_SETTINGS = 176;
+    /**
+     * Key code constant: TV power key.
+     * On TV remotes, toggles the power on a television screen.
+     */
+    public static final int KEYCODE_TV_POWER = 177;
+    /**
+     * Key code constant: TV input key.
+     * On TV remotes, switches the input on a television screen.
+     */
+    public static final int KEYCODE_TV_INPUT = 178;
+    /**
+     * Key code constant: Set-top-box power key.
+     * On TV remotes, toggles the power on an external Set-top-box.
+     */
+    public static final int KEYCODE_STB_POWER = 179;
+    /**
+     * Key code constant: Set-top-box input key.
+     * On TV remotes, switches the input mode on an external Set-top-box.
+     */
+    public static final int KEYCODE_STB_INPUT = 180;
+    /**
+     * Key code constant: A/V Receiver power key.
+     * On TV remotes, toggles the power on an external A/V Receiver.
+     */
+    public static final int KEYCODE_AVR_POWER = 181;
+    /**
+     * Key code constant: A/V Receiver input key.
+     * On TV remotes, switches the input mode on an external A/V Receiver.
+     */
+    public static final int KEYCODE_AVR_INPUT = 182;
+    /**
+     * Key code constant: Red "programmable" key.
+     * On TV remotes, acts as a contextual/programmable key.
+     */
+    public static final int KEYCODE_PROG_RED = 183;
+    /**
+     * Key code constant: Green "programmable" key.
+     * On TV remotes, actsas a contextual/programmable key.
+     */
+    public static final int KEYCODE_PROG_GREEN = 184;
+    /**
+     * Key code constant: Yellow "programmable" key.
+     * On TV remotes, acts as a contextual/programmable key.
+     */
+    public static final int KEYCODE_PROG_YELLOW = 185;
+    /**
+     * Key code constant: Blue "programmable" key.
+     * On TV remotes, acts as a contextual/programmable key.
+     */
+    public static final int KEYCODE_PROG_BLUE = 186;
+
+    public static final int LAST_KEYCODE = KEYCODE_PROG_BLUE;
+
+    public static final int META_ALT_ON = 2;
+    public static final int META_CAPS_LOCK_ON = 0x00100000;
+    public static final int META_CTRL_ON = 0x1000;
+    public static final int META_SHIFT_ON = 1;
+    public static final int META_CTRL_MASK = 0x7000;
+    public static final int META_META_ON = 0x00010000;
+    public static final int META_META_MASK = 0x00070000;
+}
diff --git a/termemulator/src/main/java/jackpal/androidterm/emulatorview/compat/Patterns.java b/termemulator/src/main/java/jackpal/androidterm/emulatorview/compat/Patterns.java
new file mode 100644
index 00000000..0398a3ae
--- /dev/null
+++ b/termemulator/src/main/java/jackpal/androidterm/emulatorview/compat/Patterns.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2014 Jack Palevich
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package jackpal.androidterm.emulatorview.compat;
+
+/**
+ * Based upon
+ * <p>
+ * https://android.googlesource.com/platform/frameworks/base/+/android-4.4.2_r2/core/java/android/util/Patterns.java
+ */
+
+import java.util.regex.Pattern;
+
+public class Patterns {
+    /**
+     *  Regular expression to match all IANA top-level domains for WEB_URL.
+     *  List accurate as of 2011/07/18.  List taken from:
+     *  http://data.iana.org/TLD/tlds-alpha-by-domain.txt
+     *  This pattern is auto-generated by frameworks/ex/common/tools/make-iana-tld-pattern.py
+     */
+    public static final String TOP_LEVEL_DOMAIN_STR_FOR_WEB_URL =
+            "(?:"
+                    + "(?:aero|arpa|asia|a[cdefgilmnoqrstuwxz])"
+                    + "|(?:biz|b[abdefghijmnorstvwyz])"
+                    + "|(?:cat|com|coop|c[acdfghiklmnoruvxyz])"
+                    + "|d[ejkmoz]"
+                    + "|(?:edu|e[cegrstu])"
+                    + "|f[ijkmor]"
+                    + "|(?:gov|g[abdefghilmnpqrstuwy])"
+                    + "|h[kmnrtu]"
+                    + "|(?:info|int|i[delmnoqrst])"
+                    + "|(?:jobs|j[emop])"
+                    + "|k[eghimnprwyz]"
+                    + "|l[abcikrstuvy]"
+                    + "|(?:mil|mobi|museum|m[acdeghklmnopqrstuvwxyz])"
+                    + "|(?:name|net|n[acefgilopruz])"
+                    + "|(?:org|om)"
+                    + "|(?:pro|p[aefghklmnrstwy])"
+                    + "|qa"
+                    + "|r[eosuw]"
+                    + "|s[abcdeghijklmnortuvyz]"
+                    + "|(?:tel|travel|t[cdfghjklmnoprtvwz])"
+                    + "|u[agksyz]"
+                    + "|v[aceginu]"
+                    + "|w[fs]"
+                    + "|(?:\u03b4\u03bf\u03ba\u03b9\u03bc\u03ae|\u0438\u0441\u043f\u044b\u0442\u0430\u043d\u0438\u0435|\u0440\u0444|\u0441\u0440\u0431|\u05d8\u05e2\u05e1\u05d8|\u0622\u0632\u0645\u0627\u06cc\u0634\u06cc|\u0625\u062e\u062a\u0628\u0627\u0631|\u0627\u0644\u0627\u0631\u062f\u0646|\u0627\u0644\u062c\u0632\u0627\u0626\u0631|\u0627\u0644\u0633\u0639\u0648\u062f\u064a\u0629|\u0627\u0644\u0645\u063a\u0631\u0628|\u0627\u0645\u0627\u0631\u0627\u062a|\u0628\u06be\u0627\u0631\u062a|\u062a\u0648\u0646\u0633|\u0633\u0648\u0631\u064a\u0629|\u0641\u0644\u0633\u0637\u064a\u0646|\u0642\u0637\u0631|\u0645\u0635\u0631|\u092a\u0930\u0940\u0915\u094d\u0937\u093e|\u092d\u093e\u0930\u0924|\u09ad\u09be\u09b0\u09a4|\u0a2d\u0a3e\u0a30\u0a24|\u0aad\u0abe\u0ab0\u0aa4|\u0b87\u0ba8\u0bcd\u0ba4\u0bbf\u0baf\u0bbe|\u0b87\u0bb2\u0b99\u0bcd\u0b95\u0bc8|\u0b9a\u0bbf\u0b99\u0bcd\u0b95\u0baa\u0bcd\u0baa\u0bc2\u0bb0\u0bcd|\u0baa\u0bb0\u0bbf\u0b9f\u0bcd\u0b9a\u0bc8|\u0c2d\u0c3e\u0c30\u0c24\u0c4d|\u0dbd\u0d82\u0d9a\u0dcf|\u0e44\u0e17\u0e22|\u30c6\u30b9\u30c8|\u4e2d\u56fd|\u4e2d\u570b|\u53f0\u6e7e|\u53f0\u7063|\u65b0\u52a0\u5761|\u6d4b\u8bd5|\u6e2c\u8a66|\u9999\u6e2f|\ud14c\uc2a4\ud2b8|\ud55c\uad6d|xn\\-\\-0zwm56d|xn\\-\\-11b5bs3a9aj6g|xn\\-\\-3e0b707e|xn\\-\\-45brj9c|xn\\-\\-80akhbyknj4f|xn\\-\\-90a3ac|xn\\-\\-9t4b11yi5a|xn\\-\\-clchc0ea0b2g2a9gcd|xn\\-\\-deba0ad|xn\\-\\-fiqs8s|xn\\-\\-fiqz9s|xn\\-\\-fpcrj9c3d|xn\\-\\-fzc2c9e2c|xn\\-\\-g6w251d|xn\\-\\-gecrj9c|xn\\-\\-h2brj9c|xn\\-\\-hgbk6aj7f53bba|xn\\-\\-hlcj6aya9esc7a|xn\\-\\-j6w193g|xn\\-\\-jxalpdlp|xn\\-\\-kgbechtv|xn\\-\\-kprw13d|xn\\-\\-kpry57d|xn\\-\\-lgbbat1ad8j|xn\\-\\-mgbaam7a8h|xn\\-\\-mgbayh7gpa|xn\\-\\-mgbbh1a71e|xn\\-\\-mgbc0a9azcg|xn\\-\\-mgberp4a5d4ar|xn\\-\\-o3cw4h|xn\\-\\-ogbpf8fl|xn\\-\\-p1ai|xn\\-\\-pgbs0dh|xn\\-\\-s9brj9c|xn\\-\\-wgbh1c|xn\\-\\-wgbl6a|xn\\-\\-xkc2al3hye2a|xn\\-\\-xkc2dl3a5ee0h|xn\\-\\-yfro4i67o|xn\\-\\-ygbi2ammx|xn\\-\\-zckzah|xxx)"
+                    + "|y[et]"
+                    + "|z[amw]))";
+    /**
+     * Good characters for Internationalized Resource Identifiers (IRI).
+     * This comprises most common used Unicode characters allowed in IRI
+     * as detailed in RFC 3987.
+     * Specifically, those two byte Unicode characters are not included.
+     */
+    public static final String GOOD_IRI_CHAR =
+            "a-zA-Z0-9\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF";
+    /**
+     *  Regular expression pattern to match most part of RFC 3987
+     *  Internationalized URLs, aka IRIs.  Commonly used Unicode characters are
+     *  added.
+     */
+    public static final Pattern WEB_URL = Pattern.compile(
+            "((?:(http|https|Http|Https|rtsp|Rtsp):\\/\\/(?:(?:[a-zA-Z0-9\\$\\-\\_\\.\\+\\!\\*\\'\\(\\)"
+                    + "\\,\\;\\?\\&\\=]|(?:\\%[a-fA-F0-9]{2})){1,64}(?:\\:(?:[a-zA-Z0-9\\$\\-\\_"
+                    + "\\.\\+\\!\\*\\'\\(\\)\\,\\;\\?\\&\\=]|(?:\\%[a-fA-F0-9]{2})){1,25})?\\@)?)?"
+                    + "((?:(?:[" + GOOD_IRI_CHAR + "][" + GOOD_IRI_CHAR + "\\-]{0,64}\\.)+"   // named host
+                    + TOP_LEVEL_DOMAIN_STR_FOR_WEB_URL
+                    + "|(?:(?:25[0-5]|2[0-4]" // or ip address
+                    + "[0-9]|[0-1][0-9]{2}|[1-9][0-9]|[1-9])\\.(?:25[0-5]|2[0-4][0-9]"
+                    + "|[0-1][0-9]{2}|[1-9][0-9]|[1-9]|0)\\.(?:25[0-5]|2[0-4][0-9]|[0-1]"
+                    + "[0-9]{2}|[1-9][0-9]|[1-9]|0)\\.(?:25[0-5]|2[0-4][0-9]|[0-1][0-9]{2}"
+                    + "|[1-9][0-9]|[0-9])))"
+                    + "(?:\\:\\d{1,5})?)" // plus option port number
+                    + "(\\/(?:(?:[" + GOOD_IRI_CHAR + "\\;\\/\\?\\:\\@\\&\\=\\#\\~"  // plus option query params
+                    + "\\-\\.\\+\\!\\*\\'\\(\\)\\,\\_])|(?:\\%[a-fA-F0-9]{2}))*)?"
+                    + "(?:\\b|$)"); // and finally, a word boundary or end of
+    // input.  This is to stop foo.sure from
+    // matching as foo.su
+}
\ No newline at end of file
diff --git a/termemulator/src/main/res/drawable-nodpi/atari_small_nodpi.png b/termemulator/src/main/res/drawable-nodpi/atari_small_nodpi.png
new file mode 100644
index 00000000..8bdd6244
Binary files /dev/null and b/termemulator/src/main/res/drawable-nodpi/atari_small_nodpi.png differ
diff --git a/termemulator/src/main/res/drawable-xxhdpi/ic_terminal_history.png b/termemulator/src/main/res/drawable-xxhdpi/ic_terminal_history.png
new file mode 100644
index 00000000..1a364541
Binary files /dev/null and b/termemulator/src/main/res/drawable-xxhdpi/ic_terminal_history.png differ
diff --git a/termemulator/src/main/res/drawable-xxhdpi/tab1.png b/termemulator/src/main/res/drawable-xxhdpi/tab1.png
new file mode 100644
index 00000000..1329eaf3
Binary files /dev/null and b/termemulator/src/main/res/drawable-xxhdpi/tab1.png differ
diff --git a/termemulator/src/main/res/drawable-xxhdpi/tab2.png b/termemulator/src/main/res/drawable-xxhdpi/tab2.png
new file mode 100644
index 00000000..85d09a8e
Binary files /dev/null and b/termemulator/src/main/res/drawable-xxhdpi/tab2.png differ
diff --git a/termemulator/src/main/res/drawable/atari_small.png b/termemulator/src/main/res/drawable/atari_small.png
new file mode 100644
index 00000000..8bdd6244
Binary files /dev/null and b/termemulator/src/main/res/drawable/atari_small.png differ
diff --git a/termemulator/src/main/res/layout/widget_shortcut_btn.xml b/termemulator/src/main/res/layout/widget_shortcut_btn.xml
new file mode 100644
index 00000000..9e18fe9d
--- /dev/null
+++ b/termemulator/src/main/res/layout/widget_shortcut_btn.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Button
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="47dp"
+    android:layout_height="wrap_content"
+    android:background="#00000000"
+    android:clickable="true"
+    android:focusable="true"
+    android:minWidth="47dp"
+    android:padding="5dp"
+    android:textColor="#4BAC07"
+    android:textStyle="bold"/>
\ No newline at end of file
diff --git a/termemulator/src/main/res/layout/widget_shortcut_imgbtn.xml b/termemulator/src/main/res/layout/widget_shortcut_imgbtn.xml
new file mode 100644
index 00000000..89466318
--- /dev/null
+++ b/termemulator/src/main/res/layout/widget_shortcut_imgbtn.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ImageButton
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="47dp"
+    android:layout_height="wrap_content"
+    android:background="@null"
+    android:clickable="true"
+    android:focusable="true"
+    android:padding="5dp"/>
\ No newline at end of file
diff --git a/termemulator/src/main/res/values/arrays.xml b/termemulator/src/main/res/values/arrays.xml
new file mode 100644
index 00000000..d0711845
--- /dev/null
+++ b/termemulator/src/main/res/values/arrays.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="term_shortcut_head" translatable="false">
+        <item>tab</item>
+        <item>del</item>
+    </string-array>
+    <string-array name="term_shortcut" translatable="false">
+        <item>ltab</item>
+        <item>rtab</item>
+        <item>def</item>
+        <item>if</item>
+        <item>ef</item>
+        <item>el</item>
+        <item>for</item>
+        <item>imt</item>
+        <item>frm</item>
+        <item>clz</item>
+        <item>ret</item>
+        <item>:</item>
+        <item>\@</item>
+        <item>=</item>
+        <item>\"</item>
+        <item>\'</item>
+        <item>;</item>
+        <item>,</item>
+        <item>+</item>
+        <item>-</item>
+        <item>*</item>
+        <item>/</item>
+        <item>|</item>
+        <item><![CDATA[<]]></item>
+        <item><![CDATA[>]]></item>
+        <item>(</item>
+        <item>)</item>
+        <item>[</item>
+        <item>]</item>
+        <item>{</item>
+        <item>}</item>
+        <item>#</item>
+    </string-array>
+
+</resources>
\ No newline at end of file
diff --git a/termexec/build.gradle b/termexec/build.gradle
new file mode 100644
index 00000000..03a46484
--- /dev/null
+++ b/termexec/build.gradle
@@ -0,0 +1,66 @@
+buildscript {
+    repositories {
+        jcenter()
+    }
+//    dependencies {
+//        classpath 'com.android.tools.build:gradle:3.0.0'
+//    }
+}
+
+apply plugin: 'com.android.library'
+
+repositories {
+    jcenter()
+    google()
+}
+
+android {
+    compileSdkVersion rootProject.ext.compileSdkVersion
+    buildToolsVersion rootProject.ext.buildToolsVersion
+    defaultConfig {
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.minSdkVersion
+        versionCode 1
+        versionName "1.0"
+        ndk {
+            abiFilters 'armeabi-v7a',"arm64-v8a"
+
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+    externalNativeBuild {
+        ndkBuild {
+            path '../termexec/src/main/jni/Android.mk'
+        }
+
+    }
+    lintOptions {
+        abortOnError false
+    }
+}
+
+// by default recent plugin version does not copy any AIDL files "to avoid publishing too much"
+android.libraryVariants.all { variant ->
+    Sync packageAidl = project.tasks.create("addPublic${variant.name.capitalize()}Aidl", Sync) { sync ->
+        from "$project.projectDir/src/main/aidl/"
+        into "$buildDir/intermediates/bundles/${variant.dirName}/aidl/"
+    }
+
+    variant.javaCompile.dependsOn packageAidl
+}
+
+dependencies {
+//    api fileTree(dir: 'libs', include: ['*.jar'])
+    api rootProject.ext.libSupportAnnotation
+}
diff --git a/termexec/proguard-rules.pro b/termexec/proguard-rules.pro
new file mode 100644
index 00000000..a754ef77
--- /dev/null
+++ b/termexec/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /home/uniqa/android-sdk/tools/proguard/proguard-android.txt
+# You can edit the include mPath and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/termexec/src/androidTest/java/jackpal/androidterm/libtermexec/ApplicationTest.java b/termexec/src/androidTest/java/jackpal/androidterm/libtermexec/ApplicationTest.java
new file mode 100644
index 00000000..ee475d05
--- /dev/null
+++ b/termexec/src/androidTest/java/jackpal/androidterm/libtermexec/ApplicationTest.java
@@ -0,0 +1,13 @@
+package jackpal.androidterm.libtermexec;
+
+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);
+    }
+}
diff --git a/termexec/src/main/AndroidManifest.xml b/termexec/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..6748b56b
--- /dev/null
+++ b/termexec/src/main/AndroidManifest.xml
@@ -0,0 +1,4 @@
+<manifest package="jackpal.androidterm.libtermexec">
+
+    <application />
+</manifest>
diff --git a/termexec/src/main/aidl/jackpal/androidterm/libtermexec/v1/ITerminal.aidl b/termexec/src/main/aidl/jackpal/androidterm/libtermexec/v1/ITerminal.aidl
new file mode 100644
index 00000000..092738b9
--- /dev/null
+++ b/termexec/src/main/aidl/jackpal/androidterm/libtermexec/v1/ITerminal.aidl
@@ -0,0 +1,39 @@
+package jackpal.androidterm.libtermexec.v1;
+
+import android.content.IntentSender;
+import android.os.ParcelFileDescriptor;
+import android.os.ResultReceiver;
+
+// see also:
+// the (clumsy) way to handle object inheritance with Binder:
+// https://kevinhartman.github.io/blog/2012/07/23/inheritance-through-ipc-using-aidl-in-android/
+// some (possibly outdated) notes on preserving backward compatibility:
+// https://stackoverflow.com/questions/18197783/android-aidl-interface-parcelables-and-backwards-compatibility
+/**
+  * An interface for interacting with Terminal implementation.
+  *
+  * The version of the interface is encoded in Intent action and the AIDL package name. New versions
+  * of this interface may be implemented in future. Those versions will be made available
+  * in separate packages and older versions will continue to work.
+  */
+interface ITerminal {
+    /**
+      * Start a new Terminal session. A session will remain hosted by service, that provides binding,
+      * but no gurantees of process pesistence as well as stability of connection are made. You
+      * should keep your ParcelFileDescriptor around and allow ServiceConnection to call this method
+      * again, when reconnection happens, in case service hosting the session is killed by system.
+      *
+      * Allows caller to be notified of terminal session events. Multiple calls can happen on each,
+      * and new call types can be introduced, so prepare to ignore unknown event codes.
+      *
+      * So far only notifications about session end (code 0) are supported. This notification is
+      * issued after abovementioned file descriptor is closed and the session is ended from
+      * Terminal's standpoint.
+      *
+      * @param pseudoTerminalMultiplexerFd file descriptor, obtained by opening /dev/ptmx.
+      * @param a callback
+      *
+      * @return IntentSender, that can be used to start corresponding Terminal Activity.
+      */
+    IntentSender startSession(in ParcelFileDescriptor pseudoTerminalMultiplexerFd, in ResultReceiver callback);
+}
diff --git a/termexec/src/main/java/jackpal/androidterm/TermExec.java b/termexec/src/main/java/jackpal/androidterm/TermExec.java
new file mode 100644
index 00000000..243d4752
--- /dev/null
+++ b/termexec/src/main/java/jackpal/androidterm/TermExec.java
@@ -0,0 +1,145 @@
+package jackpal.androidterm;
+
+import android.annotation.TargetApi;
+import android.os.Build;
+import android.os.Looper;
+import android.os.ParcelFileDescriptor;
+import android.support.annotation.NonNull;
+
+import java.io.FileDescriptor;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Utility methods for creating and managing a subprocess. This class differs from
+ * {@link java.lang.ProcessBuilder} in that a pty is used to communicate with the subprocess.
+ * <p>
+ * Pseudo-terminals are a powerful Unix feature, that allows programs to interact with other programs
+ * they start in slightly more human-like way. For example, a pty owner can send ^C (aka SIGINT)
+ * to attached shell, even if said shell runs under a different user ID.
+ */
+public class TermExec {
+    // Warning: bump the library revision, when an incompatible change happens
+    static {
+        System.loadLibrary("termexec");
+    }
+
+    public static final String SERVICE_ACTION_V1 = "jackpal.androidterm.action.START_TERM.v1";
+
+    private static Field descriptorField;
+
+    private final List<String> command;
+    private final Map<String, String> environment;
+
+    public TermExec(@NonNull String... command) {
+        this(new ArrayList<>(Arrays.asList(command)));
+    }
+
+    public TermExec(@NonNull List<String> command) {
+        this.command = command;
+        this.environment = new Hashtable<>(System.getenv());
+    }
+
+    public
+    @NonNull
+    List<String> command() {
+        return command;
+    }
+
+    public
+    @NonNull
+    Map<String, String> environment() {
+        return environment;
+    }
+
+    public
+    @NonNull
+    TermExec command(@NonNull String... command) {
+        return command(new ArrayList<>(Arrays.asList(command)));
+    }
+
+    public
+    @NonNull
+    TermExec command(List<String> command) {
+        command.clear();
+        command.addAll(command);
+        return this;
+    }
+
+    /**
+     * Start the process and attach it to the pty, corresponding to given file descriptor.
+     * You have to obtain this file descriptor yourself by calling
+     * {@link android.os.ParcelFileDescriptor#open} on special terminal multiplexer
+     * device (located at /dev/ptmx).
+     * <p>
+     * Callers are responsible for closing the descriptor.
+     *
+     * @return the PID of the started process.
+     */
+    public int start(@NonNull ParcelFileDescriptor ptmxFd) throws IOException {
+        if (Looper.getMainLooper() == Looper.myLooper())
+            throw new IllegalStateException("This method must not be called from the main thread!");
+
+        if (command.size() == 0)
+            throw new IllegalStateException("Empty command!");
+
+        final String cmd = command.remove(0);
+        final String[] cmdArray = command.toArray(new String[command.size()]);
+        final String[] envArray = new String[environment.size()];
+        int i = 0;
+        for (Map.Entry<String, String> entry : environment.entrySet()) {
+            envArray[i++] = entry.getKey() + "=" + entry.getValue();
+        }
+
+        return createSubprocess(ptmxFd, cmd, cmdArray, envArray);
+    }
+
+    /**
+     * Causes the calling thread to wait for the process associated with the
+     * receiver to finish executing.
+     *
+     * @return The exit value of the Process being waited on
+     */
+    public static native int waitFor(int processId);
+
+    /**
+     * Send signal via the "kill" system call. Android {@link android.os.Process#sendSignal} does not
+     * allow negative numbers (denoting process groups) to be used.
+     */
+    public static native void sendSignal(int processId, int signal);
+
+    public static int createSubprocess(ParcelFileDescriptor masterFd, String cmd, String[] args, String[] envVars) throws IOException {
+        final int integerFd;
+
+        if (Build.VERSION.SDK_INT >= 12)
+            integerFd = FdHelperHoneycomb.getFd(masterFd);
+        else {
+            try {
+                if (descriptorField == null) {
+                    descriptorField = FileDescriptor.class.getDeclaredField("descriptor");
+                    descriptorField.setAccessible(true);
+                }
+
+                integerFd = descriptorField.getInt(masterFd.getFileDescriptor());
+            } catch (Exception e) {
+                throw new IOException("Unable to obtain file descriptor on this OS version: " + e.getMessage());
+            }
+        }
+        return createSubprocessInternal(cmd, args, envVars, integerFd);
+    }
+
+    private static native int createSubprocessInternal(String cmd, String[] args, String[] envVars, int masterFd);
+}
+
+// prevents runtime errors on old API versions with ruthless verifier
+@TargetApi(Build.VERSION_CODES.HONEYCOMB_MR1)
+class FdHelperHoneycomb {
+    static int getFd(ParcelFileDescriptor descriptor) {
+        return descriptor.getFd();
+    }
+}
diff --git a/termexec/src/main/jni/Android.mk b/termexec/src/main/jni/Android.mk
new file mode 100644
index 00000000..fcfc5787
--- /dev/null
+++ b/termexec/src/main/jni/Android.mk
@@ -0,0 +1,32 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := termexec
+LOCAL_LDFLAGS := -Wl,--build-id
+LOCAL_LDLIBS := \
+	-llog \
+	-lc \
+
+LOCAL_SRC_FILES := \
+	process.cpp \
+
+LOCAL_C_INCLUDES += ../jni
+
+include $(BUILD_SHARED_LIBRARY)
+
+# for androidterm
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := androidterm
+LOCAL_LDFLAGS := -Wl,--build-id
+LOCAL_LDLIBS := \
+	-llog \
+
+LOCAL_SRC_FILES := \
+	common.cpp \
+	fileCompat.cpp \
+	termExec.cpp \
+
+LOCAL_C_INCLUDES += ../jni
+
+include $(BUILD_SHARED_LIBRARY)
diff --git a/termexec/src/main/jni/Application.mk b/termexec/src/main/jni/Application.mk
new file mode 100644
index 00000000..5b9d979c
--- /dev/null
+++ b/termexec/src/main/jni/Application.mk
@@ -0,0 +1,3 @@
+# Build for ARMv5TE, mips and x86 architectures.
+APP_ABI := armeabi-v7a arm64-v8a
+APP_PLATFORM := android-15
diff --git a/termexec/src/main/jni/common.cpp b/termexec/src/main/jni/common.cpp
new file mode 100644
index 00000000..fba1d8a7
--- /dev/null
+++ b/termexec/src/main/jni/common.cpp
@@ -0,0 +1,98 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "common.h"
+#include "termExec.h"
+#include "fileCompat.h"
+
+#define LOG_TAG "libjackpal-androidterm"
+
+/*
+ * Register several native methods for one class.
+ */
+int registerNativeMethods(JNIEnv *env, const char *className,
+                          JNINativeMethod *gMethods, int numMethods) {
+    jclass clazz;
+
+    clazz = env->FindClass(className);
+    if (clazz == NULL) {
+        LOGE("Native registration unable to find class '%s'", className);
+        return JNI_FALSE;
+    }
+    if (env->RegisterNatives(clazz, gMethods, numMethods) < 0) {
+        LOGE("RegisterNatives failed for '%s'", className);
+        return JNI_FALSE;
+    }
+
+    return JNI_TRUE;
+}
+
+// ----------------------------------------------------------------------------
+
+/*
+ * This is called by the VM when the shared library is first loaded.
+ */
+
+typedef union {
+    JNIEnv *env;
+    void *venv;
+} UnionJNIEnvToVoid;
+
+jint JNI_OnLoad(JavaVM *vm, void *reserved) {
+    UnionJNIEnvToVoid uenv;
+    uenv.venv = NULL;
+    jint result = -1;
+    JNIEnv *env = NULL;
+
+    LOGI("JNI_OnLoad");
+
+    if (vm->GetEnv(&uenv.venv, JNI_VERSION_1_4) != JNI_OK) {
+        LOGE("ERROR: GetEnv failed");
+        goto bail;
+    }
+    env = uenv.env;
+
+    if (init_Exec(env) != JNI_TRUE) {
+        LOGE("ERROR: init of Exec failed");
+        goto bail;
+    }
+
+    if (init_FileCompat(env) != JNI_TRUE) {
+        LOGE("ERROR: init of Exec failed");
+        goto bail;
+    }
+
+    result = JNI_VERSION_1_4;
+
+    bail:
+    return result;
+}
diff --git a/termexec/src/main/jni/common.h b/termexec/src/main/jni/common.h
new file mode 100644
index 00000000..a6bf71b1
--- /dev/null
+++ b/termexec/src/main/jni/common.h
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef _COMMON_H
+#define _COMMON_H 1
+
+#include <stddef.h>
+
+#include "jni.h"
+#include <android/log.h>
+
+#define LOGI(...) do { __android_log_print(ANDROID_LOG_INFO, LOG_TAG, __VA_ARGS__); } while(0)
+#define LOGW(...) do { __android_log_print(ANDROID_LOG_WARN, LOG_TAG, __VA_ARGS__); } while(0)
+#define LOGE(...) do { __android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__); } while(0)
+
+int registerNativeMethods(JNIEnv *env, const char *className,
+                          JNINativeMethod *gMethods, int numMethods);
+
+#endif
diff --git a/termexec/src/main/jni/fileCompat.cpp b/termexec/src/main/jni/fileCompat.cpp
new file mode 100644
index 00000000..c5af5c6d
--- /dev/null
+++ b/termexec/src/main/jni/fileCompat.cpp
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2012 Steven Luo
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "common.h"
+
+#define LOG_TAG "FileCompat"
+
+#include <unistd.h>
+
+#include "fileCompat.h"
+
+static jboolean testExecute(JNIEnv *env, jobject clazz, jstring jPathString) {
+    const char *pathname = NULL;
+    int result;
+
+    /* XXX We should convert CESU-8 to UTF-8 to deal with potential non-BMP
+       chars in pathname */
+    pathname = env->GetStringUTFChars(jPathString, NULL);
+
+    result = access(pathname, X_OK);
+
+    env->ReleaseStringUTFChars(jPathString, pathname);
+    return (result == 0);
+}
+
+static const char *classPathName = "org/qpython/qpy/console/compont/FileCompat$Api8OrEarlier";
+static JNINativeMethod method_table[] = {
+        {"testExecute", "(Ljava/lang/String;)Z", (void *) testExecute},
+};
+
+int init_FileCompat(JNIEnv *env) {
+    if (!registerNativeMethods(env, classPathName, method_table,
+                               sizeof(method_table) / sizeof(method_table[0]))) {
+        return JNI_FALSE;
+    }
+
+    return JNI_TRUE;
+}
diff --git a/termexec/src/main/jni/fileCompat.h b/termexec/src/main/jni/fileCompat.h
new file mode 100644
index 00000000..12264c50
--- /dev/null
+++ b/termexec/src/main/jni/fileCompat.h
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2012 Steven Luo
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef _FILECOMPAT_H
+#define _FILECOMPAT_H 1
+
+#include "jni.h"
+
+int init_FileCompat(JNIEnv *env);
+
+#endif	/* !defined(_FILECOMPAT_H) */
diff --git a/termexec/src/main/jni/process.cpp b/termexec/src/main/jni/process.cpp
new file mode 100644
index 00000000..dfbb70e1
--- /dev/null
+++ b/termexec/src/main/jni/process.cpp
@@ -0,0 +1,273 @@
+/*
+ * Copyright (C) 2012 Steven Luo
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "process.h"
+
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/wait.h>
+#include <dirent.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <termios.h>
+#include <signal.h>
+
+typedef unsigned short char16_tt;
+
+class String8 {
+public:
+    String8() {
+        mString = 0;
+    }
+
+    ~String8() {
+        if (mString) {
+            free(mString);
+        }
+    }
+
+    void set(const char16_tt *o, size_t numChars) {
+        if (mString) {
+            free(mString);
+        }
+        mString = (char *) malloc(numChars + 1);
+        if (!mString) {
+            return;
+        }
+        for (size_t i = 0; i < numChars; i++) {
+            mString[i] = (char) o[i];
+        }
+        mString[numChars] = '\0';
+    }
+
+    const char *string() {
+        return mString;
+    }
+
+private:
+    char *mString;
+};
+
+static int throwOutOfMemoryError(JNIEnv *env, const char *message) {
+    jclass exClass;
+    const char *className = "java/lang/OutOfMemoryError";
+
+    exClass = env->FindClass(className);
+    return env->ThrowNew(exClass, message);
+}
+
+static int throwIOException(JNIEnv *env, int errnum, const char *message) {
+    __android_log_print(ANDROID_LOG_ERROR, LOG_TAG, "%s errno %s(%d)",
+                        message, strerror(errno), errno);
+
+    if (errnum != 0) {
+        const char *s = strerror(errnum);
+        if (strcmp(s, "Unknown error") != 0)
+            message = s;
+    }
+
+    jclass exClass;
+    const char *className = "java/io/IOException";
+
+    exClass = env->FindClass(className);
+    return env->ThrowNew(exClass, message);
+}
+
+static void closeNonstandardFileDescriptors() {
+    // Android uses shared memory to communicate between processes. The file descriptor is passed
+    // to child processes using the environment variable ANDROID_PROPERTY_WORKSPACE, which is of
+    // the form "properties_fd,sizeOfSharedMemory"
+    int properties_fd = -1;
+    char *properties_fd_string = getenv("ANDROID_PROPERTY_WORKSPACE");
+    if (properties_fd_string != NULL) {
+        properties_fd = atoi(properties_fd_string);
+    }
+    DIR *dir = opendir("/proc/self/fd");
+    if (dir != NULL) {
+        int dir_fd = dirfd(dir);
+
+        while (true) {
+            struct dirent *entry = readdir(dir);
+            if (entry == NULL) {
+                break;
+            }
+
+            int fd = atoi(entry->d_name);
+            if (fd > STDERR_FILENO && fd != dir_fd && fd != properties_fd) {
+                close(fd);
+            }
+        }
+
+        closedir(dir);
+    }
+}
+
+static int create_subprocess(JNIEnv *env, const char *cmd, char *const argv[], char *const envp[],
+                             int masterFd) {
+    // same size as Android 1.6 libc/unistd/ptsname_r.c
+    char devname[64];
+    pid_t pid;
+
+    fcntl(masterFd, F_SETFD, FD_CLOEXEC);
+
+    // grantpt is unnecessary, because we already assume devpts by using /dev/ptmx
+    if (unlockpt(masterFd)) {
+        throwIOException(env, errno, "trouble with /dev/ptmx");
+        return -1;
+    }
+    memset(devname, 0, sizeof(devname));
+    // Early (Android 1.6) bionic versions of ptsname_r had a bug where they returned the buffer
+    // instead of 0 on success.  A compatible way of telling whether ptsname_r
+    // succeeded is to zero out errno and check it after the call
+    errno = 0;
+    int ptsResult = ptsname_r(masterFd, devname, sizeof(devname));
+    if (ptsResult && errno) {
+        throwIOException(env, errno, "ptsname_r returned error");
+        return -1;
+    }
+
+    pid = fork();
+    if (pid < 0) {
+        throwIOException(env, errno, "fork failed");
+        return -1;
+    }
+
+    if (pid == 0) {
+        int pts;
+
+        setsid();
+
+        pts = open(devname, O_RDWR);
+        if (pts < 0) exit(-1);
+
+        ioctl(pts, TIOCSCTTY, 0);
+
+        dup2(pts, 0);
+        dup2(pts, 1);
+        dup2(pts, 2);
+
+        closeNonstandardFileDescriptors();
+
+        if (envp) {
+            for (; *envp; ++envp) {
+                putenv(*envp);
+            }
+        }
+
+        execv(cmd, argv);
+        exit(-1);
+    } else {
+        return (int) pid;
+    }
+}
+
+extern "C" {
+
+JNIEXPORT void JNICALL Java_jackpal_androidterm_TermExec_sendSignal(JNIEnv *env, jobject clazz,
+                                                                    jint procId, jint signal) {
+    kill(procId, signal);
+}
+
+JNIEXPORT jint JNICALL Java_jackpal_androidterm_TermExec_waitFor(JNIEnv *env, jclass clazz,
+                                                                 jint procId) {
+    int status;
+    waitpid(procId, &status, 0);
+    int result = 0;
+    if (WIFEXITED(status)) {
+        result = WEXITSTATUS(status);
+    }
+    return result;
+}
+
+JNIEXPORT jint JNICALL Java_jackpal_androidterm_TermExec_createSubprocessInternal(JNIEnv *env,
+                                                                                  jclass clazz,
+                                                                                  jstring cmd,
+                                                                                  jobjectArray args,
+                                                                                  jobjectArray envVars,
+                                                                                  jint masterFd) {
+    const jchar *str = cmd ? env->GetStringCritical(cmd, 0) : 0;
+    String8 cmd_8;
+    if (str) {
+        cmd_8.set(str, env->GetStringLength(cmd));
+        env->ReleaseStringCritical(cmd, str);
+    }
+
+    jsize size = args ? env->GetArrayLength(args) : 0;
+    char **argv = NULL;
+    String8 tmp_8;
+    if (size > 0) {
+        argv = (char **) malloc((size + 1) * sizeof(char *));
+        if (!argv) {
+            throwOutOfMemoryError(env, "Couldn't allocate argv array");
+            return 0;
+        }
+        for (int i = 0; i < size; ++i) {
+            jstring arg = reinterpret_cast<jstring>(env->GetObjectArrayElement(args, i));
+            str = env->GetStringCritical(arg, 0);
+            if (!str) {
+                throwOutOfMemoryError(env, "Couldn't get argument from array");
+                return 0;
+            }
+            tmp_8.set(str, env->GetStringLength(arg));
+            env->ReleaseStringCritical(arg, str);
+            argv[i] = strdup(tmp_8.string());
+        }
+        argv[size] = NULL;
+    }
+
+    size = envVars ? env->GetArrayLength(envVars) : 0;
+    char **envp = NULL;
+    if (size > 0) {
+        envp = (char **) malloc((size + 1) * sizeof(char *));
+        if (!envp) {
+            throwOutOfMemoryError(env, "Couldn't allocate envp array");
+            return 0;
+        }
+        for (int i = 0; i < size; ++i) {
+            jstring var = reinterpret_cast<jstring>(env->GetObjectArrayElement(envVars, i));
+            str = env->GetStringCritical(var, 0);
+            if (!str) {
+                throwOutOfMemoryError(env, "Couldn't get env var from array");
+                return 0;
+            }
+            tmp_8.set(str, env->GetStringLength(var));
+            env->ReleaseStringCritical(var, str);
+            envp[i] = strdup(tmp_8.string());
+        }
+        envp[size] = NULL;
+    }
+
+    int ptm = create_subprocess(env, cmd_8.string(), argv, envp, masterFd);
+
+    if (argv) {
+        for (char **tmp = argv; *tmp; ++tmp) {
+            free(*tmp);
+        }
+        free(argv);
+    }
+    if (envp) {
+        for (char **tmp = envp; *tmp; ++tmp) {
+            free(*tmp);
+        }
+        free(envp);
+    }
+
+    return ptm;
+}
+
+}
diff --git a/termexec/src/main/jni/process.h b/termexec/src/main/jni/process.h
new file mode 100644
index 00000000..1a370aba
--- /dev/null
+++ b/termexec/src/main/jni/process.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2012 Steven Luo
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef _JACKPAL_PROCESS_H
+#define _JACKPAL_PROCESS_H 1
+
+#include <stddef.h>
+#include <string.h>
+#include "jni.h"
+#include <android/log.h>
+
+#define LOG_TAG "jackpal-termexec"
+
+extern "C" {
+JNIEXPORT jint JNICALL Java_jackpal_androidterm_TermExec_createSubprocessInternal
+        (JNIEnv *, jclass, jstring, jobjectArray, jobjectArray, jint);
+
+JNIEXPORT jint JNICALL Java_jackpal_androidterm_TermExec_waitFor
+        (JNIEnv *, jclass, jint);
+}
+
+#endif	/* !defined(_JACKPAL_PROCESS_H) */
diff --git a/termexec/src/main/jni/termExec.cpp b/termexec/src/main/jni/termExec.cpp
new file mode 100644
index 00000000..c042df7f
--- /dev/null
+++ b/termexec/src/main/jni/termExec.cpp
@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2007, 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "common.h"
+
+#define LOG_TAG "Exec"
+
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/wait.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <termios.h>
+#include <signal.h>
+
+#include "termExec.h"
+
+static void android_os_Exec_setPtyWindowSize(JNIEnv *env, jobject clazz,
+                                             jint fd, jint row, jint col, jint xpixel,
+                                             jint ypixel) {
+    struct winsize sz;
+
+    sz.ws_row = row;
+    sz.ws_col = col;
+    sz.ws_xpixel = xpixel;
+    sz.ws_ypixel = ypixel;
+
+    // TODO: handle the situation, when the file descriptor is incompatible with TIOCSWINSZ (e.g. not from /dev/ptmx)
+    if (ioctl(fd, TIOCSWINSZ, &sz) == -1)
+        env->ThrowNew(env->FindClass("java/io/IOException"), "Failed to issue TIOCSWINSZ ioctl");
+}
+
+// tcgetattr /tcsetattr are not part of Bionic at API level 4. Here's a compatible version.
+
+static __inline__ int my_tcgetattr(int fd, struct termios *s) {
+    return ioctl(fd, TCGETS, s);
+}
+
+static __inline__ int my_tcsetattr(int fd, const struct termios *s) {
+    return ioctl(fd, TCSETS, (void *) s);
+}
+
+static void android_os_Exec_setPtyUTF8Mode(JNIEnv *env, jobject clazz, jint fd, jboolean utf8Mode) {
+    struct termios tios;
+
+    if (my_tcgetattr(fd, &tios) != 0)
+        env->ThrowNew(env->FindClass("java/io/IOException"), "Failed to get terminal attributes");
+
+    if (utf8Mode) {
+        tios.c_iflag |= IUTF8;
+    } else {
+        tios.c_iflag &= ~IUTF8;
+    }
+
+    if (my_tcsetattr(fd, &tios) != 0)
+        env->ThrowNew(env->FindClass("java/io/IOException"), "Failed to set terminal UTF-8 mode");
+}
+
+static const char *classPathName = "org/qpython/qpy/console/Exec";
+static JNINativeMethod method_table[] = {
+        {"setPtyWindowSizeInternal", "(IIIII)V",
+                (void *) android_os_Exec_setPtyWindowSize},
+        {"setPtyUTF8ModeInternal",   "(IZ)V",
+                (void *) android_os_Exec_setPtyUTF8Mode}
+};
+
+int init_Exec(JNIEnv *env) {
+    if (!registerNativeMethods(env, classPathName, method_table,
+                               sizeof(method_table) / sizeof(method_table[0]))) {
+        return JNI_FALSE;
+    }
+
+    return JNI_TRUE;
+}
diff --git a/termexec/src/main/jni/termExec.h b/termexec/src/main/jni/termExec.h
new file mode 100644
index 00000000..23d2f3c4
--- /dev/null
+++ b/termexec/src/main/jni/termExec.h
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2012 Steven Luo
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef _TERMEXEC_H
+#define _TERMEXEC_H 1
+
+#include "jni.h"
+
+int init_Exec(JNIEnv *env);
+
+#endif	/* !defined(_TERMEXEC_H) */
diff --git a/utils/copy.sh b/utils/copy.sh
new file mode 100644
index 00000000..b056cca1
--- /dev/null
+++ b/utils/copy.sh
@@ -0,0 +1,2 @@
+cp {../qpython-android/,}$1
+git add $1
diff --git a/utils/diff.sh b/utils/diff.sh
new file mode 100644
index 00000000..99913579
--- /dev/null
+++ b/utils/diff.sh
@@ -0,0 +1 @@
+diff -u {../qpython-android/,}$1